diff --git a/third_party/nixpkgs/.version b/third_party/nixpkgs/.version index 62c36bbb17..b9b543d425 100644 --- a/third_party/nixpkgs/.version +++ b/third_party/nixpkgs/.version @@ -1 +1 @@ -21.03 +21.05 diff --git a/third_party/nixpkgs/doc/builders/packages/elm.section.md b/third_party/nixpkgs/doc/builders/packages/elm.section.md new file mode 100644 index 0000000000..53087c0e9d --- /dev/null +++ b/third_party/nixpkgs/doc/builders/packages/elm.section.md @@ -0,0 +1,11 @@ +# Elm {#sec-elm} + +To start a development environment do + +```ShellSession +nix-shell -p elmPackages.elm elmPackages.elm-format +``` + +To update the Elm compiler, see nixpkgs/pkgs/development/compilers/elm/README.md. + +To package Elm applications, [read about elm2nix](https://github.com/hercules-ci/elm2nix#elm2nix). diff --git a/third_party/nixpkgs/doc/builders/packages/elm.xml b/third_party/nixpkgs/doc/builders/packages/elm.xml deleted file mode 100644 index a067f6c7c7..0000000000 --- a/third_party/nixpkgs/doc/builders/packages/elm.xml +++ /dev/null @@ -1,17 +0,0 @@ -
- Elm - - - To start a development environment do nix-shell -p elmPackages.elm elmPackages.elm-format - - - - To update Elm compiler, see nixpkgs/pkgs/development/compilers/elm/README.md. - - - - To package Elm applications, read about elm2nix. - -
diff --git a/third_party/nixpkgs/doc/builders/packages/index.xml b/third_party/nixpkgs/doc/builders/packages/index.xml index ab335e24ff..e4f8a1d312 100644 --- a/third_party/nixpkgs/doc/builders/packages/index.xml +++ b/third_party/nixpkgs/doc/builders/packages/index.xml @@ -8,7 +8,7 @@ - + diff --git a/third_party/nixpkgs/doc/default.nix b/third_party/nixpkgs/doc/default.nix index 543a387417..25389fa2da 100644 --- a/third_party/nixpkgs/doc/default.nix +++ b/third_party/nixpkgs/doc/default.nix @@ -15,7 +15,7 @@ in pkgs.stdenv.mkDerivation { xmlformat ]; - src = ./.; + src = lib.cleanSource ./.; makeFlags = [ "PANDOC_LUA_FILTERS_DIR=${pkgs.pandoc-lua-filters}/share/pandoc/filters" diff --git a/third_party/nixpkgs/doc/functions/library/asserts.xml b/third_party/nixpkgs/doc/functions/library/asserts.xml index 10891039e8..7c94222ef1 100644 --- a/third_party/nixpkgs/doc/functions/library/asserts.xml +++ b/third_party/nixpkgs/doc/functions/library/asserts.xml @@ -103,7 +103,7 @@ stderr> assert failed Ensuring a user provided a possible value false stderr> trace: sslLibrary must be one of "openssl", "libressl", but is: "bearssl" ]]> diff --git a/third_party/nixpkgs/doc/stdenv/meta.xml b/third_party/nixpkgs/doc/stdenv/meta.xml index 10802d1af5..91ace0b9cc 100644 --- a/third_party/nixpkgs/doc/stdenv/meta.xml +++ b/third_party/nixpkgs/doc/stdenv/meta.xml @@ -75,7 +75,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + description @@ -94,7 +94,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + longDescription @@ -104,7 +104,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + branch @@ -114,7 +114,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + homepage @@ -124,7 +124,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + downloadPage @@ -134,7 +134,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + changelog @@ -144,7 +144,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + license @@ -183,7 +183,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + maintainers @@ -193,7 +193,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + priority @@ -203,7 +203,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - + platforms @@ -217,7 +217,7 @@ meta.platforms = lib.platforms.linux; - + tests @@ -244,7 +244,7 @@ meta.platforms = lib.platforms.linux; - + timeout @@ -254,7 +254,7 @@ meta.platforms = lib.platforms.linux; - + hydraPlatforms @@ -268,7 +268,7 @@ meta.hydraPlatforms = []; - + broken @@ -278,7 +278,7 @@ meta.hydraPlatforms = []; - + updateWalker diff --git a/third_party/nixpkgs/doc/using/configuration.xml b/third_party/nixpkgs/doc/using/configuration.xml index 1e1df867e0..2cd2615f54 100644 --- a/third_party/nixpkgs/doc/using/configuration.xml +++ b/third_party/nixpkgs/doc/using/configuration.xml @@ -138,11 +138,11 @@ - For a more useful example, try the following. This configuration only allows unfree packages named flash player and visual studio code: + For a more useful example, try the following. This configuration only allows unfree packages named roon-server and visual studio code: { allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "flashplayer" + "roon-server" "vscode" ]; } diff --git a/third_party/nixpkgs/doc/using/overlays.xml b/third_party/nixpkgs/doc/using/overlays.xml index 9ffbb4edd9..8bda235d43 100644 --- a/third_party/nixpkgs/doc/using/overlays.xml +++ b/third_party/nixpkgs/doc/using/overlays.xml @@ -236,10 +236,11 @@ self: super: { blas = super.blas.override { blasProvider = self.mkl; - } + }; + lapack = super.lapack.override { lapackProvider = self.mkl; - } + }; } diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index 830cb95aff..ee136c7337 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -306,6 +306,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Free Documentation License v1.1 only"; }; + fdl11Plus = spdx { + spdxId = "GFDL-1.1-or-later"; + fullName = "GNU Free Documentation License v1.1 or later"; + }; + fdl12Only = spdx { spdxId = "GFDL-1.2-only"; fullName = "GNU Free Documentation License v1.2 only"; diff --git a/third_party/nixpkgs/lib/lists.nix b/third_party/nixpkgs/lib/lists.nix index 56af4d9daa..e469f3ef26 100644 --- a/third_party/nixpkgs/lib/lists.nix +++ b/third_party/nixpkgs/lib/lists.nix @@ -241,7 +241,7 @@ rec { /* Return a singleton list or an empty list, depending on a boolean value. Useful when building lists with optional elements - (e.g. `++ optional (system == "i686-linux") flashplayer'). + (e.g. `++ optional (system == "i686-linux") firefox'). Type: optional :: bool -> a -> [a] diff --git a/third_party/nixpkgs/lib/systems/platforms.nix b/third_party/nixpkgs/lib/systems/platforms.nix index f399c1873f..3bf90cd0ca 100644 --- a/third_party/nixpkgs/lib/systems/platforms.nix +++ b/third_party/nixpkgs/lib/systems/platforms.nix @@ -300,7 +300,7 @@ rec { baseConfig = "multi_v7_defconfig"; DTB = true; autoModules = true; - PreferBuiltin = true; + preferBuiltin = true; target = "zImage"; extraConfig = '' # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig. diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 7c4a069296..f46e36c989 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -48,6 +48,12 @@ See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. */ { + _0qq = { + email = "0qqw0qqw@gmail.com"; + github = "0qq"; + githubId = 64707304; + name = "Dmitry Kulikov"; + }; _0x4A6F = { email = "mail-maintainer@0x4A6F.dev"; name = "Joachim Ernst"; @@ -538,12 +544,6 @@ githubId = 638836; name = "Andreas Rammhold"; }; - andreabedini = { - email = "andrea@kzn.io"; - github = "andreabedini"; - githubId = 69135; - name = "Andrea Bedini"; - }; andreasfelix = { email = "fandreas@physik.hu-berlin.de"; github = "andreasfelix"; @@ -904,6 +904,12 @@ githubId = 687218; name = "averelld"; }; + avh4 = { + email = "gruen0aermel@gmail.com"; + github = "avh4"; + githubId = 1222; + name = "Aaron VonderHaar"; + }; avitex = { email = "theavitex@gmail.com"; github = "avitex"; @@ -2279,6 +2285,12 @@ githubId = 265220; name = "David Leung"; }; + DianaOlympos = { + email = "DianaOlympos@noreply.github.com"; + github = "DianaOlympos"; + githubId = 15774340; + name = "Thomas Depierre"; + }; dipinhora = { email = "dipinhora+github@gmail.com"; github = "dipinhora"; @@ -3043,6 +3055,12 @@ githubId = 9959940; name = "Andreas Fehn"; }; + felixsinger = { + email = "felixsinger@posteo.net"; + github = "felixsinger"; + githubId = 628359; + name = "Felix Singer"; + }; felschr = { email = "dev@felschr.com"; github = "felschr"; @@ -3065,6 +3083,12 @@ githubId = 8182846; name = "Francesco Gazzetta"; }; + figsoda = { + email = "figsoda@pm.me"; + github = "figsoda"; + githubId = 40620903; + name = "figsoda"; + }; fionera = { email = "nix@fionera.de"; github = "fionera"; @@ -3591,6 +3615,12 @@ githubId = 5317234; name = "Raphael Megzari"; }; + happy-river = { + email = "happyriver93@runbox.com"; + github = "happy-river"; + githubId = 54728477; + name = "Happy River"; + }; haslersn = { email = "haslersn@fius.informatik.uni-stuttgart.de"; github = "haslersn"; @@ -3789,6 +3819,12 @@ githubId = 15371828; name = "Hugo Lageneste"; }; + hypersw = { + email = "baltic@hypersw.net"; + github = "hypersw"; + githubId = 2332070; + name = "Serge Baltic"; + }; hyphon81 = { email = "zero812n@gmail.com"; github = "hyphon81"; @@ -7101,6 +7137,12 @@ githubId = 15645854; name = "Brad Christensen"; }; + payas = { + email = "relekarpayas@gmail.com"; + github = "payasrelekar"; + githubId = 24254289; + name = "Payas Relekar"; + }; pawelpacana = { email = "pawel.pacana@gmail.com"; github = "pawelpacana"; @@ -7150,7 +7192,7 @@ name = "Paulus Esterhazy"; }; petabyteboy = { - email = "me@pbb.lc"; + email = "milan@petabyte.dev"; github = "petabyteboy"; githubId = 3250809; name = "Milan Pässler"; @@ -7561,6 +7603,12 @@ githubId = 115877; name = "Kenny Shen"; }; + queezle = { + email = "git@queezle.net"; + github = "qzle"; + githubId = 1024891; + name = "Jens Nolte"; + }; quentini = { email = "quentini@airmail.cc"; github = "QuentinI"; @@ -9385,6 +9433,12 @@ fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; }]; }; + tmountain = { + email = "tinymountain@gmail.com"; + github = "tmountain"; + githubId = 135297; + name = "Travis Whitton"; + }; tmplt = { email = "tmplt@dragons.rocks"; github = "tmplt"; @@ -9970,6 +10024,12 @@ githubId = 6016963; name = "Patrick Winter"; }; + winterqt = { + email = "nixos@winter.cafe"; + github = "winterqt"; + githubId = 78392041; + name = "Winter"; + }; wishfort36 = { email = "42300264+wishfort36@users.noreply.github.com"; github = "wishfort36"; @@ -10632,4 +10692,10 @@ github = "zupo"; githubId = 311580; }; + felixscheinost = { + name = "Felix Scheinost"; + email = "felix.scheinost@posteo.de"; + github = "felixscheinost"; + githubId = 31761492; + }; } diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index b34c3f71bd..7d778a8ae3 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -29,6 +29,18 @@ with lib.maintainers; { scope = "Maintain ACME-related packages and modules."; }; + beam = { + members = [ + ankhers + Br1ght0ne + DianaOlympos + gleber + happysalada + yurrriq + ]; + scope = "Maintain BEAM-related packages and modules."; + }; + cinnamon = { members = [ mkg20001 diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml index bf18457c2b..e083d51406 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml @@ -8,7 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. - + diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml index 0b1d0d509d..a6cff1a8fa 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml @@ -6,7 +6,9 @@ Release 20.09 (“Nightingale”, 2020.10/27) - Support is planned until the end of April 2021, handing over to 21.03. + Support is planned until the end of June 2021, handing over to 21.05. + (Plans + have shifted by two months since release of 20.09.)
Specifying mailboxes in the dovecot2 module - as a list is deprecated and will break eval in 21.03. Instead, an attribute-set should be specified where the name + as a list is deprecated and will break eval in 21.05. Instead, an attribute-set should be specified where the name should be the key of the attribute. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml similarity index 95% rename from third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml rename to third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml index e5c93f5c51..6dd14d6051 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml @@ -2,14 +2,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03"> - Release 21.03 (“Okapi”, 2021.03/??) + xml:id="sec-release-21.05"> + Release 21.05 (“Okapi”, 2021.05/??)
+ xml:id="sec-release-21.05-highlights"> Highlights @@ -20,7 +20,7 @@ - Support is planned until the end of October 2021, handing over to 21.09. + Support is planned until the end of December 2021, handing over to 21.11. @@ -46,7 +46,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-new-services"> + xml:id="sec-release-21.05-new-services"> New Services @@ -82,7 +82,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-incompatibilities"> + xml:id="sec-release-21.05-incompatibilities"> Backward Incompatibilities @@ -466,6 +466,34 @@ self: super: ALSA OSS emulation (sound.enableOSSEmulation) is now disabled by default. + + + Thinkfan as been updated to 1.2.x, which comes with a + new YAML based configuration format. For this reason, several NixOS options + of the thinkfan module have been changed to non-backward compatible types. + In addition, a new option has + been added. + + + Please read the + thinkfan documentation before updating. + + + + + Adobe Flash Player support has been dropped from the tree. In particular, + the following packages no longer support it: + + chromium + firefox + qt48 + qt5.qtwebkit + + Additionally, packages flashplayer and + hal-flash were removed along with the + services.flashpolicyd module. + +
@@ -473,7 +501,7 @@ self: super: xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-notable-changes"> + xml:id="sec-release-21.05-notable-changes"> Other Notable Changes diff --git a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix index c3120c2bf3..14fe180d0b 100644 --- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix +++ b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix @@ -29,6 +29,7 @@ with lib; nixpkgs.overlays = singleton (const (super: { cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; + beam = super.beam_nox; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/i2c.nix b/third_party/nixpkgs/nixos/modules/hardware/i2c.nix new file mode 100644 index 0000000000..ff14b4b1c8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/i2c.nix @@ -0,0 +1,43 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.hardware.i2c; +in + +{ + options.hardware.i2c = { + enable = mkEnableOption '' + i2c devices support. By default access is granted to users in the "i2c" + group (will be created if non-existent) and any user with a seat, meaning + logged on the computer locally. + ''; + + group = mkOption { + type = types.str; + default = "i2c"; + description = '' + Grant access to i2c devices (/dev/i2c-*) to users in this group. + ''; + }; + }; + + config = mkIf cfg.enable { + + boot.kernelModules = [ "i2c-dev" ]; + + users.groups = mkIf (cfg.group == "i2c") { + i2c = { }; + }; + + services.udev.extraRules = '' + # allow group ${cfg.group} and users with a seat use of i2c devices + ACTION=="add", KERNEL=="i2c-[0-9]*", TAG+="uaccess", GROUP="${cfg.group}", MODE="660" + ''; + + }; + + meta.maintainers = [ maintainers.rnhmjoj ]; + +} diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 0d26b7300d..5242ac0535 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -46,6 +46,7 @@ ./hardware/cpu/intel-microcode.nix ./hardware/digitalbitbox.nix ./hardware/device-tree.nix + ./hardware/i2c.nix ./hardware/sensor/hddtemp.nix ./hardware/sensor/iio.nix ./hardware/keyboard/zsa.nix @@ -177,7 +178,6 @@ ./programs/tsm-client.nix ./programs/udevil.nix ./programs/usbtop.nix - ./programs/venus.nix ./programs/vim.nix ./programs/wavemon.nix ./programs/waybar.nix @@ -359,6 +359,7 @@ ./services/games/terraria.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix + ./services/hardware/auto-cpufreq.nix ./services/hardware/bluetooth.nix ./services/hardware/bolt.nix ./services/hardware/brltty.nix @@ -373,6 +374,7 @@ ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix ./services/hardware/pommed.nix + ./services/hardware/power-profiles-daemon.nix ./services/hardware/ratbagd.nix ./services/hardware/sane.nix ./services/hardware/sane_extra_backends/brscan4.nix @@ -456,6 +458,7 @@ ./services/misc/domoticz.nix ./services/misc/errbot.nix ./services/misc/etcd.nix + ./services/misc/etebase-server.nix ./services/misc/ethminer.nix ./services/misc/exhibitor.nix ./services/misc/felix.nix @@ -648,7 +651,6 @@ ./services/networking/fireqos.nix ./services/networking/firewall.nix ./services/networking/flannel.nix - ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix ./services/networking/freeradius.nix ./services/networking/gale.nix @@ -889,6 +891,7 @@ ./services/web-apps/jitsi-meet.nix ./services/web-apps/keycloak.nix ./services/web-apps/limesurvey.nix + ./services/web-apps/mastodon.nix ./services/web-apps/mattermost.nix ./services/web-apps/mediawiki.nix ./services/web-apps/miniflux.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix b/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix index 4d59ea8d0f..1f223e2475 100644 --- a/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix +++ b/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: with lib; - let cfg = config.programs.captive-browser; in @@ -27,15 +26,17 @@ in # the options below are the same as in "captive-browser.toml" browser = mkOption { type = types.str; - default = concatStringsSep " " [ "${pkgs.chromium}/bin/chromium" - "--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive" - ''--proxy-server="socks5://$PROXY"'' - ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' - "--no-first-run" - "--new-window" - "--incognito" - "http://cache.nixos.org/" - ]; + default = concatStringsSep " " [ + ''${pkgs.chromium}/bin/chromium'' + ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' + ''--proxy-server="socks5://$PROXY"'' + ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' + ''--no-first-run'' + ''--new-window'' + ''--incognito'' + ''-no-default-browser-check'' + ''http://cache.nixos.org/'' + ]; description = '' The shell (/bin/sh) command executed once the proxy starts. When browser exits, the proxy exits. An extra env var PROXY is available. @@ -81,42 +82,45 @@ in config = mkIf cfg.enable { - programs.captive-browser.dhcp-dns = mkOptionDefault ( - if config.networking.networkmanager.enable then - "${pkgs.networkmanager}/bin/nmcli dev show ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" - else if config.networking.dhcpcd.enable then - "${pkgs.dhcpcd}/bin/dhcpcd -U ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" - else if config.networking.useNetworkd then - "${cfg.package}/bin/systemd-networkd-dns ${escapeShellArg cfg.interface}" - else - "${config.security.wrapperDir}/udhcpc --quit --now -f -i ${escapeShellArg cfg.interface} -O dns --script ${ - pkgs.writeScript "udhcp-script" '' - #!/bin/sh - if [ "$1" = bound ]; then - echo "$dns" - fi - ''}" - ); + programs.captive-browser.dhcp-dns = + let + iface = prefix: + optionalString cfg.bindInterface (concatStringsSep " " (map escapeShellArg [ prefix cfg.interface ])); + in + mkOptionDefault ( + if config.networking.networkmanager.enable then + "${pkgs.networkmanager}/bin/nmcli dev show ${iface ""} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" + else if config.networking.dhcpcd.enable then + "${pkgs.dhcpcd}/bin/dhcpcd ${iface "-U"} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" + else if config.networking.useNetworkd then + "${cfg.package}/bin/systemd-networkd-dns ${iface ""}" + else + "${config.security.wrapperDir}/udhcpc --quit --now -f ${iface "-i"} -O dns --script ${ + pkgs.writeShellScript "udhcp-script" '' + if [ "$1" = bound ]; then + echo "$dns" + fi + ''}" + ); security.wrappers.udhcpc = { - capabilities = "cap_net_raw+p"; - source = "${pkgs.busybox}/bin/udhcpc"; + capabilities = "cap_net_raw+p"; + source = "${pkgs.busybox}/bin/udhcpc"; }; security.wrappers.captive-browser = { - capabilities = "cap_net_raw+p"; - source = pkgs.writeScript "captive-browser" '' - #!${pkgs.bash}/bin/bash - export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' - browser = """${cfg.browser}""" - dhcp-dns = """${cfg.dhcp-dns}""" - socks5-addr = """${cfg.socks5-addr}""" - ${optionalString cfg.bindInterface '' - bind-device = """${cfg.interface}""" - ''} - ''} - exec ${cfg.package}/bin/captive-browser - ''; + capabilities = "cap_net_raw+p"; + source = pkgs.writeShellScript "captive-browser" '' + export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' + browser = """${cfg.browser}""" + dhcp-dns = """${cfg.dhcp-dns}""" + socks5-addr = """${cfg.socks5-addr}""" + ${optionalString cfg.bindInterface '' + bind-device = """${cfg.interface}""" + ''} + ''} + exec ${cfg.package}/bin/captive-browser + ''; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/venus.nix b/third_party/nixpkgs/nixos/modules/programs/venus.nix deleted file mode 100644 index 58faf38777..0000000000 --- a/third_party/nixpkgs/nixos/modules/programs/venus.nix +++ /dev/null @@ -1,173 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - cfg = config.services.venus; - - configFile = pkgs.writeText "venus.ini" - '' - [Planet] - name = ${cfg.name} - link = ${cfg.link} - owner_name = ${cfg.ownerName} - owner_email = ${cfg.ownerEmail} - output_theme = ${cfg.cacheDirectory}/theme - output_dir = ${cfg.outputDirectory} - cache_directory = ${cfg.cacheDirectory} - items_per_page = ${toString cfg.itemsPerPage} - ${(concatStringsSep "\n\n" - (map ({ name, feedUrl, homepageUrl }: - '' - [${feedUrl}] - name = ${name} - link = ${homepageUrl} - '') cfg.feeds))} - ''; - -in -{ - - options = { - services.venus = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Planet Venus is an awesome ‘river of news’ feed reader. It downloads - news feeds published by web sites and aggregates their content - together into a single combined feed, latest news first. - ''; - }; - - dates = mkOption { - default = "*:0/15"; - type = types.str; - description = '' - Specification (in the format described by - systemd.time - 7) of the time at - which the Venus will collect feeds. - ''; - }; - - user = mkOption { - default = "root"; - type = types.str; - description = '' - User for running venus script. - ''; - }; - - group = mkOption { - default = "root"; - type = types.str; - description = '' - Group for running venus script. - ''; - }; - - name = mkOption { - default = "NixOS Planet"; - type = types.str; - description = '' - Your planet's name. - ''; - }; - - link = mkOption { - default = "https://planet.nixos.org"; - type = types.str; - description = '' - Link to the main page. - ''; - }; - - ownerName = mkOption { - default = "Rok Garbas"; - type = types.str; - description = '' - Your name. - ''; - }; - - ownerEmail = mkOption { - default = "some@example.com"; - type = types.str; - description = '' - Your e-mail address. - ''; - }; - - outputTheme = mkOption { - default = "${pkgs.venus}/themes/classic_fancy"; - type = types.path; - description = '' - Directory containing a config.ini file which is merged with this one. - This is typically used to specify templating and bill of material - information. - ''; - }; - - outputDirectory = mkOption { - type = types.path; - description = '' - Directory to place output files. - ''; - }; - - cacheDirectory = mkOption { - default = "/var/cache/venus"; - type = types.path; - description = '' - Where cached feeds are stored. - ''; - }; - - itemsPerPage = mkOption { - default = 15; - type = types.int; - description = '' - How many items to put on each page. - ''; - }; - - feeds = mkOption { - default = []; - example = [ - { - name = "Rok Garbas"; - feedUrl= "http://url/to/rss/feed.xml"; - homepageUrl = "http://garbas.si"; - } - ]; - description = '' - List of feeds. - ''; - }; - - }; - }; - - config = mkIf cfg.enable { - - system.activationScripts.venus = - '' - mkdir -p ${cfg.outputDirectory} - chown ${cfg.user}:${cfg.group} ${cfg.outputDirectory} -R - rm -rf ${cfg.cacheDirectory}/theme - mkdir -p ${cfg.cacheDirectory}/theme - cp -R ${cfg.outputTheme}/* ${cfg.cacheDirectory}/theme - chown ${cfg.user}:${cfg.group} ${cfg.cacheDirectory} -R - ''; - - systemd.services.venus = - { description = "Planet Venus Feed Reader"; - path = [ pkgs.venus ]; - script = "exec venus-planet ${configFile}"; - serviceConfig.User = "${cfg.user}"; - serviceConfig.Group = "${cfg.group}"; - startAt = cfg.dates; - }; - - }; -} diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index c6f705bb2d..2d07e421ef 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -70,6 +70,8 @@ with lib; '') (mkRemovedOptionModule [ "services" "seeks" ] "") + (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") # Do NOT add any option renames here, see top of the file ]; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix index f614f0ba3e..a261b87607 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix @@ -48,8 +48,8 @@ let ++ [ "--stream.port ${toString cfg.port}" ] ++ optionalNull cfg.sampleFormat "--stream.sampleformat ${cfg.sampleFormat}" ++ optionalNull cfg.codec "--stream.codec ${cfg.codec}" - ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${cfg.streamBuffer}" - ++ optionalNull cfg.buffer "--stream.buffer ${cfg.buffer}" + ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${toString cfg.streamBuffer}" + ++ optionalNull cfg.buffer "--stream.buffer ${toString cfg.buffer}" ++ optional cfg.sendToMuted "--stream.send_to_muted" # tcp json rpc ++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ] @@ -198,13 +198,14 @@ in { type = with types; attrsOf (submodule { options = { location = mkOption { - type = types.path; + type = types.oneOf [ types.path types.str ]; description = '' - The location of the pipe. + The location of the pipe, file, Librespot/Airplay/process binary, or a TCP address. + Use an empty string for alsa. ''; }; type = mkOption { - type = types.enum [ "pipe" "file" "process" "spotify" "airplay" ]; + type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" ]; default = "pipe"; description = '' The type of input stream. @@ -219,13 +220,21 @@ in { example = literalExample '' # for type == "pipe": { - mode = "listen"; + mode = "create"; }; # for type == "process": { params = "--param1 --param2"; logStderr = "true"; }; + # for type == "tcp": + { + mode = "client"; + } + # for type == "alsa": + { + device = "hw:0,0"; + } ''; }; inherit sampleFormat; @@ -255,6 +264,11 @@ in { config = mkIf cfg.enable { + # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85 + warnings = filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then '' + services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead. + '' else "") cfg.streams); + systemd.services.snapserver = { after = [ "network.target" ]; description = "Snapserver"; @@ -272,7 +286,7 @@ in { ProtectKernelTunables = true; ProtectControlGroups = true; ProtectKernelModules = true; - RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK"; RestrictNamespaces = true; RuntimeDirectory = name; StateDirectory = name; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 4aed493c0f..9f9b86ee61 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -7,14 +7,21 @@ Platform-specific code is in the respective default.nix files. */ { config, lib, options, pkgs, ... }: - let - inherit (lib) mkOption mkIf types filterAttrs literalExample mkRenamedOptionModule; + inherit (lib) + filterAttrs + literalExample + mkIf + mkOption + mkRemovedOptionModule + mkRenamedOptionModule + types + ; cfg = config.services.hercules-ci-agent; - format = pkgs.formats.toml {}; + format = pkgs.formats.toml { }; settingsModule = { config, ... }: { freeformType = format.type; @@ -28,10 +35,14 @@ let }; concurrentTasks = mkOption { description = '' - Number of tasks to perform simultaneously, such as evaluations, derivations. + Number of tasks to perform simultaneously. - You must have a total capacity across agents of at least 2 concurrent tasks on x86_64-linux - to allow for import from derivation. + A task is a single derivation build or an evaluation. + At minimum, you need 2 concurrent tasks for x86_64-linux + in your cluster, to allow for import from derivation. + + concurrentTasks can be around the CPU core count or lower if memory is + the bottleneck. ''; type = types.int; default = 4; @@ -77,61 +88,39 @@ let }; }; + # TODO (roberth, >=2022) remove checkNix = if !cfg.checkNix then "" - else if lib.versionAtLeast config.nix.package.version "2.4.0" + else if lib.versionAtLeast config.nix.package.version "2.3.10" then "" - else pkgs.stdenv.mkDerivation { - name = "hercules-ci-check-system-nix-src"; - inherit (config.nix.package) src patches; - configurePhase = ":"; - buildPhase = '' - echo "Checking in-memory pathInfoCache expiry" - if ! grep 'struct PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then - cat 1>&2 </dev/null; then + cat 1>&2 <help@hercules-ci.com. ''; }; - patchNix = mkOption { - type = types.bool; - default = false; - description = '' - Fix Nix 2.3 cache path metadata caching behavior. Has the effect of nix.package = patch pkgs.nix; - - This option will be removed when Hercules CI Agent moves to Nix 2.4 (upcoming Nix release). - ''; - }; checkNix = mkOption { type = types.bool; default = true; @@ -206,7 +186,6 @@ in # even shortly after the previous lookup. This *also* applies to the daemon. narinfo-cache-negative-ttl = 0 ''; - nix.package = mkIf cfg.patchNix patchedNix; services.hercules-ci-agent.tomlFile = format.generate "hercules-ci-agent.toml" cfg.settings; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix index 79d1ce5805..e8a42e59de 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -7,9 +7,7 @@ Code that is shared with nix-darwin goes in common.nix. */ { pkgs, config, lib, ... }: - let - inherit (lib) mkIf mkDefault; cfg = config.services.hercules-ci-agent; @@ -21,7 +19,7 @@ in { imports = [ ./common.nix - (lib.mkRenamedOptionModule ["services" "hercules-ci-agent" "user"] ["systemd" "services" "hercules-ci-agent" "serviceConfig" "User"]) + (lib.mkRenamedOptionModule [ "services" "hercules-ci-agent" "user" ] [ "systemd" "services" "hercules-ci-agent" "serviceConfig" "User" ]) ]; config = mkIf cfg.enable { @@ -80,6 +78,8 @@ in isSystemUser = true; }; - users.groups.hercules-ci-agent = {}; + users.groups.hercules-ci-agent = { }; }; + + meta.maintainers = [ lib.maintainers.roberth ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix b/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix new file mode 100644 index 0000000000..72c4eccaff --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.auto-cpufreq; +in { + options = { + services.auto-cpufreq = { + enable = mkEnableOption "auto-cpufreq daemon"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.auto-cpufreq ]; + + systemd.packages = [ pkgs.auto-cpufreq ]; + systemd.services.auto-cpufreq.path = with pkgs; [ bash coreutils ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix b/third_party/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix new file mode 100644 index 0000000000..70b7a72b8b --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.power-profiles-daemon; + package = pkgs.power-profiles-daemon; +in + +{ + + ###### interface + + options = { + + services.power-profiles-daemon = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable power-profiles-daemon, a DBus daemon that allows + changing system behavior based upon user-selected power profiles. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + assertions = [ + { assertion = !config.services.tlp.enable; + message = '' + You have set services.power-profiles-daemon.enable = true; + which conflicts with services.tlp.enable = true; + ''; + } + ]; + + services.dbus.packages = [ package ]; + + services.udev.packages = [ package ]; + + systemd.packages = [ package ]; + + }; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/thinkfan.nix b/third_party/nixpkgs/nixos/modules/services/hardware/thinkfan.nix index 3bda61ed1a..7a5a7e1c41 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/thinkfan.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/thinkfan.nix @@ -5,50 +5,96 @@ with lib; let cfg = config.services.thinkfan; - configFile = pkgs.writeText "thinkfan.conf" '' - # ATTENTION: There is only very basic sanity checking on the configuration. - # That means you can set your temperature limits as insane as you like. You - # can do anything stupid, e.g. turn off your fan when your CPU reaches 70°C. - # - # That's why this program is called THINKfan: You gotta think for yourself. - # - ###################################################################### - # - # IBM/Lenovo Thinkpads (thinkpad_acpi, /proc/acpi/ibm) - # ==================================================== - # - # IMPORTANT: - # - # To keep your HD from overheating, you have to specify a correction value for - # the sensor that has the HD's temperature. You need to do this because - # thinkfan uses only the highest temperature it can find in the system, and - # that'll most likely never be your HD, as most HDs are already out of spec - # when they reach 55 °C. - # Correction values are applied from left to right in the same order as the - # temperatures are read from the file. - # - # For example: - # tp_thermal /proc/acpi/ibm/thermal (0, 0, 10) - # will add a fixed value of 10 °C the 3rd value read from that file. Check out - # http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may - # want to add to certain temperatures. + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "thinkfan.yaml" cfg.settings; + thinkfan = pkgs.thinkfan.override { inherit (cfg) smartSupport; }; - ${cfg.fan} - ${cfg.sensors} + # fan-speed and temperature levels + levelType = with types; + let + tuple = ts: mkOptionType { + name = "tuple"; + merge = mergeOneOption; + check = xs: all id (zipListsWith (t: x: t.check x) ts xs); + description = "tuple of" + concatMapStrings (t: " (${t.description})") ts; + }; + level = ints.unsigned; + special = enum [ "level auto" "level full-speed" "level disengage" ]; + in + tuple [ (either level special) level level ]; - # Syntax: - # (LEVEL, LOW, HIGH) - # LEVEL is the fan level to use (0-7 with thinkpad_acpi) - # LOW is the temperature at which to step down to the previous level - # HIGH is the temperature at which to step up to the next level - # All numbers are integers. - # + # sensor or fan config + sensorType = name: types.submodule { + freeformType = types.attrsOf settingsFormat.type; + options = { + type = mkOption { + type = types.enum [ "hwmon" "atasmart" "tpacpi" "nvml" ]; + description = '' + The ${name} type, can be + hwmon for standard ${name}s, - ${cfg.levels} + atasmart to read the temperature via + S.M.A.R.T (requires smartSupport to be enabled), + + tpacpi for the legacy thinkpac_acpi driver, or + + nvml for the (proprietary) nVidia driver. + ''; + }; + query = mkOption { + type = types.str; + description = '' + The query string used to match one or more ${name}s: can be + a fullpath to the temperature file (single ${name}) or a fullpath + to a driver directory (multiple ${name}s). + + + When multiple ${name}s match, the query can be restricted using the + or options. + + ''; + }; + indices = mkOption { + type = with types; nullOr (listOf ints.unsigned); + default = null; + description = '' + A list of ${name}s to pick in case multiple ${name}s match the query. + + Indices start from 0. + ''; + }; + } // optionalAttrs (name == "sensor") { + correction = mkOption { + type = with types; nullOr (listOf int); + default = null; + description = '' + A list of values to be added to the temperature of each sensor, + can be used to equalize small discrepancies in temperature ratings. + ''; + }; + }; + }; + + # removes NixOS special and unused attributes + sensorToConf = { type, query, ... }@args: + (filterAttrs (k: v: v != null && !(elem k ["type" "query"])) args) + // { "${type}" = query; }; + + syntaxNote = name: '' + + This section slightly departs from the thinkfan.conf syntax. + The type and path must be specified like this: + + type = "tpacpi"; + query = "/proc/acpi/ibm/${name}"; + + instead of a single declaration like: + + - tpacpi: /proc/acpi/ibm/${name} + + ''; - thinkfan = pkgs.thinkfan.override { smartSupport = cfg.smartSupport; }; - in { options = { @@ -59,76 +105,93 @@ in { type = types.bool; default = false; description = '' - Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads. + Whether to enable thinkfan, a fan control program. + + + This module targets IBM/Lenovo thinkpads by default, for + other hardware you will have configure it more carefully. + ''; + relatedPackages = [ "thinkfan" ]; }; smartSupport = mkOption { type = types.bool; default = false; description = '' - Whether to build thinkfan with SMART support to read temperatures + Whether to build thinkfan with S.M.A.R.T. support to read temperatures directly from hard disks. ''; }; sensors = mkOption { - type = types.lines; - default = '' - tp_thermal /proc/acpi/ibm/thermal (0,0,10) - ''; - description ='' - thinkfan can read temperatures from three possible sources: - - /proc/acpi/ibm/thermal - Which is provided by the thinkpad_acpi kernel - module (keyword tp_thermal) - - /sys/class/hwmon/*/temp*_input - Which may be provided by any hwmon drivers (keyword - hwmon) - - S.M.A.R.T. (requires smartSupport to be enabled) - Which reads the temperature directly from the hard - disk using libatasmart (keyword atasmart) - - Multiple sensors may be added, in which case they will be - numbered in their order of appearance. - ''; + type = types.listOf (sensorType "sensor"); + default = [ + { type = "tpacpi"; + query = "/proc/acpi/ibm/thermal"; + } + ]; + description = '' + List of temperature sensors thinkfan will monitor. + '' + syntaxNote "thermal"; }; - fan = mkOption { - type = types.str; - default = "tp_fan /proc/acpi/ibm/fan"; - description ='' - Specifies the fan we want to use. - On anything other than a Thinkpad you'll probably - use some PWM control file in /sys/class/hwmon. - A sysfs fan would be specified like this: - pwm_fan /sys/class/hwmon/hwmon2/device/pwm1 - ''; + fans = mkOption { + type = types.listOf (sensorType "fan"); + default = [ + { type = "tpacpi"; + query = "/proc/acpi/ibm/fan"; + } + ]; + description = '' + List of fans thinkfan will control. + '' + syntaxNote "fan"; }; levels = mkOption { - type = types.lines; - default = '' - (0, 0, 55) - (1, 48, 60) - (2, 50, 61) - (3, 52, 63) - (6, 56, 65) - (7, 60, 85) - (127, 80, 32767) - ''; + type = types.listOf levelType; + default = [ + [0 0 55] + [1 48 60] + [2 50 61] + [3 52 63] + [6 56 65] + [7 60 85] + ["level auto" 80 32767] + ]; description = '' - (LEVEL, LOW, HIGH) - LEVEL is the fan level to use (0-7 with thinkpad_acpi). + [LEVEL LOW HIGH] + + LEVEL is the fan level to use: it can be an integer (0-7 with thinkpad_acpi), + "level auto" (to keep the default firmware behavior), "level full-speed" or + "level disengage" (to run the fan as fast as possible). LOW is the temperature at which to step down to the previous level. HIGH is the temperature at which to step up to the next level. All numbers are integers. ''; }; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "-b" "0" ]; + description = '' + A list of extra command line arguments to pass to thinkfan. + Check the thinkfan(1) manpage for available arguments. + ''; + }; + + settings = mkOption { + type = types.attrsOf settingsFormat.type; + default = { }; + description = '' + Thinkfan settings. Use this option to configure thinkfan + settings not exposed in a NixOS option or to bypass one. + Before changing this, read the thinkfan.conf(5) + manpage and take a look at the example config file at + + ''; + }; }; @@ -138,12 +201,21 @@ in { environment.systemPackages = [ thinkfan ]; - systemd.services.thinkfan = { - description = "Thinkfan"; - after = [ "basic.target" ]; - wantedBy = [ "multi-user.target" ]; - path = [ thinkfan ]; - serviceConfig.ExecStart = "${thinkfan}/bin/thinkfan -n -c ${configFile}"; + services.thinkfan.settings = mapAttrs (k: v: mkDefault v) { + sensors = map sensorToConf cfg.sensors; + fans = map sensorToConf cfg.fans; + levels = cfg.levels; + }; + + systemd.packages = [ thinkfan ]; + + systemd.services = { + thinkfan.environment.THINKFAN_ARGS = escapeShellArgs ([ "-c" configFile ] ++ cfg.extraArgs); + + # must be added manually, see issue #81138 + thinkfan.wantedBy = [ "multi-user.target" ]; + thinkfan-wakeup.wantedBy = [ "sleep.target" ]; + thinkfan-sleep.wantedBy = [ "sleep.target" ]; }; boot.extraModprobeConfig = "options thinkpad_acpi experimental=1 fan_control=1"; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix index 03e7e40e38..a2298152b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix @@ -463,7 +463,7 @@ in environment.systemPackages = [ dovecotPkg ]; warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [ - "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03! See the release notes for more info for migration." + "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.05! See the release notes for more info for migration." ]; assertions = [ diff --git a/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix b/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix new file mode 100644 index 0000000000..d9d12698d7 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix @@ -0,0 +1,205 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.etebase-server; + + pythonEnv = pkgs.python3.withPackages (ps: with ps; + [ etebase-server daphne ]); + + dbConfig = { + sqlite3 = '' + engine = django.db.backends.sqlite3 + name = ${cfg.dataDir}/db.sqlite3 + ''; + }; + + defaultConfigIni = toString (pkgs.writeText "etebase-server.ini" '' + [global] + debug = false + secret_file = ${if cfg.secretFile != null then cfg.secretFile else ""} + media_root = ${cfg.dataDir}/media + + [allowed_hosts] + allowed_host1 = ${cfg.host} + + [database] + ${dbConfig."${cfg.database.type}"} + ''); + + configIni = if cfg.customIni != null then cfg.customIni else defaultConfigIni; + + defaultUser = "etebase-server"; +in +{ + options = { + services.etebase-server = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to enable the Etebase server. + + Once enabled you need to create an admin user using the + shell command etebase-server createsuperuser. + Then you can login and create accounts on your-etebase-server.com/admin + ''; + }; + + secretFile = mkOption { + default = null; + type = with types; nullOr str; + description = '' + The path to a file containing the secret + used as django's SECRET_KEY. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/etebase-server"; + description = "Directory to store the Etebase server data."; + }; + + port = mkOption { + type = with types; nullOr port; + default = 8001; + description = "Port to listen on."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open ports in the firewall for the server. + ''; + }; + + host = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "localhost"; + description = '' + Host to listen on. + ''; + }; + + unixSocket = mkOption { + type = with types; nullOr str; + default = null; + description = "The path to the socket to bind to."; + example = "/run/etebase-server/etebase-server.sock"; + }; + + database = { + type = mkOption { + type = types.enum [ "sqlite3" ]; + default = "sqlite3"; + description = '' + Database engine to use. + Currently only sqlite3 is supported. + Other options can be configured using extraConfig. + ''; + }; + }; + + customIni = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Custom etebase-server.ini. + + See etebase-src/etebase-server.ini.example for available options. + + Setting this option overrides the default config which is generated from the options + secretFile, host and database. + ''; + example = literalExample '' + [global] + debug = false + secret_file = /path/to/secret + media_root = /path/to/media + + [allowed_hosts] + allowed_host1 = example.com + + [database] + engine = django.db.backends.sqlite3 + name = db.sqlite3 + ''; + }; + + user = mkOption { + type = types.str; + default = defaultUser; + description = "User under which Etebase server runs."; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = with pkgs; [ + (runCommand "etebase-server" { + buildInputs = [ makeWrapper ]; + } '' + makeWrapper ${pythonEnv}/bin/etebase-server \ + $out/bin/etebase-server \ + --run "cd ${cfg.dataDir}" \ + --prefix ETEBASE_EASY_CONFIG_PATH : "${configIni}" + '') + ]; + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" + ]; + + systemd.services.etebase-server = { + description = "An Etebase (EteSync 2.0) server"; + after = [ "network.target" "systemd-tmpfiles-setup.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = cfg.user; + Restart = "always"; + WorkingDirectory = cfg.dataDir; + }; + environment = { + PYTHONPATH="${pythonEnv}/${pkgs.python3.sitePackages}"; + ETEBASE_EASY_CONFIG_PATH="${configIni}"; + }; + preStart = '' + # Auto-migrate on first run or if the package has changed + versionFile="${cfg.dataDir}/src-version" + if [[ $(cat "$versionFile" 2>/dev/null) != ${pkgs.etebase-server} ]]; then + ${pythonEnv}/bin/etebase-server migrate + echo ${pkgs.etebase-server} > "$versionFile" + fi + ''; + script = + let + networking = if cfg.unixSocket != null + then "-u ${cfg.unixSocket}" + else "-b 0.0.0.0 -p ${toString cfg.port}"; + in '' + cd "${pythonEnv}/lib/etebase-server"; + ${pythonEnv}/bin/daphne ${networking} \ + etebase_server.asgi:application + ''; + }; + + users = optionalAttrs (cfg.user == defaultUser) { + users.${defaultUser} = { + group = defaultUser; + home = cfg.dataDir; + }; + + groups.${defaultUser} = {}; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index 1fd85c66f8..940f281893 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -56,6 +56,7 @@ let "unifi-poller" "varnish" "wireguard" + "flow" ] (name: import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; } ); @@ -238,9 +239,6 @@ in services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey; })] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable { hardware.rtl-sdr.enable = mkDefault true; - })] ++ [(mkIf config.services.nginx.enable { - systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ]; - systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ]; })] ++ [(mkIf config.services.postfix.enable { services.prometheus.exporters.postfix.group = mkDefault config.services.postfix.setgidGroup; })] ++ (mapAttrsToList (name: conf: diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix new file mode 100644 index 0000000000..6a35f46308 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.flow; +in { + port = 9590; + extraOpts = { + brokers = mkOption { + type = types.listOf types.str; + example = literalExample ''[ "kafka.example.org:19092" ]''; + description = "List of Kafka brokers to connect to."; + }; + + asn = mkOption { + type = types.ints.positive; + example = 65542; + description = "The ASN being monitored."; + }; + + partitions = mkOption { + type = types.listOf types.int; + default = []; + description = '' + The number of the partitions to consume, none means all. + ''; + }; + + topic = mkOption { + type = types.str; + example = "pmacct.acct"; + description = "The Kafka topic to consume from."; + }; + }; + + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-flow-exporter}/bin/flow-exporter \ + -asn ${toString cfg.asn} \ + -topic ${cfg.topic} \ + -brokers ${concatStringsSep "," cfg.brokers} \ + ${optionalString (cfg.partitions != []) "-partitions ${concatStringsSep "," cfg.partitions}"} \ + -addr ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index 56cddfc55b..5ee8c346be 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -42,7 +42,7 @@ in ''; }; }; - serviceOpts = { + serviceOpts = mkMerge ([{ serviceConfig = { ExecStart = '' ${pkgs.prometheus-nginx-exporter}/bin/nginx-prometheus-exporter \ @@ -54,7 +54,10 @@ in ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; - }; + }] ++ [(mkIf config.services.nginx.enable { + after = [ "nginx.service" ]; + requires = [ "nginx.service" ]; + })]); imports = [ (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) (mkRemovedOptionModule [ "insecure" ] '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index ff8a2ab307..afc2a6d1c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -87,6 +87,7 @@ in NoNewPrivileges = true; NonBlocking = true; PrivateDevices = true; + ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; ProtectHostname = true; @@ -107,8 +108,13 @@ in SystemCallFilter = [ "@system-service" "@chown" + "~@aio" + "~@keyring" + "~@memlock" "~@resources" - "@privileged" + "~@setuid" + "~@sync" + "~@timer" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix b/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix index 692b75e4f0..f7cdc0fe79 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix @@ -53,4 +53,6 @@ in }; }; }; + + meta.maintainers = teams.beam.members; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/flashpolicyd.nix b/third_party/nixpkgs/nixos/modules/services/networking/flashpolicyd.nix deleted file mode 100644 index d3ac78430c..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/flashpolicyd.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.flashpolicyd; - - flashpolicyd = pkgs.stdenv.mkDerivation { - name = "flashpolicyd-0.6"; - - src = pkgs.fetchurl { - name = "flashpolicyd_v0.6.zip"; - url = "https://download.adobe.com/pub/adobe/devnet/flashplayer/articles/socket_policy_files/flashpolicyd_v0.6.zip"; - sha256 = "16zk237233npwfq1m4ksy4g5lzy1z9fp95w7pz0cdlpmv0fv9sm3"; - }; - - buildInputs = [ pkgs.unzip pkgs.perl ]; - - installPhase = "mkdir $out; cp -pr * $out/; chmod +x $out/*/*.pl"; - }; - - flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd" - '' - #! ${pkgs.runtimeShell} - exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \ - --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \ - 2> /dev/null - ''; - -in - -{ - - ###### interface - - options = { - - services.flashpolicyd = { - - enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable the Flash Policy server. This is - necessary if you want Flash applications to make - connections to your server. - ''; - }; - - policy = mkOption { - type = types.lines; - default = - '' - - - - - - - ''; - description = "The policy to be served. The default is to allow connections from any domain to any port."; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - services.xinetd.enable = true; - - services.xinetd.services = singleton - { name = "flashpolicy"; - port = 843; - unlisted = true; - server = "${flashpolicydWrapper}/bin/flashpolicyd"; - }; - - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix b/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix index 5482e997a4..80f35d56e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix @@ -191,6 +191,16 @@ in Whether to open ports in the firewall for the videobridge. ''; }; + + apis = mkOption { + type = with types; listOf str; + description = '' + What is passed as --apis= parameter. If this is empty, "none" is passed. + Needed for monitoring jitsi. + ''; + default = []; + example = literalExample "[ \"colibri\" \"rest\" ]"; + }; }; config = mkIf cfg.enable { @@ -221,7 +231,7 @@ in "export ${toVarName name}=$(cat ${xmppConfig.passwordFile})\n" ) cfg.xmppConfigs)) + '' - ${pkgs.jitsi-videobridge}/bin/jitsi-videobridge --apis=none + ${pkgs.jitsi-videobridge}/bin/jitsi-videobridge --apis=${if (cfg.apis == []) then "none" else concatStringsSep "," cfg.apis} ''; serviceConfig = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix index 074830fc35..4131ff8be5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix @@ -140,7 +140,7 @@ in { # Try cleaning up the previously default location of cache file. # Note that /var/cache/* should always be safe to remove. - # TODO: remove later, probably between 20.09 and 21.03 + # TODO: remove later, probably between 20.09 and 21.05 systemd.tmpfiles.rules = [ "R /var/cache/kresd" ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix index be6734f439..553638ad49 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix @@ -31,7 +31,7 @@ in proxyPass = cfg.proxy; extraConfig = '' proxy_set_header X-Scheme $scheme; - proxy_set_header X-Auth-Request-Redirect $request_uri; + proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri; ''; }; locations."/oauth2/auth" = { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix index 3f646d7db0..d940f3d3da 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix @@ -5,6 +5,10 @@ with lib; let cfg = config.services.hedgedoc; + # 21.03 will not be an official release - it was instead 21.05. This + # versionAtLeast statement remains set to 21.03 for backwards compatibility. + # See https://github.com/NixOS/nixpkgs/pull/108899 and + # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md. name = if versionAtLeast config.system.stateVersion "21.03" then "hedgedoc" else "codimd"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix new file mode 100644 index 0000000000..92b1be963b --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix @@ -0,0 +1,542 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.mastodon; + # We only want to create a database if we're actually going to connect to it. + databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == "/run/postgresql"; + + env = { + RAILS_ENV = "production"; + NODE_ENV = "production"; + + DB_USER = cfg.database.user; + + REDIS_HOST = cfg.redis.host; + REDIS_PORT = toString(cfg.redis.port); + DB_HOST = cfg.database.host; + DB_PORT = toString(cfg.database.port); + DB_NAME = cfg.database.name; + LOCAL_DOMAIN = cfg.localDomain; + SMTP_SERVER = cfg.smtp.host; + SMTP_PORT = toString(cfg.smtp.port); + SMTP_FROM_ADDRESS = cfg.smtp.fromAddress; + PAPERCLIP_ROOT_PATH = "/var/lib/mastodon/public-system"; + PAPERCLIP_ROOT_URL = "/system"; + ES_ENABLED = if (cfg.elasticsearch.host != null) then "true" else "false"; + ES_HOST = cfg.elasticsearch.host; + ES_PORT = toString(cfg.elasticsearch.port); + } + // (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {}) + // cfg.extraConfig; + + envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") ( + (lib.concatLists (lib.mapAttrsToList (name: value: + if value != null then [ + "${name}=\"${toString value}\"" + ] else [] + ) env)))); + + mastodonEnv = pkgs.writeShellScriptBin "mastodon-env" '' + set -a + source "${envFile}" + source /var/lib/mastodon/.secrets_env + eval -- "\$@" + ''; + +in { + + options = { + services.mastodon = { + enable = lib.mkEnableOption "Mastodon, a federated social network server"; + + configureNginx = lib.mkOption { + description = '' + Configure nginx as a reverse proxy for mastodon. + Note that this makes some assumptions on your setup, and sets settings that will + affect other virtualHosts running on your nginx instance, if any. + Alternatively you can configure a reverse-proxy of your choice to serve these paths: + + / -> $(nix-instantiate --eval '<nixpkgs>' -A mastodon.outPath)/public + + / -> 127.0.0.1:{{ webPort }} (If there was no file in the directory above.) + + /system/ -> /var/lib/mastodon/public-system/ + + /api/v1/streaming/ -> 127.0.0.1:{{ streamingPort }} + + Make sure that websockets are forwarded properly. You might want to set up caching + of some requests. Take a look at mastodon's provided nginx configuration at + https://github.com/tootsuite/mastodon/blob/master/dist/nginx.conf. + ''; + type = lib.types.bool; + default = false; + }; + + user = lib.mkOption { + description = '' + User under which mastodon runs. If it is set to "mastodon", + that user will be created, otherwise it should be set to the + name of a user created elsewhere. In both cases, + mastodon and a package containing only + the shell script mastodon-env will be added to + the user's package set. To run a command from + mastodon such as tootctl + with the environment configured by this module use + mastodon-env, as in: + + mastodon-env tootctl accounts create newuser --email newuser@example.com + ''; + type = lib.types.str; + default = "mastodon"; + }; + + group = lib.mkOption { + description = '' + Group under which mastodon runs. + If it is set to "mastodon", a group will be created. + ''; + type = lib.types.str; + default = "mastodon"; + }; + + streamingPort = lib.mkOption { + description = "TCP port used by the mastodon-streaming service."; + type = lib.types.port; + default = 55000; + }; + + webPort = lib.mkOption { + description = "TCP port used by the mastodon-web service."; + type = lib.types.port; + default = 55001; + }; + + sidekiqPort = lib.mkOption { + description = "TCP port used by the mastodon-sidekiq service"; + type = lib.types.port; + default = 55002; + }; + + vapidPublicKeyFile = lib.mkOption { + description = '' + Path to file containing the public key used for Web Push + Voluntary Application Server Identification. A new keypair can + be generated by running: + + nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys + + If does not + exist, it and this file will be created with a new keypair. + ''; + default = "/var/lib/mastodon/secrets/vapid-public-key"; + type = lib.types.str; + }; + + localDomain = lib.mkOption { + description = "The domain serving your Mastodon instance."; + example = "social.example.org"; + type = lib.types.str; + }; + + secretKeyBaseFile = lib.mkOption { + description = '' + Path to file containing the secret key base. + A new secret key base can be generated by running: + + nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret + + If this file does not exist, it will be created with a new secret key base. + ''; + default = "/var/lib/mastodon/secrets/secret-key-base"; + type = lib.types.str; + }; + + otpSecretFile = lib.mkOption { + description = '' + Path to file containing the OTP secret. + A new OTP secret can be generated by running: + + nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret + + If this file does not exist, it will be created with a new OTP secret. + ''; + default = "/var/lib/mastodon/secrets/otp-secret"; + type = lib.types.str; + }; + + vapidPrivateKeyFile = lib.mkOption { + description = '' + Path to file containing the private key used for Web Push + Voluntary Application Server Identification. A new keypair can + be generated by running: + + nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys + + If this file does not exist, it will be created with a new + private key. + ''; + default = "/var/lib/mastodon/secrets/vapid-private-key"; + type = lib.types.str; + }; + + redis = { + createLocally = lib.mkOption { + description = "Configure local Redis server for Mastodon."; + type = lib.types.bool; + default = true; + }; + + host = lib.mkOption { + description = "Redis host."; + type = lib.types.str; + default = "127.0.0.1"; + }; + + port = lib.mkOption { + description = "Redis port."; + type = lib.types.port; + default = 6379; + }; + }; + + database = { + createLocally = lib.mkOption { + description = "Configure local PostgreSQL database server for Mastodon."; + type = lib.types.bool; + default = true; + }; + + host = lib.mkOption { + type = lib.types.str; + default = "/run/postgresql"; + example = "192.168.23.42"; + description = "Database host address or unix socket."; + }; + + port = lib.mkOption { + type = lib.types.int; + default = 5432; + description = "Database host port."; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "mastodon"; + description = "Database name."; + }; + + user = lib.mkOption { + type = lib.types.str; + default = "mastodon"; + description = "Database user."; + }; + + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = "/var/lib/mastodon/secrets/db-password"; + example = "/run/keys/mastodon-db-password"; + description = '' + A file containing the password corresponding to + . + ''; + }; + }; + + smtp = { + createLocally = lib.mkOption { + description = "Configure local Postfix SMTP server for Mastodon."; + type = lib.types.bool; + default = true; + }; + + authenticate = lib.mkOption { + description = "Authenticate with the SMTP server using username and password."; + type = lib.types.bool; + default = true; + }; + + host = lib.mkOption { + description = "SMTP host used when sending emails to users."; + type = lib.types.str; + default = "127.0.0.1"; + }; + + port = lib.mkOption { + description = "SMTP port used when sending emails to users."; + type = lib.types.port; + default = 25; + }; + + fromAddress = lib.mkOption { + description = ''"From" address used when sending Emails to users.''; + type = lib.types.str; + }; + + user = lib.mkOption { + description = "SMTP login name."; + type = lib.types.str; + }; + + passwordFile = lib.mkOption { + description = '' + Path to file containing the SMTP password. + ''; + default = "/var/lib/mastodon/secrets/smtp-password"; + example = "/run/keys/mastodon-smtp-password"; + type = lib.types.str; + }; + }; + + elasticsearch = { + host = lib.mkOption { + description = '' + Elasticsearch host. + If it is not null, Elasticsearch full text search will be enabled. + ''; + type = lib.types.nullOr lib.types.str; + default = null; + }; + + port = lib.mkOption { + description = "Elasticsearch port."; + type = lib.types.port; + default = 9200; + }; + }; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.mastodon; + defaultText = "pkgs.mastodon"; + description = "Mastodon package to use."; + }; + + extraConfig = lib.mkOption { + type = lib.types.attrs; + default = {}; + description = '' + Extra environment variables to pass to all mastodon services. + ''; + }; + + automaticMigrations = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Do automatic database migrations. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user); + message = ''For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user and services.mastodon.database.user must be identical.''; + } + ]; + + systemd.services.mastodon-init-dirs = { + script = '' + umask 077 + + if ! test -f ${cfg.secretKeyBaseFile}; then + mkdir -p $(dirname ${cfg.secretKeyBaseFile}) + bin/rake secret > ${cfg.secretKeyBaseFile} + fi + if ! test -f ${cfg.otpSecretFile}; then + mkdir -p $(dirname ${cfg.otpSecretFile}) + bin/rake secret > ${cfg.otpSecretFile} + fi + if ! test -f ${cfg.vapidPrivateKeyFile}; then + mkdir -p $(dirname ${cfg.vapidPrivateKeyFile}) $(dirname ${cfg.vapidPublicKeyFile}) + keypair=$(bin/rake webpush:generate_keys) + echo $keypair | grep --only-matching "Private -> [^ ]\+" | sed 's/^Private -> //' > ${cfg.vapidPrivateKeyFile} + echo $keypair | grep --only-matching "Public -> [^ ]\+" | sed 's/^Public -> //' > ${cfg.vapidPublicKeyFile} + fi + + cat > /var/lib/mastodon/.secrets_env < ''; - luaSetPaths = '' + luaSetPaths = let + # support both lua and lua.withPackages derivations + luaversion = cfg.package.lua5.lua.luaversion or cfg.package.lua5.luaversion; + in + '' - LuaPackageCPath ${cfg.package.lua5}/lib/lua/${cfg.package.lua5.lua.luaversion}/?.so - LuaPackagePath ${cfg.package.lua5}/share/lua/${cfg.package.lua5.lua.luaversion}/?.lua + LuaPackageCPath ${cfg.package.lua5}/lib/lua/${luaversion}/?.so + LuaPackagePath ${cfg.package.lua5}/share/lua/${luaversion}/?.lua ''; @@ -333,7 +337,7 @@ let ${sslConf} - ${if cfg.package.luaSupport then luaSetPaths else ""} + ${optionalString cfg.package.luaSupport luaSetPaths} # Fascist default - deny access to everything. diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 29cb7cedcb..fa8614e8ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -79,6 +79,8 @@ let include ${pkgs.mailcap}/etc/nginx/mime.types; include ${cfg.package}/conf/fastcgi.conf; include ${cfg.package}/conf/uwsgi_params; + + default_type application/octet-stream; ''; configFile = pkgs.writers.writeNginxConfig "nginx.conf" '' diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix index e3ea61cb9a..548097a412 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -11,6 +11,15 @@ in services.xserver.windowManager.herbstluftwm = { enable = mkEnableOption "herbstluftwm"; + package = mkOption { + type = types.package; + default = pkgs.herbstluftwm; + defaultText = "pkgs.herbstluftwm"; + description = '' + Herbstluftwm package to use. + ''; + }; + configFile = mkOption { default = null; type = with types; nullOr path; @@ -31,8 +40,8 @@ in (cfg.configFile != null) ''-c "${cfg.configFile}"'' ; - in "${pkgs.herbstluftwm}/bin/herbstluftwm ${configFileClause}"; + in "${cfg.package}/bin/herbstluftwm ${configFileClause}"; }; - environment.systemPackages = [ pkgs.herbstluftwm ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix index ed7226331d..363d8e47a0 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -156,6 +156,16 @@ in description = "List of modules that are always loaded by the initrd."; }; + boot.initrd.includeDefaultModules = mkOption { + type = types.bool; + default = true; + description = '' + This option, if set, adds a collection of default kernel modules + to and + . + ''; + }; + system.modulesTree = mkOption { type = types.listOf types.path; internal = true; @@ -195,7 +205,8 @@ in config = mkMerge [ (mkIf config.boot.initrd.enable { boot.initrd.availableKernelModules = - [ # Note: most of these (especially the SATA/PATA modules) + optionals config.boot.initrd.includeDefaultModules ([ + # Note: most of these (especially the SATA/PATA modules) # shouldn't be included by default since nixos-generate-config # detects them, but I'm keeping them for now for backwards # compatibility. @@ -235,10 +246,11 @@ in # x86 RTC needed by the stage 2 init script. "rtc_cmos" - ]; + ]); boot.initrd.kernelModules = - [ # For LVM. + optionals config.boot.initrd.includeDefaultModules [ + # For LVM. "dm_mod" ]; }) diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd-lib.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd-lib.nix index fa109394fe..2dbf15031a 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd-lib.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd-lib.nix @@ -92,10 +92,12 @@ in rec { checkUnitConfig = group: checks: attrs: let # We're applied at the top-level type (attrsOf unitOption), so the actual - # unit options might contain attributes from mkOverride that we need to + # unit options might contain attributes from mkOverride and mkIf that we need to # convert into single values before checking them. defs = mapAttrs (const (v: - if v._type or "" == "override" then v.content else v + if v._type or "" == "override" then v.content + else if v._type or "" == "if" then v.content + else v )) attrs; errors = concatMap (c: c group defs) checks; in if errors == [] then true diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index b750820bfa..59676e9967 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -326,30 +326,36 @@ in }; }; - services.zfs.zed.settings = mkOption { - type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); - example = literalExample '' - { - ZED_DEBUG_LOG = "/tmp/zed.debug.log"; + services.zfs.zed = { + enableMail = mkEnableOption "ZED's ability to send emails" // { + default = cfgZfs.package.enableMail; + }; - ZED_EMAIL_ADDR = [ "root" ]; - ZED_EMAIL_PROG = "mail"; - ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@"; + settings = mkOption { + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); + example = literalExample '' + { + ZED_DEBUG_LOG = "/tmp/zed.debug.log"; - ZED_NOTIFY_INTERVAL_SECS = 3600; - ZED_NOTIFY_VERBOSE = false; + ZED_EMAIL_ADDR = [ "root" ]; + ZED_EMAIL_PROG = "mail"; + ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@"; - ZED_USE_ENCLOSURE_LEDS = true; - ZED_SCRUB_AFTER_RESILVER = false; - } - ''; - description = '' - ZFS Event Daemon /etc/zfs/zed.d/zed.rc content + ZED_NOTIFY_INTERVAL_SECS = 3600; + ZED_NOTIFY_VERBOSE = false; - See - zed8 - for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables - ''; + ZED_USE_ENCLOSURE_LEDS = true; + ZED_SCRUB_AFTER_RESILVER = false; + } + ''; + description = '' + ZFS Event Daemon /etc/zfs/zed.d/zed.rc content + + See + zed8 + for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables + ''; + }; }; }; @@ -358,6 +364,14 @@ in config = mkMerge [ (mkIf cfgZfs.enabled { assertions = [ + { + assertion = cfgZED.enableMail -> cfgZfs.package.enableMail; + message = '' + To allow ZED to send emails, ZFS needs to be configured to enable + this. To do so, one must override the `zfs` package and set + `enableMail` to true. + ''; + } { assertion = config.networking.hostId != null; message = "ZFS requires networking.hostId to be set"; @@ -437,7 +451,7 @@ in }; services.zfs.zed.settings = { - ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail"; + ZED_EMAIL_PROG = mkIf cfgZED.enableMail (mkDefault "${pkgs.mailutils}/bin/mail"); PATH = lib.makeBinPath [ cfgZfs.package pkgs.coreutils diff --git a/third_party/nixpkgs/nixos/modules/testing/service-runner.nix b/third_party/nixpkgs/nixos/modules/testing/service-runner.nix index 99a9f97906..76e9d4a68c 100644 --- a/third_party/nixpkgs/nixos/modules/testing/service-runner.nix +++ b/third_party/nixpkgs/nixos/modules/testing/service-runner.nix @@ -52,7 +52,7 @@ let # Run the ExecStartPre program. FIXME: this could be a list. my $preStart = < section of xml configs - for emulator in ${cfg.package}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do + for emulator in ${pkgs.libvirt}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do ln -s --force "$emulator" /run/${dirName}/nix-emulators/ done @@ -257,7 +249,7 @@ in { systemd.services.virtlogd = { description = "Virtual machine log manager"; - serviceConfig.ExecStart = "@${cfg.package}/sbin/virtlogd virtlogd"; + serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlogd virtlogd"; restartIfChanged = false; }; @@ -269,7 +261,7 @@ in { systemd.services.virtlockd = { description = "Virtual machine lock manager"; - serviceConfig.ExecStart = "@${cfg.package}/sbin/virtlockd virtlockd"; + serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd"; restartIfChanged = false; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix index 7bec1b1ff2..f06977f88f 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix @@ -463,21 +463,15 @@ in { config, options, name, ... }: { options = { - config = mkOption { description = '' A specification of the desired configuration of this container, as a NixOS module. ''; - type = let - confPkgs = if config.pkgs == null then pkgs else config.pkgs; - in lib.mkOptionType { + type = lib.mkOptionType { name = "Toplevel NixOS config"; - merge = loc: defs: (import (confPkgs.path + "/nixos/lib/eval-config.nix") { + merge = loc: defs: (import "${toString config.nixpkgs}/nixos/lib/eval-config.nix" { inherit system; - pkgs = confPkgs; - baseModules = import (confPkgs.path + "/nixos/modules/module-list.nix"); - inherit (confPkgs) lib; modules = let extraConfig = { @@ -526,12 +520,18 @@ in ''; }; - pkgs = mkOption { - type = types.nullOr types.attrs; - default = null; - example = literalExample "pkgs"; + nixpkgs = mkOption { + type = types.path; + default = pkgs.path; + defaultText = "pkgs.path"; description = '' - Customise which nixpkgs to use for this container. + A path to the nixpkgs that provide the modules, pkgs and lib for evaluating the container. + + To only change the pkgs argument used inside the container modules, + set the nixpkgs.* options in the container . + Setting config.nixpkgs.pkgs = pkgs speeds up the container evaluation + by reusing the system pkgs, but the nixpkgs.config option in the + container config is ignored in this case. ''; }; @@ -672,14 +672,31 @@ in ''; }; + # Removed option. See `checkAssertion` below for the accompanying error message. + pkgs = mkOption { visible = false; }; } // networkOptions; - config = mkMerge - [ - (mkIf options.config.isDefined { - path = config.config.system.build.toplevel; - }) - ]; + config = let + # Throw an error when removed option `pkgs` is used. + # Because this is a submodule we cannot use `mkRemovedOptionModule` or option `assertions`. + optionPath = "containers.${name}.pkgs"; + files = showFiles options.pkgs.files; + checkAssertion = if options.pkgs.isDefined then throw '' + The option definition `${optionPath}' in ${files} no longer has any effect; please remove it. + + Alternatively, you can use the following options: + - containers.${name}.nixpkgs + This sets the nixpkgs (and thereby the modules, pkgs and lib) that + are used for evaluating the container. + + - containers.${name}.config.nixpkgs.pkgs + This only sets the `pkgs` argument used inside the container modules. + '' + else null; + in { + path = builtins.seq checkAssertion + mkIf options.config.isDefined config.config.system.build.toplevel; + }; })); default = {}; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 4ea2dc44d5..444580bc0b 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -413,6 +413,7 @@ in vector = handleTest ./vector.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; + vscodium = handleTest ./vscodium.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; wireguard = handleTest ./wireguard {}; wordpress = handleTest ./wordpress.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix b/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix index 397a4a905e..1412c32bfb 100644 --- a/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix +++ b/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix @@ -1,42 +1,34 @@ -# Test for NixOS' container support. - import ./make-test-python.nix ({ pkgs, lib, ...} : let - customPkgs = pkgs // { - hello = pkgs.hello.overrideAttrs(old: { - name = "custom-hello"; + customPkgs = pkgs.appendOverlays [ (self: super: { + hello = super.hello.overrideAttrs (old: { + name = "custom-hello"; }); - }; + }) ]; in { - name = "containers-hosts"; + name = "containers-custom-pkgs"; meta = with lib.maintainers; { - maintainers = [ adisbladis ]; + maintainers = [ adisbladis earvstedt ]; }; - machine = - { ... }: - { - virtualisation.memorySize = 256; - virtualisation.vlans = []; + machine = { config, ... }: { + assertions = let + helloName = (builtins.head config.containers.test.config.system.extraDependencies).name; + in [ { + assertion = helloName == "custom-hello"; + message = "Unexpected value: ${helloName}"; + } ]; - containers.simple = { - autoStart = true; - pkgs = customPkgs; - config = {pkgs, config, ... }: { - environment.systemPackages = [ - pkgs.hello - ]; - }; + containers.test = { + autoStart = true; + config = { pkgs, config, ... }: { + nixpkgs.pkgs = customPkgs; + system.extraDependencies = [ pkgs.hello ]; }; - }; + }; - testScript = '' - start_all() - machine.wait_for_unit("default.target") - machine.succeed( - "test $(nixos-container run simple -- readlink -f /run/current-system/sw/bin/hello) = ${customPkgs.hello}/bin/hello" - ) - ''; + # This test only consists of evaluating the test machine + testScript = ""; }) diff --git a/third_party/nixpkgs/nixos/tests/power-profiles-daemon.nix b/third_party/nixpkgs/nixos/tests/power-profiles-daemon.nix new file mode 100644 index 0000000000..e073677bee --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/power-profiles-daemon.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "power-profiles-daemon"; + meta = with pkgs.lib.maintainers; { + maintainers = [ mvnetbiz ]; + }; + machine = { pkgs, ... }: { + services.power-profiles-daemon.enable = true; + environment.systemPackages = [ pkgs.glib ]; + }; + + testScript = '' + def get_profile(): + return machine.succeed( + """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Get 'net.hadess.PowerProfiles' 'ActiveProfile' + """ + ) + + + def set_profile(profile): + return machine.succeed( + """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'{profile}'>" + """.format( + profile=profile + ) + ) + + + machine.wait_for_unit("multi-user.target") + + set_profile("power-saver") + profile = get_profile() + if not "power-saver" in profile: + raise Exception("Unable to set power-saver profile") + + + set_profile("balanced") + profile = get_profile() + if not "balanced" in profile: + raise Exception("Unable to set balanced profile") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/snapcast.nix b/third_party/nixpkgs/nixos/tests/snapcast.nix index a69b7afe99..2fef636251 100644 --- a/third_party/nixpkgs/nixos/tests/snapcast.nix +++ b/third_party/nixpkgs/nixos/tests/snapcast.nix @@ -4,6 +4,8 @@ let port = 10004; tcpPort = 10005; httpPort = 10080; + tcpStreamPort = 10006; + bufferSize = 742; in { name = "snapcast"; meta = with pkgs.lib.maintainers; { @@ -17,18 +19,27 @@ in { port = port; tcp.port = tcpPort; http.port = httpPort; + buffer = bufferSize; streams = { mpd = { type = "pipe"; location = "/run/snapserver/mpd"; + query.mode = "create"; }; bluetooth = { type = "pipe"; location = "/run/snapserver/bluetooth"; }; + tcp = { + type = "tcp"; + location = "127.0.0.1:${toString tcpStreamPort}"; + }; }; }; }; + client = { + environment.systemPackages = [ pkgs.snapcast ]; + }; }; testScript = '' @@ -42,6 +53,7 @@ in { server.wait_until_succeeds("ss -ntl | grep -q ${toString port}") server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpPort}") server.wait_until_succeeds("ss -ntl | grep -q ${toString httpPort}") + server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpStreamPort}") with subtest("check that pipes are created"): server.succeed("test -p /run/snapserver/mpd") @@ -54,5 +66,12 @@ in { server.succeed( "curl --fail http://localhost:${toString httpPort}/jsonrpc -d '{json.dumps(get_rpc_version)}'" ) + + with subtest("test a connection"): + client.execute("systemd-run snapclient -h server -p ${toString port}") + server.wait_until_succeeds( + "journalctl -o cat -u snapserver.service | grep -q 'Hello from'" + ) + client.wait_until_succeeds("journalctl -o cat -u run-\* | grep -q ${toString bufferSize}") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/vscodium.nix b/third_party/nixpkgs/nixos/tests/vscodium.nix new file mode 100644 index 0000000000..ca75da35b1 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/vscodium.nix @@ -0,0 +1,47 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "vscodium"; + meta = with pkgs.lib.maintainers; { + maintainers = [ turion ]; + }; + + machine = { ... }: + + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + virtualisation.memorySize = 2047; + services.xserver.enable = true; + test-support.displayManager.auto.user = "alice"; + environment.systemPackages = with pkgs; [ + vscodium + ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + # Start up X + start_all() + machine.wait_for_x() + + # Start VSCodium with a file that doesn't exist yet + machine.fail("ls /home/alice/foo.txt") + machine.succeed("su - alice -c 'codium foo.txt' &") + + # Wait for the window to appear + machine.wait_for_text("VSCodium") + + # Save file + machine.send_key("ctrl-s") + + # Wait until the file has been saved + machine.wait_for_file("/home/alice/foo.txt") + + machine.screenshot("VSCodium") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix b/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix index e7755e24ba..2eb06d8828 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix @@ -85,7 +85,7 @@ in import ../make-test-python.nix { server.succeed('prosodyctl status | grep "Prosody is running"') server.succeed("create-prosody-users") - client.succeed('send-message 2>&1 | grep "XMPP SCRIPT TEST SUCCESS"') + client.succeed("send-message") server.succeed("delete-prosody-users") ''; } diff --git a/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix b/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix index 30945e6830..47a77f524c 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -23,8 +23,26 @@ class CthonTest(ClientXMPP): def __init__(self, jid, password): ClientXMPP.__init__(self, jid, password) self.add_event_handler("session_start", self.session_start) + self.test_succeeded = False async def session_start(self, event): + try: + # Exceptions in event handlers are printed to stderr but not + # propagated, they do not make the script terminate with a non-zero + # exit code. We use the `test_succeeded` flag as a workaround and + # check it later at the end of the script to exit with a proper + # exit code. + # Additionally, this flag ensures that this event handler has been + # actually run by ClientXMPP, which may well not be the case. + await self.test_xmpp_server() + self.test_succeeded = True + finally: + # Even if an exception happens in `test_xmpp_server()`, we still + # need to disconnect explicitly, otherwise the process will hang + # forever. + self.disconnect(wait=True) + + async def test_xmpp_server(self): log = logging.getLogger(__name__) self.send_presence() self.get_roster() @@ -42,11 +60,12 @@ class CthonTest(ClientXMPP): log.error("ERROR: Cannot run upload command. XEP_0363 seems broken") sys.exit(1) log.info('Upload success!') + # Test MUC - self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98', wait=True) + # TODO: use join_muc_wait() after slixmpp 1.8.0 is released. + self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98') log.info('MUC join success!') log.info('XMPP SCRIPT TEST SUCCESS') - self.disconnect(wait=True) if __name__ == '__main__': @@ -62,4 +81,7 @@ if __name__ == '__main__': ct.register_plugin('xep_0045') ct.connect(("server", 5222)) ct.process(forever=False) + + if not ct.test_succeeded: + sys.exit(1) '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix index 896f936194..68b74821ec 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix @@ -1,11 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, intltool, - wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib, - libsoup, avahi, taglib - }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, avahi +, curl +, dbus-glib +, gettext +, gtk3 +, libmpdclient +, libsoup +, libxml2 +, taglib +, wrapGAppsHook +}: stdenv.mkDerivation rec { - version = "1.6"; pname = "ario"; + version = "1.6"; src = fetchurl { url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz"; @@ -14,14 +26,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ]; buildInputs = [ - gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib + avahi + curl + dbus-glib + gtk3 + libmpdclient + libsoup + libxml2 + taglib ]; - meta = { + meta = with lib; { description = "GTK client for MPD (Music player daemon)"; homepage = "http://ario-player.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.garrison ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.garrison ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix b/third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix index 84914e3e79..2bf6b2a804 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-ArtyFX"; - rev = "492587461b50d140455aa3c98d915eb8673bebf0"; + rev = "8c542627d936a01b1d97825e7f26a8e95633f7aa"; sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix index f21cb9e390..cf3321e241 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, meson +, ninja +, libmpdclient +}: stdenv.mkDerivation rec { pname = "ashuffle"; @@ -14,7 +22,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake pkg-config meson ninja ]; - buildInputs = [ mpd_clientlib ]; + buildInputs = [ libmpdclient ]; meta = with lib; { homepage = "https://github.com/joshkunz/ashuffle"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 592b0fb073..5d89813216 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -1,50 +1,45 @@ { mkDerivation -, lib, stdenv +, lib +, stdenv , fetchFromGitHub , qmake -, qtbase +, pkg-config , qttools -, alsaSupport ? stdenv.hostPlatform.isLinux -, alsaLib -, pulseSupport ? stdenv.hostPlatform.isLinux -, libpulseaudio -, jackSupport ? stdenv.hostPlatform.isUnix -, libjack2 +, qtbase +, rtaudio +, rtmidi }: -let - inherit (lib) optional optionals; - -in mkDerivation rec { pname = "bambootracker"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "rerrahkr"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0ibi0sykxf6cp5la2c4pgxf5gvy56yv259fbmdwdrdyv6vlddf42"; + sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc"; }; - sourceRoot = "source/BambooTracker"; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace BambooTracker/BambooTracker.pro \ + --replace '# Temporary known-error downgrades here' 'CPP_WARNING_FLAGS += -Wno-missing-braces' + ''; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ qmake qttools pkg-config ]; - buildInputs = [ qtbase ] - ++ optional alsaSupport alsaLib - ++ optional pulseSupport libpulseaudio - ++ optional jackSupport libjack2; + buildInputs = [ qtbase rtaudio rtmidi ]; - qmakeFlags = [ "CONFIG+=release" "CONFIG-=debug" ] - ++ optional pulseSupport "CONFIG+=use_pulse" - ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ]; + qmakeFlags = [ "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; + + postConfigure = "make qmake_all"; meta = with lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; - homepage = "https://github.com/rerrahkr/BambooTracker"; + homepage = "https://rerrahkr.github.io/BambooTracker"; license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 2a12632494..9644182861 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "0f7xysk0cl48q7i28m25hasmrp30grgm3kah0s7xmkjgm33887pi"; + sha256 = "sha256-R1e+eTheS9KqPIHw1QoMJgpSB1ss0gwTUGAojdJM0Zw="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix index b00355cc9c..bfa8317c9f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config -, libiconv, CoreAudio +, libiconv, CoreAudio, AudioUnit , alsaSupport ? stdenv.isLinux, alsaLib ? null # simple fallback for everyone else @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC - ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit ] ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix index 32c61380dc..4bd9c6dcd8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix @@ -1,24 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, mpd_clientlib, dbus-glib, audacious, gtk2, gsl -, libaudclient }: +{ lib +, stdenv +, fetchurl +, pkg-config +, dbus-glib +, audacious +, gtk2 +, gsl +, libaudclient +, libmpdclient +}: -stdenv.mkDerivation { - name = "gjay-0.3.2"; +stdenv.mkDerivation rec { + pname = "gjay"; + version = "0.3.2"; src = fetchurl { - url = "mirror://sourceforge/project/gjay/gjay-0.3.2.tar.gz"; + url = "mirror://sourceforge/project/gjay/${pname}-${version}.tar.gz"; sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; + buildInputs = [ + libmpdclient + dbus-glib + audacious + gtk2 + gsl + libaudclient + ]; hardeningDisable = [ "format" ]; meta = with lib; { description = "Generates playlists such that each song sounds good following the previous song"; homepage = "http://gjay.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix index 11187015df..4c93fad511 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,22 @@ -{ lib, stdenv, fetchurl, libtool, intltool, pkg-config, glib -, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique -, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook +{ lib +, stdenv +, fetchurl +, libtool +, intltool +, pkg-config +, glib +, gtk2 +, curl +, libmpdclient +, libsoup +, gob2 +, vala +, libunique +, libSM +, libICE +, sqlite +, hicolor-icon-theme +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -26,8 +42,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ - glib gtk2 curl mpd_clientlib libsoup - libunique libmpd libSM libICE sqlite hicolor-icon-theme + glib + gtk2 + curl + libmpdclient + libsoup + libunique + libmpd + libSM + libICE + sqlite + hicolor-icon-theme ]; meta = with lib; { @@ -38,3 +63,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } +# TODO: what is this libmpd derivation embedded above? diff --git a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix index 69e427dd96..7f41fa6c5f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -17,7 +17,6 @@ , hicolor-icon-theme , intltool , ladspaH -, libav , libjack2 , libsndfile , lilv @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { gtk3 gtkmm3 ladspaH - libav libjack2 libsndfile lilv diff --git a/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix index 5d322eeca9..611956089e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jalv"; - version = "1.6.4"; + version = "1.6.6"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2"; + sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY="; }; nativeBuildInputs = [ pkg-config wafHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix b/third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix index d6e96d9083..62db3d7969 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, libav, libkeyfinder }: +{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder }: stdenv.mkDerivation rec { pname = "keyfinder-cli"; - version = "2015-09-13"; + version = "1.1.1"; src = fetchFromGitHub { repo = "keyfinder-cli"; owner = "EvanPurkhiser"; - rev = "8579282f15ab3ebad937fed398ec5c88843be03d"; - sha256 = "0jylykigxmsqvdny265k58vpxa4cqs1hq2f7mph1nl3apfx2shrh"; + rev = "v${version}"; + sha256 = "1mlcygbj3gqii3cz8jd6ks1lz612i4jp0343qjg293xm39fg47ns"; }; - buildInputs = [ libav libkeyfinder ]; + buildInputs = [ ffmpeg libkeyfinder ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/keyfinder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/keyfinder/default.nix index 19433466ec..80cd8f4d9a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/keyfinder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/keyfinder/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: +{ lib, mkDerivation, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "keyfinder"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { - sha256 = "0vjszk1h8vj2qycgbffzy6k7amg75jlvlnzwaqhz9nll2pcvw0zl"; - rev = version; + sha256 = "11yhdwan7bz8nn8vxr54drckyrnlxynhx5s981i475bbccg8g7ls"; + rev = "530034d6fe86d185f6a68b817f8db5f552f065d7"; # tag is missing repo = "is_KeyFinder"; owner = "ibsh"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix new file mode 100644 index 0000000000..0d1d2c5684 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix @@ -0,0 +1,23 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "mmtc"; + version = "0.2.12"; + + src = fetchFromGitHub { + owner = "figsoda"; + repo = pname; + rev = "v${version}"; + sha256 = "1chcnv8wql6v2vckpzvq6sxgpss7mnxaj008jdm8xalhw9d496s4"; + }; + + cargoSha256 = "06b0hag3s5irvi57n0hc97agfw4sw783lkkl1b26iap6mfbvrqma"; + + meta = with lib; { + description = "Minimal mpd terminal client that aims to be simple yet highly configurable"; + homepage = "https://github.com/figsoda/mmtc"; + changelog = "https://github.com/figsoda/mmtc/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix index f4d4e416de..2c19afb16a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix @@ -41,6 +41,8 @@ let mopidy-tunein = callPackage ./tunein.nix { }; mopidy-youtube = callPackage ./youtube.nix { }; + + mopidy-subidy = callPackage ./subidy.nix { }; }; in self diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix new file mode 100644 index 0000000000..98d69816b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + pname = "mopidy-subidy"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Prior99"; + repo = pname; + rev = version; + sha256 = "0c5ghhhrj5v3yp4zmll9ari6r5c6ha8c1izwqshvadn40b02q7xz"; + }; + + propagatedBuildInputs = [ mopidy pythonPackages.py-sonic ]; + + checkInputs = with pythonPackages; [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://www.mopidy.com/"; + description = "Mopidy extension for playing music from a Subsonic-compatible Music Server"; + license = licenses.bsd3; + maintainers = with maintainers; [ wenngle ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix index c1b88e47e8..e4ecc92024 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, mpd_clientlib, sphinx, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, libmpdclient +, sphinx +, libiconv +}: stdenv.mkDerivation rec { pname = "mpc"; @@ -11,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx"; }; - buildInputs = [ mpd_clientlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libmpdclient ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ meson ninja pkg-config sphinx ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix index 1e8d29d377..0d10b55d32 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, libav }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg }: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ]; + buildInputs = [ eigen ffmpeg ]; fixupPhase = if stdenv.isDarwin then '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly diff --git a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix index 876677c3be..bd00a692b7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , pkg-config -, mpd_clientlib +, libmpdclient , openssl , lua5_3 , libid3tag @@ -21,12 +22,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ="; }; - nativeBuildInputs = [ - pkg-config - cmake - ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - mpd_clientlib + libmpdclient openssl lua5_3 libid3tag diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index 4e30e32774..a4a32be41d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -1,7 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, ncurses -, mpd_clientlib, gettext, boost -, pcreSupport ? false -, pcre ? null +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, glib +, ncurses +, libmpdclient +, gettext +, boost +, pcreSupport ? false, pcre ? null }: with lib; @@ -10,16 +18,16 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.43"; + version = "0.44"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "sha256-/bynLU4/QtUawBjhcaajjuUDUwaSt6zk4/4TZqfQX3c="; + sha256 = "sha256-Qu41TL8KSKC9L25D6Z8bEbJUJQ9QI08grTGZ+0qGdUQ="; }; - buildInputs = [ glib ncurses mpd_clientlib boost ] + buildInputs = [ glib ncurses libmpdclient boost ] ++ optional pcreSupport pcre; nativeBuildInputs = [ meson ninja pkg-config gettext ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix index f6560a7abc..c0fa272287 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkg-config, readline -, libiconv, icu, curl +{ lib +, stdenv +, fetchurl +, boost +, libmpdclient +, ncurses +, pkg-config +, readline +, libiconv +, icu +, curl , outputsSupport ? true # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen , clockSupport ? true # clock screen @@ -27,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ] + buildInputs = [ boost libmpdclient ncurses readline libiconv icu curl ] ++ optional visualizerSupport fftw ++ optional taglibSupport taglib; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix index 70acc81404..aca96ef5da 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }: stdenv.mkDerivation rec { - pname = "ncpamixer"; version = "1.3.3.1"; @@ -12,15 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z"; }; - buildInputs = [ ncurses libpulseaudio ]; nativeBuildInputs = [ cmake pkg-config ]; - configurePhase = '' - make PREFIX=$out build/Makefile - ''; + buildInputs = [ ncurses libpulseaudio ]; - buildPhase = '' - make build + configurePhase = '' + make PREFIX=$out USE_WIDE=1 RELEASE=1 build/Makefile ''; meta = with lib; { @@ -28,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ StijnDW ]; + maintainers = with maintainers; [ StijnDW SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix index 5a610284c2..8e6113a716 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.4"; + version = "0.5.5"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "0h7gpjx1221jwsq3k91p8zhf1h77qaxyasakc88s3g57vawhckgk"; + sha256 = "sha256-8eAUg+vxpoDZ7AMMmvIPXypawPHgZCwYvVWTz6qc62s="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix new file mode 100644 index 0000000000..fad17ac71f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -0,0 +1,115 @@ +{ lib, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, itstool +, python3 +, libxml2 +, desktop-file-utils +, wrapGAppsHook +, gst_all_1 +, pulseaudio +, gtk3 +, glib +, glibmm +, gtkmm3 +, lilv +, lv2 +, serd +, sord +, sratom +, libbs2b +, libsamplerate +, libsndfile +, libebur128 +, rnnoise +, boost +, dbus +, fftwFloat +, calf +, zita-convolver +, zam-plugins +, rubberband +, lsp-plugins +}: + +let + lv2Plugins = [ + calf # limiter, compressor exciter, bass enhancer and others + lsp-plugins # delay + ]; + ladspaPlugins = [ + rubberband # pitch shifting + zam-plugins # maximizer + ]; +in stdenv.mkDerivation rec { + pname = "pulseeffects"; + version = "4.8.4"; + + src = fetchFromGitHub { + owner = "wwmm"; + repo = "pulseeffects"; + rev = "v${version}"; + sha256 = "19sndxvszafbd1l2033g2irpx2jrwi5bpbx8r35047wi0z7djiag"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + libxml2 + itstool + python3 + desktop-file-utils + wrapGAppsHook + ]; + + buildInputs = [ + pulseaudio + glib + glibmm + gtk3 + gtkmm3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base # gst-fft + gst_all_1.gst-plugins-good # pulsesrc + gst_all_1.gst-plugins-bad + lilv lv2 serd sord sratom + libbs2b + libebur128 + libsamplerate + libsndfile + rnnoise + boost + dbus + fftwFloat + zita-convolver + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}" + --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}" + ) + ''; + + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + + meta = with lib; { + description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; + homepage = "https://github.com/wwmm/pulseeffects"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index fca498bd89..0ba926fab4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -9,7 +9,7 @@ , desktop-file-utils , wrapGAppsHook , gst_all_1 -, pulseaudio +, pipewire , gtk3 , glib , glibmm @@ -45,13 +45,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.4"; + version = "5.0.0"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "19sndxvszafbd1l2033g2irpx2jrwi5bpbx8r35047wi0z7djiag"; + sha256 = "1zs13bivxlgcb24lz1pgmgy2chcjxnmn4lz7g1n0ygiaaj4c30xj"; }; nativeBuildInputs = [ @@ -66,14 +66,14 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - pulseaudio + pipewire glib glibmm gtk3 gtkmm3 gst_all_1.gstreamer gst_all_1.gst-plugins-base # gst-fft - gst_all_1.gst-plugins-good # pulsesrc + gst_all_1.gst-plugins-good # spectrum plugin gst_all_1.gst-plugins-bad lilv lv2 serd sord sratom libbs2b @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; homepage = "https://github.com/wwmm/pulseeffects"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; badPlatforms = [ "aarch64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix index 84695730db..681601c7d8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -20,8 +20,8 @@ let aixlog = dependency { name = "aixlog"; - version = "1.2.1"; - sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; + version = "1.4.0"; + sha256 = "0f2bs5j1jjajcpa251dslnwkgglaam3b0cm6wdx5l7mbwvnmib2g"; }; popl = dependency { @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.20.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls"; + sha256 = "0183hhghzn0fhw2qzc1s009q7miabpcf0pxaqjdscsl8iivxqknd"; }; nativeBuildInputs = [ cmake pkg-config boost170.dev ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/vimpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vimpc/default.nix index e38fc83866..a576898128 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vimpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vimpc/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkg-config -, taglib, curl }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libmpdclient +, ncurses +, pcre +, pkg-config +, taglib +, curl +}: stdenv.mkDerivation rec { version = "0.09.2"; @@ -13,7 +22,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ mpd_clientlib ncurses pcre taglib curl ]; + buildInputs = [ libmpdclient ncurses pcre taglib curl ]; postInstall = '' mkdir -p $out/etc diff --git a/third_party/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix index 894bed1715..865d82a735 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl -, speex, flac }: +{ lib, stdenv, fetchurl, libogg, libvorbis, libao, pkg-config, curl +, speex, flac +, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "vorbis-tools"; + version = "1.4.2"; -let - debPatch = fetchzip { - url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-11.debian.tar.xz"; - sha256 = "0kvmd5nslyqplkdb7pnmqj47ir3y5lmaxd12wmrnqh679a8jhcyi"; - }; -in -stdenv.mkDerivation { - name = "vorbis-tools-1.4.0"; src = fetchurl { - url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"; - sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"; + url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${version}.tar.gz"; + sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv"; }; - postPatch = '' - for patch in $(ls "${debPatch}"/patches/*.{diff,patch} | grep -v debian_subdir) - do patch -p1 < "$patch" - done - ''; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/ympd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ympd/default.nix index c12c060864..38c05276be 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ympd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libmpdclient +, openssl +}: stdenv.mkDerivation rec { pname = "ympd"; @@ -12,13 +19,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ mpd_clientlib openssl ]; + buildInputs = [ libmpdclient openssl ]; - meta = { + meta = with lib; { homepage = "https://www.ympd.org"; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; - maintainers = [ lib.maintainers.siddharthist ]; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + maintainers = [ maintainers.siddharthist ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/electrs.nix b/third_party/nixpkgs/pkgs/applications/blockchains/electrs.nix index 0b0da5913a..b43a6edc5e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/electrs.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/electrs.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "0nnblxz4xr8k083wy3whx8qxqmdzbxsh5gd91161mrnvidganvgb"; + sha256 = "101prhxg7dr701gwm4s15maxb7cf65hf85hc7ai53b404v39vm71"; }; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - cargoSha256 = "11xwjcfc3kqjyp94qzmyb26xwynf4f1q3ac3rp7l7qq1njly07gr"; + cargoSha256 = "12ypx0rkpbjl4awzx8ga30qhiqqd56a24q4jwlxxnfpw9ks1z252"; meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index f2087c6371..d130b3d045 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.20.0"; + version = "2.21.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "10gi29mcvs4d5flqycwid190pnlciznzbvg36250mxaxxs58rq7j"; + sha256 = "11r6gwzg5qym7h40d8mrpw8c6zbdi534c2y7ghy2k0a4k3ybk8x1"; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 84bb42fabf..9a5a1faac5 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.27"; + version = "0.8.28-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "1zkqmsclhnv14s4mxz7h49kfx8wyi3lyi0dik6jn1fh6w8zr962c"; + sha256 = "sha256-a+w/909PZuHsgIQEtO2IWQijsERfAKJUZ8K30+PhD3k="; }; - cargoSha256 = "1j0pr09y5pc43a4rz1zq3h9vmd874zz6z0wd279lpm6p2m0077cs"; + cargoSha256 = "sha256-Zz844XDx5qj2hQlf99uvHV6e5wmDAlYh3zBvcpdoiIo="; nativeBuildInputs = [ clang ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix new file mode 100644 index 0000000000..098a948c84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -0,0 +1,53 @@ +{ lib +, fetchurl +, appimageTools +, tor +, trezord +}: + +let + pname = "trezor-suite"; + version = "21.2.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-linux-x86_64.AppImage"; + sha256 = "0dj3azx9jvxchrpm02w6nkcis6wlnc6df04z7xc6f66fwn6r3kkw"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in + +appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources + + cp -a ${appimageContents}/locales/ $out/share/${pname} + cp -a ${appimageContents}/resources/app*.* $out/share/${pname}/resources + cp -a ${appimageContents}/resources/images/ $out/share/${pname}/resources + + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png + install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png + substituteInPlace $out/share/applications/trezor-suite.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + + # symlink system binaries instead bundled ones + mkdir -p $out/share/${pname}/resources/bin/{bridge,tor} + ln -sf ${trezord}/bin/trezord-go $out/share/${pname}/resources/bin/bridge/trezord + ln -sf ${tor}/bin/tor $out/share/${pname}/resources/bin/tor/tor + ''; + + meta = with lib; { + description = "Trezor Suite - Desktop App for managing crypto"; + homepage = "https://suite.trezor.io"; + license = licenses.unfree; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix index dcfba41714..3c56e0bbb2 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2021.01.01"; + version = "2021.02.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0a570570cmyngbz645728jdd0d2xmnyrnln2gbxnngiv4v62dxls"; + sha256 = "sha256-9z0Hogu/VgGxvgQMKIImv+qyTqTmR40JS4NNIOk5EZI="; }; - vendorSha256 = "1x3mhfc16slaamp51rbscfwll25qj6ama1xkysidy7rscmmsj392"; + vendorSha256 = "sha256-Ho68+SzYELQN4DE57LNSXeHIu43zAOb7HK/jx7PFdXk="; runVend = true; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 0ce0a37d87..1c3c4aade5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -35,6 +35,7 @@ , libXrender , libXtst , makeWrapper +, ncurses5 , nspr , nss , pciutils @@ -72,6 +73,9 @@ let cp -r . $out wrapProgram $out/bin/studio.sh \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ + --set JAVA_HOME "$out/jre" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set FONTCONFIG_FILE ${fontsConf} \ --prefix PATH : "${lib.makeBinPath [ # Checked in studio.sh @@ -138,12 +142,19 @@ let gnome_vfs glib GConf - ]}" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set FONTCONFIG_FILE ${fontsConf} + ]}" + + # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH + wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + ncurses5 + zlib + ]}" ''; }; + # Causes the shebangs in interpreter scripts deployed to mobile devices to be patched, which Android does not understand + dontPatchShebangs = true; + desktopItem = makeDesktopItem { name = drvName; exec = pname; @@ -161,7 +172,7 @@ let fhsEnv = buildFHSUserEnv { name = "${drvName}-fhs-env"; multiPkgs = pkgs: [ - pkgs.ncurses5 + ncurses5 # Flutter can only search for certs Fedora-way. (runCommand "fedoracert" {} diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index cbc5198f2f..1dc8b9ca7f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -14,13 +14,13 @@ let sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9"; }; betaVersion = { - version = "4.2.0.19"; # "Android Studio 4.2 Beta 3" - build = "202.7033425"; - sha256Hash = "037r99hn16y0fy6z6k90qf6yx5a4vvx6bl9rdyagdm16ry4bpiw4"; + version = "4.2.0.20"; # "Android Studio 4.2 Beta 4" + build = "202.7094744"; + sha256Hash = "10c4qfq6d9ggs88s8h3pryhlnzw17m60qci78rjbh32wmm02sciz"; }; latestVersion = { # canary & dev - version = "2020.3.1.4"; # "Android Studio Arctic Fox Canary 4" - sha256Hash = "05drh4grq0b37qg5nspf2c6vmvcc9x71al3xwc2ddjhmyj0f9sk4"; + version = "2020.3.1.5"; # "Android Studio Arctic Fox (2020.3.1) Canary 5" + sha256Hash = "0x749sbg7qa5ncwwaywcldlhyyyyfh05bms2czz1rv6h7zgq16vq"; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/jam-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/jam-mode/default.nix new file mode 100644 index 0000000000..0fd698ad2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/jam-mode/default.nix @@ -0,0 +1,22 @@ +{ trivialBuild, lib, fetchurl }: + +trivialBuild rec { + pname = "jam-mode"; + version = "0.3"; + + src = fetchurl { + url = "https://dev.gentoo.org/~ulm/distfiles/jam-mode-${version}.el.xz"; + sha256 = "1jchgiy2rgvnb3swr6ar72yas6pj4inpgpcq78q01q6snflmi2fh"; + }; + + unpackPhase = '' + xz -cd $src > jam-mode.el + ''; + + meta = with lib; { + description = "An Emacs major mode for editing Jam files"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix index 1ff64fe281..5f7d602264 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -111,6 +111,8 @@ helm-words = callPackage ./helm-words { }; + jam-mode = callPackage ./jam-mode { }; + org-mac-link = callPackage ./org-mac-link { }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 9334a16d22..62979b4226 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -610,7 +610,7 @@ let }; # Deprecated legacy aliases for backwards compat - aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { + aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.05, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { "auto-complete-clang-async" = "emacsClangCompleteAsync"; "vterm" = "emacs-libvterm"; "0xc" = "_0xc"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix index 3770799691..9377d3ba89 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -19,6 +19,7 @@ , withGTK2 ? false, gtk2-x11 ? null , withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null +, withMotif ? false, motif ? null , withCsrc ? true , srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el @@ -27,6 +28,7 @@ , toolkit ? ( if withGTK2 then "gtk2" else if withGTK3 then "gtk3" + else if withMotif then "motif" else "lucid") }: @@ -107,6 +109,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] + ++ lib.optional (withX && withMotif) motif ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ] ++ lib.optionals nativeComp [ libgccjit ] diff --git a/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix index 096b69a5e8..2f1ea40359 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc7.patch ]; + NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + meta = with lib; { description = "File editor/viewer/analyzer for executables"; homepage = "http://hte.sourceforge.net"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix index 93a9e1a05a..1f3b2685fe 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { export version="v${version}" ''; + enableParallelBuilding = true; + doInstallCheck = true; installCheckPhase = '' $out/bin/kak -ui json -e "kill 0" diff --git a/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix b/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix index b2011c5d8e..296a1eb2ad 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.4"; + version = "0.26.5"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "00qgzm5mqx0j8f0fznhnw76l9pjyw3lxirvy8ssq59nqqjbb08pg"; + sha256 = "sha256-n8ft//c+ewWDr1QLDAUvkiHKPxHqP8NgTCvO2wnCmpc="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/ox/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ox/default.nix new file mode 100644 index 0000000000..aa3f22a262 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/ox/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "ox"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "curlpipe"; + repo = pname; + rev = version; + sha256 = "18iffnmvax6mbnhypf7yma98y5q2zlsyp9q18f92fdwz426r33p0"; + }; + + cargoSha256 = "0v0a1dl9rq5qyy9xwnb59w62qr9db3y3zlmnp60wafvj70zi9zxs"; + + meta = with lib; { + description = "An independent Rust text editor that runs in your terminal"; + homepage = "https://github.com/curlpipe/ox"; + changelog = "https://github.com/curlpipe/ox/releases/tag/${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/retext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/retext/default.nix index 6bf0f191ec..19cc7bc297 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/retext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/retext/default.nix @@ -6,30 +6,10 @@ let version = "7.0.4"; - python = let - packageOverrides = self: super: { - markdown = super.markdown.overridePythonAttrs(old: { - src = super.fetchPypi { - version = "3.0.1"; - pname = "Markdown"; - sha256 = "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"; - }; - }); - - chardet = super.chardet.overridePythonAttrs(old: { - src = super.fetchPypi { - version = "2.3.0"; - pname = "chardet"; - sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"; - }; - patches = []; - }); - }; - in python3.override { inherit packageOverrides; }; - pythonEnv = python.withPackages (ps: with ps; [ + pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 docutils pyenchant Markups markdown pygments chardet ]); -in python.pkgs.buildPythonApplication { +in python3.pkgs.buildPythonApplication { inherit version; pname = "retext"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index eea34cacfc..470683bad4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -3,6 +3,9 @@ , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu +# Populate passthru.tests +, tests + # Attributes inherit from specific versions , version, src, meta, sourceRoot , executableName, longName, shortName, pname @@ -16,7 +19,7 @@ in inherit pname version src sourceRoot; passthru = { - inherit executableName; + inherit executableName tests; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 7324a19620..e772796c34 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c"; - x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r"; - aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8"; - armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv"; + x86_64-linux = "0c0m5qkqv3zhcxmwx72b7z67sjcd1miv8d10kxpk9vffyrxkmj93"; + x86_64-darwin = "1spd5rbhra4n38lp0sgxd2cr1bngsmi32a43g02vdmmhkmk0iixc"; + aarch64-linux = "1ql3hn6c59g7d0cwhg54ixww2i9jmkjw3nyzz97yw8wk63zwz024"; + armv7l-linux = "0pdqcbw7rygvdzys787kf8ag17g9qyv7k33dqhi5h2zc96j867c0"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.52.1"; + version = "1.53.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index cae1611061..bdc5552a64 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl }: +{ lib, stdenv, callPackage, fetchurl, nixosTests }: let inherit (stdenv.hostPlatform) system; @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ckg279vvg8h1n8ippa9vlyw4vk3frinb6fvvi47zggs31168m7b"; - x86_64-darwin = "168g34v2b8r1pdbnqrs0c0k9aa60n5rspixziywnq7m61i23nlgd"; - aarch64-linux = "1cd4sg6k7sqmj3yzmprq1rz928bvc3zrch8agfd8zfap1d6nfaal"; - armv7l-linux = "0f8z4lws027dyqhcrkzm9rvifwid5m0icprg0xk01l7y18n3q923"; + x86_64-linux = "1b9pzfi034idhi6f3n0sz3fckf95ckf2qx3sgfn9fx2g52r9m9z1"; + x86_64-darwin = "1983d8hn04xl5vw7p6842cv5x08q7vilqg7nhvy5yg3lj9q2rpp0"; + aarch64-linux = "09l32abkq110ib4hjd0yv9avr8a2vg5vs7w4jpk0p499gzrysh2l"; + armv7l-linux = "1s0gbq1fapq2i905c0xxfyh0656qnb7dmg00khlwbplxzd6i6m18"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.52.1"; + version = "1.53.2"; pname = "vscodium"; executableName = "codium"; @@ -45,6 +45,8 @@ in inherit sha256; }; + tests = nixosTests.vscodium; + meta = with lib; { description = '' Open source source code editor developed by Microsoft for Windows, diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index ee608b7538..58c47721b6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-46"; - sha256 = "019l1qv8ds8hvyjwi1g21293a7v28bxf8ycnvr9828kpdhf4jxaa"; + version = "7.0.10-61"; + sha256 = "sha256-c/90N5H9iz5JYmn7/ynHgSOAmO5NTtkxajChZvjfMP8="; patches = []; }; in diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix index 0f47b87d4a..2ff712851b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.4.0"; + version = "3.4.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; + sha256 = "sha256-f8P4UdqbzXxQU+zQnyGqPrYQO+mKbFj1IBC28iF0lB4="; }; nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index 555bfbe17e..db3bd494b6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -23,9 +23,12 @@ let mkdir -p $out/${gimp.targetScriptDir}/${name}; for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done } - installPlugins(){ - mkdir -p $out/${gimp.targetPluginDir}/${name}; - for p in "$@"; do cp "$p" -r $out/${gimp.targetPluginDir}/${name}; done + installPlugin() { + # The base name of the first argument is the plug-in name and the main executable. + # GIMP only allows a single plug-in per directory: + # https://gitlab.gnome.org/GNOME/gimp/-/commit/efae55a73e98389e38fa0e59ebebcda0abe3ee96 + pluginDir=$out/${gimp.targetPluginDir}/$(basename "$1") + install -Dt "$pluginDir" "$@" } ''; @@ -83,15 +86,28 @@ in Filters/Generic/FFT Forward Filters/Generic/FFT Inverse */ - name = "fourier-0.4.3"; - buildInputs = with pkgs; [ fftw ]; + pname = "fourier"; + version = "0.4.3"; src = fetchurl { - url = "https://www.lprp.fr/files/old-web/soft/gimp/${name}.tar.gz"; + url = "https://www.lprp.fr/files/old-web/soft/gimp/${pname}-${version}.tar.gz"; sha256 = "0mf7f8vaqs2madx832x3kcxw3hv3w3wampvzvaps1mkf2kvrjbsn"; }; - installPhase = "installPlugins fourier"; + buildInputs = with pkgs; [ fftw ]; + + postPatch = '' + # The tarball contains a prebuilt binary. + make clean + ''; + + installPhase = '' + runHook preInstall + + installPlugin fourier + + runHook postInstall + ''; meta = with lib; { description = "GIMP plug-in to do the fourier transform"; @@ -131,7 +147,7 @@ in rev = "de4367f71e40fe6d82387eaee68611a80a87e0e1"; sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw"; }; - installPhase = "installPlugins src/texturize"; + installPhase = "installPlugin src/texturize"; meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1 }; @@ -145,7 +161,7 @@ in url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; }; - installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? + installPhase = "installPlugin src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? }; lqrPlugin = pluginDerivation rec { @@ -181,7 +197,7 @@ in buildInputs = with pkgs; [ lensfun gexiv2 ]; installPhase = " - installPlugins gimp-lensfun + installPlugin gimp-lensfun "; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index cefb9c03dc..faa25f4aef 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss"; + sha256 = "/erkKBg3j5s8qwBgTu61t8Cnpez+ad4IuZOGd0ZDXJM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix index d9c51d3880..72c79d7dc5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix @@ -1,43 +1,67 @@ -{ lib, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript -, libjpeg, libpng, qtbase, mkDerivation +{ lib +, mkDerivation +, fetchurl +, pkg-config +, cairo +, freetype +, ghostscript +, gsl +, libjpeg +, libpng +, libspiro +, lua5 +, qtbase +, texlive +, zlib }: mkDerivation rec { - name = "ipe-7.2.13"; + pname = "ipe"; + version = "7.2.23"; src = fetchurl { - url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; - sha256 = "1a6a88r7j5z01z6k1z72a8g3n6lxdjjxxkdrzrfdd6df2gbs6g5g"; + url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${pname}-${version}-src.tar.gz"; + sha256 = "0yvm3zfba1ljyy518vjnvwpyg7lgnmdwm19v5k0wfgz64aca56x1"; }; - sourceRoot = "${name}/src"; + sourceRoot = "${pname}-${version}/src"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + cairo + freetype + ghostscript + gsl + libjpeg + libpng + libspiro + lua5 + qtbase + texlive + zlib + ]; IPEPREFIX=placeholder "out"; URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; LUA_PACKAGE = "lua"; - buildInputs = [ - libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript - ]; - - nativeBuildInputs = [ pkg-config ]; - qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin" ]; enableParallelBuilding = true; - #TODO: make .desktop entry + # TODO: make .desktop entry - meta = { + meta = with lib; { description = "An editor for drawing figures"; - homepage = "http://ipe.otfried.org"; - license = lib.licenses.gpl3Plus; + homepage = "http://ipe.otfried.org"; # https not available + license = licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents as well as presentations in PDF. ''; - maintainers = [ lib.maintainers.ttuegel ]; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ ttuegel ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 0e768afdde..9713618d79 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: - +{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ @@ -7,22 +6,23 @@ let ${file} ''; - udevRules = callPackage ./udev_rules_type1.nix {}; + udevRules = callPackage ./udev_rules_type1.nix { }; -in stdenv.mkDerivation rec { - name = "brscan4-0.4.8-1"; - src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; - sha256 = "15hrf1gpm36lniqi6yf47dvdqjinm644xb752c6rcv8n06wb79ag"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; - sha256 = "0pyprjl0capg403yp6pp07gd6msx9kn7bzjcdswdbn28fyxrk5l4"; - } - else throw "${name} is not supported on ${stdenv.hostPlatform.system} (only i686-linux and x86_64 linux are supported)"; +in +stdenv.mkDerivation rec { + pname = "brscan4"; + version = "0.4.9-1"; + src = { + "i686-linux" = fetchurl { + url = "http://download.brother.com/welcome/dlf006646/${pname}-${version}.i386.deb"; + sha256 = "0pkg9aqvnkpjnb9cgzf7lxw2g4jqrf2w98irkv22r0gfsfs3nwma"; + }; + "x86_64-linux" = fetchurl { + + url = "https://download.brother.com/welcome/dlf006645/${pname}-${version}.amd64.deb"; + sha256 = "0kakkl8rmsi2yr3f8vd1kk8vsl9g2ijhqil1cvvbwrhwgi0b7ai7"; + }; + }."${stdenv.hostPlatform.system}"; unpackPhase = '' ar x $src @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { meta = { description = "Brother brscan4 sane backend driver"; homepage = "http://www.brother.com"; - platforms = lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ jraygauthier ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index 3728216da7..4bfb6a65ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation rec { url = { "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { "i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A="; "x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw="; + "aarch64-linux" = "0932bspm1likky1n0rg15d01gspkm1fns2ma82qyb91yr6d18ddk"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { @@ -46,6 +48,6 @@ stdenv.mkDerivation rec { downloadPage = "https://app-updates.agilebits.com/product_history/CLI"; maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix index 56260fa4f7..c670a4b367 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix @@ -1,15 +1,15 @@ { lib, python3, fetchPypi, appdirs, attrs, requests, beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf, pypandoc, python-dotenv, python-frontmatter, tinydb, validators, -watchdog, wtforms }: +watchdog, wtforms, html2text, flask-compress }: python3.pkgs.buildPythonApplication rec { pname = "archivy"; - version = "0.9.3"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b6ff08a9ecd0a929663c36c73844ac5cb4dc847e69aae639a450c64d4320a506"; + sha256 = "FDyUfahjv4zqOVFr0nRhcgxr7mskFP1W/PlhZWx/6E8="; }; # Relax some dependencies @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ --replace 'requests ==' 'requests >=' \ --replace 'validators ==' 'validators >=' \ - --replace 'watchdog ==' 'watchdog >=' ''; propagatedBuildInputs = [ @@ -41,6 +40,8 @@ python3.pkgs.buildPythonApplication rec { validators watchdog wtforms + html2text + flask-compress ]; # __init__.py attempts to mkdir in read-only file system diff --git a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix index becbbda8ac..97e8227e6c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "charm"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "0cgl5dpyzc4lciij9q9yghppiclrdnrl1jsbizfgh2an3s18ab8k"; + sha256 = "0mjq0yy60czsw40h5n515qmi6bbvhrddll4sn5r2q1nf9pvviqr6"; }; vendorSha256 = "1spzawnk2fslc1m14dp8lx4vpnxwz7xgm1hxbpz4bqlqz1hfd6ax"; doCheck = false; - buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; + buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ]; meta = with lib; { description = "Manage your charm account on the CLI"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix index 51c61ca28e..547e7e0b6d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , dbus, cmake, pkg-config -, glib, udev, polkit, libmodule +, glib, udev, polkit, libusb1, libjpeg, libmodule , pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil , enableDpms ? true, libXext -, enableGamma ? true, libXrandr +, enableGamma ? true, libdrm, libXrandr, wayland , enableScreen ? true }: stdenv.mkDerivation rec { pname = "clightd"; - version = "4.2"; + version = "5.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "07z1m1x7nnczd51sg7m2lb6rb2c37c8glsnbrlq44hx176sj9cmj"; + sha256 = "sha256-BEGum0t+FrCTAEQwTsWeYpoIqimTAz+Bv/ZQPQ3fePY="; }; + patches = [ + # Not needed by next version bump + (fetchpatch { + url = "https://github.com/FedeDP/Clightd/commit/a52a2888e3798c572dad359a017cb0d40e7c5fb7.patch"; + sha256 = "sha256-nUzNBia1EvBQxinAfjyKbuldBoHLY1hfMaxgG2lKQWg="; + }) + ]; + # dbus-1.pc has datadir=/etc SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services"; # systemd.pc has prefix=${systemd.out} @@ -48,19 +56,22 @@ stdenv.mkDerivation rec { glib udev polkit + libusb1 + libjpeg libmodule pcre libXdmcp util-linux libpthreadstubs - ] ++ optional enableDdc ddcutil - ++ optional enableDpms libXext - ++ optional enableGamma libXrandr; + ] ++ optionals enableDdc [ ddcutil ] + ++ optionals enableDpms [ libXext ] + ++ optionals enableGamma [ libXrandr ] + ++ optionals (enableDpms || enableGamma || enableScreen) [ libdrm wayland ]; postInstall = '' mkdir -p $out/bin - ln -svT $out/lib/clightd/clightd $out/bin/clightd + ln -svT $out/libexec/clightd $out/bin/clightd ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix index 6ef2e886a1..e502cd6ccf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix @@ -6,24 +6,21 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "1j7va217g1k8lxl3lly13js8myf0shjc6knalq8q6lakc6j1mkxx"; + sha256 = "sha256-NmfnE6ZWgG9erBmrFFIhutnB1t2Ix/6jo+EeXYVtehg="; }; - # bash-completion.pc completionsdir=${bash-completion.out} - COMPLETIONS_DIR = "${placeholder "out"}/share/bash-completions/completions"; # dbus-1.pc has datadir=/etc SESSION_BUS_DIR = "${placeholder "out"}/share/dbus-1/services"; postPatch = '' sed -i "s@/usr@$out@" CMakeLists.txt sed -i "s@/etc@$out\0@" CMakeLists.txt - sed -i "s@pkg_get_variable(COMPLETIONS_DIR.*@set(COMPLETIONS_DIR $COMPLETIONS_DIR)@" CMakeLists.txt sed -i "s@pkg_get_variable(SESSION_BUS_DIR.*@set(SESSION_BUS_DIR $SESSION_BUS_DIR)@" CMakeLists.txt ''; @@ -46,6 +43,12 @@ stdenv.mkDerivation rec { ] ++ optional withGeoclue geoclue2 ++ optional withUpower upower; + cmakeFlags = [ + # bash-completion.pc completionsdir=${bash-completion.out} + "-DBASH_COMPLETIONS_DIR=${placeholder "out"}/share/bash-completions/completions" + "-DZSH_COMPLETIONS_DIR=${placeholder "out"}/share/zsh/site-functions" + ]; + meta = with lib; { description = "A C daemon that turns your webcam into a light sensor"; homepage = "https://github.com/FedeDP/Clight"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipcat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clipcat/default.nix index 80e4982fc8..497e5616e8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clipcat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clipcat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.4.19"; + version = "0.5.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - sha256 = "1lhnm521qqy3aw2iyk1dv4yc5ms0c5x5iipx96bz6v6y0cnmf4kw"; + sha256 = "0rxl3ksjinw07q3p2vjqg80k3c6wx2q7pzpf2344zyfb4gkqzx1c"; }; - cargoSha256 = "04iflyvz8g53z658rkxafiyi2m9kzxwl3p1xgkjq7vacmz5jk15c"; + cargoSha256 = "1ffgvhkdj8wkhlgi0cj0njdm9ycxq2qda4b5qn8bmaygzr2zkwpd"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; @@ -38,26 +38,15 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=all" ]; postInstall = '' - installShellCompletion --bash --name clipcatd completions/bash-completion/completions/clipcatd - installShellCompletion --fish --name clipcatd.fish completions/fish/completions/clipcatd.fish - installShellCompletion --zsh --name _clipcatd completions/zsh/site-functions/_clipcatd - - installShellCompletion --bash --name clipcatctl completions/bash-completion/completions/clipcatctl - installShellCompletion --fish --name clipcatctl.fish completions/fish/completions/clipcatctl.fish - installShellCompletion --zsh --name _clipcatctl completions/zsh/site-functions/_clipcatctl - - installShellCompletion --bash --name clipcat-menu completions/bash-completion/completions/clipcat-menu - installShellCompletion --fish --name clipcat-menu.fish completions/fish/completions/clipcat-menu.fish - installShellCompletion --zsh --name _clipcat-menu completions/zsh/site-functions/_clipcat-menu - - installShellCompletion --bash --name clipcat-notify completions/bash-completion/completions/clipcat-notify - installShellCompletion --fish --name clipcat-notify.fish completions/fish/completions/clipcat-notify.fish - installShellCompletion --zsh --name _clipcat-notify completions/zsh/site-functions/_clipcat-notify + installShellCompletion --bash completions/bash-completion/completions/* + installShellCompletion --fish completions/fish/completions/* + installShellCompletion --zsh completions/zsh/site-functions/* ''; meta = with lib; { description = "Clipboard Manager written in Rust Programming Language"; - license = licenses.gpl3; + homepage = "https://github.com/xrelkd/clipcat"; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 2074231137..061e3bc62d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "/WB/SsOih0N5P4cUAD6zkCajplzZ/Jez0H80+CG08rc="; + sha256 = "sha256-310zrxVjUECg/3+ydo9J8EdF0RbguBIT2PklEgpgRFU="; }; - vendorSha256 = "BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; + vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; buildFlagsArray = '' -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} diff --git a/third_party/nixpkgs/pkgs/applications/misc/ding/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ding/default.nix index f0a7e2a779..36e2923522 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ding/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ding/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation rec { - name = "ding-1.8.1"; + name = "ding-1.9"; src = fetchurl { url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz"; - sha256 = "0chjqs3z9zs1w3l7b5lsaj682rgnkf9kibcbzhggqqcn1pbvl5sq"; + sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; }; buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/far2l/default.nix b/third_party/nixpkgs/pkgs/applications/misc/far2l/default.nix index f95fb5ed6e..b414cbdd0e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/far2l/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/far2l/default.nix @@ -1,29 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash, - xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash +, xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick +, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: -let - newer-colorer-schemes = fetchFromGitHub { - owner = "colorer"; - repo = "Colorer-schemes"; - rev = "7c831f5e94a90530ace8b2bb9916210e3a2fcda6"; # 2019-11-28 (far2l has older Colorer-schemes) - sha256 = "18vaahdz5i7xdf00c9h9kjjswm4jszywm8zkhva4c4ivr4qqnv2c"; - }; -in stdenv.mkDerivation rec { pname = "far2l"; - version = "2019-12-14.git${builtins.substring 0 7 src.rev}"; + version = "2020-12-30.git${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; - rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4"; - sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; + rev = "52c1372441443aafd1a7dff6f17969a6ec19885d"; + sha256 = "0s7427fgxzj5zkyy6mhb4y5hqa6adsr30m0bigycp12b0495ryx0"; }; nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; - buildInputs = [ wxGTK30 glib pcre ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build + ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats + #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace far2l/bootstrap/trash.sh \ @@ -48,10 +42,6 @@ stdenv.mkDerivation rec { --replace '"gzip ' '"${gzip}/bin/gzip ' \ --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ --replace '"tar ' '"${gnutar}/bin/tar ' - - cp ${newer-colorer-schemes}/hrc/hrc/base/nix.hrc colorer/configs/base/hrc/base/ - cp ${newer-colorer-schemes}/hrc/hrc/base/cpp.hrc colorer/configs/base/hrc/base/ - cp ${newer-colorer-schemes}/hrc/hrc/inet/jscript.hrc colorer/configs/base/hrc/base/ ''; installPhase = '' @@ -77,10 +67,13 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" "share" ]; meta = with lib; { - description = "An orthodox file manager"; + description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; homepage = "https://github.com/elfmz/far2l"; - license = licenses.gpl2; - maintainers = [ maintainers.volth ]; + license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time + maintainers = with maintainers; [ volth hypersw ]; platforms = platforms.all; + # fails to compile with: + # error: no member named 'st_ctim' in 'stat' + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index 01493e1318..d1659822bb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, openssl }: let - version = "6.4.15"; + version = "6.4.16"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-c1shdHSTfhPPzeotQqNGv2hIfg1h7+vk0Nnt3LOia5Y="; + sha256 = "sha256-BEuaCsA6+653RJed7+Pi4y45FBvKaP0Mje2i7UCIT7k="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix new file mode 100644 index 0000000000..6ee546fa7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "flavours"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "Misterio77"; + repo = pname; + rev = "v${version}"; + sha256 = "1lvbq026ap02f22mv45s904a0f81dr2f07j6bq0wnwl5wd5w0wpj"; + }; + + cargoSha256 = "0wgi65k180mq1q6j4nma0wpfdvl67im5v5gmhzv1ap6xg3bicdg1"; + + meta = with lib; { + description = "An easy to use base16 scheme manager/builder that integrates with any workflow"; + homepage = "https://github.com/Misterio77/flavours"; + changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix new file mode 100644 index 0000000000..29c6df8a72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gtk3 +, alsaLib +}: + +stdenv.mkDerivation rec { + pname = "free42"; + version = "2.5.24a"; + + src = fetchFromGitHub { + owner = "thomasokken"; + repo = pname; + rev = "v${version}"; + sha256 = "xP0kzpmX6Q5Dg7azvyUZIdoi52AYkUmiCkUA1aVY+nQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 alsaLib ]; + + postPatch = '' + sed -i -e "s|/bin/ls|ls|" gtk/Makefile + ''; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + make -C gtk cleaner + make --jobs=$NIX_BUILD_CORES -C gtk + make -C gtk clean + make --jobs=$NIX_BUILD_CORES -C gtk BCD_MATH=1 + runHook postBuild + ''; + + preInstall = '' + install --directory $out/bin \ + $out/share/doc/${pname} \ + $out/share/${pname}/skins \ + $out/share/icons/hicolor/48x48/apps \ + $out/share/icons/hicolor/128x128/apps + ''; + + installPhase = '' + runHook preInstall + install -m755 gtk/free42dec gtk/free42bin $out/bin + install -m644 gtk/README $out/share/doc/${pname}/README-GTK + install -m644 README $out/share/doc/${pname}/README + + install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps + install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps + install -m644 skins/* $out/share/${pname}/skins + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/thomasokken/free42"; + description = "A software clone of HP-42S Calculator"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index c79c2886fd..5ea01dfa19 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.3"; + version = "8.5"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-D58Q9qZ7x2j//pOQa+oIgVK/9F0du2FUoZprSFEKViU="; + sha256 = "sha256-ygBM8HtCF8d4KVOakP4ssFyTgAsPQDfjAMJaEqo+Ml4="; }; patches = (substituteAll { diff --git a/third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix index 29816dea49..88274b8664 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/johanmalm/jgmenu"; description = "Small X11 menu intended to be used with openbox and tint2"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix index 3b44555c54..b34661e6eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.9.38023"; + version = "0.9.39536"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "0whbf7sb4i3g1f6yps3a6l3f0z3dg681ypax4snxw5vchi3h99kc"; + sha256 = "sha256-JZtc6Si3ZQoRG3q+ctzPPQm7WbMYRailIuq/Y5Avd2s="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix index 79f87612e4..8d2cabb5b8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix @@ -1,30 +1,56 @@ { lib -, python3 +, ansiwrap +, asteval +, buildPythonApplication +, colorama +, cryptography +, fetchFromGitHub +, keyring +, parsedatetime +, poetry +, pytestCheckHook +, python-dateutil +, pytz +, pyxdg +, pyyaml +, tzlocal }: -with python3.pkgs; - buildPythonApplication rec { pname = "jrnl"; - version = "1.9.8"; + version = "2.7"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "d254c9c8f24dcf985b98a1d5311337c7f416e6305107eec34c567f58c95b06f4"; + src = fetchFromGitHub { + owner = "jrnl-org"; + repo = pname; + rev = "v${version}"; + sha256 = "1hyjjw9mxy73n3pkliaaif135h2sd4iy43pw9d5zynid5abnr3yz"; }; + nativeBuildInputs = [ poetry ]; + propagatedBuildInputs = [ - pytz six tzlocal keyring dateutil - parsedatetime pycrypto + ansiwrap + asteval + colorama + cryptography + keyring + parsedatetime + python-dateutil + pytz + pyxdg + pyyaml + tzlocal ]; - # No tests in archive - doCheck = false; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jrnl" ]; meta = with lib; { homepage = "http://maebert.github.io/jrnl/"; description = "A simple command line journal application that stores your journal in a plain text file"; - license = licenses.mit; + license = licenses.gpl3Only; maintainers = with maintainers; [ zalakain ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix index cf14679cd9..391e698dcf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix @@ -4,7 +4,7 @@ let throwSystem = throw "Unsupported system: ${system}"; pname = "keeweb"; - version = "1.16.5"; + version = "1.16.7"; name = "${pname}-${version}"; suffix = { @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; sha256 = { - x86_64-linux = "18qcr8zyn20n5zrrha0qwgq2ic10bp189fps87lbnmcjknrkac9g"; - x86_64-darwin = "0crpjkcqgs7q5c814bx2npjh9kpyyb87yagm5wcy9j21kwrbqv6k"; - aarch64-darwin = "1wkf9inrm5qg0c4xrk0s97mx5j21xvlqwwkvydl513gyfzi2g9gp"; + x86_64-linux = "0a4yh2jh9sph17mqqi62gm5jc4yffkysq6yiggyzz5f8xw4p315j"; + x86_64-darwin = "0ix1apddqvz561pw5lx47x091wlfj27zh8k8v7kn5xvm09hswfkr"; + aarch64-darwin = "0p0kql79kcb3w947g1ljhbj15b8aqrwcrbi0cknb12f6iq47lkz7"; }.${system} or throwSystem; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index dbb6301d28..b580fabf58 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -28,7 +28,7 @@ in buildFHSUserEnv { # DGen // TODO: libarchive is broken # Dolphin - bluez ffmpeg_3 gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm + bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm wavpack orc nettle gmp pcre vulkan-loader # DOSBox diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix index eabc0601cf..c78d81771c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "597"; + version = "598"; src = fetchurl { url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "0d928wvlpzqwdpfksmxyyfkqrhjsij21wx2538bs2i29siwyla61"; + sha256 = "gpbJpDBXA9tmSmx9oKLa7xWtIOHBTYd1iPPgNTC2C2M="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix index 804ba33209..eabc934923 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.44.21"; + version = "0.45.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1m3iy2v8mimyb25xisr7i4ga6qlggv1i2aji9qfgagns7ffp53nf"; + sha256 = "sha256-azJ63NI0wzzv3acgoPaeF+lTM1WKpXg595FrK908k1U="; }; outputs = [ "out" "udev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/multibootusb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/multibootusb/default.nix index fd1ca66658..1d625a67b7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/multibootusb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/multibootusb/default.nix @@ -110,5 +110,6 @@ python36Packages.buildPythonApplication rec { homepage = "http://multibootusb.org/"; license = licenses.gpl2; maintainers = []; # Looking for a maintainer! + broken = true; # "name 'config' is not defined", added 2021-02-06 }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 57400fe100..b64654ad67 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.10.11"; + version = "0.10.13"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "RQdNTzorFq3W8clNObyOisKWUM/s+bE/CbpJ/8ABbrk="; + sha256 = "J4kaNtB6DVivNDhrGwrRZJBvu4Bpzl0jY1ZtlAtQiZE="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/with-svg.patch b/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/000-enable-svg.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/openbox-menu/with-svg.patch rename to third_party/nixpkgs/pkgs/applications/misc/openbox-menu/000-enable-svg.patch diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix index 9d2695f97f..71c7903dfe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, menu-cache }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gtk2 +, menu-cache +}: stdenv.mkDerivation rec { pname = "openbox-menu"; @@ -12,11 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 menu-cache ]; - patches = [ ./with-svg.patch ]; + # Enables SVG support by uncommenting the Makefile + patches = [ ./000-enable-svg.patch ]; - installPhase = "make install prefix=$out"; + installFlags = [ "prefix=${placeholder "out"}" ]; - meta = { + meta = with lib; { homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html"; description = "Dynamic XDG menu generator for Openbox"; longDescription = '' @@ -24,8 +32,8 @@ stdenv.mkDerivation rec { dynamic menu listing installed applications. Most of the work is done by the LXDE library menu-cache. ''; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = [ maintainers.romildo ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/pbpst/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pbpst/default.nix deleted file mode 100644 index 68b1908e51..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/pbpst/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ llvmPackages, lib, stdenv, fetchFromGitHub -, python36Packages, which, pkg-config, curl, git, gettext, jansson - -# Optional overrides -, maxFileSize ? 64 # in MB -, provider ? "https://ptpb.pw/" -}: - -llvmPackages.stdenv.mkDerivation rec { - version = "unstable-2018-01-11"; - name = "pbpst-${version}"; - - src = fetchFromGitHub { - owner = "HalosGhost"; - repo = "pbpst"; - rev = "ecbe08a0b72a6e4212f09fc6cf52a73506992346"; - sha256 = "0dwhmw1dg4hg75nlvk5kmvv3slz2n3b9x65q4ig16agwqfsp4mdm"; - }; - - nativeBuildInputs = [ - python36Packages.sphinx - which - pkg-config - curl - git - gettext - ]; - buildInputs = [ curl jansson ]; - - patchPhase = '' - patchShebangs ./configure - - # Remove hardcoded check for libs in /usr/lib/ - sed -e '64,67d' -i ./configure - ''; - - configureFlags = [ - "--file-max=${toString (maxFileSize * 1024 * 1024)}" # convert to bytes - "--provider=${provider}" - ]; - - meta = with lib; { - description = "A command-line libcurl C client for pb deployments"; - inherit (src.meta) homepage; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ tmplt ]; - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix index da1c79865a..474fddb252 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix @@ -7,10 +7,10 @@ let inherit (lib) optional; in stdenv.mkDerivation rec { - name = "pcmanfm-1.3.1"; + name = "pcmanfm-1.3.2"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; - sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; + sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/polybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/polybar/default.nix index c79da21ad6..b01b5af7de 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/polybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/polybar/default.nix @@ -1,13 +1,29 @@ -{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkg-config -, python3, lib, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage -, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper +{ cairo +, cmake +, fetchFromGitHub +, libXdmcp +, libpthreadstubs +, libxcb +, pcre +, pkg-config +, python3 +, lib +, stdenv +, xcbproto +, xcbutil +, xcbutilcursor +, xcbutilimage +, xcbutilrenderutil +, xcbutilwm +, xcbutilxrm +, makeWrapper , removeReferencesTo # optional packages-- override the variables ending in 'Support' to enable or # disable modules , alsaSupport ? true, alsaLib ? null , githubSupport ? false, curl ? null -, mpdSupport ? false, mpd_clientlib ? null +, mpdSupport ? false, libmpdclient ? null , pulseSupport ? false, libpulseaudio ? null , iwSupport ? false, wirelesstools ? null , nlSupport ? true, libnl ? null @@ -16,7 +32,7 @@ assert alsaSupport -> alsaLib != null; assert githubSupport -> curl != null; -assert mpdSupport -> mpd_clientlib != null; +assert mpdSupport -> libmpdclient != null; assert pulseSupport -> libpulseaudio != null; assert iwSupport -> ! nlSupport && wirelesstools != null; @@ -37,26 +53,24 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - meta = with lib; { - homepage = "https://polybar.github.io/"; - description = "A fast and easy-to-use tool for creating status bars"; - longDescription = '' - Polybar aims to help users build beautiful and highly customizable - status bars for their desktop environment, without the need of - having a black belt in shell scripting. - ''; - license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne ]; - platforms = platforms.linux; - }; - buildInputs = [ - cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto xcbutil - xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm + cairo + libXdmcp + libpthreadstubs + libxcb + pcre + python3 + xcbproto + xcbutil + xcbutilcursor + xcbutilimage + xcbutilrenderutil + xcbutilwm + xcbutilxrm (if alsaSupport then alsaLib else null) (if githubSupport then curl else null) - (if mpdSupport then mpd_clientlib else null) + (if mpdSupport then libmpdclient else null) (if pulseSupport then libpulseaudio else null) (if iwSupport then wirelesstools else null) @@ -69,16 +83,36 @@ stdenv.mkDerivation rec { (if i3Support || i3GapsSupport then makeWrapper else null) ]; - postInstall = if (i3Support || i3GapsSupport) then '' - wrapProgram $out/bin/polybar \ - --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" - '' else ""; + postInstall = if i3Support + then ''wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3}/bin" + '' + else if i3GapsSupport + then ''wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3-gaps}/bin" + '' + else ''''; nativeBuildInputs = [ - cmake pkg-config removeReferencesTo + cmake + pkg-config + removeReferencesTo ]; postFixup = '' remove-references-to -t ${stdenv.cc} $out/bin/polybar ''; + + meta = with lib; { + homepage = "https://polybar.github.io/"; + description = "A fast and easy-to-use tool for creating status bars"; + longDescription = '' + Polybar aims to help users build beautiful and highly customizable + status bars for their desktop environment, without the need of + having a black belt in shell scripting. + ''; + license = licenses.mit; + maintainers = with maintainers; [ afldcr Br1ght0ne ]; + platforms = platforms.linux; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index d0459cb426..dd46c566cd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.8.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "1vdlsfnqnyri0ny2g695lhivs9m25v9lsqf1valwbjv9l9vjxfqa"; + sha256 = "sha256-yOUVDq/wRY35ZQjQVwTLYHKukkKpoggN51wBDdZnhI4="; }; - cargoSha256 = "0qziwb69qpbziz772np8dcb1dvxg6m506k5kl63m75z4zicgykcv"; + cargoSha256 = "sha256-56jJ8IjxWTBlaDd1CVit4RP659Mgw2j2wMWcSDYVihM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index 2e7c77c093..6aa1099c35 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "3.53.0"; + version = "3.55.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv"; + sha256 = "sha256-+Vfwz8xGmSzFNdiN5XYkRqGmFuBVIgexXdH3B+XYY3o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix index cdb4f60382..100be6c2dc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix @@ -67,6 +67,6 @@ mkDerivation rec { # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 # but qt > 5.6 works when only using the native browser # https://github.com/sieren/QSyncthingTray/issues/223 - broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative); + broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative) || stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/ranger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ranger/default.nix index 619b2ba995..10ea22a1ec 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ranger/default.nix @@ -1,12 +1,8 @@ { lib, fetchFromGitHub, python3Packages, file, less, highlight -, imagePreviewSupport ? true, w3m ? null}: - -with lib; - -assert imagePreviewSupport -> w3m != null; +, imagePreviewSupport ? true, w3m }: python3Packages.buildPythonApplication rec { - name = "ranger-${version}"; + pname = "ranger"; version = "1.9.3"; src = fetchFromGitHub { @@ -18,34 +14,24 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = with python3Packages; [ pytest ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; propagatedBuildInputs = [ file ] ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ]; - checkPhase = '' - py.test tests - ''; - preConfigure = '' ${lib.optionalString (highlight != null) '' sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \ ranger/data/scope.sh ''} - substituteInPlace ranger/data/scope.sh \ - --replace "/bin/echo" "echo" - substituteInPlace ranger/__init__.py \ --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin less}/bin/less'" - for i in ranger/config/rc.conf doc/config/rc.conf ; do - substituteInPlace $i --replace /usr/share $out/share - done - # give file previews out of the box substituteInPlace ranger/config/rc.conf \ + --replace /usr/share $out/share \ --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh" - '' + optionalString imagePreviewSupport '' + '' + lib.optionalString imagePreviewSupport '' substituteInPlace ranger/ext/img_display.py \ --replace /usr/lib/w3m ${w3m}/libexec/w3m @@ -57,8 +43,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = "http://ranger.github.io/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = [ maintainers.toonn maintainers.magnetophon ]; + maintainers = with maintainers; [ toonn magnetophon ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/spacefm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spacefm/default.nix index e08240733d..3d9f720487 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spacefm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spacefm/default.nix @@ -13,7 +13,13 @@ stdenv.mkDerivation rec { sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; }; - patches = [ ./glibc-fix.patch ]; + patches = [ + # fix compilation error due to missing include + ./glibc-fix.patch + + # restrict GDK backends to only X11 + ./x11-only.patch + ]; configureFlags = [ "--with-bash-path=${pkgs.bash}/bin/bash" diff --git a/third_party/nixpkgs/pkgs/applications/misc/spacefm/x11-only.patch b/third_party/nixpkgs/pkgs/applications/misc/spacefm/x11-only.patch new file mode 100644 index 0000000000..1b2f9f1458 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/spacefm/x11-only.patch @@ -0,0 +1,10 @@ +--- a/src/main.c 2021-02-09 13:54:32.847364236 +0100 ++++ b/src/main.c 2021-02-09 10:41:51.541203271 +0100 +@@ -1350,6 +1351,7 @@ + vfs_file_monitor_clean(); + return 1; + } ++ gdk_set_allowed_backends("x11"); + gtk_init (&argc, &argv); + int ret = custom_dialog_init( argc, argv ); + if ( ret != 0 ) diff --git a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index a042cc53c0..2b97d2f018 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "08rnwj7ggh114n3mhhm8hb8fm1njgb4j6vba3hynp8x1c2ngidff"; + sha256 = "sha256-Gkq19OlX6ci2i5mno77O/v3VfUkv6FRQFcH98qaUuXs="; }; - vendorSha256 = "0k06c3jw5z8rw8nk4qf794kyfipylmz6x6l126a2snvwi0lmc601"; + vendorSha256 = "sha256-ARhWKYh8Wy2UEYGabn6l/kbnJ0nHYTIt4hn9wuVgBkw="; # used at runtime, but not installed by default postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/ssh-tools/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ssh-tools/default.nix new file mode 100644 index 0000000000..8740633262 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ssh-tools/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ssh-tools"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "vaporup"; + repo = pname; + rev = "v${version}"; + sha256 = "0m0x9383p9ab4hdirncmrfha130iasa0v4cbif2y5nbxnxgh101r"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ssh-* $out/bin/ + ''; + + meta = with lib; { + description = "Collection of various tools using ssh"; + homepage = "https://github.com/vaporup/ssh-tools/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix b/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix new file mode 100644 index 0000000000..2c5db1fe15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix @@ -0,0 +1,37 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, coreutils }: + +rustPlatform.buildRustPackage rec { + pname = "surface-control"; + version = "0.3.1-1"; + + src = fetchFromGitHub { + owner = "linux-surface"; + repo = pname; + rev = "v${version}"; + sha256 = "0wclzlix0a2naxbdg3wym7yw19p2wqpcjmkf7gn8cs00shrmzjld"; + }; + + cargoSha256 = "0vi26v9mvx298kx6k5g7h8dnn7r208an9knadc23vxcrrxjr6pn5"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion \ + $releaseDir/build/surface-*/out/surface.{bash,fish} \ + --zsh $releaseDir/build/surface-*/out/_surface + install -Dm 0444 -t $out/etc/udev/rules.d \ + etc/udev/40-surface-control.rules + substituteInPlace $out/etc/udev/rules.d/40-surface-control.rules \ + --replace "/usr/bin/chmod" "${coreutils}/bin/chmod" \ + --replace "/usr/bin/chown" "${coreutils}/bin/chown" + ''; + + meta = with lib; { + description = + "Control various aspects of Microsoft Surface devices on Linux from the Command-Line"; + homepage = "https://github.com/linux-surface/surface-control"; + license = licenses.mit; + maintainers = with maintainers; [ winterqt ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index f5c5faf4d9..2a395a227b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -19,14 +19,14 @@ }: mkDerivation rec { - version = "1.1.0"; + version = "1.1.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "0nzkzx870hzil2kny1irp4w2kxz5gmpchr2qxb7q4f9cnih92n0j"; + sha256 = "sha256-I5QhnYp4ga3ERJ3w4qjh5gFFU+S1Htw26vHK/2M8j5s="; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/tabula-java/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tabula-java/default.nix new file mode 100644 index 0000000000..a88a83bc23 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/tabula-java/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "tabula-java"; + version = "1.0.4"; + + src = fetchurl { + url = "https://github.com/tabulapdf/tabula-java/releases/download/v${version}/tabula-${version}-jar-with-dependencies.jar"; + sha256 = "12d0jcc3j0q8jbqv0gzfiif7c8ig37834vb8yq0jnyr0s72k30xw"; + }; + + buildInputs = [ makeWrapper ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -pv $out/share/tabula-java + cp -v $src $out/share/tabula-java/tabula-java.jar + + makeWrapper ${jre}/bin/java $out/bin/tabula-java --add-flags "-jar $out/share/tabula-java/tabula-java.jar" + ''; + + meta = with lib; { + description = "A library for extracting tables from PDF files."; + longDescription = '' + tabula-java is the table extraction engine that powers + Tabula. You can use tabula-java as a command-line tool to + programmatically extract tables from PDFs. + ''; + homepage = "https://tabula.technology/"; + license = licenses.mit; + maintainers = [ maintainers.jakewaksbaum ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index 5c5192ebb2..530d60c763 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.9.6"; + version = "0.9.10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "1w8x3qfw7p4q8srdbamqlrz5nsilyd0dy87jp7kq2n7yxsrbyh4x"; + sha256 = "sha256-NQzZhWoLeDF7iTgIljbVi0ULAe7DeIn45Cu6bgFCfKQ="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "0b69qyb74r9may6n61i5a5nzwhxpaij6y40bq6kh8rzdwy0awwx7"; + cargoSha256 = "sha256-9qfqQ7zFw+EwY7o35Y6RhBJ8h5eXnTAsdbqo/w0zO5w="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix index 856fa60d8e..d49c622190 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -1,20 +1,22 @@ -{ lib, rustPlatform, fetchFromGitHub, perl }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, perl, Security }: rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.7.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "159smcjrf5193yijfpvy1g9b1gin72xwbjghfyrrphwscwhb215z"; + sha256 = "sha256-kX5Vp+yNlzBj1ewm7zNtpmbk5B2OQi0nrUNV7l6XUH0="; }; - cargoSha256 = "1s95b3x7vs1z8xs7j6j80y6mfpy5bdgnzmzn3qa9zr6cghabbf6n"; + cargoSha256 = "sha256-X7ULfb2+9l8ik12SwWCTdUfki6xbk8pCnFaiEvCwYGw="; nativeBuildInputs = [ perl ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + meta = with lib; { description = "Realtime ticker data in your terminal"; homepage = "https://github.com/tarkah/tickrs"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tootle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tootle/default.nix index 3b9b09aaba..0f6747d69f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tootle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tootle/default.nix @@ -16,17 +16,18 @@ , json-glib , glib , glib-networking +, libhandy }: stdenv.mkDerivation rec { pname = "tootle"; - version = "0.2.0"; + version = "1.0"; src = fetchFromGitHub { owner = "bleakgrey"; repo = pname; rev = version; - sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi"; + sha256 = "NRM7GiJA8c5z9AvXpGXtMl4ZaYN2GauEIbjBmoY4pdo="; }; nativeBuildInputs = [ @@ -47,15 +48,7 @@ stdenv.mkDerivation rec { json-glib libgee pantheon.granite - ]; - - patches = [ - # Fix build with Vala 0.46 - # https://github.com/bleakgrey/tootle/pull/164 - (fetchpatch { - url = "https://github.com/worldofpeace/tootle/commit/0a88bdad6d969ead1e4058b1a19675c9d6857b16.patch"; - sha256 = "0xyx00pgswnhxxbsxngsm6khvlbfcl6ic5wv5n64x7klk8rzh6cm"; - }) + libhandy ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix index 893f901044..3994541f48 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "tut"; - version = "0.0.14"; - - goPackagePath = "github.com/RasmusLindroth/tut"; - goDeps = ./deps.nix; + version = "0.0.17"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "1l7lc6cjx97v9zhc0b6lfzqjmyv1i3qj83drkck36if3mc60vvwi"; + sha256 = "0g4kbprsdjk2lbx81azdvz8kkhyk370id3622xxssr894v0i7iwj"; }; + vendorSha256 = "1kf7ynmxrzvhl028b4nbz9h9v9x5srarsbynpgpp4vicmxqlvrmh"; + meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; homepage = "https://github.com/RasmusLindroth/tut"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/tut/deps.nix deleted file mode 100644 index 9264153e50..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/tut/deps.nix +++ /dev/null @@ -1,318 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/DATA-DOG/go-sqlmock"; - fetch = { - type = "git"; - url = "https://github.com/DATA-DOG/go-sqlmock"; - rev = "v1.3.3"; - sha256 = "1xrly2vmy1mgj9dbkmivhh8gvq6v9f9xy2yp2dw54i1895zzs928"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/goquery"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/goquery"; - rev = "v1.5.0"; - sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; - }; - } - { - goPackagePath = "github.com/andybalholm/cascadia"; - fetch = { - type = "git"; - url = "https://github.com/andybalholm/cascadia"; - rev = "v1.0.0"; - sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.9.0"; - sha256 = "086z8ssmr1fn9ba4mqnw7pnccfpys6l5yfhvycv1gdrsk7n27mvs"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "v1.0.0"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/gdamore/tcell"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/tcell"; - rev = "v1.3.0"; - sha256 = "1csg9qkmbg4ksj5247kgqcy7bxvqgz6b98r0rv2s4c1mkc99gx2r"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.1"; - sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/kyoh86/xdg"; - fetch = { - type = "git"; - url = "https://github.com/kyoh86/xdg"; - rev = "v1.2.0"; - sha256 = "0a5nz53fdz1c2qvwlf2dpjdd72nxri95i6q4b07c37kiipgaxncn"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "v1.0.3"; - sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.4"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.11"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-mastodon"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-mastodon"; - rev = "3e91c76504df"; - sha256 = "1wh2hqrzx80gfs1y34f4h68mnz83asx88v0bsw372ch5j1shswlr"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.8"; - sha256 = "14ilkbhnhl8yj443dd1ga4biapswv4g0b4vm2mix78a8srdww39j"; - }; - } - { - goPackagePath = "github.com/mattn/go-tty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-tty"; - rev = "v0.0.3"; - sha256 = "0d1d63q02pc5k5ga8bw4yjbkrli2769vg237psajsskjirjy53vf"; - }; - } - { - goPackagePath = "github.com/microcosm-cc/bluemonday"; - fetch = { - type = "git"; - url = "https://github.com/microcosm-cc/bluemonday"; - rev = "v1.0.2"; - sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.7.0"; - sha256 = "0sqrwldjj2qxrgjz1diw1ffviya4ma7mz7nhdgydbisi2h55lqla"; - }; - } - { - goPackagePath = "github.com/rivo/tview"; - fetch = { - type = "git"; - url = "https://github.com/rivo/tview"; - rev = "ca37f83cb2e7"; - sha256 = "05nifgrxv6aib8f20mhs9m0grdfdyyg5vyhk6zgwsxjlwbzaj021"; - }; - } - { - goPackagePath = "github.com/rivo/uniseg"; - fetch = { - type = "git"; - url = "https://github.com/rivo/uniseg"; - rev = "v0.1.0"; - sha256 = "0flpc1px1l6b1lxzhdxi0mvpkkjchppvgxshxxnlmm40s76i9ww5"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "b2de0cb4f26d"; - sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "v1.6.4"; - sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; - }; - } - { - goPackagePath = "github.com/tomnomnom/linkheader"; - fetch = { - type = "git"; - url = "https://github.com/tomnomnom/linkheader"; - rev = "02ca5825eb80"; - sha256 = "1ghrv28vrvvrpyr4d4q817yby8g1j04mid8ql00sds1pvfv67d32"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d3edc9973b7e"; - sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "85ca7c5b95cd"; - sha256 = "1504qkgbhhm4f0bhk77v2r1lj6x171ay5m79alkg78wjb5cign5l"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "ab21143f2384"; - sha256 = "15fk0psk53pplpyghz55bhay0kvsv5rikmn5hwgjnnyxq9vfy178"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "v1.55.0"; - sha256 = "1b7wsfal3b3pl5pv5n2qix09b3imh0zhirrphlsg5p2rb8fk0d0j"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix new file mode 100644 index 0000000000..a8ffb46c1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonApplication +, fetchPypi +, requests +, twitch-python +, pytz +, python-dateutil +}: + +buildPythonApplication rec { + pname = "twitch-chat-downloader"; + version = "3.2.1"; + + src = fetchPypi { + inherit version; + pname = "tcd"; + sha256 = "f9b5ea2ad3badb7deffdd9604368ccb54170cd7929efbaa2d7b534e089ae6338"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "'pipenv>=2020.5.28'," "" + ''; + + propagatedBuildInputs = [ requests twitch-python pytz python-dateutil ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "tcd" ]; + + meta = with lib; { + description = "Twitch Chat Downloader"; + homepage = "https://github.com/PetterKraabol/Twitch-Chat-Downloader"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix index 2943fe29f4..af2b6be2b2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ultralist"; - version = "1.5.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ultralist"; repo = "ultralist"; rev = version; - sha256 = "09kgf83jn5k35lyrnyzbsy0l1livzmy292qmlbx5dkdpaq5wxnmp"; + sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/misc/usync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usync/default.nix index 8ab2a485a6..cf51a53e71 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/usync/default.nix @@ -6,9 +6,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ebzzry"; - repo = pname; - rev = "9c87ea8a707a47c3d7f6ef94d07591c5ab594282"; - sha256 = "1r05gw041fz9dkkb70zd6kqw9dd8dhpv87407qxqg43pd7x47kf4"; + repo = "usync"; + rev = "99f11b0c196a81843f55ca3456abcb85149b6d51"; + sha256 = "16i1q8f0jmfd43rb8d70l2b383vr5ib4kh7iq3yd345q7xjz9c2j"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index 62be9393a0..b7f9d6ca1a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -15,13 +15,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "14169q74vpighxnmpxf3nwi19vrv7p76ybb1zp7h8q2harysxkgl"; + sha256 = "1gkvnywjg0n3n7d855ivclsj3d8mzihhkgv9a18srcszkmyix903"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix index 8dd18de5d8..0cbe325f62 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, wrapGAppsHook -, wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell +{ lib +, stdenv +, fetchFromGitHub +, meson +, pkg-config +, ninja +, wrapGAppsHook +, wayland +, wlroots +, gtkmm3 +, libsigcxx +, jsoncpp +, fmt +, scdoc +, spdlog +, gtk-layer-shell , howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? true, libpulseaudio @@ -7,68 +21,69 @@ , nlSupport ? true, libnl , udevSupport ? true, udev , swaySupport ? true, sway -, mpdSupport ? true, mpd_clientlib +, mpdSupport ? true, libmpdclient , withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl }: - stdenv.mkDerivation rec { - pname = "waybar"; - version = "0.9.5"; - src = fetchFromGitHub { - owner = "Alexays"; - repo = "Waybar"; - rev = version; - sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; - }; +stdenv.mkDerivation rec { + pname = "waybar"; + version = "0.9.5"; - nativeBuildInputs = [ - meson ninja pkg-config scdoc wrapGAppsHook cmake - ] ++ lib.optional withMediaPlayer gobject-introspection; + src = fetchFromGitHub { + owner = "Alexays"; + repo = "Waybar"; + rev = version; + sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; + }; - propagatedBuildInputs = lib.optionals withMediaPlayer [ - glib - playerctl - python38Packages.pygobject3 - ]; - strictDeps = false; + nativeBuildInputs = [ + meson ninja pkg-config scdoc wrapGAppsHook cmake + ] ++ lib.optional withMediaPlayer gobject-introspection; - buildInputs = with lib; - [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] - ++ optional traySupport libdbusmenu-gtk3 - ++ optional pulseSupport libpulseaudio - ++ optional sndioSupport sndio - ++ optional nlSupport libnl - ++ optional udevSupport udev - ++ optional swaySupport sway - ++ optional mpdSupport mpd_clientlib; + propagatedBuildInputs = lib.optionals withMediaPlayer [ + glib + playerctl + python38Packages.pygobject3 + ]; + strictDeps = false; - mesonFlags = (lib.mapAttrsToList - (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") - { - dbusmenu-gtk = traySupport; - pulseaudio = pulseSupport; - sndio = sndioSupport; - libnl = nlSupport; - libudev = udevSupport; - mpd = mpdSupport; - } - ) ++ [ - "-Dout=${placeholder "out"}" - "-Dsystemd=disabled" - ]; + buildInputs = with lib; + [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] + ++ optional traySupport libdbusmenu-gtk3 + ++ optional pulseSupport libpulseaudio + ++ optional sndioSupport sndio + ++ optional nlSupport libnl + ++ optional udevSupport udev + ++ optional swaySupport sway + ++ optional mpdSupport libmpdclient; - preFixup = lib.optional withMediaPlayer '' + mesonFlags = (lib.mapAttrsToList + (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") + { + dbusmenu-gtk = traySupport; + pulseaudio = pulseSupport; + sndio = sndioSupport; + libnl = nlSupport; + libudev = udevSupport; + mpd = mpdSupport; + } + ) ++ [ + "-Dout=${placeholder "out"}" + "-Dsystemd=disabled" + ]; + + preFixup = lib.optional withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py wrapProgram $out/bin/waybar-mediaplayer.py \ --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" ''; - meta = with lib; { - description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; - license = licenses.mit; - maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; - platforms = platforms.unix; - homepage = "https://github.com/alexays/waybar"; - }; - } + meta = with lib; { + description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; + platforms = platforms.unix; + homepage = "https://github.com/alexays/waybar"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix new file mode 100644 index 0000000000..4f385ef217 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchgit +, meson +, ninja +, pkg-config +, git +, scdoc +, cairo +, fcft +, libpng +, librsvg +, libxkbcommon +, pixman +, tllist +, wayland +, wayland-protocols +, wlroots +}: + +stdenv.mkDerivation rec { + pname = "wbg"; + version = "unstable-2020-08-01"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/wbg"; + rev = "1b05bd80d0f40e3ba1e977002d0653f532649269"; + sha256 = "0i1j7aqvj0vl2ww5cvffqci1kjqjn0sw6sp2j0ljblaif6qk9asc"; + }; + + nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; + buildInputs = [ + cairo + fcft + libpng + librsvg + libxkbcommon + pixman + tllist + wayland + wayland-protocols + wlroots + ]; + + meta = with lib; { + description = "Wallpaper application for Wayland compositors"; + homepage = "https://codeberg.org/dnkl/wbg"; + license = licenses.isc; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix index 7b9e38c87d..d8af28093b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.3"; + version = "1.2.4"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i"; + sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c"; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ elyhaka ]; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix index ad107b6447..4a7b7ad63b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "01zydr1w8byjhxf4xj6z001q4ynq0452cn332ap1l1w0dmx9mxyr"; + sha256 = "sha256-xzMXbF0M7asZtyo8DmM5yyNoHKy0H6amRDhu6hjHgq4="; }; - vendorSha256 = "1xyai417l8q44b562ssp5qqw04klrhg5397ahr4pc3i30csz8a7a"; + vendorSha256 = "sha256-6ij0NQMjDnZJhuqkUR7MdBLAMS5Xa2HKIgQjegKJyvc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix index cafbcd4b11..e57fb75c11 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix @@ -12,11 +12,11 @@ assert enablePrinting -> cups != null; stdenv.mkDerivation rec { pname = "xpdf"; - version = "4.02"; + version = "4.03"; src = fetchzip { - url = "https://xpdfreader-dl.s3.amazonaws.com/${pname}-${version}.tar.gz"; - sha256 = "0dzwq6fnk013wa4l5mjpvm4mms2mh5hbrxv4rhk2ab5ljbzz7b2w"; + url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz"; + sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6"; }; # Fix "No known features for CXX compiler", see @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { lib.optional enablePrinting cups ++ lib.optional enablePDFtoPPM freetype; - hardeningDisable = [ "format" ]; - desktopItem = makeDesktopItem { name = "xpdf"; desktopName = "Xpdf"; @@ -48,11 +46,16 @@ stdenv.mkDerivation rec { terminal = "false"; }; - postInstall = '' - install -Dm644 ${desktopItem}/share/applications/xpdf.desktop $out/share/applications/xpdf.desktop + postInstall = lib.optionalString (!stdenv.isDarwin) '' + install -Dm644 ${desktopItem}/share/applications/xpdf.desktop -t $out/share/applications install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg ''; + # wrapQtAppsHook broken on macOS (https://github.com/NixOS/nixpkgs/issues/102044) + postFixup = lib.optionalString stdenv.isDarwin '' + wrapQtApp $out/bin/xpdf + ''; + meta = with lib; { homepage = "https://www.xpdfreader.com"; description = "Viewer for Portable Document Format (PDF) files"; @@ -69,7 +72,7 @@ stdenv.mkDerivation rec { pdffonts: lists fonts used in PDF files pdfdetach: extracts attached files from PDF files ''; - license = with licenses; [ gpl2 gpl3 ]; + license = with licenses; [ gpl2Only gpl3Only ]; platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; knownVulnerabilities = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix b/third_party/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix index 342c00aa12..065ca81315 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xpdf/libxpdf.nix @@ -2,30 +2,34 @@ }: stdenv.mkDerivation { - name = "libxpdf-3.02pl4"; + name = "libxpdf-3.02pl5"; src = fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02.tar.gz"; sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; }; patches = [ (fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl1.patch"; sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq"; }) (fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl2.patch"; sha256 = "1nfrgsh9xj0vryd8h65myzd94bjz117y89gq0hzji9dqn23xihfi"; }) (fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl3.patch"; sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r"; }) (fetchurl { - url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch"; + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl4.patch"; sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h"; }) + (fetchurl { + url = "https://dl.xpdfreader.com/old/xpdf-3.02pl5.patch"; + sha256 = "1fki66pw56yr6aw38f6amrx7wxwcxbx4704pjqq7pqqr784b7z4j"; + }) ./xpdf-3.02-protection.patch ./libxpdf.patch ]; @@ -48,6 +52,6 @@ stdenv.mkDerivation { meta = with lib; { platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix new file mode 100644 index 0000000000..47d02a0cec --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix @@ -0,0 +1,86 @@ +{ stdenv +, lib +, fetchgit +, pkg-config +, meson +, ninja +, scdoc +, alsaLib +, fcft +, json_c +, libmpdclient +, libxcb +, libyaml +, pixman +, tllist +, udev +, wayland +, wayland-protocols +, xcbutil +, xcbutilcursor +, xcbutilerrors +, xcbutilwm +}: + +stdenv.mkDerivation rec { + pname = "yambar"; + version = "1.6.1"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/yambar.git"; + rev = version; + sha256 = "p47tFsEWsYNe6IVV65xGG211u6Vm2biRf4pmUDylBOQ="; + }; + + nativeBuildInputs = [ pkg-config meson ninja scdoc ]; + buildInputs = [ + alsaLib + fcft + json_c + libmpdclient + libxcb + libyaml + pixman + tllist + udev + wayland + wayland-protocols + xcbutil + xcbutilcursor + xcbutilerrors + xcbutilwm + ]; + + meta = with lib; { + homepage = "https://codeberg.org/dnkl/yambar"; + description = "Modular status panel for X11 and Wayland"; + longDescription = '' + yambar is a lightweight and configurable status panel (bar, for short) for + X11 and Wayland, that goes to great lengths to be both CPU and battery + efficient - polling is only done when absolutely necessary. + + It has a number of modules that provide information in the form of + tags. For example, the clock module has a date tag that contains the + current date. + + The modules do not know how to present the information though. This is + instead done by particles. And the user, you, decides which particles (and + thus how to present the data) to use. + + Furthermore, each particle can have a decoration - a background color or a + graphical underline, for example. + + There is no support for images or icons. use an icon font (e.g. Font + Awesome, or Material Icons) if you want a graphical representation. + + There are a number of modules and particles builtin. More can be added as + plugins. You can even write your own! + + To summarize: a bar displays information provided by modules, using + particles and decorations. How is configured by you. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix index 3759a09e70..c514ec22f1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "3.0.0"; + version = "3.0.1"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-A+SFkGDg+I1lPJ56XPaRfBUktyjSttcsZSqgXvw9sDs="; + hash = "sha256-VgepO7LHFmNKq/H0RFcIkafgtiVGt8K/LdiCO5Dw2s4="; }; profile = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index 56f2162bf0..a1ea1d64c6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -96,11 +96,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.3.2"; + version = "5.3.3"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "123d4mx2nsh8q3ckm4g2chdcdwgg0cz9cvhiwjggxzvy7j6bqgy4"; + sha256 = "1854m93mr2crg68zhh1pgwwis0dqdv0778wqrb8dz9sdz940rza8"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix index 2184c8d699..afd2e9b9c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/av-98/default.nix @@ -12,6 +12,10 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ]; + # No tests are available + doCheck = false; + pythonImportsCheck = [ "av98" ]; + meta = with lib; { homepage = "https://tildegit.org/solderpunk/AV-98"; description = "Experimental console client for the Gemini protocol"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md index 9d23e3143c..9576cb4862 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md @@ -1,11 +1,11 @@ # Maintainers -- TODO: We need more maintainers: - - https://github.com/NixOS/nixpkgs/issues/78450 - - If you just want to help out without becoming a maintainer: - - Look for open Nixpkgs issues or PRs related to Chromium - - Make your own PRs (but please try to make reviews as easy as possible) -- Primary maintainer (responsible for updating Chromium): @primeos +- Note: We could always use more contributors, testers, etc. E.g.: + - A dedicated maintainer for the NixOS stable channel + - PRs with cleanups, improvements, fixes, etc. (but please try to make reviews + as easy as possible) + - People who handle stale issues/PRs +- Primary maintainer (responsible for all updates): @primeos - Testers (test all stable channel updates) - `nixos-unstable`: - `x86_64`: @danielfullmer @@ -13,11 +13,14 @@ - Stable channel: - `x86_64`: @Frostman - Other relevant packages: - - `chromiumBeta` and `chromiumDev`: For testing purposes (not build on Hydra) + - `chromiumBeta` and `chromiumDev`: For testing purposes only (not build on + Hydra). We use these channels for testing and to fix build errors in advance + so that `chromium` updates are trivial and can be merged fast. - `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via Chromium's `upstream-info.json` - - `ungoogled-chromium`: Based on `chromium` (the expressions are regularly - copied over and patched accordingly) + - `ungoogled-chromium`: @squalus + - `chromedriver`: Updated via Chromium's `upstream-info.json` and not built + from source. # Upstream links @@ -36,6 +39,11 @@ update `upstream-info.json`. After updates it is important to test at least `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which reuses `upstream-info.json`). +Note: The source tarball is often only available a few hours after the release +was announced. The CI/CD status can be tracked here: +- https://ci.chromium.org/p/infra/builders/cron/publish_tarball +- https://ci.chromium.org/p/infra/builders/cron/publish_tarball_dispatcher + To run all automated NixOS VM tests for Chromium, ungoogled-chromium, and Google Chrome (not recommended, currently 6x tests!): ``` @@ -79,3 +87,13 @@ that a new major release of LLVM is required. Those channels are only used to test and fix builds in advance. They may be broken at times and must not delay stable channel updates. + +# Testing + +Useful tests: +- Version: chrome://version/ +- GPU acceleration: chrome://gpu/ +- Essential functionality: Browsing, extensions, video+audio, JS, ... +- WebGL: https://get.webgl.org/ +- VA-API: https://wiki.archlinux.org/index.php/chromium#Hardware_video_acceleration +- Optional: Widevine CDM (proprietary), Benchmarks, Ozone, etc. diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index d25dd2a783..d93fc5ceb4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -19,13 +19,12 @@ , jre8 , pipewire_0_2 , libva +, libdrm, wayland, mesa, libxkbcommon # Ozone # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport -, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization -, useOzone ? true , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -143,11 +142,11 @@ let jre pipewire_0_2 libva + libdrm wayland mesa.drivers libxkbcommon ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; + ++ optional pulseSupport libpulseaudio; patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) @@ -226,11 +225,11 @@ let ''; gnFlags = mkGnFlags ({ + is_official_build = true; custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; - is_official_build = true; + system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; - use_vaapi = !stdenv.isAarch64; # TODO: Remove once M88 is released use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; use_gio = gnomeSupport; @@ -266,15 +265,6 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs useOzone { - use_ozone = true; - use_xkbcommon = true; - use_glib = true; - use_gtk = true; - use_system_libwayland = true; - use_system_minigbm = true; - use_system_libdrm = true; - system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; } // optionalAttrs (chromiumVersionAtLeast "89") { # Disable PGO (defaults to 2 since M89) because it fails without additional changes: # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 900e823bb7..79899d822b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -12,7 +12,6 @@ , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true -, enablePepperFlash ? false , enableWideVine ? false , enableVaapi ? false # Disabled by default due to unofficial support , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -45,10 +44,6 @@ let browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; - plugins = callPackage ./plugins.nix { - inherit enablePepperFlash; - }; - ungoogled-chromium = callPackage ./ungoogled.nix {}; }; @@ -166,7 +161,6 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; libPath = lib.makeLibraryPath [ libva pipewire_0_2 ]; in with lib; '' @@ -174,8 +168,7 @@ in stdenv.mkDerivation { eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ - ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \ - ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} + ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} ed -v -s "$out/bin/chromium" << EOF 2i diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix deleted file mode 100644 index 355f563317..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv, gcc -, jshon -, glib -, nspr -, nss -, fetchzip -, enablePepperFlash ? false - -, upstream-info -}: - -with lib; - -let - mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; - - # Generate a shell fragment that emits flags appended to the - # final makeWrapper call for wrapping the browser's main binary. - # - # Note that this is shell-escaped so that only the variable specified - # by the "output" attribute is substituted. - mkPluginInfo = { output ? "out", allowedVars ? [ output ] - , flags ? [], envVars ? {} - }: let - shSearch = ["'"] ++ map (var: "@${var}@") allowedVars; - shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; - # We need to triple-escape "val": - # * First because makeWrapper doesn't do any quoting of its arguments by - # itself. - # * Second because it's passed to the makeWrapper call separated by IFS but - # not by the _real_ arguments, for example the Widevine plugin flags - # contain spaces, so they would end up as separate arguments. - # * Third in order to be correctly quoted for the "echo" call below. - shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; - mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; - mkFlag = flag: ["--add-flags" (shEsc flag)]; - mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; - envList = mapAttrsToList mkEnvVar envVars; - quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); - in '' - mkdir -p "''$${output}/nix-support" - echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" - ''; - - flash = stdenv.mkDerivation rec { - pname = "flashplayer-ppapi"; - version = "32.0.0.465"; - - src = fetchzip { - url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "16qbc2s8dg2rwggphf8f5665iccc6lrvgz45bdwskg9pwg87hlj1"; - stripRoot = false; - }; - - patchPhase = '' - chmod +x libpepflashplayer.so - patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - installPhase = '' - flashVersion="$( - "${jshon}/bin/jshon" -F manifest.json -e version -u - )" - - install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" - - ${mkPluginInfo { - allowedVars = [ "out" "flashVersion" ]; - flags = [ - "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" - "--ppapi-flash-version=@flashVersion@" - ]; - }} - ''; - - dontStrip = true; - - meta = { - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = platforms.x86_64; - }; - }; - -in { - enabled = optional enablePepperFlash flash; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 15fdceb644..38d1d53507 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "88.0.4324.146", - "sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q", - "sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id", + "version": "88.0.4324.150", + "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", + "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", "deps": { "gn": { "version": "2020-11-05", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "89.0.4389.40", - "sha256": "1da7l8i8hhsjnziyapynnwzfxjrj6m4p8076hg8bjqqv8alhg2zq", - "sha256bin64": "17f9yhz1w0r7panvzavmx7zyaw0i8yarlxx4zb5ghxl8hs37sasr", + "version": "89.0.4389.47", + "sha256": "022fq3mbd3j9a7lf02936ks0yvf73bwz1ws6m6zmnn9v8waardj2", + "sha256bin64": "09gjbg8678xfh22r3gzjvrkhgda77pr8an4j5ka5672jvhj4hbq9", "deps": { "gn": { "version": "2021-01-07", @@ -31,22 +31,22 @@ } }, "dev": { - "version": "90.0.4400.8", - "sha256": "0z7695r8k1xm5kx7cc42kmcr11dbagcwjak32sglj0sw3hsr2yqz", - "sha256bin64": "11gp2sxaly66qfb2gfxnikq1xad520r32pgshkm2jsb7a7vj7mmf", + "version": "90.0.4412.3", + "sha256": "1yjpfircdl38nrjh3an469g7q8178jyvawkfpnzc5aqsgkpkl442", + "sha256bin64": "1asdjicb4l4l2ak3fkxcwdx1avpc1m8wvyhxmj1k3bqa4qmvz3hz", "deps": { "gn": { - "version": "2021-01-14", + "version": "2021-01-25", "url": "https://gn.googlesource.com/gn", - "rev": "d62642c920e6a0d1756316d225a90fd6faa9e21e", - "sha256": "0f1i079asiznn092vm6lyad96wcs8pxh95fjmjbnaqjaalivsic0" + "rev": "55ad154c961d8326315b1c8147f4e504cd95e9e6", + "sha256": "0x5i1axkg44z412357sdb6kgs1h9ykzy8p5c7s40bybs4hg33lkc" } } }, "ungoogled-chromium": { - "version": "88.0.4324.146", - "sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q", - "sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id", + "version": "88.0.4324.150", + "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", + "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", "deps": { "gn": { "version": "2020-11-05", @@ -55,8 +55,8 @@ "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" }, "ungoogled-patches": { - "rev": "88.0.4324.146-1", - "sha256": "0vp53b3jdsay6a17n27vi6cj10jj6zz94gr9ip4r5zf45qq6jx3w" + "rev": "88.0.4324.150-1", + "sha256": "0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 20101258da..6b8a3b1c33 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -201,6 +201,6 @@ stdenv.mkDerivation { url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; platforms = builtins.attrNames mozillaPlatforms; - maintainers = with maintainers; [ taku0 ]; + maintainers = with maintainers; [ taku0 lovesegfault ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 246bffb8bb..4d72f21061 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "85.0"; + version = "85.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ach/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ach/firefox-85.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "af7632d2ec4772c1532745b44509ea429681fc41295e8cd577bded16aa56920a"; + sha256 = "24a938fb96347b938db028452e5a1b9f6c63c43f1e9b7ff0bf2a43f92d1df45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/af/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/af/firefox-85.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9254217dadb1fbdc58d8f2cb565a43cf22a48a9621dd9b25c274b266dfaa4a94"; + sha256 = "5799e2c1c5408da29f9922cd1a694a0ef7d4250b504dd827d5cdeeb41bc7de6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/an/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/an/firefox-85.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e92e9b30f6646ec58a8a963b4017883058058e52bb392ac81eceb6cfaccc5f98"; + sha256 = "04ee06350b7cc1f1ab808e8cff3d02060effbb9fa656c2f687b7cbe9d18b9c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ar/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ar/firefox-85.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "29d207b37c8b8832183256c5434da76bb41b8c893c728678877b6551b40f8d82"; + sha256 = "a92dbd6c4253a8ded0cf4681a6c165e6809e495d1aba84d2158b80d571c1c660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ast/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ast/firefox-85.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "aa68b7807a1cdaa0c780c0da2afcaa5b28946ead2c6f5ea5adfab798f9d223b1"; + sha256 = "eeee2c9a00ab94630f331d7f1e781ba5085415d816d403e14f356717cf5fa967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/az/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/az/firefox-85.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c193052c8ee725d6c909c4f84099d1f72de71ac59318f8fb7f959322ea78e315"; + sha256 = "107fab10c5ac5947676509fce31dec23e70b4cc2f1467e914157fab0555dbada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/be/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/be/firefox-85.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "54bb585bfbc3b910ac95dbce7b1507b210a871bece19df250bd871fdd4354e18"; + sha256 = "a04273533574232e0b2c370e2d48ab2206b53b45743543fe0efeea8bd51988cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/bg/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bg/firefox-85.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "3199a6111d85e00c63314f842adc8277d54bfbb457172bfa03f59fc186d0213e"; + sha256 = "0b18c8862ce9c26cb63919c3bd3aa911b6179eebcbc9a38001953b49dd09ad36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/bn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bn/firefox-85.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c9767a236edb36585348d7d69668074ff8b7bf0ce8bf9461660fa3f5002b5700"; + sha256 = "8aa13bccd6fcd9f9c91a18dae807394dc46ea32103608c829d4dd073861b95f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/br/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/br/firefox-85.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4f5cc23bb984de4703f0861c06d51621851149cf7f140439f4e628b760f7e6b8"; + sha256 = "121f9474e56deb5f2a606aa153c8f3c6b857f0966c9843257d22a8be01b609a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/bs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bs/firefox-85.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "fd09d9c54505ed70a94a861bac653c89b1401f3dd8bcfade90a0b43517e0bb12"; + sha256 = "c4781d938cd86988edc31674a46acb0120209b101d9b563c20ec6a213d161a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ca-valencia/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca-valencia/firefox-85.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "3b16d75fcd1f5cb38df9a3bada0dd59c050f57d4b19988d413dfa910a07a21d8"; + sha256 = "f0b0e35ae0ba98d0585c45a660c85345b71f834e61875f923713f0c05a78509d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ca/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca/firefox-85.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e3736de71272be8fb64762f48175d8f3c5efa001f5ef683327a706bacdbfe412"; + sha256 = "1208d84a85694ce1327c9a8ab6cdb6aeb45b990704bbb9fef9b1edd664597fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/cak/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cak/firefox-85.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a75a176b989383367b973b683a0755a283350aad43e2b9f8825561a3fefd9bd0"; + sha256 = "ddbc3a5d3283994b7408fd8970023b71178c83db12ba8be54553395791bc9ace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/cs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cs/firefox-85.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "40060c9664c9518692601215e86047f05e9dc1d7a51454b4e2097f6dddab5be4"; + sha256 = "c02faaf56a820c45bb38119c03becc53cd2ae25e93bed3ad93cc88f091b00a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/cy/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cy/firefox-85.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "a015e8b04695fbbc19f98361ea1965cb5901ecf285ed2a56f073b8ff0abe98fd"; + sha256 = "1d206ea516202af87511d13cbd8482b9dcbeca2447ac8b684937668afac68439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/da/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/da/firefox-85.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "976e53318750b552292d899f4534541cfd02d64c18f3f1f283ee6b5eba10f220"; + sha256 = "68976d8cd0ce910c6b8155a68a955f4dfd182fe7625ea3386f083fff27f216a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/de/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/de/firefox-85.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2951b14baacc84b9627b714a80dede18897a3f9696b50ce06c48131888b31322"; + sha256 = "6510c8105420027f1632da15060d332f9ec93353c03111a592477bf45dae5925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/dsb/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/dsb/firefox-85.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7b878a3be6798bc19b06242696a61ea78536a1b39851f9a1d41797192d7313ef"; + sha256 = "736a478e15f11126ad5dbdca66cd8938d72602041ff0c1f5f78101d4f62b1aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/el/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/el/firefox-85.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "86948d6656659180cc279401106ba7aa420e817b6cc2f633c5f9dde5f2753b33"; + sha256 = "d0c2f1c156d239c2c410d15216a8d331cde8cdb7d54bdf40aa6519f582b93bbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/en-CA/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-CA/firefox-85.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cebc4e8e9320d0141e2a81b4e54177103f6bcf69685055e3ee1bdf59b2188efd"; + sha256 = "0b68ac180a828a94743349cb53f64224d0013de610a5c9cffed9a9242caadab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/en-GB/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-GB/firefox-85.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "377b3afe2fbf6dc6d953658fe086347b795a25131eb9374465fe0b7089d22d04"; + sha256 = "978397ce347115b87ac24c174ac4363bd345ef8471d25bfc4a639722ed7098e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/en-US/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-US/firefox-85.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "addf2e4094d4b1f4d4445165a1f52fbd2198cde5fc9c213aef1145bfe8fffef2"; + sha256 = "98763f4b1526811967d71e1bbb9552a9a3fd877321ecb497083b9e313b528c31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/eo/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eo/firefox-85.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0393c54f640bba1d73c5a8f7f128d6c3d28b633432f72ec9fadc5305c6a394ee"; + sha256 = "a44c9b60e0e8342dcff31ab0bc2776680b9a94bea51ef237fc4b1f013fea6ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-AR/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-AR/firefox-85.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "700a5c7c906514dba573c72ebd92fd2809351382b870362a9e73d295ad68ee7e"; + sha256 = "3229e32a2db2f5a7638a734c538fbaf1b83f9dd203bb67008460783239da04c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-CL/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-CL/firefox-85.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "dc76f5b7690326a51ef2606bc19946c329ed3a4174cbcffe9193ec7281c03d83"; + sha256 = "574c90358de584b2bf4ec874a8f5a22fd777ceeca92c2894fe978a793faea7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-ES/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-ES/firefox-85.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "57e60cf15b7562d5766c3bffe511b43f50b9ee00c484344d7997b1dd74e6000e"; + sha256 = "1e92995900cfdbb94d673d5efb02e84321dc8917edab1ce6c86b98f860f483a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-MX/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-MX/firefox-85.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "77531203ff37345f9849b61f0c163c573c5ac5091e5d0e07037681609e0cac8e"; + sha256 = "56de604e9b32c7552825d87c0c2802bff66d72faad5d173fc71388118a47c046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/et/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/et/firefox-85.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a68e6825149007d042fc9f1fb359c18c8cf09da6bee0ef3d9f2a619bb2985b61"; + sha256 = "53297a8e1f8c5d3ac05d44c3aac1f886d7065cec6666548c3a571ec06702eb63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/eu/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eu/firefox-85.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7a94fa17efff869247b65eaf1c8731c536fedfc46edaaffba27d0367033a54f0"; + sha256 = "3b392831ee487279ffbc2156421243990a2abe94cdcf233c375f7949c28571a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fa/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fa/firefox-85.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "732417908adb7da3a9a06ad9022d3f487f6650445b93c406d6bd03482a622401"; + sha256 = "bdaf06e327bc17ff05d82e27d85d4ff747b8af58e8a0b95599d4af0068c6948c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ff/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ff/firefox-85.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "defe2f208ba27521850ec1fd8abe73c181004ddd66bc15d45a2d01c8908fee97"; + sha256 = "8e029e2f755f107bbdaf4833332f94b062284529230ef148ec404d9954da5b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fi/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fi/firefox-85.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "247ad848a34946c93129012de65da3153401b3a1dbd41d132d03904657b8ff87"; + sha256 = "b1cf30bbd4046c3f6b200b876bfa022b34771d1aebb48a56b35817d5d0f46d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fr/firefox-85.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ac56118839123c10899e043fde74051b4dca211832c2ca4abffc42062773648b"; + sha256 = "95f5265e9e7be13a8d50ff4e0c45f1247531fc78076081cf7045ffcf5e366846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fy-NL/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fy-NL/firefox-85.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "aff1bdd3559698eb253e6339088a1818490bc11fcec08560fed9732705d8f12d"; + sha256 = "f22756db0256f2d7b3ccb15c15f1006834e8a53251ba8a315f0d72365d7140e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ga-IE/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ga-IE/firefox-85.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b3aaaa9b45865d0be2fabaee45ec8ef481cc92afd93976058441c3c801f71761"; + sha256 = "7c67dc57553eca0c59293cff6f3097e56719d3c6b67d6599ea56ef799992e566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gd/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gd/firefox-85.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "979140c1d5db3ee847af64eb86e97a657f7665cc85e0754d4f580229a81a6a56"; + sha256 = "a1a4ceefc1f83454280e70316fcc9d0c2bb635a77596bafeed2f06d3cb133340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gl/firefox-85.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8953815137c2f40fbf490ce41f09c9f1c44114cf0640478e22e16ad67397f99e"; + sha256 = "02afd3809826d41a75f6554cc7f49eb65725df2721f16484907eb0ad3cb172c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gn/firefox-85.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5b8887274069e3c14ba4911cf64e01103ca2b2092f7819d535932ef09a486656"; + sha256 = "dc4de709435a0015d3c4fcb615cf8ed96814b2f6038c37ee5045e632891f8719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gu-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gu-IN/firefox-85.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f18ac181d0b5dedfc107ace1b257475d7ff75e15f069db183bd445e91ff066fd"; + sha256 = "f9a66be242916abf1576397204c8fd0c88574fcc68fb06480d82a6d7008f1f67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/he/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/he/firefox-85.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "b1b4b4bba5379e6aea2052dce060a857d545abedb75beeb09132c83d89315772"; + sha256 = "8739ec72ada89c64be8ebf692734a80f7a825c7201b4f7d43c3b0b8e18f8edba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hi-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hi-IN/firefox-85.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9fa023800ee3db1485a18ba33ce6e4b004123434da4b7e177e9413cd9dc72293"; + sha256 = "db9f6f97951291d86f8406d919377ef1121195665734edcb4ae731ebb15efa12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hr/firefox-85.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5dd335bb622a37629874680a132b4199dddfc341ed6cab7c34cc8bc6fef8fd33"; + sha256 = "b8fe4cf3e7c9d30c377504d58ae11c612cf74f0a02c3b25d4efe3ed6ee7365f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hsb/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hsb/firefox-85.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "f89219c755fe8aaf1309c6b83feffaf6630816882563286e324a90ca62394a5f"; + sha256 = "73207d15a6146e4bfe5b2324421993382a41f8648c0fe5e4f2ef72ed5182fc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hu/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hu/firefox-85.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8bff8576e76bc01e57838ec7751a8cf17d99e0c9dc153e91061ace650d8c058c"; + sha256 = "d57ac494fa650d1f0d46f9109952c1493ed476dcf26fbe843c3e9c5a722eac3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hy-AM/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hy-AM/firefox-85.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "adab4ab3ce22632836266963323a75a81db9e653614b9b639a6f61eeb10543a5"; + sha256 = "58ea459134ccddc63156161300f075cb747125a16aeeb8f616662783b2a8be73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ia/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ia/firefox-85.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "8b4acfb5654eb694b50155cfa41e02e19316cb47e552fc6537339156bb5cbfca"; + sha256 = "d0e4ab532d39eb094de62ae41fb40055e8dc20f2b69856f0ff28633f3c2a5139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/id/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/id/firefox-85.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e848c3877e0453d4ab9b6ccf6078fb919c4d15b1f0f20c1a975654c5e6182530"; + sha256 = "f60c707585e197263fd64a85a120cd4c52da17194d54a2fc538bdface62b1c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/is/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/is/firefox-85.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "00036a6977a932b547ee5b97f5c830456cb19393cda45c190ee5237e796a76e9"; + sha256 = "f0d2a9052ebefee0f7774e47fe13de41ba8c2b7cba5ca784d6d218fbb2549a75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/it/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/it/firefox-85.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "81dc17afe61ed833494cca7687a1bea1f6a5a3d93571ae0522e481ba2c9e73aa"; + sha256 = "4946d59a1b5fe36ddeacb371efe2072f66623d82eb4f26cf0fe6b96e8dd54203"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ja/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ja/firefox-85.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2f0a652d51740c9adc760a8843433a52226327600fc7e9e87b603e97c0541547"; + sha256 = "2a9f7705b5ef1258f925a6e48ccd99243003cb429bef9bba4ad56dfbd294ce11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ka/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ka/firefox-85.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8f01dcfe02fd71d3c3d564ab111b34e4f2d5c58981233c5698c87bf449144015"; + sha256 = "443b974d1631602734402a2a6dedaec8a7cc017e1abbb768ceb5e767978c36af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/kab/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kab/firefox-85.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1163788f9d943533b124a57fb3e3fc1aae56793f929e5ac2d3f17b1826e3d353"; + sha256 = "8f8283696206450cf21a4c88384ca915030a1dd7df9e93911b620dc9375e5db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/kk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kk/firefox-85.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f91eae3b5afcff6c49548c6d5d5d5b0fc0dd6a9500b87baaf00e0cee96efe22f"; + sha256 = "c9d78fdd7ac9d79dbb713a7130baceb4f19aca6bf8e7218950190ff95d921b6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/km/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/km/firefox-85.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2ab5040f15ceea952a7fb6d737eed93b23e1423e2298c31a5d7486c81ecab9af"; + sha256 = "1fb2612268f53fe300955daadae60be238070dae35555707027a8a62ce4ec3f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/kn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kn/firefox-85.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c141f0e1c95c0630aecda5f929ea3720f3620ad9f30f95e4e371865c2d0eb96b"; + sha256 = "86208426d917883c2eb6ea9248feead33d4115093bddf5f1c690ed176adb9c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ko/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ko/firefox-85.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "8e87b7f748f2fddb3edf5f12fcd8238bf8f05b403c707471878ef540f8fa2a40"; + sha256 = "b8057874e199124ebf283ab67e184dd2fed016b1bcb31a2f220e2e5d38d4f438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/lij/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lij/firefox-85.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "99e4be7139c456c7a7da8d1ba1b845d381995241940b9e9f3db81892cb51231b"; + sha256 = "2e5bdea7a0f68efb0e6bdbe64a1df287644e14ce5fbb896040f3315c6412fc43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/lt/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lt/firefox-85.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "acfc0ce0b56a15d2b5a7492807b9b70b801712b420a72d5b2e73a6e5021cce71"; + sha256 = "e1f79eba23036cdee87b9a5a2f48284bc006a191644d26e50a7ec61cb26d26c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/lv/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lv/firefox-85.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c8bab5353b01987b6e3ee434ec5460cb54d56183662fa9c7f3017ae018be575d"; + sha256 = "4d8f26a3b6211799a87dbbab6692f4a00c81b1d70c6af990a684b1b65c255482"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/mk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mk/firefox-85.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "7ba1d47b8923862ff2228faeaf86a1277dd48f45ffa83230f3b9b22b1860febc"; + sha256 = "3e5741eee9b27aa91827ef19e9b2b0200719120d07dccd37f5752ba1b746e29b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/mr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mr/firefox-85.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "acbc9dd00e31437bee02f9d3548af926ca021f128239f67ff5399e533923e2d4"; + sha256 = "247a11da64a28084d68d450cfa92ba66868891796d60a09ff9bf28d2af347a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ms/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ms/firefox-85.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6293173ccfcd0475b6ee0baffb54d4b43776710b3c4ea97ef1437a8919aebc1d"; + sha256 = "79e1823ce9d454d70660464776f1d492f67c3489f7e9ed20fef5a7331def0cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/my/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/my/firefox-85.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "c4e075996c9a6c13e2631bd85d6f5b3015400dfa40116479e5a17c939d538cf6"; + sha256 = "ebe50de263127be29aecc611c2e4b5c60068245fe64ee0a72beb2680253f85dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/nb-NO/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nb-NO/firefox-85.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "94d8f6ea965080e0b28d797c0c73813164216541bb6c008adffa523722a2727d"; + sha256 = "7e5f1266acf220fa8db165c3cc3ed2bf287ca809e3dce9b74e6284a8a3bd9e63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ne-NP/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ne-NP/firefox-85.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "129ab6f7276d180c3adacfe970c4c870953481790b451f8dc98134c914daddd6"; + sha256 = "0b7fecf7497937709d83e002951ec4425b080fe4a6f6cc967a3eab65db93a212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/nl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nl/firefox-85.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0f7efdcd52cf5c214da536261e539b45d8da3ad37543b6296feb92186053a59f"; + sha256 = "7125adcabd21b4edb2828b295713b3a35cd174abea748d5d4f8456c3e18e5707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/nn-NO/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nn-NO/firefox-85.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2e42e0a8eb2dc2fcd217aacd7c0aa7eac5e673bad0d66f0555f7bb51ffb895fd"; + sha256 = "560d195e6b472228403b2fd5651c7a61e84491e788faafb77af511e3c74e7fb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/oc/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/oc/firefox-85.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d4fabdd18ca199f6081093fe4c88191885ae0c19fc36fe574f546b26b5d2eacf"; + sha256 = "ae15b401c284e5e68819e68b0e9e76ca909ff167f2d15b3d77b546708a7e7369"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pa-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pa-IN/firefox-85.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "88ddf2bc486d13217edd3d325247dae774ba60d509481d7a6900e06ae30f70d8"; + sha256 = "32d9ef570e718ef79b004fcbb9a7e212d06e8171c0056f90709423495c3c7bdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pl/firefox-85.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9e6336fe8745e21674270a95bce7d24508c9585955c58ad74f631e1fa73c56f3"; + sha256 = "2201fb7b8edb8ce2b3446a4accf3f0ace2b1a18a7690a20b6e64ecb5ee1a61e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pt-BR/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-BR/firefox-85.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "68573084e4a826978bfae5c1c8cbfecba2fd578d0c6a07affebc2ba19f1d97e1"; + sha256 = "f80d4d45078bb3884d8302913ac738f33cd984709e95e279d341284b9c29749c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pt-PT/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-PT/firefox-85.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6b6bcca14f08cb8fe07282a3b24797417ea73a60300cdf76c64ffda4bfb051c0"; + sha256 = "aba0a4166f0b815e1bc96c4faca818e82adc4b4d1bb8d26cd1f086de681eb56b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/rm/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/rm/firefox-85.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "331c0cd9510564ade274c209514dc5ec3647e3ea37da6b630a7cefb8c445332c"; + sha256 = "450640a39b0773a255c97d884d51f7dd0de04da523e28dcfb9680e750b68e965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ro/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ro/firefox-85.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "52df2b116aaac13590076b86216b904def287e18828f040980cae01e8ae67b1c"; + sha256 = "eb20d1a28f510ca98baf24c10feb186d21900690d9f0c8be5c180b72c9d3408d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ru/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ru/firefox-85.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2fbcd36492688e21dc4e8fb1faf1ea67ecd745f3b7f58b0950786120c9043cf0"; + sha256 = "7b0c8c5b5cdbb66b36366289f7b65263abb19c174ac89cbb2970a5742eec2d66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/si/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/si/firefox-85.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "2a4ab4bf9fee148931d09bae59ec1f049c09aafdcfee3c6a083adb3d2b1e42ee"; + sha256 = "1f2e5c35d9766cb46c9c5ce5ff0f6c95ca12d0c14d12cc29d098562b8f35e9b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sk/firefox-85.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4ba12a5d49a2ee0f5c41f63cab08b7c161f3546ca9195339e22d463879e7f45b"; + sha256 = "528d3270d9bd722545fb57ab09059e0f43c0f605e479c0869cbe0757d1f38d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sl/firefox-85.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6f1f6379a9706d2af9c7797d8c1c86700f3e9ff7cd72fa35c3d602e6622de47e"; + sha256 = "d4948a03a97424c7b499e339a509b2ebba9b716c84e4713b140576bd787178ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/son/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/son/firefox-85.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "b9292626bad35a50dcb81d34db417417b031a6ef9a215e26d5e1ee9456e244cf"; + sha256 = "34a841faec9720c9ec32d6e00ca775d266f47ca3b660876cbd4a1d7c9d7b87af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sq/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sq/firefox-85.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "077dbbaa904712782252e8f8a01b78237d51cbbeeda0e455ad5f2569f9a394d1"; + sha256 = "aa5688e676bbb8ae87f089d78d4d6cb2a9c3393bf252a7c277ab6a8c97a80951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sr/firefox-85.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c537ab1e63530a82cf5c181d98895b580705e3418f598ab3f98fa67cd9a83f10"; + sha256 = "882263a340ef6b11b35e91262620218078c87b193f3d0ca8eb3a9365dfb98d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sv-SE/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sv-SE/firefox-85.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "42e36cc411666fad716a60643eae0be0301783fda10cb07943c8b6df293430dd"; + sha256 = "5b8baf5ee22e5da51040afb4cbdb4a6f165aecb117d181561c97903a0e63b74d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ta/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ta/firefox-85.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "b77e5c448f6a1bde09da07c3b20339f54214d89b4394123809e7bec668d65abb"; + sha256 = "14a00497f7a4f27680e95126b4584a13d3376b8d4f39fe0a0de9a7356bd8dca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/te/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/te/firefox-85.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8c700eb9c7a9057e4639c39643430667ed9099a37d2214c8ffc5d349e5b0fe79"; + sha256 = "0de38fdd91056121d68734c76b799534921e8adf37566465a72b4fce9d5af693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/th/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/th/firefox-85.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3a467b98fb435e80bb913c56291803a79a05a42c73576be49b014394a29002f1"; + sha256 = "80aff43b79ab4343d6b9bb2a5eebada3ef376313fe47cb2d1d7ad51f2f2a57ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/tl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tl/firefox-85.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "599214c5dd5eb28d6ea3b7e2db8795ce4923284c721b15a85bcbdbe74b416c5f"; + sha256 = "acdcbb66a68421030634bf1ea1c265ff38e84dbe010aa41058da64ce966d1e57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/tr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tr/firefox-85.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1192f241df3a8691d0e895737c03a790f47a731a6335d2ee2fd1e1310b3d0cc0"; + sha256 = "a3365e32fb78743ae45f89ae1740a7c51cd11e927454cc836bac4e9f62cd9abe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/trs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/trs/firefox-85.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "f68c08305ec3d1396826e3310ac88b5b07beb71beebcbfaebf3ac81c543bc47e"; + sha256 = "a9da73cdade15ce508678c8347c6bf03c2d93578cfd095e0c586682efba7f2fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/uk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uk/firefox-85.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4705551ac9a02b450f5e81b05a08912b7b26bdba99b9e9095461aa9c70aeed36"; + sha256 = "05ebea023813ea0755e105f6f1451ee0d85bba5e52660230f25487bb9d997bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ur/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ur/firefox-85.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "ec84dd4c7a4e338a21ccf8f09c1dfb14a9e34e3240a55b92901cc5e6a89bb135"; + sha256 = "ee4cda80858fc6ab33996a546be8de565a5d4d969ce26d0d1aa70ba7a923e496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/uz/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uz/firefox-85.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d7a5b1c95cd9c8bc20cff8add8a2fa9c9c909b3845cbdc6f593f2686f9f27a40"; + sha256 = "7be525a02c9bbd4beee8678eb8488f50337aaf16883ebd41f5b2f67586b4e57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/vi/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/vi/firefox-85.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a3c1a719317c9fc73371132dfc0349dce50db061c4f96d32585bb26d0aecc7c9"; + sha256 = "cc6a9d73810294f3261aaf26d4678c4a49b88375f48321384443f027a5a0b5ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xh/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/xh/firefox-85.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "cacdaf5b7044a7e951fd67c4ff25ed41f2fe05a6cf2f4ff5b9d8d9fb0cf211ca"; + sha256 = "5eee0a8b232448992ab37546d698d4f212df53c562f29261023e64cf5762138c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/zh-CN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-CN/firefox-85.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "888569bd9bf58a58ffd5effdc4f0c58ac53354cec5d2792f0d88cfb30efff4bd"; + sha256 = "94ac5a87b53fc8aa6769a4f6faf56d0089965514d8e811ca94ce2cd996e536e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/zh-TW/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-TW/firefox-85.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "71e1fc336cfda1401b4d96ed185423486480a5ad4d267d3c94336470fa4a8bce"; + sha256 = "025c04100a427e231db031aa43694a51191ded2c31f22913bcd694c734bd516d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ach/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ach/firefox-85.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "efcfa1aaac69712596c7f5ecbaf359c69980eb0b4d8c99857085f3a4564d5026"; + sha256 = "9f770cc6655b31ee907f949e0ba2f197d0d6fb3ae33ec1fcab311ffb7b109fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/af/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/af/firefox-85.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b5e1eb9041fdda259a3db87d784e6b633a18f18c46038361d4a6d2a8aeadcda3"; + sha256 = "7ecd58201a5f3eb6fce474bdcbb0f672c8f492f30de3ec4f8f3cc48c2c967313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/an/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/an/firefox-85.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "35ecf29bbb2e65feb372c83d2bf6b1c28b6edd57873eaec3090ed0200121043a"; + sha256 = "362d8bf290f67ea40c93fa058813c073a51911940b916595c0a8f1599ef46713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ar/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ar/firefox-85.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ef86ed77ac7de83e4e068970f57843ab801f89f180837015f1ea4e3ea11f3b6c"; + sha256 = "6b66c3f25eeea055e42a74ce6c327f09e8fe4f18acb1f947deee351d2cdda1da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ast/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ast/firefox-85.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6b58d2d132944a5106b73f47bdffbd606df63173f817bbdb32c4d3b2354030a0"; + sha256 = "0efef2406fe4d8093a1ce6bb56d1a54eaef5bb429b6fa560fff7373a7435cb3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/az/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/az/firefox-85.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "1ee85155d8d45fe003bea0d8ff9d5a1c40c4d52102e125b4bc1ad608b5383c39"; + sha256 = "bb0dc33a53a2f871b9743f17a36f50fabed87c137521404675e69df69f121350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/be/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/be/firefox-85.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e6f30798e101d73b0e359a63a35b044ea51df964f1e22a9c894f1b572cb99653"; + sha256 = "7459818c037c45ff2969998b8d3f481eb8384802e5444e2f3c58340f316aec14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/bg/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bg/firefox-85.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e3bbc6ca6c77fdb56dac6c8ad0c45d425485ef279c115651bb4824f6d52a14f8"; + sha256 = "55f10b4a5cc1d06dcb81aca68c59a0aa64d7934e01c3f5f3dbcc27dd7497e3a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/bn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bn/firefox-85.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "583762c0fb01f6ee1165eb98122940fc42286e6f8678679466a2b79051a45fd3"; + sha256 = "6491efbf19bdf11b877d04dc22707864c07e9b52452408cf386bcb7bda3cf840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/br/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/br/firefox-85.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "abef23deaac27bea07d0586f78578b34407765c05cdeaa9bd4d4ea0b552bafbe"; + sha256 = "4ae74e5843edbb01d35b7564b1e998f58fc1c50d849fca9a9e97e540abe6f140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/bs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bs/firefox-85.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "8f4385e1a8db5567d499a046a169d8a77c585a61734ee7257063a98d722cd278"; + sha256 = "c796121189e7bcf5ec5a90218db35fb34393d4e70ab7100567b3f7aa43daaea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ca-valencia/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca-valencia/firefox-85.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "eca948e8e2020cf401ac4dcaefda2aaf967336122e1927418a80d9a854e2e52c"; + sha256 = "a2097281cb1d5191992399686c26754a57d0a3bf241961374e335c225c4f7324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ca/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca/firefox-85.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c46250371ac43baaed265e74998e0bc44fdf01c4308f1bae8e34896e75004096"; + sha256 = "4135f8421b6594a468dad1057d2684cc8c5e3fee1b095653d42c86c6b4b62ab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/cak/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cak/firefox-85.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "64dace82a39b131fad3509b2865a6cb22c5044a88838187f975a9c3bbb5cff2b"; + sha256 = "93799eaee71f6e1914c9161d075163bbc7c42d85b196301eb6891bb7c3debba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/cs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cs/firefox-85.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "799c10e7f4068f4122637f4e8ae992f4da892b8f4ae17e47e2b93ff9f61f236c"; + sha256 = "25678ecf83437174adca71c682ff36145b0f68e45cdaec515fda671907c21133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/cy/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cy/firefox-85.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "9075bde46721937fc83f891a3f3162969e61c8ae6aa0904b6d597fd5c2872e81"; + sha256 = "85b571e0fe4f0bdedb8b433f8363a7649a1c5fdfeba40b35f069ef1518a28600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/da/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/da/firefox-85.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d1bc56c35db77e1ed7c3b206ca7906834edd41e8d37f5fb467fa75eab22b1c6f"; + sha256 = "d998daa0d89d7d4a632c576f9d81d5fe7af3c0e54332968d593d88e5f81fa246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/de/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/de/firefox-85.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8430827afb4a748890d1b114d3363898ff6a882b2a17165a10abe8ef385ec83f"; + sha256 = "a84adef78975397d45941ced4b17abfacc2a26a0b758336c99eb174b33f51c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/dsb/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/dsb/firefox-85.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e6985031027fc9d4e5d8ab0899daadd93a5333a668b116b632181ed34006ae64"; + sha256 = "6647771748299fe56d9f023e612de6c3dfcd1b711cdcde74ea39bafb957deb5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/el/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/el/firefox-85.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "4e5bb6be18e963006f30a1478194b6613ff922e9dd3939ed7df5e2d79df5c630"; + sha256 = "73a7a168b65362901a4b198200e2a5167244e886131203543bcf83f2998261cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/en-CA/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-CA/firefox-85.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b172f0368b07b6f908035e7d41a95ee8abd9c21cfe77923d902ec53517716a6c"; + sha256 = "d47e5707ab2ea2e369adffaaa49c52f461d3c01b6b28b31b0876bc5284d2de66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/en-GB/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-GB/firefox-85.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3e64db811fa3cf989dff5b043b9ffc3349f119ce27185fcade110e57ccb66056"; + sha256 = "6a50517b8ecd2fdbb897dca8de5a948214180fcb25ba3654faee7bb563d049d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/en-US/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-US/firefox-85.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e6269d7b11bd0e2d918e45059d201a2ae329da6ae69d33648de1e8ed885c65fc"; + sha256 = "83ace0384a14e383e65716ef9305d72e39832b855ebecf2035e6267b4c9a97a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/eo/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eo/firefox-85.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "fa1e60db4ff414b96c7813545a5b67730f312cbd85bbf079aa4c03eed5dc0920"; + sha256 = "2e8b25943115edae1dda4265aa3fd1edd8683318e47aa3b11f9e2f3d6f89a372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-AR/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-AR/firefox-85.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f65977cf029a0075e2214708719a6af4b8e41d39bbf59b1ad998a5fca460c717"; + sha256 = "559b0de8d0d846f58e15675e31e0db57ba00ad2b98d3a042c1d6d25a9727e1a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-CL/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-CL/firefox-85.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "94cf0ad46c52685c03c385ca80e159e5ddf229f31c8ef764defa50dfb5e59857"; + sha256 = "3297f38424fc6cdf2ddefa72732f977cb1ba1b309dbd3d845b63a038d748359c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-ES/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-ES/firefox-85.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6603132e1660a50ab3f0347a22b52b9480f4bac21f67f958fb0f112205f3dd3c"; + sha256 = "614e69e978f0e814b54150a013872081d6365d9e5bb03ee1147c5310d6315dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-MX/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-MX/firefox-85.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "325cefd6f0920207fdcb11674a4b5a3f8d71a4b65e64c11f7ab3681a7a1ffb08"; + sha256 = "765d1ca2685a462f173d7ba1863a2263008cba71738548dcdab83f6c010b7dc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/et/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/et/firefox-85.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9e997aac788ad9c5d249a2e1cce5f3a968fb5564c67e585f842d576aad5b710f"; + sha256 = "1465b6447bd476f98060321562ec0ab47b117f1271dc97f9924da573c77b5a3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/eu/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eu/firefox-85.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c677e6c0e86ce007fd0027132891b0baeefb172dfe19b8a3b6c0a1fdb09413a5"; + sha256 = "4f25ccef829ad465d62676aec9c6daff9e5910cdb5447c0d9b5befee89b7e4f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fa/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fa/firefox-85.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "4961d99cfa342ff1148f751a7ecb480439f2850247e4b4815023ae767cb92c55"; + sha256 = "c2bed62b36d648133edd1541799b231dbfb1c0c5fb6213ac28c3abc0a38ee66d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ff/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ff/firefox-85.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "751d7fb2485d00f1653397cbab88e0131b959cb9fe94a2c74687b05967a0efe1"; + sha256 = "527591e25cd83c6ba7fe443dd40ad6963dd1b7f69a693e76cd1e18a2bf74c082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fi/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fi/firefox-85.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "98244bbd2d914c14b66a2f1b58312fed6ad09d69a8c6e36c6a28b9d6f5b93bd1"; + sha256 = "3c89fb2c42b854fa800c47e5c91d19defe56be5f6474c500bab309eb84df0a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fr/firefox-85.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "c90054aa48353ecd2e7d8bec810e98b8706bc837216bd2237010c50d73890de1"; + sha256 = "a7b033c9df0e11abb6dae08f62dbfb34f740fb9d849e0bd8a027ecf0461ff5ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fy-NL/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fy-NL/firefox-85.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "343559198dbea2cd4f4d66c83fb8c0f44fede93843d43421c9a7e5925a7f834c"; + sha256 = "d162a3c113182178a7de0c5f3dab907badf9625ab50e8a922ceb4c34c4616c31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ga-IE/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ga-IE/firefox-85.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "44a19acee4c0a8e03604de46c19c28f54f9ecc8bbf8f32f2e7b3922c11659df9"; + sha256 = "637d65856d46474d51cff1da13b9b1e74984cb646cc5a6a643fcbc7fc1ec37fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gd/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gd/firefox-85.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "bad179771be3cb0fd0ed4dfb287f16df65a06b78b3741853f474184f534f1ec2"; + sha256 = "aab2f06d6ed6108fe48350ce0275d3d244f175e6c2427f54b403d6bd6ddc18cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gl/firefox-85.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "58732e181252d40d59e3acfaaa1da9533e659fa4d3c43f70c03801fe793c7280"; + sha256 = "a5945bf732fc6e3edddb0e7bb9067c591f4fc347f56a35c8622311706d8c135b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gn/firefox-85.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "645d6840fa76e286bf107c526de0762c5074ef3b52bae49ee5f02307c52d02f6"; + sha256 = "6036a369187f5e30322d140e1add09cc0a51e5d092693a5acb65176c872bf53b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gu-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gu-IN/firefox-85.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f61f6b052a687807022b72629a22a6b53890487add36634d09e2860d92d6733e"; + sha256 = "2b6d3c13a44b1234f591536c8f7f3cf5d1b56af53f366150e0565a36d4fa678e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/he/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/he/firefox-85.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "5b96a1b4298737182a7c7c99ea43eb7b6558593f9f7b18df4a0217101dc183e4"; + sha256 = "c3d01e14f24de5635a9c0d3c7625fcb9b84129ce9505d2601390f2d40fff5a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hi-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hi-IN/firefox-85.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "e4c393235aaa9d80d678ea2f69092462815705647022fb2635a00174e597eb60"; + sha256 = "23f1dd3a9603d797abf6a1411c7b6e44d4fb2dc7b26294670ce4c63cb859e42f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hr/firefox-85.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3722f05edf8f9fd5adf782291be51b708e7f08943b2f03351b36df00a1ef0d1e"; + sha256 = "e30d8a599b28b05a3f83692dbadeb9185829b1a87c84ab5449f142ad1a7a8a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hsb/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hsb/firefox-85.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e79dc707afdd246540e886522890d6ae2f53c38054c8902303d9bdd03df02359"; + sha256 = "1a6cb70573e9e0356e18a18d1a0a4d2f7188549c19cbed7e28d3b801915c22ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hu/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hu/firefox-85.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "415edcbfa2cf3bd0cb1278799914ccd683af51b8e380039c4aaba118e66047af"; + sha256 = "c2cc048b05e197e028606535fdeb62a205c037eb5823560f187ec4152be41d97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hy-AM/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hy-AM/firefox-85.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4561cf20fea47b11a330be2bc3b517c1c53b4577f250b531225c53f321df7382"; + sha256 = "a4b6b0d0f05ce86d13dbf08448724106278891cb79387e29f9ba3874c1aa6ec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ia/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ia/firefox-85.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "97b44d0e08f79ad55aafe2384b523d24e0147d414b95ff81834feb59c6b07695"; + sha256 = "f7d761ea9ee5d6037886a9aa8eb93747ae9f943957a296cdcca0dbbb0e7a2b38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/id/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/id/firefox-85.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "2b501c2b43fc54f1ba5a89f8b0d19f8d25626584d1bcc108e16e2287f11449a2"; + sha256 = "1599cd0ea460ee1280753bea5d5c84419506f72f8d87818114665ced3237407f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/is/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/is/firefox-85.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "2cc3d7b82be2bad7ab6dc5659bf7a4c8ce4d882964588a2a767e78a34d832b27"; + sha256 = "ec9b790cc55ed72fcd79afb6502db207906f89aff4053d62efa12a37bbe85b93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/it/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/it/firefox-85.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "68b3f63b6e561f038894d6503b4fba8177e3fc025a189b68e2da11f8bef11c2a"; + sha256 = "97c625e01e9a565ef10079ae980cd2ee45761f428594158f6c05fb4a3f1142c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ja/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ja/firefox-85.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0023494cb7a5485b1d492c2b9f1eb40a9fed06db0de6a2bcc76b54c4c8b44b5b"; + sha256 = "625dc84ed56bb46032eae0087ae96d17127594efd99e4aeea410d4c8bef93819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ka/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ka/firefox-85.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a6489db173bbf47f76379afd09c75912d2bc4b8fdd8023d654df9d5f257378ed"; + sha256 = "45a00fe06fc302d59744b8c9dfc9d7a4e27ed4ac3727848f52597208020ce16a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/kab/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kab/firefox-85.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3b060b719b8bf0993786b05753467534e10986304b3251f572603be5aaeec2eb"; + sha256 = "32b8ce9f195ecc610e3327402953609eb8621cbe116e22bba76131c9dd1b9738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/kk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kk/firefox-85.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "7c1139dad1b300c8450357356e6c317159b5d702db30747c1ff7aec31f33f82b"; + sha256 = "651f3c7314b919af1348771ef7c5ea986fe3d9d7e42e056172fa55d675e17e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/km/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/km/firefox-85.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f9dbec23d5110b389fea294cdecad03772f2471952e9ea01bc9d0462f7541ca5"; + sha256 = "1a62be10235639a7c2256521838fee8637ebd575cee39c5744a65ef057afe1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/kn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kn/firefox-85.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "7521548f755d51ed47e9596d58223f699fd4494bd5af8fffc1c59018f20be8bc"; + sha256 = "1cdb648165896ccda8da7ef6862605723089cbd8e3c9e6b8692ffeb2d28f9593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ko/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ko/firefox-85.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bed7a64af30ad21413516c201498fbc335125768ebea48cc895e724e6208d566"; + sha256 = "70781041791a7c64e518de27955cf2b57ce3d3ee7afad36737f62783b5255d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/lij/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lij/firefox-85.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "426c432ae9727806af45667948a1f1aed7196a245441054da590931f98b5e96a"; + sha256 = "ea44fdf528da53d7f2ba9d447c70079873f802647ee708f6580447af6adc1834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/lt/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lt/firefox-85.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "badafabd22ea7934cc2099677c9890cca609c56f3b16a863fa2c977f1e86a9c2"; + sha256 = "ffca3845c97f4d87e0d601c483e2bde8fa8f7f59b44ee85259fc70b1dcfb727f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/lv/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lv/firefox-85.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7caf8f81efa55b69cd51fb5f75652c6d9aeacb2711d9bdbc29fa80dcfeda74df"; + sha256 = "b513e100141d1df78de9f05dac72da91c6cf65a8fcc22b9091ec00e6c6ee21ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/mk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mk/firefox-85.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ef22239e208acfc9b0a57dd06781c09dea1afd0303a091cf075c021a5c85003a"; + sha256 = "c65febe8a9f9b59ecdc61880a5c1a5b2b29fc53ffbc8d968f1773fe60adb082e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/mr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mr/firefox-85.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "99d2c32ea14feec74db39d1eabc0c914a8681bc216aa76cd970473fbc06e5dee"; + sha256 = "b4d3b6758c67f72e8f8c9dbb0e32fcd7b527b701e41d3d492e3e7ba7817cc544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ms/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ms/firefox-85.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "43011dbbc33615a67088619053a2579098e2afaed43b09268e5117290f100101"; + sha256 = "2fe81086a7a15bb29b909987063c058c1826bee6c0c645cae1e7a0907207d1ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/my/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/my/firefox-85.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "d78bb48ec1b01787037d575da259b724db2bfffb0cad1700801ac7696eeacc55"; + sha256 = "40661cc4fa51c2782bd0da0d6f460c3a5fbfaab72e91b15c77f9b7b537484ab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/nb-NO/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nb-NO/firefox-85.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "64f55d03bcdd9132b40cad1a5265cd81e2945022056141272dc0fca22aee2a71"; + sha256 = "9ce253d8bc316fb976c4f64135f7767060aed90111b54dac687011a772e650ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ne-NP/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ne-NP/firefox-85.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "b3d7c64b087ccd67b56dbb0f9554dd3db6481fd59ec7f46db1a03dfea129c372"; + sha256 = "7fb96857d5da6726e68038a9659ac7c18b8e746d0dd5e4823655c8fd093238a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/nl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nl/firefox-85.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f2c83282acb30108f4bb381eecc30d61758d1e2279abfb772050b3ed8827b8fa"; + sha256 = "1d03b2eb31dca3cfbfb38af4e59d3eb84845b8fdaf488b76949a98f744253935"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/nn-NO/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nn-NO/firefox-85.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "534dbf0d58c85fe21ad9998a703ac4df5a0b7d124c80eaca0b72fe42b97628f4"; + sha256 = "64fdf6e8e8086c04c53c84f792382c32579b43548f9410dc074b2aff95165d88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/oc/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/oc/firefox-85.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c3eaa5dbee8ee90d735c5e6db3c397011837385d4ac4d46ba3693d3aebd03e1f"; + sha256 = "6db5c30ca7d449534289f5b84e328484edd5d04512cde11f097f28f5ffb986bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pa-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pa-IN/firefox-85.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "66c640b7bfb626b8d851af9f3170356adb3436fe1adbce76961df586fcdac051"; + sha256 = "102ac2026af2d21f27502f190dfeb0f39b148ce39324e480f653f6868df770d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pl/firefox-85.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "64d5f25fc15cad09c103fd243d0767aa4d0a6e10940e9229e9fbf5e5354f14b3"; + sha256 = "f0a03e6a95a67af8e6949f5b6ad32179f7bf4978f050ca3c453287bdfaca6252"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pt-BR/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-BR/firefox-85.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8cbd4c44af5da9fff2baedddfda640661dc3c3e0a2541985a12b0a42a76bbece"; + sha256 = "7177392c8f0c049ad685676aa6aab258274b7d5871c06467f7e87292779b7575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pt-PT/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-PT/firefox-85.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5fde2c95eafa41bd9c8da90fbc6408eee8fe8187d18ebc2b9e04a19e662eb7a8"; + sha256 = "1fcae4be8cb31d30b1187b7d94fde71c41eb95c858467136af32fd7ad1117147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/rm/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/rm/firefox-85.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1f2b1d0c9695b7a8796670baefe35e95d91a4060137c01739e00033a2c50aae3"; + sha256 = "86f801260baccff9e8d9036dae46b0796edc8d90c9a2238da1e1547ac2684da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ro/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ro/firefox-85.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "77fad9b28166ba65d8514f76f43f4686345ac7ce7cd8e08bb5575da1b042bba4"; + sha256 = "c1b02e43cc649acef6cdc9498814a4582b46b42de96dc48fcbac4d83b44ba35b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ru/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ru/firefox-85.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "58b4896bf014197734a9d8fcd03e526be422858aa0ac109282f0dcd543bb8697"; + sha256 = "c067538578c2891f062716f56f3ae057ef8db2814a03ec7f1eb8855b95f9ace0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/si/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/si/firefox-85.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8aee64af130801e33df0d2aa91ed0b1d1328e39963320a418fd04a3bb0a0ec89"; + sha256 = "8131b12c390e31c06752115abf62426565433261e73ffa37a8389b102ccd06bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sk/firefox-85.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "2f7813dc98211b3cf8fd0d2d233e2c7dca7f94e85fb2a70df9c69aa6bd5add5e"; + sha256 = "f45f32063d34930b7e0ba4c087e97a78af642a59270c62fbea86b0bd87e06171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sl/firefox-85.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "75564047dfa2bc5e4c0dd1d1dd1f15e1c59e96c203470731db143ae424cd8c2f"; + sha256 = "df8602e60a895887170ff2d18aae487730ef8e0bcfe08010fbe0da30f05af91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/son/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/son/firefox-85.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3684681de408a4cd02fdb81c559bdb15252dc56c0376a94ee512d7cc49e67190"; + sha256 = "3dd3bb220c4cfeee6ecd79977e1a619470a2504a4597f314286497164984cd9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sq/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sq/firefox-85.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "573e998a49756843d14f063d4e3aea23f7844076d8ed3b5a0409d0c3758d7a17"; + sha256 = "cc04ff65bb4fbc714e21a416af26256d4b203f327e5678c71378fa507242ec6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sr/firefox-85.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9289ae5e5270553dfc11dd6a7b9db6e6afa106919daedf085494c96f79cd0c52"; + sha256 = "abb30a4c0eb7ea9910b21c0f10cace395f9d413ce39051494c97ddd1e18e2c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sv-SE/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sv-SE/firefox-85.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4b97dd3f617774925a140edcde97b5e0864405401222f46bcc59d02537168ff9"; + sha256 = "76ae51342d5b8a93ae5f3927a69b9b1a6cd4877b98a7a103f8250bbe105ecf6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ta/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ta/firefox-85.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "80273dacecd26e0dbf1dcc39858f05c5ef0415972851166c0761f553e832e071"; + sha256 = "1e9866ac793705555c15ae4d0e16753e90e8deae19e6694ce9f85e8dfa6ee476"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/te/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/te/firefox-85.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e074997f616b1b356f40dab47f25e13e8b9b143bfaf932a0a281eec8675b71dd"; + sha256 = "66dcd400f89054f194f1a794c8731c7344b04f97209023559bfcd0f008e005c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/th/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/th/firefox-85.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e28ae199709c1ab1d580f8bd83b7ef8cf56750f17b4c30bcd188b088a61d8ba7"; + sha256 = "adef4cf7769510a8b47628eff5ee0f3b00c23862634fd8f6975daf599cf7b056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/tl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tl/firefox-85.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c8b5161094d3fbed51d4dc033804ce5c2e77f9d96172076edced695ba76922c9"; + sha256 = "465d089eb0c68d8279e3cc7f8ceb5c08527fc48b0292cc8ce523879c4643fbb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/tr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tr/firefox-85.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a5178b392fdf8b36292548c9a98e22b879eb19e0f6d237192b376b7df92ee219"; + sha256 = "00d75ff3605672f6704fb600208872e536f76907ed25a4f90325cabc1924f991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/trs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/trs/firefox-85.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "38554c05e9122c71ea0910892e6c455c4402ead97c6f00d309391544ca208697"; + sha256 = "299be659a464911dd27d92c36f567f675a26aa6d92af63deb002e172ba6b40e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/uk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uk/firefox-85.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d6b2fe56aae2b6f4543072f0968c357ab893d89b92ff6c053cc709df75a51aa8"; + sha256 = "49c2084ec32c03fd2821c8f1220bbbf954b98705e44a6a7fa65ec6f1abb12c02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ur/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ur/firefox-85.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "fcd15754df86493bc627e8fd65f0237a7a10e6e5e5843715bd31445e4b99f2dd"; + sha256 = "d703344d8f03186b0fb246108892432f137cc033ae66bef395e7216cfa7bbdd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/uz/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uz/firefox-85.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2a9cfc082a01c6af057627f4d028b67e0f0b72f913994ac208cea6ccfcd7e41a"; + sha256 = "02379c1fd1766eb15d9e99f8a6f08074df943c49ecf6b50a6b29ae8e922bf347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/vi/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/vi/firefox-85.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b32b7b8ff09a0642d4636a1d6477ba3b14c0a47ef93407078998818e7fc23145"; + sha256 = "0577b4c2891ba646a67a93b4d6373095b98466e32b95993abc79e7bfd240f7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/xh/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/xh/firefox-85.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "5a95cd2dbb58f739b58eb8ba5d829d1e7f4e7be405cc6659857432a5c10c8d21"; + sha256 = "83e40e1b33b2782d5dc68d32286da290188e8b5c3d689e5352d53411f95bed4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/zh-CN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-CN/firefox-85.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e5f93c089a0de95e3e430ed7ad3b028ee7a427072ebb3a035451b5724ee248d7"; + sha256 = "695e647135b911a5e60374595197cd096b7bc180e63ee3069e4550a612354369"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/zh-TW/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-TW/firefox-85.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "348b26495fca92805814ee355962741154654d9babe5959ed4f41065123a50d2"; + sha256 = "5dcc5aa463f3c2325dcc7f4f768580dca6adf66e052470ec932bfabe9b3f8f29"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index c54d533840..fb340ee1ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,7 +8,7 @@ , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification , libvpx_1_8 -, icu67, libpng, jemalloc, glib +, icu67, libpng, jemalloc, glib, pciutils , autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 @@ -182,6 +182,8 @@ buildStdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + substituteInPlace toolkit/xre/glxtest.cpp \ + --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' '' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") '' # substitute the /usr/include/ lines for the libraries that pipewire provides. # The patch we pick from fedora only contains the generated moz.build files diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 53830b7d18..bbc3f7308f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,16 +7,16 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "85.0"; + ffversion = "85.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "17bx4782ix3nrjnc6y29bz86lkpc2fzapqraa67xi65m46qrn0cs9hwdjyl48rdc44j5972gilpmd217kfxf4wxrfc2vcxadgk75158"; + sha512 = "2m46li5ni1m4xv42h99rn2hhhv2mqy229wihmzxmgvws1rh2h11yf6x2a07akkjrsp2dmwxmmkhmf9dhakgj9i55z5qqi99azyx07df"; }; meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco ]; + maintainers = with lib.maintainers; [ eelco lovesegfault ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.7.0esr"; + ffversion = "78.7.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0606prndxfv9nvrpcnagwky04j4jhn1139gr72a0rydfagznsaqwy13gpzdf58ifycdln63052kchlh2dslz5m8hifp215ydcppv8xg"; + sha512 = "138dcfpdkp78yqgygac212vg5fm5ich2a82p7258ch8hk6bpvpdxbws4sdqwljs92x831dblcsshwkl06vh48899489gx87mdkqd0nm"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 31cfe0247e..96a4e15adf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,6 @@ , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, flashplayer, hal-flash , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire @@ -47,28 +46,31 @@ let assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used let - enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; alsaSupport = browser.alsaSupport or false; pipewireSupport = browser.pipewireSupport or false; + # FIXME: This should probably be an assertion now? plugins = let removed = lib.filter (a: builtins.hasAttr a cfg) [ - "enableVLC" - "enableDjvu" - "enableMPlayer" - "jre" - "icedtea" - "enableGoogleTalkPlugin" - "enableFriBIDPlugin" - "enableBluejeans" + "enableAdobeFlash" "enableAdobeReader" + "enableBluejeans" + "enableDjvu" + "enableFriBIDPlugin" + "enableGoogleTalkPlugin" + "enableMPlayer" + "enableVLC" + "icedtea" + "jre" ]; - in if removed != [] - then throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options, except for the adobe flash player, have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." - else lib.optional enableAdobeFlash flashplayer; + in if removed != [] then + throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." + else + [] + ; nativeMessagingHosts = ([ ] @@ -88,7 +90,6 @@ let ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) - ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional alsaSupport alsaLib ++ pkcs11Modules; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix deleted file mode 100644 index 1a4f9b4ec7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ stdenv -, lib -, fetchurl -, alsaLib -, atk -, bzip2 -, cairo -, curl -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, graphite2 -, gtk2 -, harfbuzz -, libICE -, libSM -, libX11 -, libXau -, libXcomposite -, libXcursor -, libXdamage -, libXdmcp -, libXext -, libXfixes -, libXi -, libXinerama -, libXrandr -, libXrender -, libXt -, libXxf86vm -, libdrm -, libffi -, libglvnd -, libpng -, libvdpau -, libxcb -, libxshmfence -, nspr -, nss -, pango -, pcre -, pixman -, zlib -, unzip -, debug ? false - -/* you have to add ~/mm.cfg : - - TraceOutputFileEnable=1 - ErrorReportingEnable=1 - MaxWarnings=1 - - in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt - Then FlashBug (a FireFox plugin) shows the log as well -*/ - -}: - -let - arch = - if stdenv.hostPlatform.system == "x86_64-linux" then - "x86_64" - else if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else throw "Flash Player is not supported on this platform"; - lib_suffix = - if stdenv.hostPlatform.system == "x86_64-linux" then - "64" - else - ""; -in -stdenv.mkDerivation rec { - pname = "flashplayer"; - version = "32.0.0.465"; - - src = fetchurl { - url = - if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_npapi_linux_debug.${arch}.tar.gz" - else - "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; - sha256 = - if debug then - if arch == "x86_64" then - "04p70zc4y7k1klsxa70ngl7g5q6pf2n4018r7d5n6wg2961mjk3y" - else - "1avslj2ssp9fcvygcc8f578gpj3bbbpvap4ssr7ag6xn6mh15adw" - else - if arch == "x86_64" then - "0dbccg7ijlr9wdjkh6chbw0q1qchycbi1a313hrrc613k3djw3x9" - else - "1mhbkb2d6ky1xlgx55yip1l9kh5nq35jjbbm6hf6ckai146j3dr7"; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - dontStrip = true; - dontPatchELF = true; - - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/lib/mozilla/plugins - cp -pv libflashplayer.so $out/lib/mozilla/plugins - - mkdir -p $out/bin - cp -pv usr/bin/flash-player-properties $out/bin - - mkdir -p $out/lib${lib_suffix}/kde4 - cp -pv usr/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so $out/lib${lib_suffix}/kde4 - - patchelf --set-rpath "$rpath" \ - $out/lib/mozilla/plugins/libflashplayer.so \ - $out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $out/bin/flash-player-properties - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - rpath = lib.makeLibraryPath - [ stdenv.cc.cc - alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib - glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite - libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama - libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng - libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib - ]; - - meta = { - description = "Adobe Flash Player browser plugin"; - homepage = "http://www.adobe.com/products/flashplayer/"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix deleted file mode 100644 index ed95d02ade..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv -, lib -, fetchurl -, alsaLib -, atk -, bzip2 -, cairo -, curl -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, graphite2 -, gtk2 -, harfbuzz -, libICE -, libSM -, libX11 -, libXau -, libXcomposite -, libXcursor -, libXdamage -, libXdmcp -, libXext -, libXfixes -, libXi -, libXinerama -, libXrandr -, libXrender -, libXt -, libXxf86vm -, libdrm -, libffi -, libglvnd -, libpng -, libvdpau -, libxcb -, libxshmfence -, nspr -, nss -, pango -, pcre -, pixman -, zlib -, unzip -, debug ? false -}: - -stdenv.mkDerivation { - pname = "flashplayer-standalone"; - version = "32.0.0.465"; - - src = fetchurl { - url = - if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz" - else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; - sha256 = - if debug then - "1ija3z5bxg0ppx9r237cxs1cdrhk6pia2kcxbrm6y30kvzrd3nqs" - else - "1hwnvwph7p3nfv2xf7kjw3zdpb546dsia0cmhzg81z016fi7lgw8"; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - dontStrip = true; - dontPatchELF = true; - - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/bin - cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $out/bin/flashplayer${lib.optionalString debug "debugger"} - ''; - - rpath = lib.makeLibraryPath - [ stdenv.cc.cc - alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib - glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite - libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama - libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng - libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib - ]; - - meta = { - description = "Adobe Flash Player standalone executable"; - homepage = "https://www.adobe.com/support/flashplayer/debug_downloads.html"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = [ "x86_64-linux" ]; - # Application crashed with an unhandled SIGSEGV - # Not on all systems, though. Video driver problem? - broken = false; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 1c723d86f7..8207040f1b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.0.0"; + version = "29.0.1"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1v870kxbl7b0kazd6krjiarvbjwmv13hgwkzpi054i9cf8z7pyiv"; + sha256 = "18flr64041cvffj6jbzx0njnynvyk3k5yljb446a4lwmksvd3nmq"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 810ea11b01..6b1df1acf5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.1.5"; + version = "2021.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-nknRQdlYVfqCi9SMVTak615Yn/9N99+zHITDKL5nZ00="; + sha256 = "sha256-kmlyj6Q+OAJ0cKMeWxajPDBm99WpRf+Gpvc+Jy79DCo="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index e018422050..8fc667e339 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "1nkaspz96yglq1fr8a3xr39qmbs98pk7qpqav3cfd82qwbq7vs06"; + sha256 = "sha256-n+OtFXgFmW0xsGEtC6ua0qjdsJSbEjn08mAl5Z51Kp8="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index ec69b34907..a45f3553b9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.7.6"; + version = "0.8.0"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1bngsm2z02w9chbd65dvd1k21y16rapx6i84ac2icmc9wwpsfnls"; + sha256 = "1k7zcn8l60qfgiixkjcmp94w87w88n475mmhf58vl5pfz21p9vky"; }; - vendorSha256 = "0pl1llj4bfxxxp49v3190vpvplv0wbw5ahj6l2045pic5yyxwrma"; + vendorSha256 = "16yixz47zrzjkb2k4n03zfivpc2cavcrrv4fz8s5a4xzfrcp4nvx"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index d823e38f3f..5da9e9220a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.4.2"; + version = "3.5.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "17bb0f2w0qn6zq5isskckwqlscqig2d6pra3f7mfwilnckg1lj9s"; + sha256 = "sha256-XFWJtzKQrZL6lcr8JNiEQ8ldG5289x5pE21E8XgoYkA="; }; - vendorSha256 = "0ycp0i26rf3c96i4nqcbh7rb6i6lk62hljcsgsjyggq3pj3gpb4x"; + vendorSha256 = "sha256-mjWQxCCtTgj1VCFjnuJWgDjwMt/r4jiFC9Of+CXRgPg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index c45ff90c02..72fcc2f9c3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.138.2"; + version = "0.138.4"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-hy673acO9/fJL/80VTnQS8t9jXb7y9KVSVa0Zmja4uk="; + sha256 = "sha256-Y0/0wC00s7QY7/B6igOoPKXv5TE2P8NoGd9UhfVmLOk="; }; - vendorSha256 = "sha256-BWWmdKrxay0Qy5z+UFFZ3we5C7wI1KUHv6qHF4TPzJE="; + vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index 5f136fef80..a7d99fc5bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-9mQYJvZU/Ra+LyzfDbWGfopkdGBD7DpS9/yvRvGHDKg="; + sha256 = "sha256-GfQjgtjFynYa8SfQyoGjsyXEv0XuaK8ZbTcMhQGkcTg="; }; - vendorSha256 = "sha256-7LQY32hNXLxg/IUBbzzgb67yrbPGLCTNtmNvjE9tUno="; + vendorSha256 = "sha256-Xj9nC9ijLVmrSvgKq33yUyMO+RmeDkf7FKKCehP4GFE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 5a7d953a06..739992e6bc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -120,7 +120,7 @@ let # with generated bindata yet. k3sBuildStage1 = buildGoPackage rec { name = "k3s-build-1"; - version = "${k3sVersion}"; + version = k3sVersion; goPackagePath = "github.com/rancher/k3s"; @@ -160,7 +160,7 @@ let }; k3sBin = buildGoPackage rec { name = "k3s-bin"; - version = "${k3sVersion}"; + version = k3sVersion; goPackagePath = "github.com/rancher/k3s"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index cc90cf2d63..5bfceefad5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "4.0.0"; + version = "4.2.0"; excludedPackages = "tools"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-sHtPW9EaTycHh9d/vp28BvzhmbLUQYsu6yMfJlJYH+k="; + sha256 = "sha256-R2RbQlceOD/uY3IdLLiM23gESh/oWnsiTWxHeH/Si18="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 6be32ed17a..ffc682ca4d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "0lm691w4v2sdv5i2dkszwv6g11ig2aavlbxh40kjlmc05dz7dapv"; + sha256 = "sha256-8qY99sEEOFY2eMfuZSWv49nw1LKVHn50P1gYQN6y2f4="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix deleted file mode 100644 index 58bdb694ee..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage -, buildGoPackage -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.11.8"; - sha256 = "1dhh07bifr02jh2lls8fv1d9ra67ymgh8qxqvpvm0cd0qdd469z1"; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix index b6e053e757..82f508c63e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.12.9"; - sha256 = "1a0ig6pb0z3qp7zk4jgz3h241bifmjlyqsfikyy3sxdnzj7yha27"; + version = "0.12.10"; + sha256 = "12hlzjkay7y1502nmfvq2qkhp9pq7vp4zxypawnh98qvxbzv149l"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix index ff4434399b..6ae5903383 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.2"; - sha256 = "1l9j6k5dzh9ym9j75mam10vd9b5qh4xqfj6d63bjp7gkk4hd1jxx"; + version = "1.0.3"; + sha256 = "142rwpli8mbyg4vhhybnym34rk9w1ns4ddfhqjr1ygmxb1rlsngi"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index f6fb486bd9..e956715d9b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R6hnAqFpebZ9PV3KAX052wjjCtW5D9hKfj7DdS+3Ibg="; + sha256 = "sha256-u+yxAGVVFsZpiexToNDUfQATsYOkKWHkYF9roK0OInY="; }; vendorSha256 = "sha256-c5sel3xs4npTENqRQu8d9hUOK1OFQodF3M0ZpUpr1po="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index 0ce692402e..163deb1bef 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BzOpP34UumGaAL+vc+lkCKBuK8i0zAWzpMLuPszupQI="; + sha256 = "sha256-ZIAdYuJ8LS8x2h+VXQrkgdmKkw9VKl7FcnOVZNSnXM0="; }; - vendorSha256 = "sha256-XOneGFTtoxuHnjGVse15Ypfo7vO3ReeGs46qLG619aM="; + vendorSha256 = "sha256-aVKQcRZgxhIph+y28HhR15DUjwiz/4+t1bMrYXjPW7Q="; subPackages = [ "cmd/starboard" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 29aa7d41f3..9626479934 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "0fj6a52wb0jv5bz2j2wq3ljnlxnsj9bg3kbzgkz0vh0b63zyn782"; + sha256 = "sha256-8l/Tr+IxR3yPmt9hI70XuUQ4YEYzRTMLbo8BsngoU60="; }; - vendorSha256 = "14nrdaaby74bjbk777hr82p0ybzk3spc59lbrjn9z0q3hc0p4vaf"; + vendorSha256 = "sha256-pvFT4A7bDBvBf1odyv3z4inw1/IsvOA+++OPbfNjzxM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index 293cdb6737..44ad3dfd72 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "1f67b236njz1qdxjyf2568vkigjmpylqlra29jlgm6vhd5qky7ia"; + sha256 = "sha256-y2HhtYKgC9Y397dZ14eQoPZxqS1fTOXVD8B4wdLIHzM="; }; - vendorSha256 = "1pr265g11lcviqw974lf05q52qrfpwnpn9a64q6088g0nfp4ly06"; + vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index a2bb9da680..581af59f0c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,30 +2,37 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "0xb2zlpkh9cwinp6zj2jpv4wlws042ad1fa0wkcnnkh0vjm6mnrl"; + sha256 = "sha256-IY9iJa4HcZ60jDPdP47jjC0FiOJesvf2vEENMAYVd4Q="; }; vendorSha256 = null; - doCheck = false; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" + ]; nativeBuildInputs = [ installShellFiles ]; - buildPhase = '' - make bin/tkn + # third_party/VENDOR-LICENSE breaks build/check as go files are still included + # docs is a tool for generating docs + excludedPackages = "\\(third_party\\|cmd/docs\\)"; + + preCheck = '' + # Change the golden files to match our desired version + sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden ''; - installPhase = '' - install bin/tkn -Dt $out/bin - - mkdir -p "$out/share/man/man1" - cp docs/man/man1/* "$out/share/man/man1" + postInstall = '' + installManPage docs/man/man1/* installShellCompletion --cmd tkn \ --bash <($out/bin/tkn completion bash) \ @@ -34,14 +41,14 @@ buildGoModule rec { ''; meta = with lib; { - description = "The Tekton Pipelines cli project provides a CLI for interacting with Tekton"; homepage = "https://tekton.dev"; + changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}"; + description = "Provides a CLI for interacting with Tekton"; longDescription = '' The Tekton Pipelines cli project provides a CLI for interacting with Tekton! For your convenience, it is recommended that you install the Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines. ''; license = licenses.asl20; - maintainers = with maintainers; [ jk mstrangfeld ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ jk mstrangfeld vdemeester ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 3570191fd8..a08a3d336b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -56,14 +56,12 @@ let # Packages that don't fit the default model ansible = callPackage ./ansible {}; cloudfoundry = callPackage ./cloudfoundry {}; - elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; hcloud = callPackage ./hcloud {}; keycloak = callPackage ./keycloak {}; libvirt = callPackage ./libvirt {}; linuxbox = callPackage ./linuxbox {}; lxd = callPackage ./lxd {}; - shell = callPackage ./shell {}; vpsadmin = callPackage ./vpsadmin {}; vercel = callPackage ./vercel {}; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix deleted file mode 100644 index 6ae781046d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-elasticsearch"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "phillbaker"; - repo = "terraform-provider-elasticsearch"; - rev = "v${version}"; - sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; - }; - - vendorSha256 = "1rdvyypdl3fk6af66gfjhyl271cnlx5xgrl1w68sc6sbvq00bqkd"; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postInstall = "mv $out/bin/terraform-provider-elasticsearch{,_v${version}}"; - - meta = with lib; { - description = "Terraform provider for elasticsearch"; - homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch"; - license = licenses.mpl20; - maintainers = with maintainers; [ basvandijk ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index 23d41ce7f1..ab3d07a7f4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-provider-lxd"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "sl1pm4t"; repo = "terraform-provider-lxd"; rev = "v${version}"; - sha256 = "00gj7zj45wm9sf7a7nybjijdrdr00g2yf8h41c6j679a6nfnx0fd"; + sha256 = "sha256-ikI8LQ6qawdeUSb1Ee03H409DQw2M4QtsIxAESxXNRI="; }; - vendorSha256 = "0xq8zgx8h47pc88nkdvy5skpr8vk87b4212mm5msfxk8n7nl4fi2"; + vendorSha256 = "sha256-IjpC7bFodqdrqVUEQdZBc6N8py5+t2kRYvcQiPr7CHc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 76d36255c7..198a05621a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -70,10 +70,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.20.0", - "sha256": "18zccjkdxzcprhpv3cn3b9fbp0h81pkj0dsygfz2islclljc3x17", - "vendorSha256": "0lalcp3wwjbwhp1rwidpndjmilfsc7cb79diicn02a207y277gji", - "version": "3.20.0" + "rev": "v3.27.0", + "sha256": "0hn55mpg64bibf10m7x7wpfkipvlm8q4avgqcf0rf8rmprwvdlxd", + "vendorSha256": "0ph106bqsy988s20adf6gyc5jfvvy9zsj74lkbciwx7mvw5f514s", + "version": "3.27.0" }, "azuread": { "owner": "terraform-providers", @@ -287,6 +287,15 @@ "sha256": "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48", "version": "1.2.0" }, + "elasticsearch": { + "owner": "phillbaker", + "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", + "repo": "terraform-provider-elasticsearch", + "rev": "v1.5.2", + "sha256": "1yfmlqab2jb679gbns04sdcjfihzsa0dfp7blhfk3v5zhgv1g7ys", + "vendorSha256": "15m9aqb2lqjv6g3k46zyha2m118wpbjrh4ap1bfps0fcxn20qvr5", + "version": "1.5.2" + }, "exoscale": { "owner": "terraform-providers", "repo": "terraform-provider-exoscale", @@ -787,11 +796,13 @@ "version": "1.1.8" }, "rabbitmq": { - "owner": "terraform-providers", + "owner": "cyrilgdn", + "provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq", "repo": "terraform-provider-rabbitmq", - "rev": "v1.3.0", - "sha256": "1adkbfm0p7a9i1i53bdmb34g5871rklgqkx7kzmwmk4fvv89n6g8", - "version": "1.3.0" + "rev": "v1.5.1", + "sha256": "1yxvhzrp63wv5zbzj3ma2745g1marpj32b5h41ha27h0i42498ky", + "vendorSha256": null, + "version": "1.5.1" }, "rancher": { "owner": "terraform-providers", @@ -865,6 +876,15 @@ "sha256": "1fs96qd2b4glk8hhn5m9r04ap679g0kf3nnhjx1a2idqwrv71gcl", "version": "3.3.0" }, + "shell": { + "owner": "scottwinkler", + "provider-source-address": "registry.terraform.io/scottwinkler/shell", + "repo": "terraform-provider-shell", + "rev": "v1.6.0", + "sha256": "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l", + "vendorSha256": "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg", + "version": "1.6.0" + }, "signalfx": { "owner": "terraform-providers", "repo": "terraform-provider-signalfx", @@ -1033,11 +1053,13 @@ "version": "1.0.1" }, "vsphere": { - "owner": "terraform-providers", + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v1.18.3", - "sha256": "1cvfmkckigi80cvv826m0d8wzd98qny0r5nqpl7nkzz5kybkb5qp", - "version": "1.18.3" + "rev": "v1.24.3", + "sha256": "1sc60x3r4nb48p8yb7778fpk78acq808jzcd5ijnwxqakccml5kl", + "vendorSha256": null, + "version": "1.24.3" }, "vthunder": { "owner": "terraform-providers", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix deleted file mode 100644 index f2e9b86a64..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-shell"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "scottwinkler"; - repo = pname; - rev = "v${version}"; - sha256 = "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l"; - }; - - vendorSha256 = "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg"; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allows checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postInstall = "mv $out/bin/${pname}{,_v${version}}"; - - passthru.provider-source-address = "registry.terraform.io/scottwinkler/shell"; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Terraform provider for executing shell commands and saving output to state file"; - changelog = "https://github.com/scottwinkler/terraform-provider-shell/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ mupdt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 95772e997e..9e2b9709af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.1"; + version = "0.28.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uY0J/w7uIVMd+0N0IeWKWWzQENI6oaLCD4+YUz9BOVA="; + sha256 = "sha256-LilIwg3Zu7Zi7AhJeW0j2qUmSOGy1HHjvvB07FUcEeI="; }; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index a185c64646..415a895e52 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.5"; + version = "0.18.8"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "0msfc2cgfq7dz02n2z898iw2bx98qsny3j4pzja767vcdpnzjmr5"; + sha256 = "sha256-ICJrY4XUrxVeZlMx69SB/ounfIwLFSguf9bhLOpYP3E="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index 250d6cfc1a..6b878cec92 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "velero"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "vmware-tanzu"; repo = "velero"; - sha256 = "1hfi1iipbval0c0c0nnf6fz5n76za0vwczm5lq86sddqnznbvsrz"; + sha256 = "sha256-DZ6phJxc8n9LCSsER09K3j+pUJxkYrBZQaI4h+bcV94="; }; buildFlagsArray = '' @@ -19,7 +19,7 @@ buildGoModule rec { -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean ''; - vendorSha256 = "1izl7z689jf3i3wax7rfpk0jjly7nsi7vzasy1j9v5cwjy2d5z4v"; + vendorSha256 = "sha256-m/zShJeclZ1k8Fr9faK2x1Mpwbwun674iMPJhMw/9Mc="; excludedPackages = [ "issue-template-gen" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix index 32a4aa373a..3d62a1dcf2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,45 +2,43 @@ buildGoModule rec { pname = "waypoint"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iGR2N1ZYA5G9K2cpfrwWRhSEfehRshx157ot1yq15AY="; + sha256 = "sha256-bCvi5xIL6xAtQ9mgf4feh076sAmog/3eGBlgvcLXJyc="; }; deleteVendor = true; vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY="; - subPackages = ["."]; - nativeBuildInputs = [ go-bindata ]; + # GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway buildPhase = '' - CGO_ENABLED=0 go build -ldflags '-s -w -extldflags "-static"' -o ./internal/assets/ceb/ceb ./cmd/waypoint-entrypoint - cd internal/assets - go-bindata -pkg assets -o prod.go -tags assetsembedded ./ceb - cd ../../ - CGO_ENABLED=0 go build -ldflags '-s -w -X github.com/hashicorp/waypoint/version.GitDescribe=v${version}' -tags assetsembedded -o ./waypoint ./cmd/waypoint - CGO_ENABLED=0 go build -ldflags '-s -w' -tags assetsembedded -o ./waypoint-entrypoint ./cmd/waypoint-entrypoint + make bin GIT_DESCRIBE="v${version}" GIT_COMMIT="" GIT_DIRTY="" ''; installPhase = '' - mkdir -p $out/bin - mv waypoint{,-entrypoint} $out/bin/ + install -D waypoint $out/bin/waypoint ''; + dontPatchELF = true; + dontPatchShebangs = true; + meta = with lib; { + homepage = "https://waypointproject.io"; + changelog = "https://github.com/hashicorp/waypoint/blob/v${version}/CHANGELOG.md"; description = "A tool to build, deploy, and release any application on any platform"; longDescription = '' - Waypoint allows developers to define their application build, deploy, and release lifecycle as code, reducing the - time to deliver deployments through a consistent and repeatable workflow. + Waypoint allows developers to define their application build, deploy, and + release lifecycle as code, reducing the time to deliver deployments + through a consistent and repeatable workflow. ''; - homepage = "https://waypointproject.io"; - platforms = platforms.linux; license = licenses.mpl20; maintainers = with maintainers; [ winpat jk ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix index 62fdfd71f2..5ba6b57d5b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -34,10 +34,8 @@ in python.pkgs.buildPythonPackage { }; postPatch = '' - # yarl 1.4+ only requires Python 3.6+ substituteInPlace requirements.txt \ - --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \ - --replace "yarl==1.3.0" "" + --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" ''; propagatedBuildInputs = with python.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix index a3ead49c69..046ae42ebc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "sacc"; - version = "1.02"; + version = "1.03"; src = fetchurl { url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz"; - sha512 = "18ja95cscgjaj1xqn70dj0482f76d0561bdcc47flqfsjh4mqckjqr65qv7awnw6rzm03i5cp45j1qx12y0y83skgsar4pplmy8q014"; + sha512 = "sha512-vOjAGBM2+080JZv4C4b5dNRTTX45evWFEJfK1DRaWCYrHRCAe07QdEIrHhbaIxhSYfrBd3D1y75rmDnuPC4THA=="; }; inherit patches; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 874a764a8c..c7ddc49554 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.118"; + version = "0.0.119"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1ar4d6mgn248h6pqcw5ra787padsxyzfkgf9yf62ypn1zrxa9sxq"; + sha256 = "0bzrilag7mjfhr84l956xisbaz8mmkmqizg22f9gabgcv85vwzsi"; }; }; }.${branch} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 7cb614f1d4..feffbe312d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -2,19 +2,19 @@ , fetchurl , appimageTools , makeWrapper -, electron_9 +, electron_10 }: let - electron = electron_9; + electron = electron_10; in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.3.1"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "0af87lvqw3sagi2cayripm62q17nfd841xz0ghvbixzfnqkvgf7x"; + sha256 = "1lv3ca9qlggyb8vcg8zlxv46i8fgx5qrx7i7y71dlqblajalf42p"; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 9055b51d97..e5221d861d 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "ripcord"; - version = "0.4.26"; + version = "0.4.28"; src = let appimage = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "0i9l21gyqga27ainzqp6icn8vbc22v1knq01pglgg1lg3p504ikq"; + sha256 = "0bczqp4kny7jlp06f4bh1xg0x17g8980dj6pk4waqc7qk88i6sfv"; name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 09452aa90b..fe7a2e3ba0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.66.0.74"; + version = "8.68.0.100"; rpath = lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "11bpzr3j6fa5x62xrx2q2sr1wxjrn0a37053j4prxjcvdrc5in8f"; + sha256 = "gHjgQRdNABO+R+fcDurHDAQtZpckIxLbODM6Txz+LH4="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix index e59e586443..fc6c78a4f6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1v9cdpy6i3xl70g75zg33sqi4aqp20by0pyjhjg5iz24fxvfaw6c"; + sha256 = "sha256-EElDi/VEYgYPpoDNatxcKQC1pnCU8kOcj0bAFojD9fU="; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index fafda5577c..c431b5d0ce 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -31,11 +31,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.5.6981.0202"; + version = "5.5.7011.0206"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "05alb81cn1vbpva5rcfwh58sjbg4f2pils4vcdgw6dvi4pbvs694"; + sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; }; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index b745a842b9..7eaefdd91c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -31,11 +31,11 @@ with lib; stdenv.mkDerivation rec { pname = "claws-mail"; - version = "3.17.7"; + version = "3.17.8"; src = fetchurl { url = "https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0"; + sha256 = "sha256-zbeygUmV1vSpw7HwvBRn7Vw88qXg2hcwqqJaisyv3a8="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index 104e0da9a8..c0ebb3d807 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "20201127"; + version = "20210205"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-BkDGKZmpwahDw1vD67CyWfxD93H83kcpv5JBGVL5F/o="; + sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index f78c4457b8..e86e847e8f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.7.0"; + version = "78.7.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/af/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/af/thunderbird-78.7.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2e5741f536243b84f6014c33b44900a01dcbe8c42e17f3d6acb62a2441708c69"; + sha256 = "b9d7bacd982db97e531775ceca569e011603dbd2806a64bce43ef2ff30e6c8f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ar/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ar/thunderbird-78.7.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bb2126528e1aa170fd0b59914fbcb3df3eba57aa83c995284ceadb40b24e65be"; + sha256 = "144647297e15556de5273e4f41712fc348b3dd401d71356d556c1ed09221037d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ast/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ast/thunderbird-78.7.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "93b59d8d66b2d87076f680fd6e284f7f424a7925d82e3fa6e394388278a89a4a"; + sha256 = "9adb0d16ab633e4ffa3628969ccb542488fc299da5250c058828144f6f773781"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/be/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/be/thunderbird-78.7.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "92dd5f24667a1886ab321df2148096ab7530c6fb8306d6d21e158c72dbcd8611"; + sha256 = "3e54fa9ca34bcc11d411a979ed6bcd0a68b67da08cdba49e1f8a59794bc2dff0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/bg/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/bg/thunderbird-78.7.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "03444b4e10bbad0fec4928564d39b30f9e9ff8705adcc20706959eee357ee45c"; + sha256 = "d576d3193c8e263d44942043b7e13c8861b2234ebb66969ac2cd20f84d6d769f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/br/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/br/thunderbird-78.7.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "088b6b2456f475c76527122d503f2d91c274e88cafa9a052029f2f4e00a0609d"; + sha256 = "cd85058134a3b1364049d11a32bd964f8f9488fb48ece65d32fbb9005831b1d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ca/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ca/thunderbird-78.7.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4be51f350929a907aa20a036c7ea7232d14874ff29c622cb4a6c917634a79019"; + sha256 = "5bf9ac27b8401f7c1479cacddc48e6310e6ac52e038f824193788dd6883512a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/cak/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cak/thunderbird-78.7.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f50880a17573b1eb2bee79c2768eb04eaf2b715b7fbeb134e08634dac3ea7e22"; + sha256 = "dfa2f97ee07f80adc5ded391bf01aea36e2aaf5a12ca9a510c5842756d9b9f8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/cs/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cs/thunderbird-78.7.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e1971a4e5f91a7d6de06fd2121e7cc0169d5c8ec04418540a840c887b5c1a560"; + sha256 = "c76d755c9b54921a4edc9521aea2c51aa6301d954154fa6228195193000be56f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/cy/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cy/thunderbird-78.7.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "20f7086783ce5ed7bafa9875555008e62e146b080fe6eb1ad3ddf2e5fee9f0c1"; + sha256 = "09475639dec1e370360c1c257b88ab45fbf2251bd22d1d50e9df078b035b8560"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/da/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/da/thunderbird-78.7.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8ea77a13dd99252ada9a02115457ffd8a73e7422bd633d1f8dff835fef1daedf"; + sha256 = "74cc98d1d99e9fd101e86051cf9aee26b40cfcb6203892adf6fd45fad5934926"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/de/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/de/thunderbird-78.7.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9ba270c4013c0bee106ea45fc46b79f066daa1e1b90a03000ec93a54c80f65b6"; + sha256 = "509648ba2c7d9ef4db1755ae5e017d3dc1c73c5a3a94a293bbc9a505b5349e2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/dsb/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/dsb/thunderbird-78.7.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "1e4394e4ecd44714abc0756054e751daeee4b2f485bcd3fa2db697dceb756c37"; + sha256 = "03dff2bbcb39d967c96934675134acd3ec74b39df3b6cc76846229ff92653483"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/el/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/el/thunderbird-78.7.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "543d9343785f655caa637a2bdbf56a814b280efe206ef5868c855f2b397e0e88"; + sha256 = "d6ec9ccdd2945d6de1718f32b551e922da1808d59acec937a16addaa0004e94a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/en-CA/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-CA/thunderbird-78.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "76e414cf62428874d4e9633fa6ae166ea16f6d295a4ddb4240c5f310557ec928"; + sha256 = "bc97cadcf95bd0273708e1ea5cc8cdddd29f11b280213c1bd4f35a50d446763e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/en-GB/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-GB/thunderbird-78.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "cfbd194b58349fbd5d8dc0ccaeb36ea0fe21b28bf25f176ba8d12bb79ff25501"; + sha256 = "82fd7e16cc8d5df4e775187d7f3e32b9b1dab3647cd766cec1649c39d08d5165"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/en-US/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-US/thunderbird-78.7.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2e0501823951e4f5239b4c75a05f1d9d882d600a0080fd5cc7bc792990357b2f"; + sha256 = "463c1164b80f0f8bcb72f04fb0c17e32a637df988c0ea14d90469b1d7a958f82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/es-AR/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/es-AR/thunderbird-78.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "37c8d43b674558fa7e8bfe9b276762562e9132daf377727ac77cd2869c16a628"; + sha256 = "1ce69e73e8326e316d056a98efe601e7300714f1b65f69e2fcd175123fdca96b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/es-ES/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/es-ES/thunderbird-78.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b79324ecdf228b24c7c51a1dc9129c39518d6a19c7a083364639bab16cc52214"; + sha256 = "a04161f56944527f8537d46e046fbed715a554e4dc581aa636f1cec3fb1e1351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/et/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/et/thunderbird-78.7.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "35c30673d027bfc465bb1ff9b5fa2f52487472ef870e6a8c08e0ec2d0ceacae2"; + sha256 = "36c2e7ae029b65976b92cff62c3c3a97e8c44a73c2f5e48415260b23a23ff653"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/eu/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/eu/thunderbird-78.7.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3af23e4364bb5a44f38a8931da270269780c0d8d0a115f77d16a15ff84f4c2bb"; + sha256 = "538a42bb6eb11360fa70bd06058dbd47f2a3eec53fbbfe0232ddfbbeb4a4187c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fa/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fa/thunderbird-78.7.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "596877606b66903812ca456332aeb0c80d365255d99c6adc51d8606a5a80e024"; + sha256 = "6e2b18166237fdf0d020570957ee7d0815d846a0aca8df2036cdf99e651cfce9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fi/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fi/thunderbird-78.7.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e9fa8440743a8ff0ba6963e1d595e959791ad814bc3c239f63478ef1fe2fe05c"; + sha256 = "1769213bf789a21572014d4d97c823db14e11f7a32b91d57d98bebe39a80786d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fr/thunderbird-78.7.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5b41d9065654f248b3765c79872d6ab9f4333515f36d6bdd8306e73502100f54"; + sha256 = "60017c2151aed3782567d9c10817e89c738d6bce322fd33f1188bc25dc12ac3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fy-NL/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fy-NL/thunderbird-78.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f607c83d05d40ba9bb596819a86cc1c15fedc55ff47916f83650ef8f6e37251c"; + sha256 = "3878ce39135e30a76c67182765f5fa7fc38b7019021aa86f0806028f67a7dfd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ga-IE/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ga-IE/thunderbird-78.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b1a244481eef2a8a7796fb17ec6283ab44bce5ec04063a8b84a5fffef8ea70d0"; + sha256 = "b2e66dd3fe5a78d2eb6691bc91521b3f22fbb5be88c556e2d5158057db0d6cfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/gd/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/gd/thunderbird-78.7.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bf30f3825599bc0168fe533a50481f779acd57432188fd0b90c98fa50ad23eb6"; + sha256 = "c4722ceb4eca2afaa3502f2bc419b0ffc6cd2600100c5a91bf2cb7cdda60cd66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/gl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/gl/thunderbird-78.7.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3184484adade8ee8fd57570103fd3dce2f2ac582e9f4fb5bfc884fd3f0fa6630"; + sha256 = "0f34fd28523062c90c521b40b0a67ad23e3b2ba05fe5c03cc1da29d480fde1e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/he/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/he/thunderbird-78.7.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e34713989d1b98d55ea852f23e49353779be449142bdfa5098d68d076d6a9f69"; + sha256 = "8cf8a0b5e1bd3ed116ac1dcbcb1857db9ccff8452ff0d1f3ac2957cada5883c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hr/thunderbird-78.7.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a1833d7bbd438319f4dc37378c1dce49243f148db7f58f8063346bf9a5725653"; + sha256 = "827d0c46d404d871661af45d301645a1c888941741c1b6cad27c7c37aed52800"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hsb/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hsb/thunderbird-78.7.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "359117a30c63a85b9d41f0369bb448ba470edd41f705070d9f7b4a805f89cf65"; + sha256 = "83e965004f0293c324393914cc931ccfa608360982d338859da1e7e2ae0f333f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hu/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hu/thunderbird-78.7.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4d51554390fdab6caa01993697b1490d69504556207e9202d6e59614256dc941"; + sha256 = "120ca3f7b356c57d7fa2af63ebcb974ad0ba313fe9c615afa5553b2e7ab75e62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hy-AM/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hy-AM/thunderbird-78.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a838b6bfefa9c2852e4316f3665c37c1fcad8e8400fcf8fff769f1e44b4004eb"; + sha256 = "7d0c2c5854f0a5a2288cacb6bf0d2f8ecd838dffcc8ccd040f993af94cb92d13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/id/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/id/thunderbird-78.7.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b293c67ff239ac6632d9c914ba8c9f6a161c1400bf3dca3295683632d2e4e64b"; + sha256 = "29462ae0dd0eaa8ac9370b8fc46ad8ad679ef44996a7f80468890b8a75ce4a29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/is/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/is/thunderbird-78.7.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "f5cce0c2dcaef81da19a2eaf3e294e9c72153d25be48d382ecd06aca430c76c8"; + sha256 = "084aee31331bb0bbdf466d3c3a6bb1834dfbdddaefe0e8c6e1d4a91eec0725ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/it/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/it/thunderbird-78.7.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1ab3587a7ba49e479588fba735571f458f378f4845a686a22bcd6e2483bbc3d7"; + sha256 = "f180ceb0cd9f2e1d3e975f30fffa968e938b18ebb3c45108b6758d36989918e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ja/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ja/thunderbird-78.7.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9ce1c13c539e3e11203ad35ef1f70e71204ceaf548279ac1dd8f39ee07f92013"; + sha256 = "662f124e3a32ab9e6b6fbefed9b58779060d927558bbc9527d83936191e3e044"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ka/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ka/thunderbird-78.7.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5174664bb0cd1dcbdc845664ba41c89ea0ae3bbd4c755219e709f1be76d99ef7"; + sha256 = "2faece980493b0071e5d62a579f4e1c4d792a63293949d81fa96e70468044acc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/kab/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/kab/thunderbird-78.7.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "de5fc0cbc657d07138f8ba744903909133fe4cfeb5436c13a5c669573b4b5170"; + sha256 = "7382fc4e006bcb05c0db2dc88f8aad32a3abbce2bcb32f28d6271658caf934b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/kk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/kk/thunderbird-78.7.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "abbb0e5474a369c230a4faf386dbf6d663020ffbaa0bd75e69305e539006d6f4"; + sha256 = "c8c52e06cd3ac3a02dc0081a82b25223a1da5a918335f770660122c8a6ba750c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ko/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ko/thunderbird-78.7.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7b66371753ced2b07d136c67c3fc91a562a3fcee6b377fe1d35c550126358b91"; + sha256 = "67928b2f6861b1071ff76c457f6aef4a9eb0d80f896331bdb847543c62b0dd11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/lt/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/lt/thunderbird-78.7.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "99811e5ecd83d827a3fbbe20666da7ea307e105fdf1090f0f61e3853a51bb53f"; + sha256 = "aec1acfb847cea57772197d81d122e97915b03358c984293d40f6ce759b9e77a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ms/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ms/thunderbird-78.7.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d2c11fb20170d2c9eec6b780532ac9aa4e7d8d705802e2b68a8d7c07d3d1e120"; + sha256 = "9a4411e932789040abc939a64b9ad979104ffe868a969dabc27022dc9ff822fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/nb-NO/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nb-NO/thunderbird-78.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "19fb8d0d0f8d80c4ed9c45c861c98c862ae880bcefb365c86fc5bcea1ef19d8c"; + sha256 = "c7cfcd78108d931c60e9a061ed459da9df0cee27b16085fd1c6f3d71d54cd2fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/nl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nl/thunderbird-78.7.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "42855c4f257cad05b6f9c6c7c48ee9cf02a9159e5dd05619f3af4b473574bd87"; + sha256 = "44e9a143f00636a9287b2f0774720fd372de25fff9de8ceb468bc81de1d7ade3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/nn-NO/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nn-NO/thunderbird-78.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c16c892b9a515700e328f01f5a92b7c4af199ae29a7c610d4795140c70bb83e5"; + sha256 = "75269ac3171d14ca6145c3d00ba004489f89fc9210cf3af0d4e0248e24dac273"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pa-IN/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pa-IN/thunderbird-78.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "74c8bbf72b304d81d14fe9c1342c7b8bf17eb42dae52bb3b9ee043f0bdec94ec"; + sha256 = "ef98d53446ad294eaa861919cc8e9e70f4f6458d3a4210a43ec37bd919db8aa7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pl/thunderbird-78.7.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cadf3756acf8cbae0c2778edda4656589eb3d339a80736a9223c6add5c6fa99c"; + sha256 = "682c6b2a5e808e65e1e233fb48bbd68058a7f2745648d01d6342c90316b8135c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pt-BR/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pt-BR/thunderbird-78.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1fe1f6edbd9d38a9db30720413c48ef91e4be77b1c218fddcb3db1fb98017971"; + sha256 = "761988b180f3077cd9710324fd87ec577de5f5ee11c79404b416c64ba322c65a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pt-PT/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pt-PT/thunderbird-78.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ae5be903d29582feab6402b12034a01bbf338602a8739a1cad9d5d9806e4ed1c"; + sha256 = "9182a7064d0f98a49b34b9bf78ae4d63fe6b588c51ceb48ffe0974455e767867"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/rm/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/rm/thunderbird-78.7.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cfc9dba2b3977ac5721559746a1a1e071ff24116db5c52039ce9b40631e43619"; + sha256 = "33a8bec5ee7240fb44e350139f60e1d7c92361020bba2857634af03e40ee0f87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ro/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ro/thunderbird-78.7.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "97bdb9a195a3b8a74d82dd373cd5b25ffb1d61178a9f2b0a3610341e9a207158"; + sha256 = "a50168d1b5e62d7bec9d75714612614b9d2342fdc6b8f89959d50d1505cbf7d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ru/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ru/thunderbird-78.7.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "c16b656259451be87d5e86795bf2ee14322743046a0b6f3542369337494abc90"; + sha256 = "555e630090fbc41711e88d0a8e822febf0619333c2bcace5bdfbfdfdddfbb0dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/si/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/si/thunderbird-78.7.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "34596141553b28a72b743cc7f80edb06549a71816f8caa4c7f9b20148a523fcc"; + sha256 = "f977bd3fb4caaefb03eb8c967ae4850c0b7b2b8dfa0f7d7cedfba0847788cdb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sk/thunderbird-78.7.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "71ec684701c5d42521e5e1f39601f0cbf8b9c082555dd593695288f327c1a44e"; + sha256 = "f1e5c9787a2ae8f8aaceef1ca2963884031a6cb8dc0ab3c3230fa0021156cfc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sl/thunderbird-78.7.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9c4de92259c02966d8970fa7792d6a1d279d2021ecf78e4cdb5e992f4eae5e8d"; + sha256 = "59a97046285bca3e5b8ba396d3afef69fe2cb5a41347e4e0a21e9ff66c03ae12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sq/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sq/thunderbird-78.7.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e05525980dba6605f4e722a42aa074a014c7a5786d261b3fa6f10570cfd952da"; + sha256 = "ed0cf7d341d42dedeaa224f7f1f8e005172134da591f65664a4aca717e6db44a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sr/thunderbird-78.7.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "e05a147164785faa39ca35728cbc8f5e769267a546bb22cade4411e3cc34cc22"; + sha256 = "fd61b2e8e048f162e59a1a428100e6d0556d7120de1f8b46decdfe60509de0d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sv-SE/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sv-SE/thunderbird-78.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "f1349dce69bc95329b7558cd7b87109ccbf201bb6f42040c1b1a034d48d7d62a"; + sha256 = "87afa3b4b12848de156ea61d1727dea1ef5b86bc83b583df55f089bd1d1bec1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/th/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/th/thunderbird-78.7.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e30b19275cfe460ebdf47c1c9bf8f97342568041ed16e925ddda334532ad1453"; + sha256 = "0e9b959424106680bced6d924c184d1306f7f1fd34fb4d3e4d8a54cb191500bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/tr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/tr/thunderbird-78.7.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "13d3264c891b198e4030334ee771919c8fa45ca4cee4a9c30e6776e258a15ed1"; + sha256 = "f2d037cea39d2698e71a0885587302644450149434ac7c3234c7ae32c5f4d103"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/uk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/uk/thunderbird-78.7.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f3a3c098c71c7632c36da1e1f401db5dcb5fefe8c4658d2e221d429be4d0867d"; + sha256 = "663aa8509cc75c074697509981bf54ab00eeddc50c53acc0221225c3d7c63f9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/uz/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/uz/thunderbird-78.7.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8c4a4e904eb4ddc131dbec594ccc9e4faef209f746d999c08618ad9757ec300b"; + sha256 = "892209fbe5d48532710feab4ad8f38f9387e10b088d91a12c9778bc465af194c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/vi/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/vi/thunderbird-78.7.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "bad2147d54293ce4b245df01d47ab2555811292ec117a1b74e49aece0a5aa625"; + sha256 = "a66d1d470f4a76cfa8b31fa3d60acb91cc7657455f9aebf930e127c2acbf4c8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/zh-CN/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/zh-CN/thunderbird-78.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "000a1143b3f7c09717610459549305c99cedd4a4fc35d1b0bb276ae72b83c44e"; + sha256 = "10830b4a84ca22c19ee329cb00b92816e9b74f99c99a1ba6cfc86171470d655d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/zh-TW/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/zh-TW/thunderbird-78.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "bae5923d844f137e38b46519420a6e765fa5457733a60ffa6bda70185993e575"; + sha256 = "b88200643a70ba3391cfd3be6cbc7bb178c6170f26041d4153021736d03365f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/af/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/af/thunderbird-78.7.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "94e7737e9e06d84b336b5f69ff3a69220ff6ef12588857b8b8e4596f5f5ca7f3"; + sha256 = "e78e2ef7411b3e6c0f2ed5c0729dfdc144f94e8575f2f30ae1cbaeb7c73188dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ar/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ar/thunderbird-78.7.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2843aa9cbc0f102aae2abb192590445240568e94e35f4ed558fac446895c9daa"; + sha256 = "42c3f3b177a50afd6640db6815e7c159048cebb6dd5613c2fdf9ef18871d40cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ast/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ast/thunderbird-78.7.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "01130d2e0bba48de5c9cdb3c0c83081e29ce8964218ab1e7f9d03b61facfb513"; + sha256 = "b8fb786756051169d96a4fecf05cdabf4becc8fbcabd56ba676e96286a80b9d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/be/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/be/thunderbird-78.7.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d8377688f8760afdea0ff93b37267b117090c311e0636aefe1185ab2ed0e0a05"; + sha256 = "4e3f8f26b1321d130fb16b5eb30c3b3c3a7863e6d43ee9604f1a6da97228c85f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/bg/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/bg/thunderbird-78.7.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2eca1032ae4bc73967fab319681a5123ae2681a0128de6efd0d7a58aa97986b3"; + sha256 = "0385b615dfb21f33b3e84b6c9213d3d8980379bb4be07967f5309888078ac177"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/br/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/br/thunderbird-78.7.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3c5b9e1a96be9f706f458480badcd4efb324d59c2e1227c31720c98eef19dac0"; + sha256 = "e338d6b439577af562c4dbcd2951176d2c6cf87254203e6d20602de4563484c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ca/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ca/thunderbird-78.7.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c31b3d7936726295e2e66a25b554af25fef04d76eeca0f0b2744dc6b38eb25d0"; + sha256 = "71f1b5f1b35a9c5712ba6cedbf3de96f4a3814655c44ed1cda48d4e5a56c3e03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/cak/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cak/thunderbird-78.7.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8abbf5f08d4b9e606090a976bfc9e5cad794259cf2461c2a4edd028c783440e8"; + sha256 = "0f616eb61c0de3e38d2092ae215613ba104be279027259def8bca4082bd74cd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/cs/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cs/thunderbird-78.7.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "63a6a2e0eab7f7ab0522d36369b4cd696af3b24e9a00977bf3ba1ae440ec077c"; + sha256 = "8de26b3daa7b087fb94a349e909da703867665fb2b4add360584c8d61f0c84ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/cy/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cy/thunderbird-78.7.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5415f68080e95b331146a53d00b312882a8c0b904c91509785bf79139a1accd6"; + sha256 = "74e28fb04e08bcfd68215eec443fde725077850e412798c1f0870e776ecbeeb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/da/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/da/thunderbird-78.7.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a43d6445cb39506a898e96432d1730b780bc745344011d230771e4592e34b49d"; + sha256 = "d50f37a31e4e5805084fa14bf639057b543deac99738871c402ad9af9684ce20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/de/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/de/thunderbird-78.7.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b14360cbc698e636b56150bdf3ffd145d3bbb43c9f342eb56d74dca82674c25e"; + sha256 = "7aa84ada2e6cb6b467a618b234a7cd0370f5d71fd1eb0f5da1addb6478665ad3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/dsb/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/dsb/thunderbird-78.7.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "dc83ee5540b4254cd01f67f72adad857774f23769748550fcf46e7f066a672a3"; + sha256 = "e273b80d5039097a34e7e2c96f65aca112e68d72a82782e783ea9412e49ab21f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/el/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/el/thunderbird-78.7.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "5ca65866f1440ba2161d08005d3229e5f08c9a5696db51f633a8154c93d0ce97"; + sha256 = "f31dfc543cca8d8f3c6e1cc40f8a07ead7b231222c8e04e5e2202c315c4708d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/en-CA/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-CA/thunderbird-78.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "35afceb267f29985ea068afb0358e3e73d120c7f63162ddd22854b1179a2c409"; + sha256 = "534f8008886a3028c09afb1c030923359f8ee0c85c6e961faa4c974b6c2c30da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/en-GB/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-GB/thunderbird-78.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6f2cb3fe2d4223809ec7e842746bb6453ec741df59fcf63898af9e4c579158c9"; + sha256 = "c9c138e5d92847c0c0ec82d1799fddf1267b95a5f6ef2cae7820f560aff53732"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/en-US/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-US/thunderbird-78.7.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "dc1dae45f45246c95861ef7a50c2acfd7ad343eb0bf39049094dd999e18338ee"; + sha256 = "6ec06f3a432301745ed24607b0549602ae31bf6e051ca9a4079f4cd6caf2041f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/es-AR/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/es-AR/thunderbird-78.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1d25b980227c60cff9db1c052167c82c06f853b0ebafb5144e53a1be6fbf4b49"; + sha256 = "8debebc56ee0fbcbf2507f98f28f7807b55d4d768bd40c7820aa9e4f7dc9f0ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/es-ES/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/es-ES/thunderbird-78.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "c34971c9a52bb6174254d4bbb67b682e862187b008bd0fa3c07d3d6955da6f6d"; + sha256 = "58ac431d1b48a1c8224e414577a7405f20336cd990f6e4d8399e304cc5f38a3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/et/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/et/thunderbird-78.7.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "da6305745f73ea4469d308c6ada3749b8c09852e57e9af6d00fe470e40092cf2"; + sha256 = "a80917893c189acbd745e56820b7f4fce1ebf14e99be8700db75817ffa3eccf5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/eu/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/eu/thunderbird-78.7.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "406bb8b9a7c5eace3b84ed29e16dee077ee2e4f1b8ddd49afc9291e368b44ce0"; + sha256 = "f305db54f9cc504777ee9d329ca1da97a8642f7505903b2744cb7d86382b0ccf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fa/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fa/thunderbird-78.7.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "4756eca3217756d540bf4e904bcda9f7259b65ae2062b493a8f05122a730130c"; + sha256 = "0a90e573bf94097f790dec0ef2771266bf115c0c4768c3952758f8c17f7cfb70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fi/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fi/thunderbird-78.7.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "dbe77298a712a0a64a16fcf618b1e3fb21d1afbea8f7b93a9e6d7e43edbede6a"; + sha256 = "264104b86cd034927586520b6c4df25b1c75da4d97ea18bffd74261e553b4eb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fr/thunderbird-78.7.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "71ce692f4f46e8afe488581670c186c20eccb5bf78306452fd7b82964f6d1087"; + sha256 = "2cbca14d94252f24dd50c971fd5ad367b4b3c0d3ccfd2d9ce8b18cb1df62a82c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fy-NL/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fy-NL/thunderbird-78.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "2f62f25c74e382cec5a9cccc24429cff5a5c36ab3810b5b43f194beb0a5b7a3a"; + sha256 = "d60c543f59ebdb539b9d3799d77f4ad1d05738cc5d1b78d016a7d2f036d72095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ga-IE/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ga-IE/thunderbird-78.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "4da8e456e0e1f115e4018275c041fa345c02b635fd20ec0b3a5b3d1975dde52f"; + sha256 = "2d0a19e3a702a72866af8c8e9aac64e9c41b3b1bc44de53ec42b56efd657cd63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/gd/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/gd/thunderbird-78.7.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8517486ccdf76ac04b8e8c4df11e5bfd79375a8023efb63476232d985b47a8ca"; + sha256 = "93eaaf7d5c6cdf1947e25fbd053185f09f60329ba729a53f12d272f24dca6bf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/gl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/gl/thunderbird-78.7.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "928f1721f4ca40f154041bc4ed4aa7b06e3508eba45c7f6ee889fb4e698fb6a6"; + sha256 = "02d78333abaed79e7a2fccc6af3edef3077e08cadcc83fa2856779b6d24e9113"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/he/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/he/thunderbird-78.7.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e49d647ee9d414cfd9dfecc4fdaa7931fd4d4a8ffab3fe9bd820023813d0d7b6"; + sha256 = "d4dd60245672fc23e114d2cfef40ff69faf08a2f188969deff7d084d8aebd64f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hr/thunderbird-78.7.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "8c804b3288036619e0be76d9129102098f5406a00c6586a7edd1e35ac5ffe1ea"; + sha256 = "0aba235af4ebdd924d9d909755dd059025c1b502ab0056a24ef0eb5aea05b9ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hsb/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hsb/thunderbird-78.7.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "846966d7f8dc6619afa7904debeaf3aeac95d040478fb3e29cae5cb116782d88"; + sha256 = "acc53828d809a21b3a5bc6b00cf5681b376284e4818c8db250f61a3117573f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hu/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hu/thunderbird-78.7.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a05a7410d0f8ae016d3aa69152a381173c22f3361c7a940a2f7f1684a42ac0d7"; + sha256 = "39aac6a7e96fbc71c9e537f4312fa528c0f3b56a5d669638ca2a4ff2a4823cb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hy-AM/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hy-AM/thunderbird-78.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "93783417a9c065a4b53566d21bfd34f3a96c9cca7e6cd61c20474c63c28f5f15"; + sha256 = "bb1fdc6084ca5d761823b5391aa237d14d62f783007cbb2d6ccff1b69a7b3142"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/id/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/id/thunderbird-78.7.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3608569802e13a45feb519239f43bed7ee06f8e3198f188ba8f5c815ca9748bb"; + sha256 = "340b91be60235a91b1a130d68e9b5ddc16d63eba381cc59efd2d396764bf2327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/is/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/is/thunderbird-78.7.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "afbcee0a5c4926dc7ee089e6e11d83844d068bac2ddb71bf7cf29747dc753420"; + sha256 = "4f3b255119669de976714089d11532342eb6c1ede95e98d8de09413cdaf28c4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/it/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/it/thunderbird-78.7.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "212d0125796a12ccde71939bf1b62b540a630a965f160ebe6199e8b1d3149043"; + sha256 = "1fdda6110ef1eec5702490dfb786fadeb6bbb73fa849526327baebdf3aeaf348"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ja/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ja/thunderbird-78.7.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c450ba455b8e8b846a6dfc6a380c672e6ed9d18553c07caae3cd3d24a9d21744"; + sha256 = "fd10c2307c71e143d76dfba7d26ea15a6a211878bcf1287128d5706018fb3083"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ka/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ka/thunderbird-78.7.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "349da02164ef984dc22b85b9e4e7a09748cdd1d6325904b32c1e36a8a9f7c4f5"; + sha256 = "b796f8b6aaa28a23726afe915b741b7c89ed73f4e731bf7fad3848aade16001c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/kab/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/kab/thunderbird-78.7.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "0f367818d4a7568e57ad9d06c52c55c2feebac351d164c434f86943a420c283b"; + sha256 = "35941699918a3177b092c650a73d8bc8f6d06bdf8cbc5c33e492d93f6cb0f198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/kk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/kk/thunderbird-78.7.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3274d7e4b787e5ed2f26ce11ff26e261e33a90b60bfef644f017215cbdaefc6e"; + sha256 = "3ea99defb54f2e672d48b424e842c876ad0ceacd87cd19cc643acb55586948ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ko/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ko/thunderbird-78.7.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "8aa9eebe4ffeaa3f6d963806a6b5d0d3e6530b08476bf55e9cdc1b25cdc105d5"; + sha256 = "4cfa908b81773b57486b8144eb61c949c70615eafc1b3d050b6ceb6292958769"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/lt/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/lt/thunderbird-78.7.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2e811db91100b6e3671693fda6776406477ee3f71f4ae9431eb1b94e1aff4a19"; + sha256 = "0d668e8a27f7044c610cff1028f245d2952abf6320ce905365bd42a39df85c23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ms/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ms/thunderbird-78.7.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "950a316e46a5f6bc127715295e00cf9c742d3bd7ef23a489e3fe4131f7394e2e"; + sha256 = "a632e60198e189d33e87a01c084179bdfb8f8c1d1547dfa4747dec325d1c04c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/nb-NO/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nb-NO/thunderbird-78.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c3bcd1740b5288b9d0f486fc9d2f5936e38e869eab5bf84a92bfc50caa11c5cc"; + sha256 = "d0336060f8e8b632462df91dc0e3ba33f2a7dbf1da6084d41961c05fbbedd46b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/nl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nl/thunderbird-78.7.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f7eb04082ef4ff38e287016ea3b75e795eb7428c8271ae06a21930031de108bf"; + sha256 = "4e9c1921dac5ce0008b7380d810d5ee4530c4d336c79c6a274c657ea338a4ca1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/nn-NO/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nn-NO/thunderbird-78.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "01adbf1a345fa117ac8cf5ae65f11e5ce14dafe3f06d99fede51abaa4eee3f94"; + sha256 = "c33045aaa5d9054022431cf66f03ba2485ea7c68553ea245b73c8cf33b4458fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pa-IN/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pa-IN/thunderbird-78.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "3d8b49a32080315c3726fbc77ff2de4eda453e4919b487af99cbc85a9e8b79fa"; + sha256 = "8b3810587f61e029a2536cb0eceb8b0b26656adf9ce17e8a7f020ed41b6e5724"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pl/thunderbird-78.7.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "32429dee14ba7c405ccab71bc3a8ea24cc4a028ea331254c0b4e227c921da58b"; + sha256 = "01c8e6ba91037b8e5f713fd7d0dc9b6025aa3dc83fd8b13f1490dd849ec5e87f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pt-BR/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pt-BR/thunderbird-78.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2709ac332c29c0d2dfb3e76c77e3af58cc27a9d23496fa7432fe043ebd486a35"; + sha256 = "9ab3d18699c6de55a198028592da01b576d67920375cbc2154d356bdf7fd4ccc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pt-PT/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pt-PT/thunderbird-78.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "eca228d5846b51cbbd64888477e7514669dc1714dc07d1aab86e38ab0f7956b5"; + sha256 = "3446b5b82aeb058ff880d82fa7da923231a7104bcef77bc08f640490c79b24b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/rm/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/rm/thunderbird-78.7.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "269e7483c5f1a884fd809dc3ccb5c1627573708c558a5f2acdd9ca6b925312b5"; + sha256 = "0e1ba7a270021b2df2f189715ddd6b0d540c35dbfb3f45d8216b24e29c6ecd25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ro/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ro/thunderbird-78.7.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "41d769fb26c99e66708c7c8884c822e863d8066b46512ec20b26c760e7c78916"; + sha256 = "9845b2e33d758474c44e46804c7c49255f3acf9f25c8afa299320828cefb3ec8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ru/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ru/thunderbird-78.7.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "06ed87bfb7830607e87ef5f17f553e34275f3c0a56674f1f07e7e30b43c1f9d0"; + sha256 = "60dc7072a6dfa0723972522d4a06be75c99e6e1b423e68e91af276f2a325913b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/si/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/si/thunderbird-78.7.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "09b96524a7b887ba0cdae931ca368f079d5c3536134f6d9798b0073cfa047332"; + sha256 = "fd08c36b8143196ca73aade09e3a8292bab0ce8b6e6d18705eed2594f342ce86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sk/thunderbird-78.7.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a9025df80c0dd8ebe96dec1503d11820ac7c48ea35ef695e883f1e01dbd0b6dd"; + sha256 = "068d927b94908224c7a789bfe33d1e884228d82d3f30e573a0006136d5841c5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sl/thunderbird-78.7.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8db2dceecad941230113b079bd083d0548cafef3bab0b9698260ce3db28453fd"; + sha256 = "27d3a7f5549c48fa2724dc98b8df72bf2b843b0cc34d55371f050ca217cd2ed3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sq/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sq/thunderbird-78.7.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "365db0f0872959400b5aaae94866f1a49e0b14db2fd55938c0084e983f06f2bc"; + sha256 = "b8d3ca545ff88c854b13e1ee89793b33df39f3d6713aae8fb4a2fa3be2d6f73f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sr/thunderbird-78.7.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "252587e46e7cf1fbd83f9bc9da6b8273985f26d5ede94aab16a2d2ef1d92faa2"; + sha256 = "10d0f70e52bbb8b0978ff6c26359120bb537cc9f15b47a93744ad8ee6dbd7b96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sv-SE/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sv-SE/thunderbird-78.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "029d0a70f4c0bf770dc37263639097aed24b6186057cd9d81c50fb4657ce3e04"; + sha256 = "15fd51de4cd82eaadfb0c9a5231cd6c8f83a58eca1eb66acafa037ca8ae76767"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/th/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/th/thunderbird-78.7.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "24b20e9cd1d9a5b863d4dcfd8d62599b52ba9a64126b6bf584d4ff5c3db524d8"; + sha256 = "07a6289101aa3d105c2a358ea53d1045bfc3616cd909e57b5a577bcba38dba0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/tr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/tr/thunderbird-78.7.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "d7d9878fbcf9b552164f588600ac1704a5e295fe73c333f0e838b5d99fbd5deb"; + sha256 = "6253f5e59cf07cfe8bbdd566b27ad9cd56aab29f40c42df1368d7e14d064a27a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/uk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/uk/thunderbird-78.7.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "3c8eef6d084fec6b0ac57ae6d2fce6dc7e02977ed10c670be30d032e417a50ce"; + sha256 = "e4e37d8194d8df48810afc47463d044e4b4b9fdd0752b0199e4c6a7aa1b46d60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/uz/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/uz/thunderbird-78.7.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "545de649b406faa1b942020eb418c4e52054efcc8706a2f4881409d253ed5c4a"; + sha256 = "983d9701e367017ada3b6583d9e6985a73609c642968f1c82ec9b08644fe82b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/vi/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/vi/thunderbird-78.7.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "86ae5dbef5ec4cdb0e25ce3cbe78b46ed35349d11038ed12a49dc0440dc7111e"; + sha256 = "b743d0c18257880cf0d7c463a0e39f6029fede79a534bef9dbd5ffe6ba3b10e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/zh-CN/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/zh-CN/thunderbird-78.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "ce94974470209d9dc81f676f3e74a6359d4e97c7f8801f644c7ea0fe774ad6bc"; + sha256 = "8cc5d4a05eef0498fe12476e7ee7a91dce0c69234b78278cc7985505708ff8ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/zh-TW/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/zh-TW/thunderbird-78.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f013131307e31eed708f8a75e1313b2f94cd401de06e00053f4155aedca33b13"; + sha256 = "5070474b2ac89d09e45bced9513b0f317d4dce76c57ce5f82c75feafb6d49ec3"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 8c7d471776..d91239c3a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.7.0"; + version = "78.7.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1fwi9dvh9q8pzwri6hyyg89zxkfpw3zin53nkqgvips43yq6jdmyxnz3y9qnk2f50d0lnkx12vvkzgirjhdz23gkf7y860zmwg85vpy"; + "328p14mgcam4dxx0asbgp4v2v559bwbw7z2kxd5yfwkna040r9ccrkkirma5580z9vkwb0rcjlmai9wrbacxrg8hg65d8vylvnkampy"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index 8b78c49a2f..82140f2d77 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, fetchurl, dpkg +{ stdenv, lib, fetchurl, dpkg , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3 , xorg, autoPatchelfHook, systemd, libnotify, libappindicator @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2020.7"; + version = "2021.1"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "07vryz1nq8r4m5y9ry0d0v62ykz1cnnsv628x34yvwiyazbav4ri"; + sha256 = "1ksa327zaiwmcmzv4n4ycfzc4sqhj2492c5ir0mqlx7x2nnhx6q7"; }; nativeBuildInputs = [ @@ -84,9 +84,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mullvad/mullvadvpn-app"; description = "Client for Mullvad VPN"; changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne ymarkus ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix index bde8f7c4fe..2eeb151beb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -133,14 +133,14 @@ let } source; source = rec { - version = "1.3.3"; + version = "1.3.4"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; rev = version; - sha256 = "1jaq5bl5gdpzd4pskpcd2j93g2w320znn4s8ck8f4jz5f46da1bj"; + sha256 = "sha256-njovShQpW0JNeeE8VugdmGzDk3fKG8/fcJoBgdyTZug="; fetchSubmodules = true; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix index c2d7fbd10b..8029264fda 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix @@ -76,6 +76,9 @@ in python3Packages.buildPythonApplication rec { done ''; + # no tests + doCheck = false; + meta = with lib; { description = "Linux GUI for ProtonVPN, written in Python"; homepage = "https://github.com/ProtonVPN/linux-gui"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index a28c68a658..c742d076f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -4,16 +4,6 @@ , pulseaudio }: let - sha256 = { - x86_64-linux = "19751ygq1ng79aniqx91qawc0cw07cwdjdjd88azc9ww6z6nv0mp"; - i386-linux = "0dwc7v4p1dz51444zwn0kds23yi87r4h2d3isfj9xwkn90pxb7in"; - }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); - - arch = { - x86_64-linux = "amd64"; - i386-linux = "i386"; - }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); - description = "Desktop sharing application, providing remote support and online meetings"; desktopItem = makeDesktopItem { @@ -28,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { urls = [ - "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz" - "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-${arch}.tar.gz" + "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - inherit sha256; + sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r"; }; buildInputs = [ @@ -83,7 +73,7 @@ in stdenv.mkDerivation rec { inherit description; homepage = "https://www.anydesk.com"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ shyim ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix index eb59f90e6d..75eb4645f4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -65,6 +65,17 @@ let x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf"; x64suffix = "12"; x86suffix = "12"; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html"; + }; + + "21.01.0" = { + major = "21"; + minor = "1"; + patch = "0"; + x64hash = "01m9g1bs6iiqbd778gjps2zznvqijlyn3mfw38aa0w1rr6ms326a"; + x86hash = "1mmx5r3wi9i6bwh4kdlpw446m8kijkaar8shi0q1n21fv0ygg3r5"; + x64suffix = "14"; + x86suffix = "14"; homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index 4b29985685..b4f6f96e58 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-MMFVJoiVrA0zy4RM2nyhlu/JfnzIRpxrA3N1jm2R0jI="; + sha256 = "sha256-nz45vCRhWhgVG2pMA6TZVUIS4d9qBWW7NtTHuEsn4pg="; }; - vendorSha256 = "sha256-UucbEBjIKRbZFd99BsnG6AAEIQ13+vzKe61k6ZPvE0A="; + vendorSha256 = "sha256-v0wFlwODZt3LC+yTuNS1hAAkoedVPfTeEIvs6rUGUa4="; subPackages = [ "weed" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix b/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix index 05aa66eb39..bf45db9209 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "umurmur"; - version = "0.2.17"; + version = "0.2.19"; src = fetchFromGitHub { owner = "umurmur"; repo = "umurmur"; rev = version; - sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl"; + sha256 = "sha256-86wveYlM493RIuU8aKac6XTOMPv0JxlZL4qH2N2AqRU="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix index 9fc7a84231..9d085b6c88 100644 --- a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "grisbi"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha256 = "sha256-b3I87tlXhIjM/bFjhsJTNFQvZxIGKsIbsf4zZT5sHXg="; + sha256 = "sha256-hFLiVHyEekCP9btO75e5ni70ZcLhjbBGCBjF2gERIqs="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix index 03c9445fe2..17c72e8a33 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.4.3"; + name = "homebank-5.5"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; + sha256 = "sha256-3tqmsCxQXNAsDsLdiyuk4MydH0WgHqsNpgqxvCp+bHU="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix index 3974e75a2f..4eb39f4d1f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas -, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, libav, cairo, freetype, pango, gdk-pixbuf, glib }: +, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { version = "5.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs; - systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib libav cairo freetype pango gdk-pixbuf glib ]; + systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib cairo freetype pango gdk-pixbuf glib ]; systemLibPaths = lib.makeLibraryPath systemLibs; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/kbibtex/default.nix b/third_party/nixpkgs/pkgs/applications/office/kbibtex/default.nix new file mode 100644 index 0000000000..861ec4d99e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/kbibtex/default.nix @@ -0,0 +1,74 @@ +{ lib +, mkDerivation +, fetchurl +# build-time +, extra-cmake-modules +, shared-mime-info +# Qt +, qtxmlpatterns +, qtwebengine +, qca-qt5 +# KDE +, ki18n +, kxmlgui +, kio +, kiconthemes +, kitemviews +, kparts +, kcoreaddons +, kservice +, ktexteditor +, kdoctools +, kwallet +, kcrash +# other +, poppler +, bibutils +}: + +mkDerivation rec { + pname = "kbibtex"; + version = "0.9.2"; + + src = fetchurl { + url = "mirror://kde/stable/KBibTeX/${version}/kbibtex-${version}.tar.xz"; + sha256 = "09xcdx363z9hps3wbr1kx96a6q6678y8pg8r3apyps4xm7xm31nr"; + }; + + nativeBuildInputs = [ + extra-cmake-modules + shared-mime-info + ]; + + buildInputs = [ + qtxmlpatterns + qtwebengine + qca-qt5 + # TODO qtoauth + ki18n + kxmlgui + kio + kiconthemes + kitemviews + kparts + kcoreaddons + kservice + ktexteditor + kdoctools + kwallet + kcrash + poppler + ]; + + qtWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ bibutils ]}" + ]; + + meta = with lib; { + description = "Bibliography editor for KDE"; + homepage = "https://userbase.kde.org/KBibTeX"; + changelog = "https://invent.kde.org/office/kbibtex/-/raw/v${version}/ChangeLog"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 7b3e630233..c917c43969 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, gettext +{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which @@ -58,18 +58,13 @@ in (mkDrv rec { outputs = [ "out" "dev" ]; - # For some reason librdf_redland sometimes refers to rasqal.h instead - # of rasqal/rasqal.h NIX_CFLAGS_COMPILE = [ - "-I${librdf_rasqal}/include/rasqal" - ] ++ lib.optionals stdenv.isx86_64 [ "-mno-fma" "-mno-avx" ] - # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 - ++ [ "-fno-visibility-inlines-hidden" ]; - - patches = [ - ./xdg-open-brief.patch + "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h + "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 ]; + patches = [ ./xdg-open-brief.patch ]; + tarballPath = "external/tarballs"; postUnpack = '' @@ -378,7 +373,7 @@ in (mkDrv rec { "--enable-kf5" "--enable-qt5" "--enable-gtk3-kde5" - ] ++ lib.optional (lib.versionOlder version "6.4") "--disable-gtk"; # disables GTK2, GTK3 is still there + ]; checkPhase = '' make unitcheck @@ -391,7 +386,7 @@ in (mkDrv rec { ++ lib.optional kdeIntegration wrapQtAppsHook; buildInputs = with xorg; - [ ant ArchiveZip boost cairo clucene_core + [ ant ArchiveZip boost box2d cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype getopt gperf gtk3 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index d956a3b08a..ea6fc1d777 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -34,6 +34,13 @@ md5 = ""; md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } + { + name = "box2d-2.3.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz"; + sha256 = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c"; + md5 = ""; + md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz"; + } { name = "breakpad.zip"; url = "https://dev-www.libreoffice.org/src/breakpad.zip"; @@ -329,11 +336,11 @@ md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { - name = "gpgme-1.9.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; - sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; + name = "gpgme-1.13.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2"; + sha256 = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46"; md5 = ""; - md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; + md5name = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46-gpgme-1.13.1.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -371,18 +378,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-67_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; - sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; + name = "icu4c-68_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz"; + sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d"; md5 = ""; - md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; + md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz"; } { - name = "icu4c-67_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; - sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; + name = "icu4c-68_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip"; + sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510"; md5 = ""; - md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; + md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -483,18 +490,18 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.9.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; - sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; + name = "lcms2-2.11.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz"; + sha256 = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e"; md5 = ""; - md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; + md5name = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e-lcms2-2.11.tar.gz"; } { - name = "libassuan-2.5.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; - sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; + name = "libassuan-2.5.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2"; + sha256 = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702"; md5 = ""; - md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; + md5name = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702-libassuan-2.5.3.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; @@ -525,11 +532,11 @@ md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; } { - name = "libgpg-error-1.27.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; - sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; + name = "libgpg-error-1.37.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2"; + sha256 = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"; md5 = ""; - md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; + md5name = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763-libgpg-error-1.37.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; @@ -595,11 +602,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.6.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; - sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; + name = "mdds-1.7.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2"; + sha256 = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf"; md5 = ""; - md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; + md5name = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf-mdds-1.7.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -616,11 +623,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; - sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; + name = "libmwaw-0.3.17.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz"; + sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c"; md5 = ""; - md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; + md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -630,11 +637,11 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.30.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; - sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; + name = "neon-0.31.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz"; + sha256 = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d"; md5 = ""; - md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; + md5name = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d-neon-0.31.1.tar.gz"; } { name = "nss-3.55-with-nspr-4.27.tar.gz"; @@ -672,18 +679,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2t.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; - sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; + name = "openssl-1.1.1i.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.1.1i.tar.gz"; + sha256 = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"; md5 = ""; - md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; + md5name = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242-openssl-1.1.1i.tar.gz"; } { - name = "liborcus-0.15.4.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; - sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; + name = "liborcus-0.16.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2"; + sha256 = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4"; md5 = ""; - md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; + md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -721,11 +728,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.82.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; - sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; + name = "poppler-21.01.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz"; + sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3"; md5 = ""; - md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; + md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -735,11 +742,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.7.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; - sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; + name = "Python-3.8.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.4.tar.xz"; + sha256 = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37"; md5 = ""; - md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; + md5name = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37-Python-3.8.4.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; @@ -798,11 +805,11 @@ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; - sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760"; + name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301"; md5 = ""; - md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -854,11 +861,11 @@ md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.11.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; - sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; + name = "libwps-0.4.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz"; + sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb"; md5 = ""; - md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; + md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index c9b1826471..6fbc8c5cfc 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "7"; - minor = "0"; - patch = "4"; - tweak = "2"; + minor = "1"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz"; + sha256 = "1rpk90g1g8m70nrj4lwkg50aiild73d29yjlgyrgg8wx6hzq7l4y"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl"; + sha256 = "0m6cxyrxig8akv9183xdn6ialmjddicn676149nm506yc5y0szmi"; }; # 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 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb"; + sha256 = "1kvsi28n8x3gxpiszxh84x05aw23i3z4id63pgw2s7mfclby52k9"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix index 78482326be..d956a3b08a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix @@ -1,854 +1,882 @@ [ { name = "libabw-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/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 = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; md5 = ""; md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; md5 = ""; md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_69_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; - sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; + name = "boost_1_71_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; + sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; md5 = ""; - md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; + md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { name = "breakpad.zip"; - url = "http://dev-www.libreoffice.org/src/breakpad.zip"; + url = "https://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; md5 = ""; md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; - url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; md5 = "beeca87be45ec87d241ddd0e1bad80c1"; md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { name = "bzip2-1.0.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-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 = "cairo-1.16.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; md5 = ""; md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz"; - sha256 = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48"; + name = "libcdr-0.1.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; + sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; md5 = ""; - md5name = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48-libcdr-0.1.5.tar.xz"; + md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } + { + name = "dtoa-20180411.tgz"; + url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; + sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; + md5 = ""; + md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; + } { name = "libcmis-0.5.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2"; md5 = ""; md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz"; } { name = "CoinMP-1.7.6.tgz"; - url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; + url = "https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; md5 = ""; md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { - name = "cppunit-1.14.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; - sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; + name = "cppunit-1.15.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; + sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7"; md5 = ""; - md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; + md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; - url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + url = "https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.65.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; - sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; + name = "curl-7.71.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; + sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772"; md5 = ""; - md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; + md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; md5 = ""; md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.5.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; md5 = ""; md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; } { name = "epm-3.7.tar.gz"; - url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + url = "https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { name = "libepubgen-0.1.1.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad"; md5 = ""; md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { name = "libetonyek-0.1.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; md5 = ""; md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { name = "expat-2.2.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/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"; md5 = ""; md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.12.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2"; - sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"; + name = "fontconfig-2.13.91.tar.gz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; + sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5"; md5 = ""; - md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2"; + md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz"; } { name = "crosextrafonts-20130214.tar.gz"; - url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + url = "https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; md5 = "368f114c078f94214a308a74c7e991bc"; md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; } { name = "crosextrafonts-carlito-20130920.tar.gz"; - url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + url = "https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; md5 = "c74b7223abe75949b4af367942d96c7a"; md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; } { name = "dejavu-fonts-ttf-2.37.zip"; - url = "http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; + url = "https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a"; md5 = "33e1e61fab06a547851ed308b4ffef42"; md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; } { name = "GentiumBasic_1102.zip"; - url = "http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; + url = "https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc"; md5 = "1725634df4bb3dcb1b2c91a6175f8789"; md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3"; md5 = ""; md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { name = "liberation-fonts-ttf-2.00.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/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"; md5 = ""; md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; - url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + url = "https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; md5 = "907d6e99f241876695c19ff3db0b8923"; md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; } { name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; md5 = "edc4d741888bc0d38e32dbaa17149596"; md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { name = "source-serif-pro-3.000R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; md5 = ""; md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { name = "noto-fonts-20171024.tar.gz"; - url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; + url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; md5 = ""; md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { name = "culmus-0.131.tar.gz"; - url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; md5 = ""; md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; md5 = ""; md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; } { name = "alef-1.001.tar.gz"; - url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + url = "https://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; md5 = ""; md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { name = "Amiri-0.111.zip"; - url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-0.111.zip"; sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166"; md5 = ""; md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip"; } { name = "ttf-kacst_2.01+mry.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; + url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; md5 = ""; md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; } { name = "ReemKufi-0.7.zip"; - url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f"; md5 = ""; md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip"; } { name = "Scheherazade-2.100.zip"; - url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + url = "https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; md5 = ""; md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; } { name = "libfreehand-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; md5 = ""; md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { name = "freetype-2.9.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { - name = "glm-0.9.4.6-libreoffice.zip"; - url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; - sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a"; - md5 = "bae83fa5dc7f081768daace6e199adc3"; - md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + name = "glm-0.9.9.7.zip"; + url = "https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; + sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95"; + md5 = ""; + md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { name = "gpgme-1.9.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; md5 = ""; md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.13.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; - sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; + name = "graphite2-minimal-1.3.14.tgz"; + url = "https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; + sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc"; md5 = ""; - md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; + md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-2.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; - sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; + name = "harfbuzz-2.6.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; + sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; md5 = ""; - md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; + md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; - url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + url = "https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; md5 = "17410483b5b5f267aa18b7e00b65e6e0"; md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { name = "hunspell-1.7.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; md5 = ""; md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-63_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; - sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; + name = "icu4c-67_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; + sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; md5 = ""; - md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; + md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; } { - name = "icu4c-63_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; - sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; + name = "icu4c-67_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; + sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; md5 = ""; - md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; + md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; - url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + url = "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; md5 = "ba2930200c9f019c2d93a8c88c651a0f"; md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; } { name = "flute-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; } { name = "libbase-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; } { name = "libfonts-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; md5 = "3bdf40c0d199af31923e900d082ca2dd"; md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; } { name = "libformula-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; } { name = "liblayout-0.2.10.zip"; - url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + url = "https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; md5 = "db60e4fde8dd6d6807523deb71ee34dc"; md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; } { name = "libloader-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; md5 = "97b2d4dba862397f446b217e2b623e71"; md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; } { name = "librepository-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; md5 = "8ce2fcd72becf06c41f7201d15373ed9"; md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; } { name = "libserializer-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; md5 = "f94d9870737518e3b597f9265f4e9803"; md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; } { name = "libxml-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; md5 = "ace6ab49184e329db254e454a010f56d"; md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; } { name = "sacjava-1.3.zip"; - url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + url = "https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; md5 = "39bb3fcea1514f1369fcfc87542390fd"; md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { name = "libjpeg-turbo-1.5.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; md5 = ""; md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-09-16.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; - sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; + name = "language-subtag-registry-2020-09-29.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2"; + sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f"; md5 = ""; - md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; + md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; md5 = "b63e6340a02ff1cacfeadb2c42286161"; md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { name = "lcms2-2.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; md5 = ""; md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; } { name = "libassuan-2.5.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; md5 = ""; md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"; md5 = ""; md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz"; } { name = "libeot-0.01.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; md5 = ""; md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { name = "libexttextcat-3.4.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; md5 = ""; md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } + { + name = "libffi-3.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; + sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; + md5 = ""; + md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; + } { name = "libgpg-error-1.27.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; md5 = ""; md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; md5 = ""; md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"; - sha256 = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7"; + name = "libnumbertext-1.0.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; + sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; md5 = ""; - md5name = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7-libnumbertext-1.0.5.tar.xz"; + md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; } { name = "ltm-1.0.zip"; - url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; + url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; md5 = ""; md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; - sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; + name = "xmlsec1-1.2.30.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; + sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; md5 = ""; - md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; + md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { name = "libxml2-2.9.10.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { name = "libxslt-1.1.34.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; - url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { name = "lxml-4.1.1.tgz"; - url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; + url = "https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; md5 = ""; md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; } { - name = "mariadb_client-2.0.0-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; - sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; - md5 = "a233181e03d3c307668b4c722d881661"; - md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + name = "mariadb-connector-c-3.1.8-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; + sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b"; + md5 = ""; + md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; - sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; + name = "mdds-1.6.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; + sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; md5 = ""; - md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; + md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"; md5 = ""; md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"; md5 = ""; md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.15.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; - sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; + name = "libmwaw-0.3.16.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; + sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; md5 = ""; - md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; + md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { name = "neon-0.30.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; md5 = ""; md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.47.1-with-nspr-4.23.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; - sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; + name = "nss-3.55-with-nspr-4.27.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.55-with-nspr-4.27.tar.gz"; + sha256 = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45"; md5 = ""; - md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; + md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; md5 = ""; md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - sha256 = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504"; + name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0"; md5 = ""; - md5name = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { name = "officeotron-0.7.4-master.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; md5 = "8249374c274932a21846fa7629c2aa9b"; md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { name = "openldap-2.4.45.tgz"; - url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; md5 = ""; md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { name = "openssl-1.0.2t.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { - name = "liborcus-0.14.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; - sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; + name = "liborcus-0.15.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; + sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; md5 = ""; - md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; + md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - url = "http://dev-www.libreoffice.org/src/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 = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; md5 = ""; md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3794.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; - sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; + name = "pdfium-4306.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2"; + sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8"; md5 = ""; - md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; + md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-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 = "libpng-1.6.37.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; md5 = ""; md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { name = "poppler-0.82.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; md5 = ""; md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"; - sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049"; + name = "Python-3.7.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; + sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; md5 = ""; - md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz"; + md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; + } + { + 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"; + md5 = ""; + md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; } { name = "libqxp-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c"; md5 = ""; md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; } { name = "rasqal-0.9.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; + url = "https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c"; md5 = "1f5def51ca0026cd192958ef07228b52"; md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; } { name = "redland-1.0.17.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; md5 = "e5be03eda13ef68aabab6e42aa67715e"; md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { name = "librevenge-0.0.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; md5 = ""; md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; - url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { name = "serf-1.2.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; md5 = ""; md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"; - sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4"; + name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760"; md5 = ""; - md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz"; + md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + } + { + name = "libstaroffice-0.0.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; + sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db"; + md5 = ""; + md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } { name = "swingExSrc.zip"; - url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; md5 = "35c94d2df8893241173de1d16b6034c0"; md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; } { name = "twaindsm_2.4.1.orig.tar.gz"; - url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; + url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; md5 = ""; md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { name = "ucpp-1.3.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; md5 = "0168229624cfac409e766913506961a8"; md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { name = "libvisio-0.1.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"; md5 = ""; md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { name = "libwpg-0.3.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; md5 = ""; md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.10.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"; - sha256 = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca"; + name = "libwps-0.4.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; + sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; md5 = ""; - md5name = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca-libwps-0.4.10.tar.xz"; + md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; } { name = "xsltml_2.1.2.zip"; - url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + url = "https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; md5 = "a7983f859eafb2677d7ff386a023bc40"; md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { name = "zlib-1.2.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; md5 = ""; md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; md5 = ""; md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix index 50812d0efb..0141b74c38 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,19 +1,10 @@ -{ lib, kdeIntegration, fetchpatch, ... }: +{ lib, kdeIntegration, ... }: attrs: { - patches = attrs.patches or [ ] ++ [ - (fetchpatch { - url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; - name = "poppler-0.86.patch"; - sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; - }) - ]; postConfigure = attrs.postConfigure + '' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' ''; - configureFlags = lib.remove "--without-system-qrcodegen" - (attrs.configureFlags ++ [ - (lib.enableFeature kdeIntegration "kde5") - ]); - meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; + configureFlags = attrs.configureFlags ++ [ + (lib.enableFeature kdeIntegration "kf5") + ]; } diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix index 36deae5367..c9b1826471 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -6,9 +6,9 @@ rec { inherit sha256; }; - major = "6"; - minor = "3"; - patch = "5"; + major = "7"; + minor = "0"; + patch = "4"; 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 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz"; + sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; + sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl"; }; # 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 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6"; + sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index c470a56b8a..f8b91a94cc 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pytest_4, pytest-django, django }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-django +, django +}: -buildPythonPackage { +buildPythonPackage rec { pname = "django-crispy-forms"; - version = "2019.04.21"; + version = "1.10.0"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; - rev = "e25a5326697e5b545689b3a914e516404a6911bb"; - sha256 = "12zqa76q6i7j47aqvhilivpbdplgp9zw2q8zfcjzlgclrqafaj39"; + rev = version; + sha256 = "0y6kskfxgckb9npcgwx4zrs5n9px159zh9zhinhxi3i7wlriqpf5"; }; # For reasons unknown, the source dir must contain a dash @@ -19,12 +24,10 @@ buildPythonPackage { export sourceRoot=source- ''; - checkInputs = [ pytest_4 pytest-django django ]; + checkInputs = [ django pytest-django pytestCheckHook ]; - checkPhase = '' - PYTHONPATH="$(pwd):$PYTHONPATH" \ - DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings \ - pytest crispy_forms/tests + preCheck = '' + export DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix b/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix index acf4488045..f83ce8b39b 100644 --- a/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix +++ b/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix @@ -43,6 +43,13 @@ mkDerivation rec { sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s="; }; + patches = [ + (fetchpatch { # fix build with podofo 0.9.7 + url = "https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch"; + sha256 = "0vp275xfbd4xnj5s55cgzsihgihby5mmjlbmrc7sa6jbrsm8aa2c"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index 499aa1e5fa..cb0781f74e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill ]; }; - version = "0.43.3"; + version = "0.43.4"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1k9vcs7pwa89bzivqp0gfs45jzqw216fpypg3ja4n2dzn4qkv2as"; + sha256 = "0kjysam5alsmnj93fcqq1ivawnra42gn7dch99rrfmvbkxp7hhr8"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1n3v7wdav6mvgcy72mmfhncsa74i0ax1ij5rjczgfjjyiyc5y0rk"; + sha256 = "128mvmp15mjpb5ipkmr0yn7ahby26shbix3f8q094f4zpxjp83zx"; }; in { diff --git a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix index 51728bfb40..d14e0017f6 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.17"; + version = "4.1.18"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1gzff60sn3h05279f9mdi1rkdws52m28shcil16911lvlq6ki13m"; + sha256 = "sha256-PH/YSrOoS6RSWyUenVYSDa7mJqODFoSpdP2tR2+QJw0="; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix b/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix index 276581d80e..c927d77bef 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.53"; + version = "1.3.54"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "1m0fa891scpaf719002w9gpg1famx84kpzav1mw1fafmbzyvjw1i"; + sha256 = "sha256-zw0xi4AVnm8Vi/oWkh13C9BjabOKUtZaVmLN++zKGug="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix index 9455656143..8d6e850977 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix @@ -1,10 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio -, makeWrapper, cppunit, gr-osmosdr, log4cpp -, pythonSupport ? true, python, swig +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, boost +, gnuradio +, makeWrapper +, cppunit +, gr-osmosdr +, log4cpp +, pythonSupport ? true +, python +, swig +, fetchpatch }: -assert pythonSupport -> python != null && swig != null; - stdenv.mkDerivation { pname = "gr-ais"; version = "2015-12-20"; @@ -12,14 +22,20 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "bistromath"; repo = "gr-ais"; - # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 - rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; - sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; + rev = "cdc1f52745853f9c739c718251830eb69704b26e"; + sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; }; + patches = [ + (fetchpatch { + url = "https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054.patch"; + sha256 = "1cwalphldvf6dbhzwz1gi53z0cb4921qsvlz4138q7m6dxccvssg"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] - ++ lib.optionals pythonSupport [ python swig ]; + ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index b4a6cb775c..6f723971c8 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -9,7 +9,7 @@ fftwFloat, glew, hackrf, lib, -libav, +ffmpeg, libiio, libopus, libpulseaudio, @@ -44,7 +44,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb1 boost libopus limesuite ffmpeg libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2 cm256cc serialdv qtserialport libbladeRF uhd soapysdr-with-plugins diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 4c773208d5..235d06a9cd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "08abrshrzhdfcg3b2vzfmnq8fhzrasadg1ajs81kcw96yjc59vak"; + sha256 = "sha256-EhlcaMxlDyX2RneBrpbmLScc9vd77Tf7RPblbQqAqZ0="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix index 6fd061f140..877b5b7d34 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }: +{ lib, stdenv, buildPackages, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }: stdenv.mkDerivation rec { pname = "blast"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; - sha256 = "09nry5knj5hhxpn0a5ww1gb1704grd4r1y7adbjl6kqwq37dkk9s"; + url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; + sha256 = "0m0r9vkw631ky1za1wilsfk9k9spwqh22nkrb9a57rbwmrc1i3nq"; }; sourceRoot = "ncbi-blast-${version}+-src/c++"; @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { --replace /bin/date ${coreutils}/bin/date ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; # perl is necessary in buildInputs so that installed perl scripts get patched diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch b/third_party/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch index 9b78ac5792..851e37fa90 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch +++ b/third_party/nixpkgs/pkgs/applications/science/biology/blast/no_slash_bin.patch @@ -171,14 +171,8 @@ diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/strip_for_install. GREP = @GREP@ --- ncbi-blast-2.9.0+-src/src/build-system/configure 2019-03-05 00:49:08.000000000 +0800 +++ ncbi-blast-2.9.0+-src.patched/src/build-system/configure 2019-05-15 16:55:40.711795042 +0800 -@@ -10417,10 +10417,6 @@ - echo "${ECHO_T}no, using $LN_S" >&6; } - fi - +@@ -10417,4 +10417,0 @@ -case "$LN_S" in - /*) ;; - * ) LN_S=/bin/$LN_S ;; -esac - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 4a3816c4d4..52a17e8d01 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.24.1"; + version = "2.25.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-acCsYHyZ358hYqa2haOxR+g6FQGtK+hstYfLBvHLwR8="; + sha256 = "sha256-+vJDTahP4htRbVeBd2eSD97fwZ69wB2cro1tMxT36Jc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix index a7fe948ecf..3458638473 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.6a"; + version = "2.7.7a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "1zw9f4jbhz0y51namnmid42pa7pviviy94q9db8w0774nksdf8is"; + sha256 = "sha256-0K49yjcnTzC56ZIB20OeTiMJ5EW8mRx+xEpyWEfFcts="; }; sourceRoot = "source/source"; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix index f6de72205d..23635f8e6c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "21.1.0"; + version = "21.2.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-HlBvtpxm8voLS6E8QQ4Ur211KSUhAkL/sv4odoy8oUo="; + sha256 = "sha256-CLvMspk7HqrtNM5TD45mZIz6vsS32eUuxFDJiBDs9VY="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix index dd76e9364c..4cb8048df6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix @@ -38,7 +38,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # tests try to access /proc/ which does not exist on darwin + # Cannot locate IVL modules : couldn't get command path from OS. + doCheck = !stdenv.isDarwin; installCheckInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix index 1f2ad4634d..118bb8ecd2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation { substituteInPlace sbysrc/sby_core.py \ --replace '##yosys-program-prefix##' '"${yosys}/bin/"' + + substituteInPlace sbysrc/sby.py \ + --replace '/usr/bin/env python3' '${python3}/bin/python' ''; buildPhase = "true"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix index cd58740186..cfef5960bd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix @@ -1,9 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, python, fixDarwinDylibNames +{ lib +, stdenv +, fetchFromGitHub +, python +, fixDarwinDylibNames , javaBindings ? false , ocamlBindings ? false , pythonBindings ? true , jdk ? null -, ocaml ? null, findlib ? null, zarith ? null +, ocaml ? null +, findlib ? null +, zarith ? null }: assert javaBindings -> jdk != null; @@ -13,19 +19,19 @@ with lib; stdenv.mkDerivation rec { pname = "z3"; - version = "4.8.9"; + version = "4.8.10"; src = fetchFromGitHub { - owner = "Z3Prover"; - repo = pname; - rev = "z3-${version}"; - sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"; + owner = "Z3Prover"; + repo = pname; + rev = "z3-${version}"; + sha256 = "1w1ym2l0gipvjx322npw7lhclv8rslq58gnj0d9i96masi3gbycf"; }; nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ python ] - ++ optional javaBindings jdk - ++ optionals ocamlBindings [ ocaml findlib zarith ] + ++ optional javaBindings jdk + ++ optionals ocamlBindings [ ocaml findlib zarith ] ; propagatedBuildInputs = [ python.pkgs.setuptools ]; enableParallelBuilding = true; @@ -35,16 +41,17 @@ stdenv.mkDerivation rec { mkdir -p $OCAMLFIND_DESTDIR/stublibs ''; - configurePhase = concatStringsSep " " ( - [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ] - ++ optional javaBindings "--java" - ++ optional ocamlBindings "--ml" - ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" - ) + "\n" + "cd build"; + configurePhase = concatStringsSep " " + ( + [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ] + ++ optional javaBindings "--java" + ++ optional ocamlBindings "--ml" + ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" + ) + "\n" + "cd build"; postInstall = '' mkdir -p $dev $lib - mv $out/lib $lib/lib + mv $out/lib $lib/lib mv $out/include $dev/include '' + optionalString pythonBindings '' mkdir -p $python/lib @@ -53,14 +60,13 @@ stdenv.mkDerivation rec { ''; outputs = [ "out" "lib" "dev" "python" ] - ++ optional ocamlBindings "ocaml" - ; + ++ optional ocamlBindings "ocaml"; - meta = { + meta = with lib; { description = "A high-performance theorem prover and SMT solver"; - homepage = "https://github.com/Z3Prover/z3"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thoughtpolice ttuegel ]; + homepage = "https://github.com/Z3Prover/z3"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ttuegel ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix index e770cff2da..81b7487bd2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.12.7.2"; + version = "2.12.7.6"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "147wmbajcxv6wp92j6pizq4plrr1sb7jirifr1477bx33hc49bsp"; + sha256 = "sha256-Pg8nvW+RDy1Vb+Xg+5tnDxZEVkD80VcQGyZVayq8zsk="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index e8c801ff37..703048118f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.31"; + version = "1.8.32"; src = fetchPypi { inherit pname version; - sha256 = "51d4a21372fcac615a0191cb29c444889ecfede402e95c847346842400a86273"; + sha256 = "f89ba880fe7351a13c68ba3f4c56acd6e246790b103f3ec79d9a527b5767b8f0"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 95c8aebd32..82959e7f5e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.0.11"; + version = "4.1.1"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -27,6 +27,7 @@ mkDerivation rec { ''; qmakeFlags = [ + "CONFIG+=StableBuild" # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" "../qgroundcontrol.pro" @@ -42,7 +43,7 @@ mkDerivation rec { cp -v deploy/qgroundcontrol.desktop $out/share/applications mkdir -p $out/bin - cp -v build/release/QGroundControl "$out/bin/" + cp -v build/staging/QGroundControl "$out/bin/" mkdir -p $out/share/qgroundcontrol cp -rv resources/ $out/share/qgroundcontrol @@ -62,7 +63,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "14pk1vmcpg2cc5p100chbhnynclcwyqmyb2n2w11vvk0l2c9z1gz"; + sha256 = "1dji7jmwsrgcgzhra94wrgz67ydsdra7p10fw8gbw54gf6ncjfjm"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/search/xlsxgrep/default.nix b/third_party/nixpkgs/pkgs/applications/search/xlsxgrep/default.nix new file mode 100644 index 0000000000..8c62ae5736 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/search/xlsxgrep/default.nix @@ -0,0 +1,20 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "xlsxgrep"; + version = "0.0.23"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm"; + }; + + pythonPath = with python3Packages; [ xlrd ]; + + meta = with lib; { + maintainers = with maintainers; [ felixscheinost ]; + description = "CLI tool to search text in XLSX and XLS files. It works similarly to Unix/GNU Linux grep"; + homepage = "https://github.com/zazuum/xlsxgrep"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix index 10a6eb9c6b..26ca10e3f3 100644 --- a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.1.6.1"; + version = "3.1.6.2"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "sha256-lYvFNeCuvLIV//fEQDZIj+nLGZmrKHfAQyNpe4vMmfU="; + sha256 = "sha256-6vxJKIwMKz8KQn10aOzqXhVBDfBLylw925hR1hWP7/A="; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index b9a8316794..63642af708 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -21,7 +21,7 @@ }: let - version = "1.6.3"; + version = "1.6.4"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "0rm7w29wf3gipf69qf7s42qw8857z74gsigrpz9g6vvd1x58f03m"; + sha256 = "0awv53l3039s1rnkhdkzc0gwawlnd1m8cl4qhaijhxzzq68w0dfb"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix index 9634a3be6b..baa71a09b9 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,18 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }: -with lib; - -let - version = "0.7.2"; - name = "xst-${version}"; -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "xst"; + version = "0.8.4.1"; src = fetchFromGitHub { owner = "gnotclub"; - repo = "xst"; + repo = pname; rev = "v${version}"; - sha256 = "1fplgy30gyrwkjsw3z947327r98i13zd1whwkplpj9fzckhb9vs9"; + sha256 = "nOJcOghtzFkl7B/4XeXptn2TdrGQ4QTKBo+t+9npxOA="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,8 +18,8 @@ in stdenv.mkDerivation { TERMINFO=$out/share/terminfo make install PREFIX=$out ''; - meta = { - homepage = "https://github.com/neeasade/xst"; + meta = with lib; { + homepage = "https://github.com/gnotclub/xst"; description = "Simple terminal fork that can load config from Xresources"; license = licenses.mit; maintainers = [ maintainers.vyp ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index abef9cf9bf..8983b3d990 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "364"; + version = "366"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "0fizaalpv96sc199dfc00696vq18fixqb4fxb3jsard19k96x4pb"; + sha256 = "0vmzffy3hzgcgwx305h07ars5sxsq6nnl1ir4xqpxs9zjs2ji2w5"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix index 465de2d1d2..4b77853746 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "17cmwkha25hwsvnjcp388zd9kwacfq7adjp0sjw59y0vyr1maf22"; + sha256 = "sha256-cEVYU7vMgVxVIKztL6LHcvQjrNRRMrB5XMP/7gPCr5A="; }; - cargoSha256 = "1bji818cmkl0286a4qcnfiwibnqd5q5fvzmzgk5cabrdwaag2ia5"; + cargoSha256 = "sha256-iD3Cr1vo0FNyWvAN5m6ND+8sGyekgbkYmIxGTJkPEYE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 42ebe89cd4..a1daf3db44 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; + sha256 = "sha256-//n7kOANVHRSjxclxDcMnpMVzUcd/U6fFsP8acRjVWA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix index 679e8dbdf5..e7eea5e43a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { pname = "git-cinnabar"; - version = "0.5.4"; + version = "0.5.6"; src = fetchFromGitHub { owner = "glandium"; repo = "git-cinnabar"; rev = version; - sha256 = "1cjn2cc6mj4m736wxab9s6qx83p5n5ha8cr3x84s9ra6rxs8d7pi"; + sha256 = "1wbp4xqpkaqhhkjw8rbbsagwiciqffacqqbm4j49q41mlk371ai3"; fetchSubmodules = true; }; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/libexec install git-cinnabar-helper $out/bin install git-cinnabar git-remote-hg $out/libexec @@ -38,12 +40,14 @@ stdenv.mkDerivation rec { --prefix GIT_CINNABAR_EXPERIMENTS , python3 \ --set PYTHONPATH ${mercurial}/${python3.sitePackages} done + + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/glandium/git-cinnabar"; description = "git remote helper to interact with mercurial repositories"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ qyliss ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix index d5abd0a597..5193cd2531 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Command-line tool to delete merged Git branches"; homepage = "https://pypi.org/project/git-delete-merged-branches/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 3f6ea7972b..f2291882b2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchzip, unixtools, which }: +{ lib, stdenv, fetchFromGitHub, unixtools, which }: stdenv.mkDerivation rec { pname = "git-extras"; version = "6.1.0"; - src = fetchzip { - url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "tj"; + repo = "git-extras"; + rev = version; sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz"; }; @@ -29,6 +31,6 @@ stdenv.mkDerivation rec { description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.spwhitt maintainers.cko ]; + maintainers = with maintainers; [ spwhitt cko ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 376568324b..f28d49702b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ masaeedu zowoq ]; + maintainers = with maintainers; [ masaeedu SuperSandro2000 zowoq ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 3abfd3a313..3129bd2e20 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -8,13 +8,13 @@ let in crystal.buildCrystalPackage rec { pname = "thicket"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "taylorthurlow"; repo = pname; rev = "v${version}"; - sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw"; + sha256 = "sha256-A89E0CbV7VFB7W4ycFcZloP0J/d42agEuD+hs9a6a6E="; }; format = "shards"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix index 6ac6cde44a..1f2a77d201 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b"; + sha256 = "sha256-kkH4px34VpnO/S1VjgQGU9Mm4/VpmiOtvlz2ubtStAk="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # those files are inherently impure, we'll handle the corresponding dependencies. postPatch = '' - rm -f contrib/config.make-* + rm contrib/config.make-* ''; enableParallelBuilding = true; @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; - maintainers = with maintainers; [ bjornfor domenkozar qknight globin ]; - license = licenses.gpl2; + maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ]; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index ea9e195cd0..f6250563fc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.12"; + version = "2.12.2"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-k9G0lN7qKQhWiXibzhC9Ma9h+44LQJ966MIakWk5nJM="; + sha256 = "sha256-E0HGianaTNRVJsFh8tb1wdxEARRXzkFG2OHU6op5oQ4="; }; patches = [ ./import-ssl-module.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix b/third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix index bfc577e51a..e0249f6d0b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool , pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr @@ -10,12 +10,20 @@ stdenv.mkDerivation { name = "cinelerra-cv-2018-05-16"; src = fetchFromGitHub { - owner = "ratopi"; - repo = "CinelerraCV"; + owner = "cinelerra-cv-team"; + repo = "cinelerra-cv"; rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc"; sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk"; }; + patches = [ + # avoid gcc10 error about narrowing + (fetchpatch { + url = "https://github.com/cinelerra-cv-team/cinelerra-cv/pull/2/commits/a1b2d9c3bd5730ec0284894f3d81892af3e77f1f.patch"; + sha256 = "1cjyv1m174dblpa1bs5dggk24h4477zqvc5sbfc0m5rpkndx5ycp"; + }) + ]; + preConfigure = '' find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i ./autogen.sh @@ -28,10 +36,9 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; + nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ]; buildInputs = - [ automake - autoconf libtool pkg-config file - faad2 faac + [ faad2 faac a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype mjpegtools x264 gettext openexr @@ -39,13 +46,13 @@ stdenv.mkDerivation { libtheora libpng libdv libuuid nasm perl - fontconfig intltool + fontconfig ]; - meta = { + meta = with lib; { description = "Video Editor"; - homepage = "http://www.cinelerra.org"; - maintainers = [ lib.maintainers.marcweber ]; - license = lib.licenses.gpl2; + homepage = "https://www.cinelerra.org/"; + maintainers = with maintainers; [ marcweber ]; + license = licenses.gpl2Only; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix index bc045deb9e..65865c31df 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix @@ -16,6 +16,10 @@ buildPythonApplication rec { gtk3 gobject-introspection ]; + # NOTE: gdk-pixbuf setup hook does not run with strictDeps + # https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-hooks-gobject-introspection + strictDeps = false; + preFixup = '' gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]}) ''; diff --git a/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix index 10047b2148..2e3d022170 100644 --- a/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "vishen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ehIhFqZeVidhYTgqOLlf0aMHKG0cOe6245UyOVM/nOg="; + sha256 = "sha256-KhJMgr57pDnuFLhsbf0/4n9w0EfjuuKA46ENPLXox3A="; }; vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 8ac7af3b21..39d2f1e21c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "51.0.0"; + version = "53.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "06k2slgac0fhgypmdriwdc5s09mry22vxk316ixfj5sv3irwn7wc"; + sha256 = "04wjs3sgb3gn85gl8y1svx177d1213hswx37zdsj80giw1k5df79"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix index c925eca302..f798992596 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, autoreconfHook , libarchive, perl, xorg, libdvdnav, libbluray -, zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib +, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # which are not included here for no other reason that nobody has mentioned # needing them buildInputs = [ - zlib a52dec libmad faad2 ffmpeg_3 alsaLib libdvdnav libdvdnav.libdvdread + zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 143d2fdcea..3d73ccbf48 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -10,6 +10,7 @@ , systemd , yajl , nixosTests +, criu }: let @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; - buildInputs = [ libcap libseccomp systemd yajl ]; + buildInputs = [ criu libcap libseccomp systemd yajl ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 5c03951e17..e82ab35a34 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.2.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "166ch73pqx76ppfkhfg3zqxr71jf5pk5asl5bb5rwhyzf7f057q5"; + sha256 = "141ii271w2azvhl8ragrgzmir9iq9npl8wmh5dr31kvq4z4syxw1"; }; vendorSha256 = null; @@ -55,8 +55,9 @@ buildGoModule rec { mv bin/{podman-remote,podman} '' + '' install -Dm555 bin/podman $out/bin/podman - installShellCompletion --bash completions/bash/podman - installShellCompletion --zsh completions/zsh/_podman + installShellCompletion --bash completions/bash/* + installShellCompletion --fish completions/fish/* + installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild ''; @@ -65,6 +66,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; + changelog = "https://github.com/containers/podman/blob/v${version}/changelog.txt"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix new file mode 100644 index 0000000000..9a56f865c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, libxcb +, libxkbcommon +, wayland +, wayland-protocols +, wlroots +, enable-xwayland ? true, xwayland, libX11 +, patches ? [ ] +, conf ? null +, writeText +}: + +stdenv.mkDerivation rec { + pname = "dwl"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "djpohly"; + repo = pname; + rev = "v${version}"; + sha256 = "QoKaeF5DbSX0xciwc/0VKpubn/001cJjoZ+UzVDX4qE="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libxcb + libxkbcommon + wayland + wayland-protocols + wlroots + ] ++ lib.optionals enable-xwayland [ xwayland libX11 ]; + + # Allow users to set their own list of patches + inherit patches; + + prePatch = lib.optionalString enable-xwayland '' + sed -i -e '$ s|^#||' config.mk + ''; + + # Allow users to set an alternative config.def.h + postPatch = let + configFile = if lib.isDerivation conf || builtins.isPath conf + then conf + else writeText "config.def.h" conf; + in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + install -d $out/bin + install -m755 dwl $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/djpohly/dwl/"; + description = "Dynamic window manager for Wayland"; + longDescription = '' + dwl is a compact, hackable compositor for Wayland based on wlroots. It is + intended to fill the same space in the Wayland world that dwm does in X11, + primarily in terms of philosophy, and secondarily in terms of + functionality. Like dwm, dwl is: + + - Easy to understand, hack on, and extend with patches + - One C source file (or a very small number) configurable via config.h + - Limited to 2000 SLOC to promote hackability + - Tied to as few external dependencies as possible + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} +# TODO: custom patches from upstream website +# TODO: investigate the modifications in the upstream unstable version diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix index eb349e6f3b..2c3ed2e47e 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix @@ -1,34 +1,46 @@ -{lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}: +{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [ ], conf ? null}: -with lib; - -let - name = "dwm-6.2"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "dwm"; + version = "6.2"; src = fetchurl { - url = "https://dl.suckless.org/dwm/${name}.tar.gz"; + url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz"; sha256 = "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p"; }; buildInputs = [ libX11 libXinerama libXft ]; - prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; + prePatch = '' + sed -i "s@/usr/local@$out@" config.mk + ''; # Allow users set their own list of patches inherit patches; # Allow users to set the config.def.h file containing the configuration - postPatch = let configFile = if isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; - in optionalString (conf!=null) "cp ${configFile} config.def.h"; + postPatch = + let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "config.def.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} config.def.h"; - meta = { - homepage = "https://suckless.org/"; - description = "Dynamic window manager for X"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; all; + meta = with lib; { + homepage = "https://dwm.suckless.org/"; + description = "An extremely fast, small, and dynamic window manager for X"; + longDescription = '' + dwm is a dynamic window manager for X. It manages windows in tiled, + monocle and floating layouts. All of the layouts can be applied + dynamically, optimising the environment for the application in use and the + task performed. + Windows are grouped by tags. Each window can be tagged with one or + multiple tags. Selecting certain tags displays all windows with these + tags. + ''; + license = licenses.mit; + maintainers = with maintainers; [ viric ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/git.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/git.nix deleted file mode 100644 index 71e91b6093..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/git.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, patches ? [], conf ? null }: - -let - name = "dwm-git-20180602"; -in - -stdenv.mkDerivation { - inherit name; - - src = fetchgit { - url = "git://git.suckless.org/dwm"; - rev = "b69c870a3076d78ab595ed1cd4b41cf6b03b2610"; - sha256 = "10i079h79l4gdch1qy2vrrb2xxxkgkjmgphr5r9a75jbbagwvz0k"; - }; - - buildInputs = [ libX11 libXinerama libXft ]; - - prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; - - # Allow users set their own list of patches - inherit patches; - - # Allow users to override the entire config file AFTER appying the patches - postPatch = lib.optionalString (conf!=null) '' - echo -n '${conf}' > config.def.h - ''; - - buildPhase = "make"; - - meta = with lib; { - homepage = "https://suckless.org/"; - description = "Dynamic window manager for X, development version"; - license = licenses.mit; - maintainers = with maintainers; [xeji]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix index 1a11d40e3d..d158aea83f 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix @@ -3,11 +3,11 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.19"; + version = "4.19.1"; src = fetchurl { url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz"; - sha256 = "0j19kj05fpjfnj50vyykk6jsr07hq9l26y8na55bb7yfrra8yp4h"; + sha256 = "sha256-+yZ4Pc7zPZfwgBKbjQsrlXxIaxJBmIdE47lljx8FZG0="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index 76048465a8..571c13e946 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-WVlp8ir7w/wv4CI11dTQZkLcnW8JYLRQ+bbz73KEcWo="; + sha256 = "sha256-n9mLD1WrHsO9W1rxopFQENxQEHp/sxuixV3PxLp2vOY="; }; nativeBuildInputs = [ cmake pkg-config perl asciidoc ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix new file mode 100644 index 0000000000..9d39bd537f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, cairo +, glib +, libinput +, libxml2 +, pandoc +, pango +, wayland +, wayland-protocols +, wlroots +, libxcb +, libxkbcommon +, xwayland +}: + +stdenv.mkDerivation rec { + pname = "labwc"; + version = "unstable-2021-02-06"; + + src = fetchFromGitHub { + owner = "johanmalm"; + repo = pname; + rev = "4a8fcf5c6d0b730b1e2e17e544ce7d7d3c72cd13"; + sha256 = "g1ba8dchUN393eis0VAu1bIjQfthDGLaSijSavz4lfU="; + }; + + nativeBuildInputs = [ pkg-config meson ninja pandoc ]; + buildInputs = [ + cairo + glib + libinput + libxml2 + pango + wayland + wayland-protocols + wlroots + libxcb + libxkbcommon + xwayland + ]; + + mesonFlags = [ "-Dxwayland=enabled" ]; + + meta = with lib; { + homepage = "https://github.com/johanmalm/labwc"; + description = "Openbox alternative for Wayland"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix index cdef71c965..72170401d7 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "03kk3vg0r88317zv8j2bj44wq2fwxi25rv1aasvayrh1i5j6zr10"; + sha256 = "sha256-hirT0gScC2LFPvygywgPiSVDUE/Zd++62wc26HlufYU="; }; - cargoSha256 = "0m4sv4chxzk60njixlyja44rpn04apf3bm04fgd3v7abpr169f2s"; + cargoSha256 = "sha256-j57LHPU3U3ipUGQDrZ8KCuELOVJ3BxhLXsJePOO6rTM="; buildInputs = [ makeWrapper libX11 libXinerama ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix index 513784b8b5..cb9f2fe85a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "wayfire"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz"; - sha256 = "0wc5szslgf8d4r4dlbfgc5v49j2ziaa8fycmknq4p0vl67mh7acq"; + url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz"; + sha256 = "19k9nk5whql03ik66i06r4xgxk5v7mpdphjpv13hdw8ba48w73hd"; }; nativeBuildInputs = [ meson ninja pkg-config wayland ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix index 7c4b546c68..d6ac6aeb84 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix @@ -1,16 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland, wrapGAppsHook +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook , gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell }: stdenv.mkDerivation rec { pname = "wcm"; - version = "0.6.0"; + version = "0.7.0"; - src = fetchFromGitHub { - owner = "WayfireWM"; - repo = "wcm"; - rev = "v${version}"; - sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg"; + src = fetchurl { + url = "https://github.com/WayfireWM/wcm/releases/download/v${version}/wcm-${version}.tar.xz"; + sha256 = "19za1fnlf5hz4n4mxxwqcr5yxp6mga9ah539ifnjnqrgvj19cjlj"; }; nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix index 00a4404c1d..b8e4c6aa77 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wf-config"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://github.com/WayfireWM/wf-config/releases/download/${version}/wf-config-${version}.tar.xz"; - sha256 = "1a5aqybhbp9dp4jygrm3gbkdap5qbd52y6ihfr4rm1cj37sckcn0"; + url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz"; + sha256 = "1bas5gsbnf8jxkkxd95992chz8yk5ckgg7r09gfnmm7xi8w0pyy7"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix index 6e5f189275..3948e9a32a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wf-shell"; - version = "0.6.1"; + version = "0.7.0"; # > Note to packagers: do not use the autogenerated "Source code" # > archives from GitHub, but the wf-shell-0.4.0.tar.xz file. src = fetchurl { url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"; - sha256 = "0jl8gj185k2ff754lcj5b5nldhkvrhmlaj8lsik4kx78vlb5m3ns"; + sha256 = "1isybm9lcpxwyf6zh2vzkwrcnw3q7qxm21535g4f08f0l68cd5bl"; }; nativeBuildInputs = [ meson ninja pkg-config wayland ]; diff --git a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix index 6824b8215e..2a13d107bd 100644 --- a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix @@ -121,7 +121,6 @@ rec { libusb1 udev dbus-glib - libav atk at-spi2-atk libudev0-shim diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index 48a3ebb32d..8fef2ca662 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -64,6 +64,7 @@ let else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" + else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; diff --git a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix index 103c55ee1f..3be72bd22c 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix @@ -126,7 +126,7 @@ in stdenv.mkDerivation (fBuildAttrs // { find $bazelOut/external -maxdepth 1 -type l | while read symlink; do name="$(basename "$symlink")" rm "$symlink" - test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" || exit 0 + test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" done # Patching symlinks to remove build directory reference diff --git a/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh index 0975c34788..fe1019aafc 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -(echo '#!/usr/bin/env sh'; \ +(echo "#!$SHELL"; \ echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh chmod +x ssh export CVS_RSH=$PWD/ssh diff --git a/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix index a1744b48de..b00983772e 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix @@ -45,18 +45,13 @@ '' else '' mv "$unpackDir" "$out" '') - + extraPostFetch - # Remove write permissions for files unpacked with write bits set - # Fixes https://github.com/NixOS/nixpkgs/issues/38649 - # - # However, we should (for the moment) retain write permission on the directory - # itself, to avoid tickling https://github.com/NixOS/nix/issues/4295 in - # single-user Nix installations. This is because in sandbox mode we'll try to - # move the path, and if we don't have write permissions on the directory, - # then we can't update the ".." entry. + '' - chmod -R a-w "$out" - chmod u+w "$out" + ${extraPostFetch} + '' + # Remove non-owner write permissions + # Fixes https://github.com/NixOS/nixpkgs/issues/38649 + + '' + chmod 755 "$out" ''; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { # Hackety-hack: we actually need unzip hooks, too diff --git a/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix b/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix index 2544d5c740..4c2d82ce63 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix @@ -2,7 +2,6 @@ # that contains a Debian-like (i.e. dpkg-based) OS. { name ? "debian-build" -, lib , diskImage , src, lib, stdenv, vmTools, checkinstall , fsTranslation ? false diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index f3bd8dab01..e9fad77e8c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 0d998a4863..cbdd309db5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -1,31 +1,51 @@ { stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal , ttfautohint-nox + # Custom font set options. + # See https://typeof.net/Iosevka/customizer + # Can be a raw TOML string, or a Nix attrset. -# Custom font set options. -# See https://github.com/be5invis/Iosevka#build-your-own-style -# Ex: -# privateBuildPlan = { -# family = "Iosevka Expanded"; -# -# design = [ -# "sans" -# "expanded" -# ]; -# }; + # Ex: + # privateBuildPlan = '' + # [buildPlans.iosevka-custom] + # family = "Iosevka Custom" + # spacing = "normal" + # serifs = "sans" + # + # [buildPlans.iosevka-custom.variants.design] + # capital-j = "serifless" + # + # [buildPlans.iosevka-custom.variants.italic] + # i = "tailed" + # ''; + + # Or: + # privateBuildPlan = { + # family = "Iosevka Custom"; + # spacing = "normal"; + # serifs = "sans"; + # + # variants = { + # design.capital-j = "serifless"; + # italic.i = "tailed"; + # }; + # } , privateBuildPlan ? null # Extra parameters. Can be used for ligature mapping. - # It must be a raw toml string. - # + # It must be a raw TOML string. + # Ex: - # [[iosevka.compLig]] - # unicode = 57808 # 0xe1d0 - # featureTag = 'XHS0' - # sequence = "+>" + # extraParameters = '' + # [[iosevka.compLig]] + # unicode = 57808 # 0xe1d0 + # featureTag = 'XHS0' + # sequence = "+>" + # ''; , extraParameters ? null # Custom font set name. Required if any custom settings above. , set ? null }: assert (privateBuildPlan != null) -> set != null; +assert (extraParameters != null) -> set != null; let # We don't know the attribute name for the Iosevka package as it @@ -54,15 +74,21 @@ stdenv.mkDerivation rec { ttfautohint-nox ]; - privateBuildPlanJSON = - builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }; + buildPlan = + if builtins.isAttrs privateBuildPlan + then builtins.toJSON { buildPlans.${pname} = privateBuildPlan; } + else privateBuildPlan; + inherit extraParameters; - passAsFile = [ "privateBuildPlanJSON" "extraParameters" ]; + passAsFile = [ "buildPlan" "extraParameters" ]; configurePhase = '' runHook preConfigure - ${lib.optionalString (privateBuildPlan != null) '' - remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml + ${lib.optionalString (builtins.isAttrs privateBuildPlan) '' + remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml + ''} + ${lib.optionalString (builtins.isString privateBuildPlan) '' + cp "$buildPlanPath" private-build-plans.toml ''} ${lib.optionalString (extraParameters != null) '' echo -e "\n" >> params/parameters.toml diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 6b6cd00f49..8ee3206d07 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0qkxqdx3vs53djiibc4ib3qj61fygxvxfcvs7yi08vdhd9qbxhjg"; - iosevka-aile = "053f6b1z0w1089y608k4wmspgljn9lyzyggq168k0110z9vlfjhf"; - iosevka-curly = "04kc7f6gqqxbdkdh1k4z4b28f8pj09npb87fx4zr41wkzkxmavcf"; - iosevka-curly-slab = "1pdm2g3a1nfc8w53r3sdifwypj3diil16jy6sgvgpmk7klf804vf"; - iosevka-etoile = "10vw53cd317qxhvws11zf98756vfn836assw3rbns6zpfrj7a2xg"; - iosevka-slab = "01ynv6b7fqdd98imfr14xcgrhp20yffa3n738iz5qnr75vqpnfdc"; - iosevka-sparkle = "1nw63dd1ccj8cp1x06alfxdvdlw9ibin41llmc0jla0nz7n8vsp3"; - iosevka-ss01 = "0g54rghx6z0a9azckvgh7njq12rsr1zzskgrm3f29rin8fdwvvd9"; - iosevka-ss02 = "0jhl75bwd76vp9hpvqgj7awpvibv4pk5vjab97n53b4bdxdxh1rf"; - iosevka-ss03 = "1ki5q7gafgm2iayjn82wrnwkfb3nbcr2xsrgs2vsw5lm9plawbmd"; - iosevka-ss04 = "03933skk5zqxrkj5m0j90cxrv4fmjfbp7ai5fywmhjzq92xbcr97"; - iosevka-ss05 = "014dglqr17adyj2229vvzhz61jpkgj33ngkav5sh2dj5wcx6b137"; - iosevka-ss06 = "07z87rm0rb9n6d7h0kmp51dnnglmr0wbwmplc5mlv036fcrdibaj"; - iosevka-ss07 = "1672n5ynd5fv8dwnwg8aa50ny74ad9gbx2xlk2ixih7ajv15p19d"; - iosevka-ss08 = "1jqdqg6dzrnq6y0g7ls2ya3dh0j00xj2k41aajvdqw342n08h27k"; - iosevka-ss09 = "1p1v0byb2nh11k362zxjrbvzbbryh2wk76dsd1zwyjrlgqq6qa81"; - iosevka-ss10 = "12c940w8vy1hjhi7cxgqsb23ip60xw1ydzhx5cv4ycxmi5745wqq"; - iosevka-ss11 = "0s6fvh5pw119w872w4rvamiwssryx4a98c7fhr737nzgiqy4iyz5"; - iosevka-ss12 = "14gjqmn807cv3dbvkm2i6dz6if46fbrkr8ls5shwalnl8qj3d06c"; - iosevka-ss13 = "1qd04cani9jzp1hjs8g6b42bmxvjyyxdha122816s0rg9i46mpcc"; - iosevka-ss14 = "0q109ahk7ww66brxgldgmr61m2qzpyhi1q21591wg1br5cn2d52w"; + iosevka = "1ic5w8w4v27vfq7pvx9wv2zdcsj16xi71ln2a3fb4kh93zj84kl8"; + iosevka-aile = "1qv2b4zcz172knvr39argqshjpin1lidlafilfcm569cp8rasrdd"; + iosevka-curly = "0x9pdgyiab8hibyf1yrwn6cr90aqy9ygyk1zz9nqzcndk5mk54p4"; + iosevka-curly-slab = "0mxnbf9dwq3iq5dc0cgrdqf2dlyymylv46psb83n5kra4rz1wxnb"; + iosevka-etoile = "1rz9dkpiwwfjnhiajfxg3rrnf4lyxnynx89qswg0b8wql4q6bz71"; + iosevka-slab = "17p0cf4k8k3kabqp0b1anqqj8phfw7nnxiiscnngbrxhdvhpp62n"; + iosevka-sparkle = "0ip46lcq7gcv77ar6vqz51lhf448fd0nviijfpqfg7gdywdzalm0"; + iosevka-ss01 = "1v1z2rx7r6nb45i3qcb9pvilm6yxxkl5ks7ldmm902cx67pkv7rj"; + iosevka-ss02 = "1pd4sbr1p1cf9917nnn22v1kah8jfgm9jpfvq1j51wyr8lnxqz2k"; + iosevka-ss03 = "0pdbvrzilrxxcaz9gnhnqxvk4ipfxcgys41sasl3znxzij1ary8s"; + iosevka-ss04 = "08xwdp5s3dp30qy81j3qwhhqk1bibcpnh2i00a3kyw3g6jsnsvmp"; + iosevka-ss05 = "1njf1ysd42k2rc2lvg5ilq6q2wvg8dlm04d7wygdamw0yx6sia83"; + iosevka-ss06 = "04g4m770i1b75gl1lanbs0ibmjj8vg5yfwyn6n0bidfn30z4n01l"; + iosevka-ss07 = "07f1n44f5bvifbns6572ys6zihac6yljv7frm58w7xgyl0a3prvg"; + iosevka-ss08 = "157cq5jfxvr0n7ksqln5mjmr800dbyfy8vwl0ngbf0aiq3mw2x8f"; + iosevka-ss09 = "0yib3mhb48g2vjiaviwgcl6lad4dbwwblnmv4zi880bdvz7jrwr9"; + iosevka-ss10 = "06s0s9x1fiqqmnkm42khasws40db7l68d2ycsm38mx6b62nlsbkr"; + iosevka-ss11 = "0yzy322zqas0id70i1p92x7fbim8gai0a61nf6bf33aq3qgsj2w8"; + iosevka-ss12 = "0lhmhwd4z44y4469av6na7k5w4ra47g98dxfi0mb42a4n4sq0k5j"; + iosevka-ss13 = "1cq91iqfgq4fsazi2pjh6l4n9mgci4aayqp7fiy8lydv7f1ym0z9"; + iosevka-ss14 = "0xid48yr2qfsh6kvlajlaqnb43ck351kg8r3bwpvzrdbvl809983"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix b/third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix index aa5ee0ff1c..c36292eb00 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub { owner = "tomokuni"; repo = "Myrica"; + # commit does not exist on any branch on the target repository rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/siji/default.nix b/third_party/nixpkgs/pkgs/data/fonts/siji/default.nix index ea2d2b687d..adc6a79f10 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/siji/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/siji/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: +{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }: stdenv.mkDerivation rec { name = "siji-${version}"; version = "2016-05-13"; - src = fetchzip { - url = "https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip"; + src = fetchFromGitHub { + owner = "stark"; + repo = "siji"; + rev = "3cbb7fe938c33aaadbb657803ea5946e5157d6e2"; sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix index 5e690e7fd6..a2fde6813b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,37 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "twemoji-color-font"; - version = "12.0.1"; - src = fetchFromGitHub { - owner = "eosrei"; - repo = "twemoji-color-font"; - rev = "v${version}"; - sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; + version = "13.0.1"; + + # We fetch the prebuilt font because building it takes 1.5 hours on hydra. + # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 + src = fetchurl { + url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"; + sha256 = "1mn2cb6a3v0q8i81s9a8bk49nbwxq91n6ki7827i7rhjkncb0mbn"; }; - patches = [ - # Fix build with Inkscape 1.0 - # https://github.com/eosrei/twemoji-color-font/pull/82 - (fetchpatch { - url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch"; - sha256 = "TV8I++BEnVUQg7FNbnrEQ/MLV9n3drmspqjmDZgTGFI="; - postFetch = '' - substituteInPlace $out \ - --replace "inkscape --without-gui" "inkscape --export-png" - ''; - }) - ]; - - nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; - # silence inkscape errors about non-writable home - preBuild = "export HOME=\"$NIX_BUILD_ROOT\""; - makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ]; - enableParallelBuilding = true; + dontBuild = true; installPhase = '' - install -Dm755 build/TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf - install -Dm644 linux/fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf + install -Dm755 TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf + install -Dm644 fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix b/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix index 7d13476d73..3a5fe54198 100644 --- a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-jade"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1bns1f3vv7d7ps08plnhl3432cy2l2mhv85h7n4fifjqqi8bll9x"; + sha256 = "0pwz3l5i93s84iwkn1jq8a150ma96788a0n41xq2cgy00j8h8xh0"; }; nativeBuildInputs = [ gtk3 ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Icon pack based upon Faenza and Mint-X"; homepage = "https://github.com/madmaxms/iconpack-jade"; - license = licenses.lgpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index ae3bf79d79..13b314e1ae 100644 --- a/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-obsidian"; - version = "4.14"; + version = "4.15"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1rhs8k88gh6673flr22cb3gbbw37wyzhd6jyysx6qgjjsnjvl2h8"; + sha256 = "1f32isq1xyn9b6p1nx5rssqgg9gw0jp9ld19860xk29fspmlfb8n"; }; nativeBuildInputs = [ gtk3 ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gnome icon pack based upon Faenza"; homepage = "https://github.com/madmaxms/iconpack-obsidian"; - license = licenses.lgpl3; + license = licenses.gpl3Only; # darwin cannot deal with file names differing only in case platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index 38f72b5a2e..2212b158c8 100644 --- a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,15 @@ , fetchFromGitHub }: -stdenv.mkDerivation { - name = "ddccontrol-db-20180908"; +stdenv.mkDerivation rec { + pname = "ddccontrol-db"; + version = "20201221"; + src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; - rev = "5f211be363f77dc43e39f911b30f4fb19a2d7a84"; - sha256 = "0vi3bzxpjdkn791vri68k7dah4v2liscniz7hxrarhl4fxlicc0w"; + rev = version; + sha256 = "1sryyjjad835mwc7a2avbij6myln8b824kjdr78gc9hh3p16929b"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix index 581d897702..d1d8b91bda 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f8773aba1736a7929a7262fdd6217be67f679c98.tar.gz"; - sha256 = "1flmp0r1isgp8mf85iwiwps6sa3wczb6k0zphprhnvbi2dzg9x87"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c0fe8e827d5ec71141700f5d5a90a6f6616ecbc5.tar.gz"; + sha256 = "16is1cipkfiabbh01i247vqfviwzjpfhgf6pkli61wwlhnk0q95s"; } diff --git a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index 70224aaa83..a75b2c1b65 100644 --- a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20201218"; + version = "20210202"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-APKuXWtnpF1r/q2MXddaDeBnBigx4hwMevPwx5uNq3k="; + sha256 = "sha256-C7Vq7d+Uos9IhTwOgsrK64c9mMGVkNgfvOrbBqORsRs="; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix b/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix index d4ffdca3ae..3f87473a4a 100644 --- a/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2020-11-16"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0qp65py1p93f5bxbf0jgc1d2lwrjhb7d0vzkivm73haji197l9p5"; + sha256 = "1pilq939bqzxysw4ixd279c49bp7l74bykpprrhgc5f2klpjg1zn"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/Qogir-theme"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix index b5475ae00f..0c2ff79ddb 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "0.5.10"; + version = "0.5.11"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kCO55UvQnRQhXLRqeJr6SN9FiTeKkh3P7QFkJe+GXjY="; + sha256 = "sha256-jCOYnG/+xz9qK6npOPT+tw1tp/K0QaFCmsBRO9J4bjE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix new file mode 100755 index 0000000000..f8a8803435 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitLab, gnome3, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-fuzzy-app-search"; + version = "4"; + + src = fetchFromGitLab { + owner = "Czarlie"; + repo = "gnome-fuzzy-app-search"; + rev = "da9c15d39958d9c3b38df3b616fd40b85aed24e5"; + sha256 = "1r3qha530s97x818znn1wi76f4x9bhlgi7jlxfwjnrwys62cv5fn"; + }; + + uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; + + nativeBuildInputs = [ glib ]; + + patches = [ ./fix-desktop-file-paths.patch ]; + + makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; + + meta = with lib; { + description = "Fuzzy application search results for Gnome Search"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search"; + broken = versionOlder gnome3.gnome-shell.version "3.18"; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch new file mode 100755 index 0000000000..1795f998c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch @@ -0,0 +1,50 @@ +diff --git a/applicationsUtils.js b/applicationsUtils.js +index 728223b..aa9f291 100644 +--- a/applicationsUtils.js ++++ b/applicationsUtils.js +@@ -44,27 +44,24 @@ var Search = new Lang.Class({ + * @return {Void} + */ + _init: function () { +- let dir = [ +- "/usr/share/applications", +- GLib.get_home_dir() + "/.local/share/applications", +- ]; +- +- // listen object - file/monitor list +- this._listen = dir.map((path) => { +- let file = Gio.File.new_for_path(path); +- let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); +- +- // refresh on each directory change +- monitor.connect( +- "changed", +- Lang.bind(this, this._handleMonitorChanged) +- ); +- +- return { +- file: file, +- monitor: monitor, +- }; +- }); ++ this._listen = [...new Set(GLib.get_system_data_dirs())] ++ .filter((path) => path.endsWith("/share")) ++ .map((path) => Gio.File.new_for_path(path + "/applications")) ++ .filter((file) => file.query_exists(null)) ++ .map((file) => { ++ let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); ++ ++ // refresh on each directory change ++ monitor.connect( ++ "changed", ++ Lang.bind(this, this._handleMonitorChanged) ++ ); ++ ++ return { ++ file: file, ++ monitor: monitor, ++ }; ++ }); + this._interval = null; + this._data = {}; + \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 89d01c166b..894197ae6d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.38.4"; + version = "3.38.5"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-CvrwVyx5QP9CeEraJsUInV2pG5puSJebpXQiLwnrFSs="; + sha256 = "sha256-hUqFijqUQ1W8OThpbioqcxkOgYvScKUBmXN84MbMPGE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix index 8ff71e0a54..21d8245533 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -9,10 +9,11 @@ }: stdenv.mkDerivation rec { - name = "lxappearance-0.6.3"; + pname = "lxappearance"; + version = "0.6.3"; src = fetchurl { - url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; + url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz"; sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj"; }; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight program for configuring the theme and fonts of gtk applications"; homepage = "https://lxde.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ hinton romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix index 8cb8d2f580..15a3d918b9 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,21 +1,54 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, m4, intltool, libxmlxx, keybinder -, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib -, menu-cache, lxmenu-data, wirelesstools, curl +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, m4 +, intltool +, libxmlxx +, keybinder +, gtk2 +, libX11 +, libfm +, libwnck +, libXmu +, libXpm +, cairo +, gdk-pixbuf +, gdk-pixbuf-xlib +, menu-cache +, lxmenu-data +, wirelesstools +, curl , supportAlsa ? false, alsaLib }: stdenv.mkDerivation rec { - name = "lxpanel-0.10.0"; + pname = "lxpanel"; + version = "0.10.1"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; + sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug="; }; nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ]; buildInputs = [ - keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev - menu-cache lxmenu-data m4 wirelesstools curl + keybinder + gtk2 + libX11 + libfm + libwnck + libXmu + libXpm + cairo + gdk-pixbuf + gdk-pixbuf-xlib.dev + menu-cache + lxmenu-data + m4 + wirelesstools + curl ] ++ lib.optional supportAlsa alsaLib; postPatch = '' @@ -25,11 +58,11 @@ stdenv.mkDerivation rec { --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" ''; - meta = { + meta = with lib; { description = "Lightweight X11 desktop panel for LXDE"; homepage = "https://lxde.org/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.ryneeverett ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.ryneeverett ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix index 7de2886eeb..b6358cadea 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,23 +1,37 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, gtk2 +, libX11 +, xrandr +, withGtk3 ? false, gtk3 +}: stdenv.mkDerivation rec { - name = "lxrandr-0.3.2"; + pname = "lxrandr"; + version = "0.3.2"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"; }; configureFlags = lib.optional withGtk3 "--enable-gtk3"; nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; + buildInputs = [ + libX11 + xrandr + (if withGtk3 then gtk3 else gtk2) + ]; meta = with lib; { description = "Standard screen manager of LXDE"; homepage = "https://lxde.org/"; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ rawkode ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxsession/default.nix b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxsession/default.nix index 16264522f2..b30c195f63 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxsession/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxsession/default.nix @@ -58,9 +58,9 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with lib; { + homepage = "https://wiki.lxde.org/en/LXSession"; description = "Classic LXDE session manager"; license = licenses.gpl2Plus; - homepage = "https://wiki.lxde.org/en/LXSession"; maintainers = [ maintainers.shamilton ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix index 27066ba995..d2a560afd0 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libintl }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, gtk3 +, libintl +}: stdenv.mkDerivation rec { pname = "lxtask"; @@ -15,7 +22,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gtk3" ]; - meta = { + meta = with lib; { + homepage = "https://wiki.lxde.org/en/LXTask"; description = "Lightweight and desktop independent task manager"; longDescription = '' LXTask is a lightweight task manager derived from xfce4 task manager @@ -24,9 +32,8 @@ stdenv.mkDerivation rec { Desktop Environment, it's totally desktop independent and only requires pure GTK. ''; - homepage = "https://wiki.lxde.org/en/LXTask"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix index 0ffdc5199a..111f7f175d 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "GUI configuration tool for compton X composite manager"; homepage = "https://github.com/lxqt/compton-conf"; - license = licenses.lgpl21; + description = "GUI configuration tool for compton X composite manager"; + license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix index 4bb3cd52d8..be1f8a80e7 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -46,9 +46,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Core library of PCManFM-Qt (Qt binding for libfm)"; homepage = "https://github.com/lxqt/libfm-qt"; - license = licenses.lgpl21; + description = "Core library of PCManFM-Qt (Qt binding for libfm)"; + license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix index f2d00a5869..adb8b8a116 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Qt implementation of freedesktop.org xdg specs"; homepage = "https://github.com/lxqt/libqtxdg"; - license = licenses.lgpl21; + description = "Qt implementation of freedesktop.org xdg specs"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix index 217a6fe792..b7e30096b7 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -45,9 +45,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The image viewer and screenshot tool for lxqt"; homepage = "https://github.com/lxqt/lximage-qt"; - license = licenses.gpl2; + description = "The image viewer and screenshot tool for lxqt"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix index 0070d31af9..523092d178 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = "https://github.com/lxqt/lxqt-about"; - license = licenses.lgpl21; + description = "Dialogue window providing information about LXQt and the system it's running on"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix index b3b74b92f6..8406b90949 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -47,9 +47,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "LXQt system administration tool"; homepage = "https://github.com/lxqt/lxqt-admin"; - license = licenses.lgpl21; + description = "LXQt system administration tool"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 3d2ce3c0f5..43896c2d6c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Archive tool for the LXQt desktop environment"; homepage = "https://github.com/lxqt/lxqt-archiver/"; - license = licenses.gpl2; + description = "Archive tool for the LXQt desktop environment"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ jchw ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 249d166488..f45f8c7295 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -44,9 +44,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Various packaging tools and scripts for LXQt applications"; homepage = "https://github.com/lxqt/lxqt-build-tools"; - license = licenses.lgpl21; + description = "Various packaging tools and scripts for LXQt applications"; + license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix index 407e45655a..c273a7bd85 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -58,9 +58,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Tools to configure LXQt and the underlying operating system"; homepage = "https://github.com/lxqt/lxqt-config"; - license = licenses.lgpl21; + description = "Tools to configure LXQt and the underlying operating system"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 62bb75e787..a54564e062 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "LXQt service for global keyboard shortcuts registration"; homepage = "https://github.com/lxqt/lxqt-globalkeys"; - license = licenses.lgpl21; + description = "LXQt service for global keyboard shortcuts registration"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 520c0322ea..c02b768d6b 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The LXQt notification daemon"; homepage = "https://github.com/lxqt/lxqt-notificationd"; - license = licenses.lgpl21; + description = "The LXQt notification daemon"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index cdfb51a472..3aac000fb6 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "GUI to query passwords on behalf of SSH agents"; homepage = "https://github.com/lxqt/lxqt-openssh-askpass"; - license = licenses.lgpl21; + description = "GUI to query passwords on behalf of SSH agents"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix index 5da0ab2499..bb6ed85489 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -73,9 +73,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The LXQt desktop panel"; homepage = "https://github.com/lxqt/lxqt-panel"; - license = licenses.lgpl21; + description = "The LXQt desktop panel"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 762e7ac046..fc4378d861 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -48,9 +48,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The LXQt PolicyKit agent"; homepage = "https://github.com/lxqt/lxqt-policykit"; - license = licenses.lgpl21; + description = "The LXQt PolicyKit agent"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 22eb060dfd..3c1350753c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -48,9 +48,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Power management module for LXQt"; homepage = "https://github.com/lxqt/lxqt-powermanagement"; - license = licenses.lgpl21; + description = "Power management module for LXQt"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 5fbf9f8f56..d19abcfe95 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -47,9 +47,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "LXQt Qt platform integration plugin"; homepage = "https://github.com/lxqt/lxqt-qtplugin"; - license = licenses.lgpl21; + description = "LXQt Qt platform integration plugin"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix index 41a673fc34..3f80800310 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -52,9 +52,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Tool used to launch programs quickly by typing their names"; homepage = "https://github.com/lxqt/lxqt-runner"; - license = licenses.lgpl21; + description = "Tool used to launch programs quickly by typing their names"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix index 4be5eab5d9..4c29a249dd 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -49,9 +49,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "An alternative session manager ported from the original razor-session"; homepage = "https://github.com/lxqt/lxqt-session"; - license = licenses.lgpl21; + description = "An alternative session manager ported from the original razor-session"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix index a6fef7479a..79168795c6 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -44,9 +44,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "GUI frontend for sudo/su"; homepage = "https://github.com/lxqt/lxqt-sudo"; - license = licenses.lgpl21; + description = "GUI frontend for sudo/su"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix index 5ab100bd10..08ba99c960 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -25,9 +25,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Themes, graphics and icons for LXQt"; homepage = "https://github.com/lxqt/lxqt-themes"; - license = licenses.lgpl21; + description = "Themes, graphics and icons for LXQt"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix index 5772dfcf9e..442c4c940b 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -44,9 +44,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The Qt port of obconf, the Openbox configuration tool"; homepage = "https://github.com/lxqt/obconf-qt"; - license = licenses.gpl2; + description = "The Qt port of obconf, the Openbox configuration tool"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index cd6d177b2e..e996eefc90 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -39,9 +39,9 @@ mkDerivation rec { passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = "https://github.com/lxqt/pavucontrol-qt"; - license = licenses.gpl2; + description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index a2378fafd5..2fa7879d58 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -47,9 +47,9 @@ mkDerivation rec { ''; meta = with lib; { - description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = "https://github.com/lxqt/pcmanfm-qt"; - license = licenses.gpl2; + description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix index fea3db315c..be28b589ca 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Qt based process manager"; homepage = "https://github.com/lxqt/qps"; - license = licenses.gpl2; + description = "Qt based process manager"; + license = licenses.gpl2Plus; platforms = with platforms; linux; # does not build on darwin maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix index 47a621d219..740cc09fca 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix @@ -36,9 +36,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "A lightweight Qt-based terminal emulator"; homepage = "https://github.com/lxqt/qterminal"; - license = licenses.gpl2; + description = "A lightweight Qt-based terminal emulator"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo globin ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix index 2517b7a444..5970827f45 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -32,9 +32,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "A terminal emulator widget for Qt 5"; homepage = "https://github.com/lxqt/qtermwidget"; - license = licenses.gpl2; + description = "A terminal emulator widget for Qt 5"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix index bc4f0f0de9..36174c870d 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix @@ -45,9 +45,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Crossplatform tool for fast making screenshots"; homepage = "https://github.com/lxqt/screengrab"; - license = licenses.gpl2; + description = "Crossplatform tool for fast making screenshots"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix index 570155e4d1..02877a9541 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix @@ -33,6 +33,7 @@ let buildRebar3 = callPackage ./build-rebar3.nix {}; buildHex = callPackage ./build-hex.nix {}; buildErlangMk = callPackage ./build-erlang-mk.nix {}; + fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-mix-deps.nix b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-mix-deps.nix new file mode 100644 index 0000000000..020a82ad70 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -0,0 +1,40 @@ +{ stdenvNoCC, lib, elixir, hex, rebar, rebar3, cacert, git }: + +{ name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: + +stdenvNoCC.mkDerivation ({ + name = "mix-deps-${name}-${version}"; + + nativeBuildInputs = [ elixir hex cacert git ]; + + inherit src; + + MIX_ENV = mixEnv; + MIX_DEBUG = if debug then 1 else 0; + DEBUG = if debug then 1 else 0; # for rebar3 + + configurePhase = '' + export HEX_HOME="$TEMPDIR/.hex"; + export MIX_HOME="$TEMPDIR/.mix"; + export MIX_DEPS_PATH="$out"; + + # Rebar + mix local.rebar rebar "${rebar}/bin/rebar" + mix local.rebar rebar3 "${rebar3}/bin/rebar3" + export REBAR_GLOBAL_CONFIG_DIR="$TMPDIR/rebar3" + export REBAR_CACHE_DIR="$TMPDIR/rebar3.cache" + ''; + + dontBuild = true; + + installPhase = '' + mix deps.get --only ${mixEnv} + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + inherit meta; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix index 0b4ea9b838..79a290a6c1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl +{lib, stdenv, fetchurl, fetchpatch , libtool, autoconf, automake , texinfo , gmp, mpfr, libffi, makeWrapper @@ -11,10 +11,10 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="20.4.24"; + version="21.2.1"; name="${baseName}-${version}"; url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz"; - sha256="01qgdmr54wkj854f69qdm9sybrvd6gd21dpx4askdaaqybnkh237"; + sha256="000906nnq25177bgsfndiw3iqqgrjc9spk10hzk653sbz3f7anmi"; }; buildInputs = [ libtool autoconf automake texinfo makeWrapper @@ -36,37 +36,10 @@ stdenv.mkDerivation { }; patches = [ - # https://trac.sagemath.org/ticket/22191#comment:237 - (fetchurl { - name = "ECL_WITH_LISP_FPE.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/ECL_WITH_LISP_FPE.patch?h=9.2"; - sha256 = "0b194613avcmzr1k9gq725z41wdkg5rsa0q21kdw050iqpprcj1c"; - }) - # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1 - (fetchurl { - name = "write_error.patch"; + (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2"; - sha256 = "1lvdvh77blnxp0zbd27dsbq1ljkb5qblabf1illszn4j7qgq88fh"; - }) - - # Three patches to fix ecl's unicode handling (https://trac.sagemath.org/ticket/30122) - (fetchurl { - name = "0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch?h=9.2"; - sha256 = "0z8pnhawivrrbg4vz144nr2sz64jxp7764hn6df13bgkz84iqbmk"; - }) - - (fetchurl { - name = "0002-cosmetic-fix-some-compiler-warnings.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0002-cosmetic-fix-some-compiler-warnings.patch?h=9.2"; - sha256 = "0msx3say9igwr9z5ywnr3gs6vsndnzlx47fmzwzh4l0m274cnia8"; - }) - - (fetchurl { - name = "0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch?h=9.2"; - sha256 = "0ln5dsx6p265fkph3bl5wblgfi3f7frb4jl6v473wz3ibvcx1x9a"; + sha256 = "0hfxacpgn4919hg0mn4wf4m8r7y592r4gw7aqfnva7sckxi6w089"; }) ]; @@ -96,6 +69,6 @@ stdenv.mkDerivation { homepage = "https://common-lisp.net/project/ecl/"; license = lib.licenses.mit ; maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix index 7ee9e6e5d6..333c8c2027 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; - hsPkgs = haskell.packages.ghc883.override { + hsPkgs = haskell.packages.ghc8103.override { overrides = self: super: with haskell.lib; with lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { @@ -41,7 +41,7 @@ let description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; homepage = "https://github.com/avh4/elm-format"; license = licenses.bsd3; - maintainers = with maintainers; [ turbomack ]; + maintainers = with maintainers; [ avh4 turbomack ]; })); elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: { @@ -79,6 +79,11 @@ let # Needed for elm-format indents = self.callPackage ./packages/indents.nix {}; + bimap = self.callPackage ./packages/bimap.nix {}; + avh4-lib = self.callPackage ./packages/avh4-lib.nix {}; + elm-format-lib = self.callPackage ./packages/elm-format-lib.nix {}; + elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; + elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; }; }; @@ -104,7 +109,6 @@ let homepage = "https://github.com/zwilias/elm-json"; license = licenses.mit; maintainers = [ maintainers.turbomack ]; - platforms = platforms.linux; }; }; }; @@ -117,7 +121,7 @@ let }; in with hsPkgs.elmPkgs; { - elm-test = patchBinwrap [elmi-to-json] + elm-test = nodePkgs.elm-test // { meta = with lib; { description = "Runs elm-test suites from Node.js"; @@ -162,8 +166,8 @@ let }; }); - create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json] - nodePkgs.create-elm-app) // { + create-elm-app = patchNpmElm + nodePkgs.create-elm-app // { meta = with lib; { description = "Create Elm apps with no build configuration"; homepage = "https://github.com/halfzebra/create-elm-app"; @@ -172,7 +176,7 @@ let }; }; - elm-review = patchBinwrap [elmRustPackages.elm-json] + elm-review = nodePkgs.elm-review // { meta = with lib; { description = "Analyzes Elm projects, to help find mistakes before your users find them"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/avh4-lib.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/avh4-lib.nix new file mode 100644 index 0000000000..cd3df7d67a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/avh4-lib.nix @@ -0,0 +1,29 @@ +{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base, bimap +, binary, bytestring, containers, directory, fetchgit, filepath +, lib, mtl, process, relude, tasty, tasty-discover, tasty-hspec +, tasty-hunit, text +}: +mkDerivation { + pname = "avh4-lib"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base bimap binary bytestring + containers directory filepath mtl process relude text + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base bimap binary bytestring + containers directory filepath mtl process relude tasty tasty-hspec + tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Common code for haskell projects"; + license = lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/bimap.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/bimap.nix new file mode 100644 index 0000000000..41412d1639 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/bimap.nix @@ -0,0 +1,15 @@ +{ mkDerivation, base, containers, exceptions, lib, QuickCheck +, template-haskell +}: +mkDerivation { + pname = "bimap"; + version = "0.3.3"; + sha256 = "73829355c7bcbd3eedba22a382a04a3ab641702b00828790ec082ec2db3a8ad1"; + libraryHaskellDepends = [ base containers exceptions ]; + testHaskellDepends = [ + base containers exceptions QuickCheck template-haskell + ]; + homepage = "https://github.com/joelwilliamson/bimap"; + description = "Bidirectional mapping between two key types"; + license = lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-lib.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-lib.nix new file mode 100644 index 0000000000..7beb52e800 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-lib.nix @@ -0,0 +1,33 @@ +{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, avh4-lib +, base, bimap, binary, bytestring, containers, directory +, elm-format-markdown, elm-format-test-lib, fetchgit, filepath +, indents, json, lib, mtl, optparse-applicative, parsec, process +, relude, split, tasty, tasty-discover, tasty-hspec, tasty-hunit +, text +}: +mkDerivation { + pname = "elm-format-lib"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary + bytestring containers directory elm-format-markdown filepath + indents json mtl optparse-applicative parsec process relude text + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary + bytestring containers directory elm-format-markdown + elm-format-test-lib filepath indents json mtl optparse-applicative + parsec process relude split tasty tasty-hspec tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Common code used by elm-format and elm-refactor"; + license = lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-markdown.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-markdown.nix new file mode 100644 index 0000000000..ae3b40347d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-markdown.nix @@ -0,0 +1,16 @@ +{ mkDerivation, base, containers, fetchgit, lib, mtl, text }: +mkDerivation { + pname = "elm-format-markdown"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ base containers mtl text ]; + doHaddock = false; + description = "Markdown parsing for Elm documentation comments"; + license = lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix new file mode 100644 index 0000000000..729c2d678f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix @@ -0,0 +1,27 @@ +{ mkDerivation, avh4-lib, base, containers, fetchgit, filepath +, hspec-core, hspec-golden, lib, mtl, split, tasty, tasty-discover +, tasty-hspec, tasty-hunit, text +}: +mkDerivation { + pname = "elm-format-test-lib"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + avh4-lib base containers filepath hspec-core hspec-golden mtl split + tasty tasty-hspec tasty-hunit text + ]; + testHaskellDepends = [ + avh4-lib base containers filepath hspec-core hspec-golden mtl split + tasty tasty-hspec tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Test helpers used by elm-format-tests and elm-refactor-tests"; + license = lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix index b2f655d4f1..6b583a6edd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,40 +1,40 @@ -{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary -, bytestring, cmark, containers, directory, filepath, free, HUnit -, indents, json, mtl, optparse-applicative, parsec, process -, QuickCheck, quickcheck-io, split, lib, tasty, tasty-golden -, tasty-hunit, tasty-quickcheck, text +{ mkDerivation, ansi-wl-pprint, avh4-lib, base, bimap, cmark +, containers, elm-format-lib, elm-format-test-lib, fetchgit, json +, lib, mtl, optparse-applicative, parsec, QuickCheck, quickcheck-io +, relude, tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, text }: -mkDerivation { +mkDerivation rec { pname = "elm-format"; - version = "0.8.4"; + version = "0.8.5"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0cxlhhdjx4h9g03z83pxv91qrysbi0ab92rl52jb0yvkaix989ai"; - rev = "5bd4fbe591fe8b456160c180cb875ef60bc57890"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint avh4-lib base containers elm-format-lib json + optparse-applicative relude text + ]; + testHaskellDepends = [ + ansi-wl-pprint avh4-lib base bimap cmark containers elm-format-lib + elm-format-test-lib json mtl optparse-applicative parsec QuickCheck + quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck + text + ]; + doHaddock = false; + homepage = "https://elm-lang.org"; + description = "A source code formatter for Elm"; + license = lib.licenses.bsd3; postPatch = '' mkdir -p ./generated cat < ./generated/Build_elm_format.hs module Build_elm_format where gitDescribe :: String - gitDescribe = "0.8.4" + gitDescribe = "${version}" EOHS ''; - isLibrary = false; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base binary bytestring - containers directory filepath free indents json mtl - optparse-applicative parsec process split text - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base cmark containers HUnit mtl parsec QuickCheck quickcheck-io - split tasty tasty-golden tasty-hunit tasty-quickcheck text - ]; - doHaddock = false; - homepage = "https://elm-lang.org"; - description = "A source code formatter for Elm"; - license = lib.licenses.bsd3; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh index d805fe3827..0ffa56eae9 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -10,6 +10,4 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ - # TODO: Switch to the commented out version once nodejs package set gets updated to new node2nix - -e node-env.nix - # --no-copy-node-env -e ../../../node-packages/node-env.nix + --no-copy-node-env -e ../../../node-packages/node-env.nix diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix index d196e8d0fb..85e765db3e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix @@ -1,4 +1,4 @@ -{ mkDerivation, base, concatenative, mtl, parsec, lib }: +{ mkDerivation, base, concatenative, lib, mtl, parsec }: mkDerivation { pname = "indents"; version = "0.3.3"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix index f6cfb2cd2e..4b662bd072 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix @@ -1,17 +1,17 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import { inherit system; }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let - nodeEnv = import ./node-env.nix { - inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; + nodeEnv = import ../../../node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix deleted file mode 100644 index 759fa71c5a..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix +++ /dev/null @@ -1,542 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: - -let - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi - - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) - cd $TMPDIR - - unpackFile ${src} - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" - - if [ -f "${src}" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash ${src})" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" - fi - - # Unset the stripped name to not confuse the next unpack step - unset strippedName - - # Include the dependencies of the package - cd "$DIR/${packageName}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node_${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell < gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + +in +stdenv.mkDerivation (rec { + version = "8.10.4"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ] ++ lib.optionals stdenv.isDarwin [ + # Make Block.h compile with c++ compilers. Remove with the next release + (fetchpatch { + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; + sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; + }) + ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix index 219ace5a91..8237f27241 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix @@ -110,6 +110,14 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + (fetchpatch { # https://phabricator.haskell.org/D5123 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/13ff0b7ced097286e0d7b054f050871effe07f86.diff"; name = "D5123.diff"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix index 94553e56a8..144e464597 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix @@ -111,6 +111,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix index ca4dc35ccd..9e99207d9a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix @@ -116,6 +116,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index ab5f2c12e2..9bef190ad1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -116,6 +116,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix index 39abe9c760..83f3534d3e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -96,12 +96,12 @@ let in stdenv.mkDerivation (rec { - version = "9.0.0.20201227"; + version = "9.0.1"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/9.0.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "1kg227fzg9qq2p7r8xqr99vvnx7ind4clxkydikyzf3vqvaacjfy"; + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "1y9mi9bq76z04hmggavrn8jwi1gx92bm3zhx6z69ypq6wha068x5"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/respect-ar-path.patch b/third_party/nixpkgs/pkgs/development/compilers/ghc/respect-ar-path.patch new file mode 100644 index 0000000000..a08a802c18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/respect-ar-path.patch @@ -0,0 +1,25 @@ +diff -urd a/aclocal.m4 b/aclocal.m4 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1199,7 +1199,8 @@ + # thinks that target == host so it never checks the unqualified + # tools for Windows. See #14274. + AC_DEFUN([FP_PROG_AR], +-[if test -z "$fp_prog_ar"; then ++[AC_SUBST(fp_prog_ar,$AR) ++if test -z "$fp_prog_ar"; then + if test "$HostOS" = "mingw32" + then + AC_PATH_PROG([fp_prog_ar], [ar]) +diff -urd a/configure b/configure +--- a/configure ++++ b/configure +@@ -10744,6 +10744,8 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + ++fp_prog_ar=$AR ++ + if test -z "$fp_prog_ar"; then + if test "$HostOS" = "mingw32" + then diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix index 6181486f50..e733243943 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix @@ -5,24 +5,22 @@ assert backend == "mcode" || backend == "llvm"; stdenv.mkDerivation rec { pname = "ghdl-${backend}"; - # NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable - # version of the yosys plugin - version = "unstable-2021.01.14"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ghdl"; repo = "ghdl"; - rev = "4868294436574660552ccef50a5b0849559393de"; - sha256 = "1wqjf0qc66dam1n2mskmlvj53bcsdwwk5rq9gimq6ah1vcwi222p"; + rev = "v${version}"; + sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly"; }; LIBRARY_PATH = "${stdenv.cc.libc}/lib"; - buildInputs = [ gnat zlib ]; + buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ]; preConfigure = '' # If llvm 7.0 works, 7.x releases should work too. - sed -i 's/check_version 7.0/check_version 7/g' configure + sed -i 's/check_version 7.0/check_version 7/g' configure ''; configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm") diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index b9c7e7e1e3..78a335f1b7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec { description = "A statically typed language for the Erlang VM"; homepage = "https://gleam.run/"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = teams.beam.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix index c9c5206f6d..eb3045d52a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, setJavaClassPath }: let common = javaVersion: diff --git a/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix b/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix index b65d640b47..59e853f4c7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "unstable-2020-10-04"; + version = "unstable-2020-12-25"; src = fetchFromGitHub { owner = "aardappel"; repo = pname; - rev = "4c5e78f021ce9d06592fb3a66388e5e31fac1adb"; - sha256 = "1wnbc8kr1dyfs53nlcxah22ghphmazzrlcj9z47cgkdsj1qfy84x"; + rev = "70e44d475995b03363dedf9c2bcb817b0db8fdcf"; + sha256 = "0azhminzrkbpvkapass1kccd6123bg7qmcbnzr5774n6bz5365g3"; }; nativeBuildInputs = [ cmake ]; @@ -48,7 +48,9 @@ stdenv.mkDerivation rec { passthru = { tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + url = "https://github.com/aardappel/lobster"; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix index 5fc134f5ab..1769b31b5a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.5.6"; + version = "4.5.7"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-aa6dRcGTXGakJsHCvHXRKs5BHtIZi6V2r8348epzpVc="; + sha256 = "sha256-Wq+Os7nzRA5Pxz6Ba7DudcDQs3KA0eYVLy1nO/A16EE="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix index 1d8ba03e72..d8d141a5e5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix @@ -1,22 +1,19 @@ -{ lib, stdenv, fetchFromGitLab, coreutils, which }: +{ lib, stdenv, fetchFromGitLab, which }: stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.1.23"; + version = "0.2"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "1indcbicqcdlk9sinkdyhk50fi1b4cb7yrr14vr874gjzmwr2l3i"; + sha256 = "sha256-G12yZxlq6Hss5j4Seq1hcPQWXMIeL2Z8VkBdmIGESX8="; }; nativeBuildInputs = [ which ]; - prePatch = '' - substituteInPlace Makefile \ - --replace /usr $out - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; # tests are run as part of the compilation process doCheck = false; @@ -26,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/owl-lisp/owl"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix b/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix index 9ebcb2242d..b4bc2a35a5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "unstable-2019-07-11"; + version = "unstable-2020-10-05"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "7bf08ff50729037c8820b26d085905175b5593c8"; - sha256 = "0w1yack5ky6x6lbw8vn6swsy8s90n6ny0jpkw0866ja677z7qz34"; + rev = "496c069405cd79aed968f59dd5a5f92d1f96809f"; + sha256 = "1vpszl77j9mnw8r0p9l23k8nxbnz31lgii7v3mai130nbpjsjsdf"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 7d2191f8f4..9ac7603ea2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -103,5 +103,12 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ shell thoughtpolice emily ]; + #In file included from kernel/driver.cc:20: + #./kernel/yosys.h:42:10: fatal error: 'map' file not found + ##include + + #https://github.com/YosysHQ/yosys/issues/681 + #https://github.com/YosysHQ/yosys/issues/2011 + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix index ccf8efc7c8..35f3ef2bcc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/ghdl.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "yosys-ghdl"; - version = "2021.01.01"; + version = "2021.01.25"; src = fetchFromGitHub { owner = "ghdl"; repo = "ghdl-yosys-plugin"; - rev = "8b3e740fef9a653a20a838f1ade475960e1d379b"; - sha256 = "13kpcp37r11xgqd8aksddi40a5vpzqi7p8qgyjbs99lyscyli75x"; + rev = "cba859cacf8c6631146dbdaa0f297c060b5a68cd"; + sha256 = "01d9wb7sqkmkf2y9bnn3pmhy08khzs5m1d06whxsiwgwnjzfk9mx"; }; buildInputs = [ yosys readline zlib ghdl ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix index e81cc41242..2bc90539be 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib +, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL + stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix index 63b95465c2..cbfa9997b8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib +, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL + stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 1144ee0f82..f03f4a6dcc 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1405,28 +1405,26 @@ self: super: { # quickcheck-instances is only used in the tests of binary-instances. binary-instances = dontCheck super.binary-instances; - # tons of overrides for bleeding edge versions for ghcide and hls - # overriding aeson on all of them to prevent double compilations - # this shouldn‘t break anything because nearly all their reverse deps are - # in this list or marked as broken anyways # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests: # https://github.com/haskell/haskell-language-server/issues/610 # https://github.com/haskell/haskell-language-server/issues/611 - haskell-language-server = dontCheck (super.haskell-language-server.override { - lsp-test = dontCheck self.lsp-test; - fourmolu = self.fourmolu_0_3_0_0; - }); - # 2021-01-20 - # apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0 - # https://github.com/haskell/haskell-language-server/issues/1240 - apply-refact = super.apply-refact_0_8_2_1; + haskell-language-server = dontCheck super.haskell-language-server; - fourmolu = dontCheck super.fourmolu; + # 2021-02-08: Jailbreaking because of + # https://github.com/haskell/haskell-language-server/issues/1329 + hls-tactics-plugin = doJailbreak super.hls-tactics-plugin; + # 2021-02-11: Jailbreaking because of syntax error on bound revision + hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin; + + # 2021-02-08: Overrides because nightly is to old for hls 0.9.0 + lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7); + haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0; + haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0; # 1. test requires internet # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute - ghcide = doDistribute (unmarkBroken (dontCheck (super.ghcide_0_7_0_0.override { lsp-test = dontCheck self.lsp-test; }))); - refinery = doDistribute super.refinery_0_3_0_0; + ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide)); + data-tree-print = doJailbreak super.data-tree-print; # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing @@ -1527,7 +1525,7 @@ self: super: { # 2020-12-05: http-client is fixed on too old version essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { - http-client = self.http-client_0_7_4; + http-client = self.http-client_0_7_5; }; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) @@ -1575,4 +1573,12 @@ self: super: { # Allow building with older versions of http-client. http-client-restricted = doJailbreak super.http-client-restricted; + # 2020-02-11: https://github.com/ekmett/lens/issues/969 + # A change in vector 0.2.12 broke the lens doctests. + # This is fixed on lens master. Remove this override on assert fail. + lens = assert super.lens.version == "4.19.2"; doJailbreak (dontCheck super.lens); + + # Test suite fails, upstream not reachable for simple fix (not responsive on github) + vivid-osc = dontCheck super.vivid-osc; + vivid-supercollider = dontCheck super.vivid-supercollider; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 27bf04b914..6831c7c327 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -88,5 +88,6 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 2a0a7810f7..b695c448be 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -94,4 +94,12 @@ self: super: { # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. exceptions = super.exceptions_0_10_4; + + # Older compilers need the latest ghc-lib to build this package. + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + + # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + vector = dontCheck super.vector; + + mmorph = super.mmorph_1_1_3; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index d1099c56b2..e6e0f690fe 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -123,4 +123,10 @@ self: super: { # ghc versions which don‘t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + + # Older compilers need the latest ghc-lib to build this package. + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + + # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + vector = dontCheck super.vector; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index d9efb1ab9c..e3f196440c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -84,7 +84,7 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch"; sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh"; }); - doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_17)) (pkgs.fetchpatch { + doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18)) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/doctest-0.17.patch"; sha256 = "16s2jcbk9hsww38i2wzxghbf0zpp5dc35hp6rd2n7d4z5xfavp62"; }); @@ -100,10 +100,6 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch"; sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d"; }); - syb = appendPatch (dontCheck super.syb) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/syb-0.7.1.patch"; - sha256 = "1407r8xv6bfnmpbw7glfh4smi76a2fc9pkq300c3d9f575708zqr"; - }); # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. unordered-containers = dontCheck super.unordered-containers; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fa18d7507d..e03c9425ed 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.10.3 +compiler: ghc-8.10.4 core-packages: - array-0.5.4.0 @@ -13,17 +13,17 @@ core-packages: - directory-1.3.6.0 - exceptions-0.10.4 - filepath-1.4.2.1 - - ghc-8.10.3 - - ghc-boot-8.10.3 - - ghc-boot-th-8.10.3 + - ghc-8.10.4 + - ghc-boot-8.10.4 + - ghc-boot-th-8.10.4 - ghc-compact-0.1.0.0 - - ghc-heap-8.10.3 + - ghc-heap-8.10.4 - ghc-prim-0.6.1 - - ghci-8.10.3 + - ghci-8.10.4 - haskeline-0.8.0.1 - hpc-0.6.1.0 - integer-gmp-1.0.3.0 - - libiserv-8.10.3 + - libiserv-8.10.4 - mtl-2.2.2 - parsec-3.1.14.0 - pretty-1.1.3.6 @@ -73,10 +73,10 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # haskell-language-server 0.5.0.0 doesn't accept newer versions - - fourmolu ==0.2.* - - refinery ==0.2.* - # Stackage Nightly 2021-01-29 + - ghcide < 0.7.4 # for hls 0.9.0 + - hls-explicit-imports-plugin < 0.1.0.1 # for hls 0.9.0 + + # Stackage Nightly 2021-02-10 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -105,6 +105,7 @@ default-package-overrides: - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 + - Agda ==2.6.1.3 - agda2lagda ==0.2020.11.1 - al ==0.1.4.2 - alarmclock ==0.7.0.5 @@ -215,33 +216,33 @@ default-package-overrides: - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - - ap-normalize ==0.1.0.0 - apecs ==0.9.2 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.5 - api-field-json-th ==0.1.0.2 - api-maker ==0.1.0.0 - - app-settings ==0.2.0.12 + - ap-normalize ==0.1.0.0 - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.9.0.0 - apportionment ==0.0.0.3 - approximate ==0.3.2 - approximate-equality ==1.1.0.2 + - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - arbor-postgres ==0.0.5 - arithmoi ==0.11.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - - ascii ==1.0.1.0 + - ascii ==1.0.1.2 - ascii-case ==1.0.0.2 - ascii-char ==1.0.0.6 + - asciidiagram ==1.3.3.3 - ascii-group ==1.0.0.2 - ascii-predicates ==1.0.0.2 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.0 + - ascii-superset ==1.0.1.2 - ascii-th ==1.0.0.2 - - asciidiagram ==1.3.3.3 - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -269,8 +270,8 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 + - autoexporter ==1.1.20 - auto-update ==0.1.6 - - autoexporter ==1.1.19 - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 @@ -278,11 +279,6 @@ default-package-overrides: - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 - - base-orphans ==0.8.4 - - base-prelude ==1.4 - - base-unicode-symbols ==0.2.4.2 - base16 ==0.3.0.1 - base16-bytestring ==0.1.1.7 - base16-lens ==0.1.3.0 @@ -296,7 +292,12 @@ default-package-overrides: - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 - base64-string ==0.2 + - base-compat ==0.11.2 + - base-compat-batteries ==0.11.2 - basement ==0.0.11 + - base-orphans ==0.8.4 + - base-prelude ==1.4 + - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 @@ -309,8 +310,8 @@ default-package-overrides: - bibtex ==0.1.0.6 - bifunctors ==5.5.10 - bimap ==0.4.0 - - bimap-server ==0.1.0.1 - bimaps ==0.1.0.2 + - bimap-server ==0.1.0.1 - bin ==0.1 - binary-conduit ==1.3.1 - binary-ext ==2.0.4 @@ -330,8 +331,8 @@ default-package-overrides: - bins ==0.1.2.0 - bitarray ==0.0.1.1 - bits ==0.5.2 - - bits-extra ==0.0.2.0 - bitset-word8 ==0.1.1.2 + - bits-extra ==0.0.2.0 - bitvec ==1.0.3.0 - bitwise-enum ==1.0.0.3 - blake2 ==0.3.0 @@ -356,13 +357,13 @@ default-package-overrides: - bordacount ==0.1.0.0 - boring ==0.1.3 - both ==0.1.1.1 - - bound ==2.0.2 - - bounded-queue ==1.0.0 + - bound ==2.0.3 - BoundedChan ==1.0.3.0 + - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.59 + - brick ==0.60.2 - broadcast-chan ==0.2.1.1 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 @@ -371,15 +372,15 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.1 - bugsnag-hs ==0.2.0.3 - - bugzilla-redhat ==0.3.0 - - burrito ==1.2.0.0 + - bugzilla-redhat ==0.3.1 + - burrito ==1.2.0.1 - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 - - byte-count-reader ==0.10.1.2 - - byte-order ==0.1.2.0 - byteable ==0.1.1 + - byte-count-reader ==0.10.1.2 - bytedump ==1.0 + - byte-order ==0.1.2.0 - byteorder ==1.0.4 - bytes ==0.17 - byteset ==0.1.1.0 @@ -395,7 +396,7 @@ default-package-overrides: - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - c2hs ==0.28.7 - - ca-province-codes ==1.0.0.0 + - cabal-appimage ==0.3.0.2 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 - cabal-file ==0.1.1 @@ -407,12 +408,13 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-stack ==0.2.0 - can-i-haz ==0.3.1.0 + - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - casa-types ==0.0.1 - - case-insensitive ==1.2.1.0 - cased ==0.1.0.0 + - case-insensitive ==1.2.1.0 - cases ==0.1.4 - casing ==0.1.4.1 - cassava ==0.5.2.0 @@ -473,12 +475,12 @@ default-package-overrides: - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 + - codec-beam ==0.2.0 + - codec-rpm ==0.2.2 + - code-page ==0.2.1 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - - code-page ==0.2 - - codec-beam ==0.2.0 - - codec-rpm ==0.2.2 - Color ==0.3.0 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 @@ -491,6 +493,7 @@ default-package-overrides: - comonad ==5.0.8 - comonad-extras ==4.0.1 - compactmap ==0.1.4.2.1 + - compdata ==0.12.1 - compensated ==0.8.1 - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 @@ -524,8 +527,8 @@ default-package-overrides: - conferer-aeson ==1.0.0.0 - conferer-hspec ==1.0.0.0 - conferer-warp ==1.0.0.0 - - config-ini ==0.2.4.0 - ConfigFile ==1.1.4 + - config-ini ==0.2.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - configurator-pg ==0.2.5 @@ -533,8 +536,8 @@ default-package-overrides: - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraint-tuples ==0.1.2 - constraints ==0.12 + - constraint-tuples ==0.1.2 - construct ==0.3 - contravariant ==1.5.3 - contravariant-extras ==0.3.5.2 @@ -562,13 +565,8 @@ default-package-overrides: - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 - - crypto-enigma ==0.1.1.6 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 - - crypto-pubkey-types ==0.4.3 - - crypto-random ==0.0.9 - - crypto-random-api ==0.2.0 - cryptocompare ==0.1.2 + - crypto-enigma ==0.1.1.6 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -577,6 +575,11 @@ default-package-overrides: - cryptonite ==0.27 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 @@ -601,7 +604,7 @@ default-package-overrides: - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.16 - data-accessor-transformers ==0.2.1.7 - - data-ascii ==1.0.0.2 + - data-ascii ==1.0.0.4 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 @@ -613,9 +616,10 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 + - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - - data-fix ==0.3.0 + - data-fix ==0.3.1 - data-forest ==0.1.0.8 - data-has ==0.4.0.0 - data-hash ==0.2.0.1 @@ -631,7 +635,6 @@ default-package-overrides: - data-reify ==0.6.3 - data-serializer ==0.3.4.1 - data-textual ==0.3.0.3 - - datadog ==0.2.5.0 - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 @@ -650,27 +653,27 @@ default-package-overrides: - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 - - derive-topdown ==0.0.2.2 - deriveJsonNoPrefix ==0.1.0.1 + - derive-topdown ==0.0.2.2 - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - - derulo ==1.0.9 + - derulo ==1.0.10 - dhall ==1.38.0 - dhall-bash ==1.0.36 - dhall-json ==1.7.5 - dhall-lsp-server ==1.0.13 - dhall-yaml ==1.2.5 - - di-core ==1.0.4 - - di-monad ==1.3.1 - diagrams-solve ==0.1.2 - dialogflow-fulfillment ==0.1.1.3 + - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.3 - - direct-sqlite ==2.3.26 + - di-monad ==1.3.1 - directory-tree ==0.12.1 + - direct-sqlite ==2.3.26 - dirichlet ==0.1.0.2 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -682,8 +685,6 @@ default-package-overrides: - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 - dockerfile ==0.2.0 - doclayout ==0.3 - doctemplates ==0.9 @@ -692,6 +693,8 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-lib ==0.1 - doldol ==0.4.1.2 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 - dot ==0.3 - dotenv ==0.8.0.7 - dotgen ==0.4.3 @@ -731,10 +734,10 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.7 + - elm2nix ==0.2.1 - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm2nix ==0.2.1 - elynx ==0.5.0.1 - elynx-markov ==0.5.0.1 - elynx-nexus ==0.5.0.1 @@ -746,9 +749,9 @@ default-package-overrides: - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 - - enum-subset-generate ==0.1.0.0 - enummapset ==0.6.0.3 - enumset ==0.0.5 + - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 - envparse ==0.4.1 - envy ==2.1.0.0 @@ -770,25 +773,25 @@ default-package-overrides: - essence-of-live-coding-quickcheck ==0.2.4 - etc ==0.4.1.0 - eve ==0.1.9.0 - - event-list ==0.1.2 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 + - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 + - exceptions ==0.10.4 - exception-transformers ==0.4.0.9 - exception-via ==0.1.0.0 - - exceptions ==0.10.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 - exomizer ==1.0.0 - - exp-pairs ==0.2.1.0 - experimenter ==0.1.0.4 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 + - exp-pairs ==0.2.1.0 - express ==0.1.3 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 @@ -815,10 +818,10 @@ default-package-overrides: - fgl ==5.7.0.3 - file-embed ==0.0.13.0 - file-embed-lzma ==0 - - file-modules ==0.1.2.4 - - file-path-th ==0.1.0.0 - filelock ==0.1.1.5 - filemanip ==0.3.6.3 + - file-modules ==0.1.2.4 + - file-path-th ==0.1.0.0 - filepattern ==0.1.2 - fileplow ==0.1.0.0 - filtrable ==0.1.4.0 @@ -841,16 +844,16 @@ default-package-overrides: - flexible-defaults ==0.0.3 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==1.0.21 + - flow ==1.0.22 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.1.2 - fn ==0.3.0.2 - focus ==1.0.2 - focuslist ==0.1.0.2 + - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.5 - - foldable1 ==0.1.0.0 - foldl ==1.4.10 - folds ==0.7.5 - follow-file ==0.0.3 @@ -864,10 +867,10 @@ default-package-overrides: - foundation ==0.0.25 - free ==5.1.5 - free-categories ==0.2.0.2 - - free-vl ==0.1.4 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - freetype2 ==0.2.0 + - free-vl ==0.1.4 - friendly-time ==0.4.1 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 @@ -883,8 +886,8 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - fuzzy-dates ==0.1.1.2 - - fuzzy-time ==0.1.0.0 - fuzzyset ==0.2.0 + - fuzzy-time ==0.1.0.0 - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 @@ -895,12 +898,13 @@ default-package-overrides: - generic-data ==0.9.2.0 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.13.1 + - generic-functor ==0.2.0.0 - generic-lens ==2.0.0.0 - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 - generic-optics ==2.0.0.0 - - generic-random ==1.3.0.1 - GenericPretty ==1.2.2 + - generic-random ==1.3.0.1 - generics-sop ==0.5.1.0 - generics-sop-lens ==0.2.0.1 - geniplate-mirror ==0.7.7 @@ -933,10 +937,13 @@ default-package-overrides: - ghc-check ==0.5.0.3 - ghc-core ==0.5.6 - ghc-events ==0.15.1 - - ghc-exactprint ==0.6.3.3 - - ghc-lib ==8.10.3.20201220 - - ghc-lib-parser ==8.10.3.20201220 - - ghc-lib-parser-ex ==8.10.0.17 + - ghc-exactprint ==0.6.3.4 + - ghcid ==0.8.7 + - ghci-hexcalc ==0.1.1.0 + - ghcjs-codemirror ==0.0.0.2 + - ghc-lib ==8.10.4.20210206 + - ghc-lib-parser ==8.10.4.20210206 + - ghc-lib-parser-ex ==8.10.0.19 - ghc-parser ==0.2.2.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.7 @@ -948,9 +955,6 @@ default-package-overrides: - ghc-typelits-knownnat ==0.7.4 - ghc-typelits-natnormalise ==0.7.3 - ghc-typelits-presburger ==0.5.2.0 - - ghci-hexcalc ==0.1.1.0 - - ghcid ==0.8.7 - - ghcjs-codemirror ==0.0.0.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 - gi-cairo ==1.0.24 @@ -968,18 +972,18 @@ default-package-overrides: - gi-gtk ==3.0.36 - gi-gtk-hs ==0.3.9 - gi-harfbuzz ==0.0.3 - - gi-pango ==1.0.23 - - gi-xlib ==2.0.9 - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 + - gi-pango ==1.0.23 - githash ==0.1.5.0 - github ==0.26 - - github-release ==1.3.5 + - github-release ==1.3.6 - github-rest ==1.0.3 - github-types ==0.2.1 - github-webhooks ==0.15.0 - gitlab-haskell ==0.2.5 - gitrev ==1.3.1 + - gi-xlib ==2.0.9 - gl ==0.9 - glabrous ==2.0.2 - GLFW-b ==3.3.0.0 @@ -994,11 +998,11 @@ default-package-overrides: - gothic ==0.1.5 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - - graph-wrapper ==0.2.6.0 - graphite ==0.10.0.1 - graphql-client ==1.1.0 - graphs ==0.7.1 - graphviz ==2999.20.1.0 + - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - greskell ==1.2.0.0 - greskell-core ==0.1.3.5 @@ -1013,7 +1017,7 @@ default-package-overrides: - hackage-db ==2.1.0 - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - - hadolint ==1.20.0 + - hadolint ==1.22.1 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.3 - half ==0.3.1 @@ -1065,10 +1069,10 @@ default-package-overrides: - hebrew-time ==0.1.2 - hedgehog ==1.0.4 - hedgehog-corpus ==0.2.0 - - hedgehog-fakedata ==0.0.1.3 + - hedgehog-fakedata ==0.0.1.4 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.14.1 + - hedis ==0.14.2 - hedn ==0.3.0.2 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1082,9 +1086,9 @@ default-package-overrides: - hgeometry ==0.11.0.0 - hgeometry-combinatorial ==0.11.0.0 - hgrev ==0.2.6 - - hi-file-parser ==0.1.0.0 - hidapi ==0.1.5 - hie-bios ==0.7.2 + - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 @@ -1117,22 +1121,21 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.9 - - hpack ==0.34.3 + - hpack ==0.34.4 - hpack-dhall ==0.5.2 - hpc-codecov ==0.2.0.1 - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8 - - hs-bibutils ==6.10.0.0 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - - hs-php-session ==0.0.9.3 - hsass ==0.8.0 + - hs-bibutils ==6.10.0.0 - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 - hsemail ==2.2.1 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.6 - HSlippyMap ==3.0.1 @@ -1166,6 +1169,7 @@ default-package-overrides: - hspec-tables ==0.0.1 - hspec-wai ==0.10.1 - hspec-wai-json ==0.10.1 + - hs-php-session ==0.0.9.3 - hsshellscript ==3.4.5 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1179,6 +1183,7 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 + - http2 ==2.0.5 - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 @@ -1190,14 +1195,13 @@ default-package-overrides: - http-date ==0.0.10 - http-directory ==0.1.8 - http-download ==0.2.0.0 + - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-query ==0.1.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.7.2 - http-types ==0.12.3 - - http2 ==2.0.5 - - httpd-shed ==0.4.1.1 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.1.0 - HUnit-approx ==1.1.1.1 @@ -1210,6 +1214,7 @@ default-package-overrides: - hw-conduit-merges ==0.2.1.0 - hw-diagnostics ==0.0.1.0 - hw-dsv ==0.4.1.0 + - hweblib ==0.6.3 - hw-eliasfano ==0.1.2.0 - hw-excess ==0.2.3.0 - hw-fingertree ==0.1.2.0 @@ -1222,7 +1227,7 @@ default-package-overrides: - hw-json-simd ==0.1.1.0 - hw-json-simple-cursor ==0.1.1.0 - hw-json-standard-cursor ==0.2.3.1 - - hw-kafka-client ==4.0.2 + - hw-kafka-client ==4.0.3 - hw-mquery ==0.2.1.0 - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 @@ -1234,14 +1239,13 @@ default-package-overrides: - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hw-xml ==0.5.1.0 - - hweblib ==0.6.3 - - hxt ==9.3.1.18 - - hxt-charproperties ==9.4.0.0 + - hxt ==9.3.1.21 + - hxt-charproperties ==9.5.0.0 - hxt-css ==0.1.0.3 - hxt-curl ==9.1.1.1 - hxt-expat ==9.1.1 - hxt-http ==9.1.5.2 - - hxt-regex-xmlschema ==9.2.0.3 + - hxt-regex-xmlschema ==9.2.0.7 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 @@ -1318,13 +1322,13 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - - it-has ==0.2.0.0 - iterable ==3.0 - - ix-shapable ==0.1.0 + - it-has ==0.2.0.0 - ixset-typed ==0.5 - ixset-typed-binary-instance ==0.1.0.2 - ixset-typed-conversions ==0.1.2.0 - ixset-typed-hashable-instance ==0.1.0.2 + - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 @@ -1334,10 +1338,10 @@ default-package-overrides: - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - - json-feed ==1.0.11 + - json-feed ==1.0.12 + - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 - - jsonpath ==0.2.0.0 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.4.1 @@ -1401,7 +1405,7 @@ default-package-overrides: - lens-family-core ==2.0.0 - lens-family-th ==0.5.1.0 - lens-misc ==0.0.2.0 - - lens-process ==0.3.0.2 + - lens-process ==0.4.0.0 - lens-properties ==4.11.1 - lens-regex ==0.1.1 - lens-regex-pcre ==1.1.0.0 @@ -1416,22 +1420,22 @@ default-package-overrides: - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 - - lift-generics ==0.2 - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 + - lift-generics ==0.2 - line ==4.0.1 - - linear ==1.21.3 + - linear ==1.21.4 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 - List ==0.6.2 - - list-predicate ==0.1.0.1 - - list-singleton ==1.0.0.4 - - list-t ==1.0.4 - ListLike ==4.7.4 + - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 + - list-singleton ==1.0.0.5 + - list-t ==1.0.4 - ListTree ==0.2.3 - little-logger ==0.3.1 - little-rio ==0.2.2 @@ -1464,8 +1468,8 @@ default-package-overrides: - machines ==0.7.1 - magic ==1.1 - magico ==0.0.2.1 - - main-tester ==0.2.0.1 - mainland-pretty ==0.7.0.1 + - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 @@ -1477,9 +1481,9 @@ default-package-overrides: - massiv-persist ==0.1.0.0 - massiv-serialise ==0.1.0.0 - massiv-test ==0.1.6.1 + - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 - - mathexpr ==0.3.0.0 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1491,9 +1495,9 @@ default-package-overrides: - mbox-utility ==0.0.3.1 - mcmc ==0.4.0.0 - mcmc-types ==1.0.3 - - med-module ==0.1.2.1 - medea ==1.2.0 - median-stream ==0.7.0.0 + - med-module ==0.1.2.1 - megaparsec ==9.0.1 - megaparsec-tests ==9.0.1 - membrain ==0.0.0.2 @@ -1522,12 +1526,12 @@ default-package-overrides: - mime-mail ==0.5.0 - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 - - min-max-pqueue ==0.1.0.2 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.0 - minio-hs ==1.5.3 - miniutter ==0.5.1.1 + - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 @@ -1537,20 +1541,22 @@ default-package-overrides: - mmark ==0.0.7.2 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.2 - - mmorph ==1.1.3 + - mmorph ==1.1.4 - mnist-idx ==0.1.2.8 - - mock-time ==0.1.0 - mockery ==0.3.5 + - mock-time ==0.1.0 - mod ==0.1.2.1 - model ==0.5 - - modern-uri ==0.3.3.0 + - modern-uri ==0.3.3.1 - modular ==0.1.0.8 - monad-chronicle ==1.0.0.1 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 + - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 + - monadlist ==0.0.2 - monad-logger ==0.3.36 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.1.0.0 @@ -1559,28 +1565,26 @@ default-package-overrides: - monad-memo ==0.5.3 - monad-metrics ==0.2.2.0 - monad-par ==0.3.5 - - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.3 + - monad-par-extras ==0.3.3 - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 + - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - monadic-arrays ==0.2.2 - - monadlist ==0.0.2 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.2 - - monads-tf ==0.1.0.3 - mongoDB ==2.7.0.0 + - monoid-subclasses ==1.0.1 + - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 - - monoid-subclasses ==1.0.1 - - monoid-transformer ==0.0.4 - more-containers ==0.2.2.0 - morpheus-graphql ==0.16.0 - morpheus-graphql-client ==0.16.0 @@ -1593,14 +1597,14 @@ default-package-overrides: - mpi-hs-cereal ==0.1.0.0 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - - multi-containers ==0.1.1 - multiarg ==0.30.0.10 + - multi-containers ==0.1.1 - multimap ==1.2.1 - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur-hash ==0.1.0.9 - murmur3 ==1.0.4 + - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 @@ -1608,7 +1612,7 @@ default-package-overrides: - mwc-random ==0.14.0.0 - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - - mysql ==0.1.7.2 + - mysql ==0.1.7.3 - mysql-simple ==0.4.5 - n2o ==0.11.1 - nagios-check ==0.3.2 @@ -1642,22 +1646,22 @@ default-package-overrides: - network-simple-tls ==0.4 - network-transport ==0.5.4 - network-transport-composed ==0.2.1 - - network-uri ==2.6.3.0 + - network-uri ==2.6.4.1 - newtype ==0.2.2.0 - - newtype-generics ==0.5.4 + - newtype-generics ==0.6 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 - - no-value ==1.0.0.0 - - non-empty ==0.3.2 - - non-empty-sequence ==0.2.0.4 - - non-negative ==0.1.2 - nonce ==1.0.7 - nondeterminism ==1.4 + - non-empty ==0.3.2 - nonempty-containers ==0.3.4.1 - - nonempty-vector ==0.2.1.0 - nonemptymap ==0.0.6.0 + - non-empty-sequence ==0.2.0.4 + - nonempty-vector ==0.2.1.0 + - non-negative ==0.1.2 - not-gloss ==0.7.7.0 + - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - nri-env-parser ==0.1.0.3 @@ -1673,9 +1677,9 @@ default-package-overrides: - nvim-hs ==2.1.0.4 - nvim-hs-contrib ==2.0.0.0 - nvim-hs-ghcid ==2.0.0.0 - - o-clock ==1.2.0.1 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 + - o-clock ==1.2.0.1 - odbc ==0.2.2 - oeis2 ==1.0.4 - ofx ==0.4.4.0 @@ -1688,9 +1692,9 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 - - open-browser ==0.2.1.0 - OpenAL ==1.7.0.5 - openapi3 ==3.0.1.0 + - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.4.0 @@ -1739,8 +1743,8 @@ default-package-overrides: - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-semigroup ==0.5.1.8 - - password ==2.1.0.0 - - password-instances ==2.0.0.1 + - password ==2.1.1.0 + - password-instances ==2.0.0.2 - path ==0.7.0 - path-binary-instance ==0.1.0.1 - path-extensions ==0.1.1.0 @@ -1754,14 +1758,15 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.0 - pcg-random ==0.1.3.7 + - pcre2 ==1.1.4 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 - - pcre2 ==1.1.4 - pdfinfo ==1.5.4 - peano ==0.1.0.1 - pem ==0.2.4 - percent-format ==0.0.1 + - peregrin ==0.3.1 - perfect-hash-generator ==0.2.0.6 - perfect-vector-shuffle ==0.1.1.1 - persist ==0.1.1.5 @@ -1774,13 +1779,13 @@ default-package-overrides: - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.11.0.1 - persistent-qq ==2.9.2.1 - - persistent-sqlite ==2.11.0.0 + - persistent-sqlite ==2.11.1.0 - persistent-template ==2.9.1.0 - persistent-test ==2.0.3.5 - persistent-typed-db ==0.1.0.2 - pg-harness-client ==0.6.0 - - pg-transact ==0.3.1.1 - pgp-wordlist ==0.1.0.3 + - pg-transact ==0.3.1.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 @@ -1819,7 +1824,6 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 - - post-mess-age ==0.2.1.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.12.3.3 - postgresql-libpq ==0.9.4.3 @@ -1828,27 +1832,28 @@ default-package-overrides: - postgresql-simple ==0.6.4 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 + - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.3 - prairie ==0.0.1.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 + - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-diff ==0.2.0.3 - pretty-hex ==1.1 - - pretty-relative-time ==0.2.0.0 - - pretty-show ==1.10 - - pretty-simple ==4.0.0.0 - - pretty-sop ==0.2.0.3 - - pretty-terminal ==0.1.0.0 - - prettyclass ==1.0.0.0 - prettyprinter ==1.7.0 - prettyprinter-ansi-terminal ==1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1.1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1.1 + - pretty-relative-time ==0.2.0.0 + - pretty-show ==1.10 + - pretty-simple ==4.0.0.0 + - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 - primes ==0.2.1.0 - primitive ==0.7.1.0 - primitive-addr ==0.1.0.2 @@ -1859,23 +1864,17 @@ default-package-overrides: - probability ==0.2.7 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - - product-profunctors ==0.11.0.1 + - product-profunctors ==0.11.0.2 - profiterole ==0.1 - profunctors ==5.5.2 - - project-template ==0.2.1.0 - projectroot ==0.2.0.1 + - project-template ==0.2.1.0 - prometheus ==2.2.2 - prometheus-client ==1.0.1 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 - - proto-lens ==0.7.0.0 - - proto-lens-optparse ==0.1.1.7 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - proto3-wire ==1.1.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 @@ -1883,6 +1882,12 @@ default-package-overrides: - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 + - proto-lens ==0.7.0.0 + - proto-lens-optparse ==0.1.1.7 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 - protolude ==0.3.0 - proxied ==0.3.1 - psqueues ==0.2.7.2 @@ -1893,7 +1898,7 @@ default-package-overrides: - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==2.0.0.3 - pvar ==1.0.0.0 - - PyF ==0.9.0.2 + - PyF ==0.9.0.3 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.4 @@ -1914,12 +1919,12 @@ default-package-overrides: - quickcheck-transformer ==0.3.1.1 - quickcheck-unicode ==1.0.1.0 - quiet ==0.2 - - quote-quot ==0.1.0.0 + - quote-quot ==0.2.0.0 - radius ==0.7.1.0 - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.1 - - rampart ==1.1.0.1 + - rampart ==1.1.0.2 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.1 @@ -1929,45 +1934,45 @@ default-package-overrides: - random-source ==0.3.0.8 - random-tree ==0.6.0.5 - range ==0.3.0.2 - - range-set-list ==0.1.3.1 - Ranged-sets ==0.4.0 + - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 + - ratel ==1.0.13 - rate-limit ==1.4.2 - - ratel ==1.0.12 - - ratel-wai ==1.1.3 + - ratel-wai ==1.1.4 - rattle ==0.2 - - raw-strings-qq ==1.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 + - raw-strings-qq ==1.1 - rcu ==0.2.4 - rdf ==0.1.0.4 - rdtsc ==1.3.0.1 - re2 ==0.3 + - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - readable ==0.3.1 - reanimate ==1.1.3.2 - reanimate-svg ==0.13.0.0 - rebase ==1.6.1 - record-dot-preprocessor ==0.2.7 - record-hasfield ==1.0 - - record-wrangler ==0.1.1.0 - records-sop ==0.1.0.3 + - record-wrangler ==0.1.1.0 - recursion-schemes ==5.2.1 - reducers ==3.12.3 - - ref-fd ==0.4.0.2 - - ref-tf ==0.4.0.2 - refact ==0.3.0.2 - - refined ==0.6.1 + - ref-fd ==0.4.0.2 + - refined ==0.6.2 - reflection ==2.1.6 - reform ==0.2.7.4 - reform-blaze ==0.2.4.3 - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.4 - RefSerialize ==0.4.0 + - ref-tf ==0.4.0.2 - regex ==1.1.0.0 - regex-applicative ==0.3.4 - regex-applicative-text ==0.1.0.1 @@ -2017,27 +2022,27 @@ default-package-overrides: - rocksdb-haskell-jprupp ==2.1.3 - rocksdb-query ==0.4.2 - roles ==0.2.0.0 - - rope-utf16-splay ==0.3.1.0 + - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.3.1 + - rpmbuild-order ==0.4.3.2 - RSA ==2.4.1 - runmemo ==1.0.0.1 - rvar ==0.2.0.6 - safe ==0.3.19 + - safecopy ==0.10.3.1 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 - safe-foldable ==0.1.0.0 + - safeio ==0.0.5.0 - safe-json ==1.1.1.1 - safe-money ==0.9 - - safe-tensor ==0.2.1.0 - - safecopy ==0.10.3.1 - - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 + - safe-tensor ==0.2.1.0 - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.1 - - salve ==1.0.10 + - salve ==1.0.11 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 @@ -2071,8 +2076,8 @@ default-package-overrides: - semigroupoid-extras ==5 - semigroupoids ==5.3.5 - semigroups ==0.19.1 - - semiring-simple ==1.0.0.1 - semirings ==0.6 + - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 @@ -2118,9 +2123,9 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shell-utility ==0.1 - shellmet ==0.0.3.1 - shelltestrunner ==1.9 + - shell-utility ==0.1 - shelly ==1.9.0 - shikensu ==0.3.11 - shortcut-links ==0.5.1.1 @@ -2186,21 +2191,21 @@ default-package-overrides: - speedy-slice ==0.3.1 - Spintax ==0.3.5 - splice ==0.6.1.1 - - splint ==1.0.1.2 + - splint ==1.0.1.3 - split ==0.2.3.4 - splitmix ==0.1.0.3 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - - sql-words ==0.1.6.4 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.0 + - sql-words ==0.1.6.4 - squeal-postgresql ==0.7.0.1 - squeather ==0.6.0.0 - srcloc ==0.5.1.2 - stache ==2.2.0 - - stack-templatizer ==0.1.0.2 - stackcollapse-ghc ==0.0.1.3 + - stack-templatizer ==0.1.0.2 - stateref ==0.3 - StateVar ==1.2.1 - static-text ==0.2.0.6 @@ -2215,8 +2220,8 @@ default-package-overrides: - stm-extras ==0.1.0.3 - stm-hamt ==1.2.0.4 - stm-lifted ==2.5.0.0 - - stm-split ==0.0.2.1 - STMonadTrans ==0.4.5 + - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6 @@ -2237,6 +2242,7 @@ default-package-overrides: - strict-list ==0.1.5 - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 + - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 @@ -2244,15 +2250,14 @@ default-package-overrides: - string-interpolate ==0.3.0.2 - string-qq ==0.0.4 - string-random ==0.1.4.0 - - string-transform ==1.1.1 - - stringbuilder ==0.5.1 - stringsearch ==0.3.6.6 + - string-transform ==1.1.1 - stripe-concepts ==1.0.2.4 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 - stripe-http-client ==2.6.2 - stripe-tests ==2.6.2 - - strive ==5.0.12 + - strive ==5.0.13 - structs ==0.1.4 - structured ==0.1 - structured-cli ==2.6.0.0 @@ -2271,10 +2276,10 @@ default-package-overrides: - symmetry-operations-symbols ==0.0.2.1 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 + - systemd ==2.3.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 - - systemd ==2.3.0 - tabular ==0.2.2.8 - taffybar ==3.2.3 - tagchup ==0.4.1.1 @@ -2291,6 +2296,7 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.7 + - tasty-bench ==0.2.1 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.2 @@ -2331,7 +2337,7 @@ default-package-overrides: - test-framework-smallcheck ==0.2 - test-fun ==0.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.1 + - texmath ==0.12.1.1 - text-ansi ==0.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 @@ -2340,6 +2346,7 @@ default-package-overrides: - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 + - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 @@ -2350,16 +2357,19 @@ default-package-overrides: - text-show ==3.9 - text-show-instances ==3.8.4 - text-zipper ==0.11 - - textlocal ==0.1.0.5 - - tf-random ==0.5 - tfp ==1.0.1.1 + - tf-random ==0.5 - th-abstraction ==0.4.2.0 - th-bang-compat ==0.0.1.0 - - th-compat ==0.1 + - th-compat ==0.1.1 - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.11 - th-env ==0.1.0.2 + - these ==1.1.1.1 + - these-lens ==1.0.1.1 + - these-optics ==1.0.1.1 + - these-skinny ==0.7.4 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 @@ -2367,43 +2377,39 @@ default-package-overrides: - th-nowq ==0.1.0.5 - th-orphans ==0.13.11 - th-printf ==0.7 - - th-reify-compat ==0.0.1.5 - - th-reify-many ==0.1.9 - - th-strict-compat ==0.1.0.1 - - th-test-utils ==1.1.0 - - th-utilities ==0.2.4.1 - - these ==1.1.1.1 - - these-lens ==1.0.1.1 - - these-optics ==1.0.1.1 - - these-skinny ==0.7.4 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 - - thread-supervisor ==0.2.0.0 - threads ==0.5.1.6 + - thread-supervisor ==0.2.0.0 - threepenny-gui ==0.9.0.0 + - th-reify-compat ==0.0.1.5 + - th-reify-many ==0.1.9 - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 + - th-strict-compat ==0.1.0.1 + - th-test-utils ==1.1.0 + - th-utilities ==0.2.4.1 - thyme ==0.3.5.5 - tidal ==1.6.1 - tile ==0.3.0.0 - time-compat ==1.9.5 + - timeit ==2.0 + - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - - time-units ==1.0.0 - - timeit ==2.0 - - timelens ==0.2.0.2 - - timer-wheel ==0.3.0 - timerep ==2.0.1.0 + - timer-wheel ==0.3.0 + - time-units ==1.0.0 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.9.0 - - tls ==1.5.4 + - tls ==1.5.5 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - tlynx ==0.5.0.1 @@ -2425,6 +2431,7 @@ default-package-overrides: - traverse-with-class ==1.0.1.0 - tree-diff ==0.1 - tree-fun ==0.8.1.0 + - tree-view ==0.5 - trifecta ==2.1 - triplesec ==0.2.2.1 - tsv2csv ==0.1.0.2 @@ -2432,10 +2439,14 @@ default-package-overrides: - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 + - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - tuples-homogenous-h98 ==0.1.1.0 - turtle ==1.5.20 + - typecheck-plugin-nat-simple ==0.1.0.2 + - TypeCompose ==0.9.14 + - typed-process ==0.2.6.0 + - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 @@ -2446,15 +2457,11 @@ default-package-overrides: - type-level-numbers ==0.1.1.1 - type-map ==0.1.6.0 - type-natural ==1.0.0.0 - - type-of-html ==1.6.1.2 + - type-of-html ==1.6.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - type-spec ==0.4.0.0 - - typecheck-plugin-nat-simple ==0.1.0.2 - - TypeCompose ==0.9.14 - - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 - typerep-map ==0.3.3.0 + - type-spec ==0.4.0.0 - tzdata ==0.2.20201021.0 - ua-parser ==0.7.5.1 - uglymemo ==0.1.0.1 @@ -2494,6 +2501,7 @@ default-package-overrides: - unliftio ==0.2.14 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 + - unliftio-streams ==0.1.1.1 - unlit ==0.4.0.0 - unordered-containers ==0.2.13.0 - unsafe ==0.0 @@ -2527,12 +2535,13 @@ default-package-overrides: - valor ==0.1.0.0 - vault ==0.3.1.4 - vec ==0.3 - - vector ==0.12.1.2 + - vector ==0.12.2.0 - vector-algorithms ==0.8.0.4 - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - vector-builder ==0.3.8 - vector-bytes-instances ==0.1.1 + - vector-circular ==0.1.3 - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 @@ -2570,7 +2579,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.13 + - warp ==3.3.14 - warp-tls ==3.3.0 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2592,27 +2601,27 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.0.0.4 - - with-location ==0.1.0 - - with-utf8 ==1.0.2.1 + - witch ==0.0.0.5 - witherable-class ==0 - within ==0.2.0.1 + - with-location ==0.1.0 + - with-utf8 ==1.0.2.1 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 - wl-pprint-text ==1.2.0.1 - - word-trie ==0.3.0 - - word-wrap ==0.4.1 - word24 ==2.0.1 - word8 ==0.1.3 + - word-trie ==0.3.0 + - word-wrap ==0.4.1 - world-peace ==1.0.2.0 - wrap ==0.0.0 - - wreq ==0.5.3.2 + - wreq ==0.5.3.3 - writer-cps-exceptions ==0.1.0.1 - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - - wuss ==1.1.17 + - wuss ==1.1.18 - X11 ==1.9.2 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2631,6 +2640,7 @@ default-package-overrides: - xml-basic ==0.1.3.1 - xml-conduit ==1.9.0.0 - xml-conduit-writer ==0.1.1.2 + - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 - xml-helpers ==1.0.0 - xml-html-qq ==0.1.0.1 @@ -2640,7 +2650,6 @@ default-package-overrides: - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 - - xmlgen ==0.6.2.2 - xmonad ==0.15 - xmonad-contrib ==0.16 - xmonad-extras ==0.15.3 @@ -2648,7 +2657,6 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.2 - - yes-precure5-command ==5.5.3 - yesod ==1.6.1.0 - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 @@ -2659,13 +2667,14 @@ default-package-overrides: - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.2 + - yesod-page-cursor ==2.0.0.3 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.5 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 - yesod-websockets ==0.3.0.2 + - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 @@ -2680,9 +2689,9 @@ default-package-overrides: - zio ==0.1.0.2 - zip ==1.7.0 - zip-archive ==0.4.1 - - zip-stream ==0.2.0.1 - zipper-extra ==0.1.3.2 - zippers ==0.3 + - zip-stream ==0.2.0.1 - zlib ==0.6.2.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 @@ -2694,7 +2703,9 @@ default-package-overrides: extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - - dhall == 1.29.0 # required for spago 0.14.0. + - Cabal == 3.2.* # required for cabal-install etc. + - dhall == 1.29.0 # required for ats-pkg + - dhall == 1.37.1 # required for spago 0.19.0. - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - haddock == 2.23.* # required on GHC < 8.10.x @@ -2707,8 +2718,10 @@ extra-packages: - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - - ghcide == 0.7.0.0 # Needed for hls 0.8.0 - - apply-refact == 0.8.2.1 # Needed for hls 0.8.0 + - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls + - haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08 package-maintainers: peti: @@ -5123,6 +5136,7 @@ broken-packages: - fay-websockets - fb-persistent - fbmessenger-api + - fbrnch - fca - fcache - fcd @@ -6036,7 +6050,6 @@ broken-packages: - haskell-igraph - haskell-in-space - haskell-kubernetes - - haskell-language-server - haskell-lsp-client - haskell-ml - haskell-mpfr @@ -6466,9 +6479,6 @@ broken-packages: - hlrdb - hlrdb-core - hls - - hls-explicit-imports-plugin - - hls-hlint-plugin - - hls-retrie-plugin - hlwm - hly - hmark @@ -6854,7 +6864,6 @@ broken-packages: - hugs2yc - hulk - HulkImport - - hum - human-parse - human-text - humble-prelude @@ -7563,6 +7572,7 @@ broken-packages: - libxml-enumerator - libxslt - lie + - lifetimes - lifted-base-tf - lifted-protolude - lifter @@ -8286,9 +8296,6 @@ broken-packages: - nested-sequence - NestedFunctor - nestedmap - - net-mqtt - - net-mqtt-lens - - net-mqtt-rpc - net-spider - net-spider-cli - net-spider-pangraph @@ -8963,7 +8970,6 @@ broken-packages: - postgresql-tx-squeal - postgresql-tx-squeal-compat-simple - postgresql-typed-lifted - - postgrest - postgrest-ws - postie - postmark @@ -11032,6 +11038,7 @@ broken-packages: - unix-fcntl - unix-handle - unix-process-conduit + - unix-simple - unlifted-list - unliftio-streams - unm-hip @@ -11202,9 +11209,6 @@ broken-packages: - visual-prof - visualize-cbn - vitrea - - vivid - - vivid-osc - - vivid-supercollider - vk-aws-route53 - VKHS - voicebase diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 06578f5653..4e23ab80c1 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -659,7 +659,9 @@ self: super: builtins.intersectAttrs super { let # spago requires an older version of megaparsec, but it appears to work # fine with newer versions. - spagoWithOverrides = doJailbreak super.spago; + spagoWithOverrides = doJailbreak (super.spago.override { + dhall = self.dhall_1_37_1; + }); # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. @@ -785,7 +787,7 @@ self: super: builtins.intersectAttrs super { testTarget = "unit-tests"; }; - haskell-language-server = overrideCabal super.haskell-language-server (drv: { + haskell-language-server = enableCabalFlag (enableCabalFlag (overrideCabal super.haskell-language-server (drv: { postInstall = let inherit (pkgs.lib) concatStringsSep take splitString; ghc_version = self.ghc.version; @@ -800,7 +802,7 @@ self: super: builtins.intersectAttrs super { export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper export HOME=$TMPDIR ''; - }); + })) "all-plugins") "all-formatters"; # tests depend on a specific version of solc hevm = dontCheck (doJailbreak super.hevm); diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index cfd4a5eac6..6928bba47f 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -800,12 +800,12 @@ self: { , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process , regex-tdfa, split, stm, strict, template-haskell, text, time - , unordered-containers, uri-encode, zlib + , transformers, unordered-containers, uri-encode, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.1.2"; - sha256 = "0b872fi12j316zcbwnablkg45p252a4sqca9lsgfig55qirk0w08"; + version = "2.6.1.3"; + sha256 = "1rx1r21kpgz27g2qn6fqgdpkl5b07c2fl86j3clylpp9rr0ch6xv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -815,7 +815,7 @@ self: { containers data-hash deepseq directory edit-distance equivalence exceptions filepath geniplate-mirror ghc-compact gitrev hashable hashtables haskeline ieee754 mtl murmur-hash pretty process - regex-tdfa split stm strict template-haskell text time + regex-tdfa split stm strict template-haskell text time transformers unordered-containers uri-encode zlib ]; libraryToolDepends = [ alex happy ]; @@ -2777,6 +2777,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal_3_4_0_0" = callPackage + ({ mkDerivation, array, async, base, base-compat, base-orphans + , binary, bytestring, clock, containers, deepseq, Diff, directory + , filepath, integer-logarithms, mtl, optparse-applicative, parsec + , pretty, process, QuickCheck, rere, stm, tagged, tar, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, text + , time, transformers, tree-diff, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.4.0.0"; + sha256 = "1za1cl14fkw8y89hhw6sqirzmkixjaa4wpqsibyk0fvnjs59jydq"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty process text time transformers unix + ]; + testHaskellDepends = [ + array async base base-compat base-orphans binary bytestring clock + containers deepseq Diff directory filepath integer-logarithms + optparse-applicative pretty process QuickCheck rere stm tagged tar + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text + transformers tree-diff + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -8012,8 +8042,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.4.0.0"; - sha256 = "1zmilqvlp170nb7zakbhdpihykkq95s7nb7la2sdas1fv69mhnx3"; + version = "2.5.0.0"; + sha256 = "1awwrq7hivk1hp709iz624hm2wjbk18hspld91pixv5x34fcn7s9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -16316,8 +16346,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.9.0.2"; - sha256 = "186kxid40nsxhc4yas6a1jk6ndsycsfrc5k9pfvyhgw720rx2p2c"; + version = "0.9.0.3"; + sha256 = "1x1zryq3di5z3mc1wind6ma1b7cpsvf90y7k5dyvwkn1kisz3jf8"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec mtl template-haskell text @@ -21931,8 +21961,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.5.0.0"; - sha256 = "07yx0mh1h0p5qsw0sn20mcz542h5dh3p6l3nbzqrjvdpp22s27h0"; + version = "0.6.0.0"; + sha256 = "16wb7hrk6rlxl0sks5nkhl60wxwlxdyjwj9j72g40l5x6qnlvk7d"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -21959,8 +21989,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.4.0.0"; - sha256 = "0jyx2mghm40llcvilg6m9120wfngvpmsggy7xy6zdf29lz3v9bd5"; + version = "0.6.1.0"; + sha256 = "0m0qvamvixxm9yd45393j44mnnlnw2672gcdv7kaqw4hjczlddmq"; libraryHaskellDepends = [ base containers exceptions primitive stm time unix-time unordered-containers Z-Data @@ -22006,17 +22036,18 @@ self: { }) {}; "Z-YAML" = callPackage - ({ mkDerivation, base, primitive, scientific, transformers + ({ mkDerivation, base, hspec, primitive, scientific, transformers , unordered-containers, Z-Data, Z-IO }: mkDerivation { pname = "Z-YAML"; - version = "0.3.0.0"; - sha256 = "1z5k6qd9hsbwlvxcmy442g8fk7707fccwa9l8b518psp29nd7kzm"; + version = "0.3.2.0"; + sha256 = "01v0vza54lpxijg4znp2pcnjw2z6ybvx453xqy7ljwf9289csfq8"; libraryHaskellDepends = [ base primitive scientific transformers unordered-containers Z-Data Z-IO ]; + testHaskellDepends = [ base hspec Z-Data ]; description = "YAML tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -23930,6 +23961,8 @@ self: { pname = "acts"; version = "0.3.1.0"; sha256 = "06bpayfa8vwj8dqlqp71nw2s9iwbffdknkk4hpazd4r1wvhnrg37"; + revision = "2"; + editedCabalFile = "1xc061cj6wxqyr79hdakmc3nnzdh46sj2sd7j9gfrvgmbipl895q"; libraryHaskellDepends = [ base deepseq finitary finite-typelits groups ]; @@ -23949,6 +23982,8 @@ self: { pname = "ad"; version = "4.4.1"; sha256 = "1afpqk0my4n50xvq9f0rhcs8kzy3w1xxjql462xc0mvvhsgp6s6g"; + revision = "1"; + editedCabalFile = "1sprgwc6niixmc3p073al3bm3ff873h6zjgizdz2wpqm0b6rfmka"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -25298,6 +25333,8 @@ self: { pname = "aeson-yaml"; version = "1.1.0.0"; sha256 = "1kyrh2w3qpzwm7kpb4rkrzi22kqqz1vcjw1f59wdkl8a5hffkv6y"; + revision = "1"; + editedCabalFile = "167gfgmy1pq50rh3rszj01ch4qy3jl4lpl3g8yq300kffrfs882a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29578,6 +29615,27 @@ self: { license = lib.licenses.gpl3; }) {}; + "amqp-utils_0_4_5_0" = callPackage + ({ mkDerivation, amqp, base, bytestring, connection, containers + , data-default-class, directory, hinotify, magic, network, process + , text, time, tls, unix, utf8-string, x509-system + }: + mkDerivation { + pname = "amqp-utils"; + version = "0.4.5.0"; + sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + amqp base bytestring connection containers data-default-class + directory hinotify magic network process text time tls unix + utf8-string x509-system + ]; + description = "AMQP toolset for the command line"; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; + }) {}; + "amqp-worker" = callPackage ({ mkDerivation, aeson, amqp, base, bytestring, data-default , exceptions, monad-control, monad-loops, mtl, resource-pool @@ -30182,24 +30240,23 @@ self: { "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck - , random, split, terminal-size, timers-tick + , random, split, terminal-size, timers-tick, unidecode }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.0.0.0"; - sha256 = "0h33ih7sxzyp1a6r6ivk73lrfx6haxxzmgh56n75sa7p8vhr8f1i"; - revision = "1"; - editedCabalFile = "1x601p97ragf9k56qy1ndmn7g3brs8fvvmf1wcrxz1ynhndqqpjw"; + version = "1.1.0.0"; + sha256 = "08sy50yicjgcxmnpq2828xggmvxc5yjp3xp03nd0bq4ykyr4za80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal array base bytestring cereal clock exceptions linebreak mintty mtl QuickCheck random split terminal-size - timers-tick + timers-tick unidecode ]; testHaskellDepends = [ ansi-terminal array base bytestring cereal clock exceptions hspec linebreak mtl QuickCheck random split terminal-size timers-tick + unidecode ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = lib.licenses.gpl3; @@ -31740,37 +31797,6 @@ self: { broken = true; }) {}; - "apply-refact_0_8_2_1" = callPackage - ({ mkDerivation, base, containers, directory, extra, filemanip - , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative - , process, refact, silently, syb, tasty, tasty-expected-failure - , tasty-golden, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.8.2.1"; - sha256 = "12dnwsv37bhla7cnqa3h24mnvdk5199lwd5mf845n1r6xqrh2vvp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory extra filemanip ghc ghc-exactprint - process refact syb transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint optparse-applicative process refact syb transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint optparse-applicative process refact silently syb - tasty tasty-expected-failure tasty-golden transformers unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative @@ -33275,8 +33301,8 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.0.1.0"; - sha256 = "0px41v49i3czchlv09dnbivlrk1zci4b2mg0xkrp6nwyzb9z4xyr"; + version = "1.0.1.2"; + sha256 = "051q0gamgvgd4j1bzqxww7qy4syx21s0vqhfihwlb2ypxf2s2fqa"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-predicates ascii-superset ascii-th base bytestring data-ascii text @@ -33285,6 +33311,24 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii_1_0_1_4" = callPackage + ({ mkDerivation, ascii-case, ascii-char, ascii-group + , ascii-predicates, ascii-superset, ascii-th, base, bytestring + , data-ascii, text + }: + mkDerivation { + pname = "ascii"; + version = "1.0.1.4"; + sha256 = "0j0cx91q4kmljv2fnfa1cllmyyk2wr6vg373bdfq0cx79d6542hw"; + libraryHaskellDepends = [ + ascii-case ascii-char ascii-group ascii-predicates ascii-superset + ascii-th base bytestring data-ascii text + ]; + description = "The ASCII character set and encoding"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-art-to-unicode" = callPackage ({ mkDerivation, base, comonad, doctest, strict }: mkDerivation { @@ -33311,6 +33355,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-case_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.0.4"; + sha256 = "1485y33as83f1iprdq7hl6ar7gha85678ajq80jld06wsmi9k0xa"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII letter case"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-char" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { @@ -33322,6 +33378,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-char_1_0_0_8" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.0.8"; + sha256 = "1ajpkzq1d04ww5yif7dl4np5zhhm5ks8wxhmfdl8ygy8r7akg50d"; + libraryHaskellDepends = [ base hashable ]; + description = "A Char type representing an ASCII character"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-cows" = callPackage ({ mkDerivation, base, random-extras, random-fu, text }: mkDerivation { @@ -33360,6 +33428,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-group_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-group"; + version = "1.0.0.4"; + sha256 = "0h1y0dmly3yammmqwa197nf3g83x03r5jlnsv9z9zxm9bin38ac5"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII character groups"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-holidays" = callPackage ({ mkDerivation, base, random, random-shuffle, terminfo, time }: mkDerivation { @@ -33386,6 +33466,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-predicates_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, base }: + mkDerivation { + pname = "ascii-predicates"; + version = "1.0.0.4"; + sha256 = "0c2331y1izxw7n33pfxfb7krz4lgdf87244xlnf03x8npckb7kgq"; + libraryHaskellDepends = [ ascii-char base ]; + description = "Various categorizations of ASCII characters"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-progress" = callPackage ({ mkDerivation, async, base, concurrent-output, data-default , hspec, QuickCheck, time @@ -33434,8 +33526,8 @@ self: { ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; - version = "1.0.1.0"; - sha256 = "1d4yfcy8yr6zimpv8mq8lsf8sd85rg4m8x7l81lr6wan2wx54gh6"; + version = "1.0.1.2"; + sha256 = "0hx5kh6h239hqrnqyda55769jfbxjxcr4mihya1djl7ls1fy493v"; libraryHaskellDepends = [ ascii-char base bytestring hashable text ]; @@ -33443,6 +33535,20 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-superset_1_0_1_4" = callPackage + ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: + mkDerivation { + pname = "ascii-superset"; + version = "1.0.1.4"; + sha256 = "1bjkinz2p8lq4grnj5d9q1z9jsn4b8cgkqsnxjhzb3plz94i5mxk"; + libraryHaskellDepends = [ + ascii-char base bytestring hashable text + ]; + description = "Representing ASCII with refined supersets"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-table" = callPackage ({ mkDerivation, aeson, base, containers, dlist, hashable, text , unordered-containers, vector, wl-pprint-extras @@ -33475,6 +33581,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-th_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell + }: + mkDerivation { + pname = "ascii-th"; + version = "1.0.0.4"; + sha256 = "08vfy2gp0ppa3l95gjqrbqca3gn2aln7zvw7qpp6x7jnzjkl8dn1"; + libraryHaskellDepends = [ + ascii-char ascii-superset base template-haskell + ]; + description = "Template Haskell support for ASCII"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -34904,6 +35025,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_5" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.5"; + sha256 = "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11"; + libraryHaskellDepends = [ + array base bytestring containers deepseq ghc-prim scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + description = "Fast combinator parsing for bytestrings and text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -35520,8 +35670,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.19"; - sha256 = "0hgxfd5pykl6y1v3asnh46abfmi5fsdp0hs1kf6a2acqsnx9vad7"; + version = "1.1.20"; + sha256 = "1aciwnsxb76hl2yx1n8mbmd6rhl41f1axq3c2djdc6mkkiyh9qc1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -36491,6 +36641,8 @@ self: { pname = "aws-larpi"; version = "0.1.0.0"; sha256 = "04z5wcvkcvq961zc9pg79k6340vgm6rdws6lfjysl5jrwr5sfxg9"; + revision = "1"; + editedCabalFile = "00singwkjvv2g92i16bsaqdq2rwg2l4v39vmy1vdi6dbpalkka4n"; libraryHaskellDepends = [ aeson base bytestring modern-uri req text ]; @@ -38776,8 +38928,8 @@ self: { }: mkDerivation { pname = "bcp47"; - version = "0.2.0.0"; - sha256 = "0dbbpxjhsm17xhqp2a4vvwb0rq3v33wmb84rqdcjr6j8d54wnq5f"; + version = "0.2.0.1"; + sha256 = "1hrqszdzr15p45wbbnpdkairmqwz8giyb0gn727wgxflh75a84xr"; libraryHaskellDepends = [ aeson base containers country generic-arbitrary iso639 megaparsec QuickCheck text @@ -38797,8 +38949,8 @@ self: { }: mkDerivation { pname = "bcp47-orphans"; - version = "0.1.0.1"; - sha256 = "0phw6hsrhya93w7zlrl7866zgpa62pscicjdb5lllpdqfcwl4jl2"; + version = "0.1.0.2"; + sha256 = "0rgr1p8dn54j432hfwg361dhsd4ngwvy3h8wx094m0kb6vjix9l6"; libraryHaskellDepends = [ base bcp47 cassava errors esqueleto hashable http-api-data path-pieces persistent text @@ -42621,8 +42773,8 @@ self: { pname = "bits"; version = "0.5.2"; sha256 = "1q5grjma421qiwjkwvnsakd4hxnf02bavfinky2skfhqvg63hkav"; - revision = "1"; - editedCabalFile = "0yjx0rixg51bhhddhb7m4g2ryp1qqj70j4bj6ggj0wpzmzazq5aa"; + revision = "2"; + editedCabalFile = "0zcxzi3afs2vxmm2mc9l65br5qym2ah9q3671f4ckzn0h0hcqw2n"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -42907,15 +43059,15 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; - "bitvec_1_1_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , ghc-prim, integer-gmp, primitive, quickcheck-classes, random - , tasty, tasty-hunit, tasty-quickcheck, vector + "bitvec_1_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , integer-gmp, primitive, quickcheck-classes, random, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "bitvec"; - version = "1.1.0.0"; - sha256 = "1blfi62immsx7hvg9krdbcp9n1p2a9qyhm9j30lc0g2jcl1n11mz"; + version = "1.1.1.0"; + sha256 = "0652dxx19g26jlx945qas09jhbcy17yw4visk9qhi9fbjl53v3yv"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp primitive vector ]; @@ -42924,7 +43076,7 @@ self: { tasty-quickcheck vector ]; benchmarkHaskellDepends = [ - base containers gauge integer-gmp random vector + base containers integer-gmp random tasty-bench vector ]; description = "Space-efficient bit vectors"; license = lib.licenses.bsd3; @@ -42955,6 +43107,8 @@ self: { pname = "bitwise-enum"; version = "1.0.0.3"; sha256 = "0ykrr8x1hc1lsj8cn19jcypvww4598g1v0vrn3z3b7n6hp6wfyis"; + revision = "3"; + editedCabalFile = "19d5xwigd482z47s8gpbd2jmm4pmx5bxg2fxkzjl8dias4yb431x"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -44968,24 +45122,22 @@ self: { }) {}; "bound" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytes, Cabal - , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest - , functor-classes-compat, hashable, mmorph, profunctors - , template-haskell, th-abstraction, transformers - , transformers-compat, vector, void + ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad + , deepseq, deriving-compat, functor-classes-compat, hashable + , mmorph, profunctors, template-haskell, th-abstraction + , transformers, transformers-compat, vector, void }: mkDerivation { pname = "bound"; - version = "2.0.2"; - sha256 = "14kl0aak48m1sbvi0g772hfmn6w984yc4j9p4ljxq6bfb2q4gqax"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "2.0.3"; + sha256 = "0rhpcz99sax81zh2k1ww7g2xgfcna56ppj9xc1l4gfnsrrlb27yg"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers transformers-compat ]; testHaskellDepends = [ - base deriving-compat doctest functor-classes-compat transformers + base deriving-compat functor-classes-compat transformers transformers-compat vector void ]; description = "Making de Bruijn Succ Less"; @@ -45185,8 +45337,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "box-tuples"; - version = "0.2.0.3"; - sha256 = "12a3jj3z1gni8925n16ipqyah8vg244lx88v289f2rldiyvh3bvf"; + version = "0.2.0.4"; + sha256 = "02f3ll6qghs36sill1pznj2354cliq5kh5rbg19lsnykvqimca0i"; libraryHaskellDepends = [ base ghc-prim ]; description = "A hack to use GHC.Prim primitives in GHCi"; license = lib.licenses.mit; @@ -45404,8 +45556,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.59"; - sha256 = "1nkx7b6688ba0h8kw8xzqamj9zpdjyrdpmg8h18v3l03hw5jcszf"; + version = "0.60.2"; + sha256 = "1fcpbm58fikqv94cl97p6bzhyq07kkp3zppylqwpil2qzfhvzb3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46401,10 +46553,8 @@ self: { }: mkDerivation { pname = "bugzilla-redhat"; - version = "0.3.0"; - sha256 = "1d751f1219ivx9bfdl7xb89w2vns07ciqp4cqcykixnllx2jx18y"; - revision = "1"; - editedCabalFile = "145sdnk28sxwz4s1gh0qq6vzm9q6s5433q6w1199cv9585b53kcx"; + version = "0.3.1"; + sha256 = "088ya35lwxnvg0x996agy2ky8kp4r3j2i1ja15fy3afcqfpvbqiv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46679,8 +46829,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "1.2.0.0"; - sha256 = "1nrb08czlnfcgb7v59vzkffik2w5yp833la4mq6sp6sgnm0ylgya"; + version = "1.2.0.1"; + sha256 = "0swxc78vz1rj3q994cdnadgkanzcpm8rshvs2q49534rc2s6gq4g"; libraryHaskellDepends = [ base bytestring containers parsec template-haskell text transformers @@ -47150,8 +47300,8 @@ self: { pname = "bytes"; version = "0.17"; sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3"; - revision = "4"; - editedCabalFile = "0vxmahjxskyddq3gmr2b2ix5h33ywk6fmv17vqfbh8mhfbb26113"; + revision = "5"; + editedCabalFile = "0a089bz9sjnmv3f5w9jsm1b7g60qx8qxqj76lwjj0mslzi9iajk2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable @@ -48092,8 +48242,8 @@ self: { ({ mkDerivation, base, Cabal, filepath }: mkDerivation { pname = "cabal-appimage"; - version = "0.3.0.0"; - sha256 = "0m3xq3k4s6rn90vd2sp115jyb722vi9wgih3lz05fnc2bypyg6zi"; + version = "0.3.0.2"; + sha256 = "0hyjb8y4zf7qccyzsms98sd0kgz83q1aqfhgx2f3dq1nprhbg9ld"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; license = lib.licenses.agpl3; @@ -48695,8 +48845,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.4"; - sha256 = "12z9gz1afra0fqd79j1r9fsdc7k8r6v1saw14l42kd2dqxdjqwcf"; + version = "0.4.1"; + sha256 = "1djw4l0z8nsaby2qcm08kvn2p1c35ynzdg25vc815dx2wpw38bh3"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko @@ -49612,8 +49762,8 @@ self: { }: mkDerivation { pname = "caerbannog"; - version = "0.6.0.3"; - sha256 = "0mv10cc50365kz2ad36wivvhcyl43bwxjp71f0n9vq2ndrmb4dna"; + version = "0.6.0.4"; + sha256 = "0zm6vdbsb947nd3wcniyk8mjs52r6hwyyp64w1abnazajraqask8"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hspec QuickCheck random @@ -49880,8 +50030,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.24.1"; - sha256 = "14q0s17an5vk2gq9vcy0ghd30zg1dj3q5vdln86mnd4v34wkpfr2"; + version = "0.1.25.1"; + sha256 = "17i8l2p314bifa5cfqvpy89m0yh9m1m4120cjc71ir2lb35wj9lf"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -53068,23 +53218,22 @@ self: { "chart-svg" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Color, concurrency - , cubicbezier, doctest, foldl, generic-lens, JuicyPixels, lens - , linear, lucid, numhask, numhask-space, reanimate, reanimate-svg - , scientific, tagsoup, text, time, transformers - , unordered-containers, vector + , containers, cubicbezier, doctest, foldl, generic-lens + , JuicyPixels, lens, linear, lucid, numhask, numhask-space + , reanimate, reanimate-svg, scientific, tagsoup, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "chart-svg"; - version = "0.2.0"; - sha256 = "1w7381r9zfj02c5r6fbza1x2qdxyqpgb3dj2wld73pzcladszp34"; - revision = "1"; - editedCabalFile = "18ilaajn42jni3pgzyc9f7z6ph3jyf0wrjfv9jnsp3ypyjj7yjn3"; + version = "0.2.2"; + sha256 = "184hpqkc9fvn64bg550clwxvjg2ii8igcl7nq3895pgi0cxxr0p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base Color cubicbezier foldl generic-lens JuicyPixels - lens linear lucid numhask numhask-space reanimate reanimate-svg - scientific tagsoup text time transformers unordered-containers + attoparsec base Color containers cubicbezier foldl generic-lens + JuicyPixels lens linear lucid numhask numhask-space reanimate + reanimate-svg scientific tagsoup text time transformers + unordered-containers ]; executableHaskellDepends = [ attoparsec base bytestring concurrency foldl JuicyPixels lens @@ -54076,6 +54225,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "chronos_1_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, doctest, hashable, HUnit, old-locale, primitive + , QuickCheck, semigroups, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, thyme, time, torsor, vector + }: + mkDerivation { + pname = "chronos"; + version = "1.1.2"; + sha256 = "0izzg5cnnw53m3pfxglpj96i88h1qx75w04n6a67855xly4dfyxa"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring deepseq hashable primitive + semigroups text torsor vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring deepseq doctest HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + torsor + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq old-locale QuickCheck + text thyme time vector + ]; + description = "A high-performance time library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chronos-bench" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , containers, deepseq, optparse-applicative, process, terminal-size @@ -54104,8 +54281,8 @@ self: { pname = "chs-cabal"; version = "0.1.1.0"; sha256 = "0zan47md9zivzc1gd1j1g0200n8d0ffx4dcmkd9vriqjsdwhqvl5"; - revision = "1"; - editedCabalFile = "04fh1g2wfm69hz1hjg4ds2c3npdx6z2mgwddlkqr2sdbnngnmv10"; + revision = "2"; + editedCabalFile = "1axn8xmnrk42j1b8bxykbrqjy1ia0ajg27jirjb2gix1vvvpxb1d"; libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; license = lib.licenses.bsd3; @@ -54705,8 +54882,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.3.0.5"; - sha256 = "18ybi21fmw9rkd4m74dgy1cf3i9l79bpalm79427kass8mv4wpia"; + version = "0.3.0.7"; + sha256 = "03cc3d7a1rf3k23150b19y4mx1c6vk53l9c59vv9npf39id33g7s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55975,8 +56152,8 @@ self: { }: mkDerivation { pname = "clickhouse-haskell"; - version = "0.1.2.3"; - sha256 = "1sa9jbiw8j04plk26p7n25plq0ymzsw7vqln0y6kbn3k30panyqg"; + version = "0.1.2.4"; + sha256 = "0c9847024crxiql09l55cx4881sv6lpzhhrwvhvb6f5548403iqg"; libraryHaskellDepends = [ aeson array async attoparsec base binary bytestring bytestring-to-vector call-stack containers data-default-class @@ -57348,8 +57525,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.13"; - sha256 = "0qi07canqwnwfvmbsp1j9lyklnn8h909r6js94xlpin1qa7dpjda"; + version = "0.1.3.14"; + sha256 = "1vkjnyzcl44h9b24k1h5mz61gdz42bs64ifxwijx8a2a72mwmaa6"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -57407,8 +57584,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.2"; - sha256 = "0i0qbrbhvrwkbikqb7hh7yxaipaavwzvyrw211d0vkz99f62mqxz"; + version = "0.2.1"; + sha256 = "1aiavczjk6f2kc1cdwjc1mwkr4d9shiz3xwmfbzsdn0yqqchxydj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Windows code page library for Haskell"; @@ -58794,8 +58971,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.1.1.3"; - sha256 = "1hwbii1d56979l0svvjayzhmwa25s66l36bb08hjq6p36lkv2a1v"; + version = "0.1.1.4"; + sha256 = "0dpm110svgdf21lf5sfbzjcfryn0v6hhjcs8kkyf167kng2sclfn"; libraryHaskellDepends = [ base bytestring containers parsec text transformers ]; @@ -59192,8 +59369,8 @@ self: { }: mkDerivation { pname = "compdata"; - version = "0.12"; - sha256 = "0b08mmj04bbi735hvvdbg1nmg66qg1c11r0kvq7m569r91bmy54v"; + version = "0.12.1"; + sha256 = "0ksa3bgqjvshkrpd74420z9kkb3asq4flszzwrqswd4qw1yn9f05"; libraryHaskellDepends = [ base containers deepseq mtl QuickCheck template-haskell th-expand-syns transformers tree-view @@ -61583,6 +61760,8 @@ self: { pname = "config-schema"; version = "1.2.1.0"; sha256 = "1p5nhvhq7q5s67l4h4zb19ali5jbxrz9mb5cwzhykqmqji56n5vf"; + revision = "1"; + editedCabalFile = "056iks8k9lhbv34pqk8nisqc7vwzqq0shknixbpkd3vgbd3yksyf"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -61617,6 +61796,8 @@ self: { pname = "config-value"; version = "0.8.1"; sha256 = "086jv01a737547w6x9w1951vq0p7mx6vqw9ifw5kcs5nvhj5rx2q"; + revision = "1"; + editedCabalFile = "0wa3grq566fpkq5g9bcszwjv96drq6b3qg2w32rv8m00pd1j0n27"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -62851,6 +63032,8 @@ self: { pname = "contra-tracer"; version = "0.1.0.0"; sha256 = "146g43sqa23n1qg100jvz5m1jcjfxx4rxzmc8559b6apys9ys4br"; + revision = "1"; + editedCabalFile = "1r3rnxlbvfirj4n2vwysh7zkfdwlx3x4p9yjd32hpr3vdikgpvds"; libraryHaskellDepends = [ base ]; description = "Arrow and contravariant tracers"; license = lib.licenses.bsd3; @@ -64860,8 +65043,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "10.6"; - sha256 = "0c86gf70iv59dwmm0yv8isyyd6zy497vqgf6ml9s6rz4hhg1rwl0"; + version = "10.7"; + sha256 = "0745aa7zs5niwi55kdkfnyii9vdg9jfqr2872w068r8p33njcbdk"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -67153,28 +67336,28 @@ self: { }) {}; "curry-frontend" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, curry-base - , directory, extra, file-embed, filepath, mtl, network-uri, pretty - , process, set-extra, template-haskell, transformers + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , directory, extra, file-embed, filepath, mtl, network-uri, parsec + , pretty, process, set-extra, template-haskell, time, transformers }: mkDerivation { pname = "curry-frontend"; - version = "1.0.4"; - sha256 = "1dfljqyrp9w0sw3zmyy9rglpnjv14qj8ky1yjslmiaanjnl0m07b"; + version = "2.0.0"; + sha256 = "0bfqb922drarbjig3a35frf29cc4qa9mw789p5m0d88iwgkhvqnr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers curry-base directory extra file-embed + base binary bytestring containers directory extra file-embed + filepath mtl network-uri parsec pretty process set-extra + template-haskell time transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring Cabal containers directory extra file-embed filepath mtl network-uri pretty process set-extra template-haskell transformers ]; - executableHaskellDepends = [ - base bytestring containers curry-base directory extra file-embed - filepath mtl network-uri pretty process set-extra template-haskell - transformers - ]; - testHaskellDepends = [ base Cabal curry-base filepath ]; description = "Compile the functional logic language Curry to several intermediate formats"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -68333,8 +68516,8 @@ self: { }: mkDerivation { pname = "data-ascii"; - version = "1.0.0.2"; - sha256 = "03lxcybzamd1d5lrd1i9ygr5s094cr9ch2jdk5fx5hjg4bkigdds"; + version = "1.0.0.4"; + sha256 = "17pb1kmqln7cswsc4c7xipq619aj2y0kjhrcm23r8b39c0g02scy"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable semigroups text @@ -68343,6 +68526,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-ascii_1_0_0_6" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , hashable, semigroups, text + }: + mkDerivation { + pname = "data-ascii"; + version = "1.0.0.6"; + sha256 = "0j8mk1gdxcczhwcs75rx50zh6vxv2vkd1rf5n6q4ryn8wm5r3gcr"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive hashable semigroups + text + ]; + description = "Type-safe, bytestring-based ASCII values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-aviary" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -69034,8 +69234,8 @@ self: { ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "data-fix"; - version = "0.3.0"; - sha256 = "184rz8ypgrb3sxy9wiaq321d82p689w7dcwkc0qkjlabd7nv6ncy"; + version = "0.3.1"; + sha256 = "0yfciggx8l82nfpv40w2673glnl9nnbh269kpfbw28i98x0c0icv"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; @@ -69984,8 +70184,8 @@ self: { }: mkDerivation { pname = "data-validation"; - version = "0.1.2.4"; - sha256 = "1ck7grirqv0hbi973fgbgwzflsmz8diwi1rmjmfxz1f3915vi1yz"; + version = "0.1.2.5"; + sha256 = "0xma425fsnqczw2csknms75zx9i5nfnjc3nqcxlqi9xbxv2fksi6"; libraryHaskellDepends = [ base containers template-haskell ]; testHaskellDepends = [ base containers hspec regex-tdfa template-haskell @@ -71688,16 +71888,14 @@ self: { broken = true; }) {}; - "deepseq_1_4_4_0" = callPackage + "deepseq_1_4_5_0" = callPackage ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.4.0"; - sha256 = "09kfpmgl679l74b6dadia11pvhya9ik4wrd8x76cgkxk7gwcbkrc"; - revision = "1"; - editedCabalFile = "0mbby1hig605jyiyy4m2y2nnjjf5i2adzc6x269hbz4pxscjp43n"; + version = "1.4.5.0"; + sha256 = "0d3yw95xkyx7wwx3anfj1fqb10080xykqic483xpl7rvi1mik6js"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base ghc-prim HUnit test-framework test-framework-hunit @@ -72261,34 +72459,39 @@ self: { }) {}; "dep-t" = callPackage - ({ mkDerivation, base, mtl, rank2classes, tasty, tasty-hunit - , template-haskell, transformers, unliftio-core + ({ mkDerivation, base, doctest, mtl, rank2classes, sop-core, tasty + , tasty-hunit, template-haskell, transformers, unliftio-core }: mkDerivation { pname = "dep-t"; - version = "0.1.3.0"; - sha256 = "1bzf2czbml949an6gffc7jh898ba2axfh87phnrla0595x7nrx21"; + version = "0.4.4.0"; + sha256 = "1qknqh9j7nvyy15zfi3prx6bifp2nd72kgfd085p478z887i71r4"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ - base mtl rank2classes tasty tasty-hunit template-haskell - transformers unliftio-core + base doctest mtl rank2classes sop-core tasty tasty-hunit + template-haskell transformers unliftio-core ]; description = "Reader-like monad transformer for dependency injection"; license = lib.licenses.bsd3; }) {}; "dep-t-advice" = callPackage - ({ mkDerivation, base, dep-t, doctest, mtl, rank2classes, sop-core - , tasty, tasty-hunit, template-haskell, transformers + ({ mkDerivation, barbies, base, criterion, dep-t, doctest, mtl + , rank2classes, sop-core, tasty, tasty-hunit, template-haskell + , transformers }: mkDerivation { pname = "dep-t-advice"; - version = "0.3.0.0"; - sha256 = "00nqf37x877s5arkwv55cki068gpgq64yns4qhp039az2mfr4g9q"; - libraryHaskellDepends = [ base dep-t sop-core ]; + version = "0.4.6.0"; + sha256 = "1v1nn0qbr3l7hh3f5aw6ril8ifzg6r8im7gpyj5plfbp272v4gs9"; + libraryHaskellDepends = [ base dep-t sop-core transformers ]; testHaskellDepends = [ - base dep-t doctest mtl rank2classes sop-core tasty tasty-hunit - template-haskell transformers + barbies base dep-t doctest mtl rank2classes sop-core tasty + tasty-hunit template-haskell transformers + ]; + benchmarkHaskellDepends = [ + base criterion dep-t mtl rank2classes sop-core template-haskell + transformers ]; description = "Giving good advice to functions in a DepT environment"; license = lib.licenses.bsd3; @@ -72868,8 +73071,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "derulo"; - version = "1.0.9"; - sha256 = "1rpxbg0g44813b0mlkifiav2w04wy56n1zlnqk5jcibdbmi6yagi"; + version = "1.0.10"; + sha256 = "0mdmrzypl0hjbnwn9ij1bjfk4j07r0c9gw7h3wdhl82a8zcxggpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -73336,6 +73539,63 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "dhall_1_37_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mmorph, mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-silver, template-haskell, text + , text-manipulate, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.37.1"; + sha256 = "16qpasw41wcgbi9ljrs43dn2ajw25yipm8kxri6v5fwj3gyzj24d"; + revision = "1"; + editedCabalFile = "11sjra0k7sdy0xcbhlxvjjpd4h7ki9dcrndcpaq71qlgdql32w24"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random http-client http-client-tls + lens-family-core megaparsec mockery prettyprinter QuickCheck + quickcheck-instances scientific serialise special-values spoon + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-silver template-haskell text transformers turtle + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge text + ]; + doCheck = false; + description = "A configuration language guaranteed to terminate"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dhall" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers @@ -73443,6 +73703,8 @@ self: { pname = "dhall-docs"; version = "1.0.4"; sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl"; + revision = "2"; + editedCabalFile = "1y8aaph8zg3lp53apvkg0s6zviz3sa82qq1dnbqn6xjgb1dqjr7z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73508,6 +73770,8 @@ self: { pname = "dhall-json"; version = "1.7.5"; sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy"; + revision = "1"; + editedCabalFile = "0vl9vb84r1fz80jvqxaq4624pk67hxkm3vsx5j0l3bz8mk439yzn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73557,6 +73821,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.13"; sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak"; + revision = "2"; + editedCabalFile = "1gmcfp6i36y00z4gyllcq62rgpjz2x7fgdy4n6d24ygczpqbwy9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73582,6 +73848,8 @@ self: { pname = "dhall-nix"; version = "1.1.20"; sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd"; + revision = "1"; + editedCabalFile = "16hz1i0vkp1qsqf9dm0d9pc1kap02nzdalzjpiw2r8p3qbykaann"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74797,8 +75065,8 @@ self: { }: mkDerivation { pname = "differential"; - version = "0.2.0.0"; - sha256 = "1dzxqva176dw22bb4hlv8dfizkzqsj5z9qdv7piwdh171nd9bwqd"; + version = "0.2.0.1"; + sha256 = "0xmsrc92jxd78b3vri3sf37w1w7c8nl7wc36gsqamd00laia95xv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75828,8 +76096,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.1"; - sha256 = "07rhg7r4v05q1y6rin4b5v49231r2w35jfwnrbg7b7s1skdld9g3"; + version = "1.8.3"; + sha256 = "0adpb7wzij9n5f2xxqy9j8n3rx0bjg7z1lk0p212zkygabw297mi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77846,7 +78114,7 @@ self: { license = lib.licenses.mit; }) {}; - "doctest_0_17" = callPackage + "doctest_0_18" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, hspec-core, HUnit, mockery , process, QuickCheck, setenv, silently, stringbuilder, syb @@ -77854,8 +78122,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.17"; - sha256 = "0f0knggq6yjcznyri35fll619q5jr8vcsbiyvdiz4prkawhaa4pz"; + version = "0.18"; + sha256 = "1yqrmjg3rn1vy0p6a6j78gnnl8lx4hzi0rwhpl5ljb4q6kzyc3x4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78329,6 +78597,59 @@ self: { broken = true; }) {}; + "dormouse-client" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, dormouse-uri, hedgehog, hspec + , hspec-discover, hspec-hedgehog, http-api-data, http-client + , http-client-tls, http-types, mtl, safe-exceptions, scientific + , streamly, streamly-bytestring, template-haskell, text, vector + }: + mkDerivation { + pname = "dormouse-client"; + version = "0.1.0.1"; + sha256 = "033299c0rc6hsg51pg7igb5fnf8w200ckazmyjk23d1h48mz7gcg"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + dormouse-uri http-api-data http-client http-client-tls http-types + mtl safe-exceptions streamly streamly-bytestring template-haskell + text + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + dormouse-uri hedgehog hspec hspec-discover hspec-hedgehog + http-api-data http-client http-client-tls http-types mtl + safe-exceptions scientific streamly streamly-bytestring + template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Simple, type-safe and testable HTTP client"; + license = lib.licenses.bsd3; + }) {}; + + "dormouse-uri" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, case-insensitive + , containers, hedgehog, hspec, hspec-discover, hspec-hedgehog + , http-types, safe-exceptions, scientific, template-haskell, text + , vector + }: + mkDerivation { + pname = "dormouse-uri"; + version = "0.1.0.1"; + sha256 = "04ps9k4dhg9xk7al12y757lxl45dfa0aczirdkyks28cavlpr07b"; + libraryHaskellDepends = [ + attoparsec base bytestring case-insensitive containers http-types + safe-exceptions template-haskell text + ]; + testHaskellDepends = [ + attoparsec base bytestring case-insensitive containers hedgehog + hspec hspec-discover hspec-hedgehog http-types safe-exceptions + scientific template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for type-safe representations of Uri/Urls"; + license = lib.licenses.bsd3; + }) {}; + "dot" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -78876,22 +79197,24 @@ self: { "dprox" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, dns - , hspec, iproute, network, optparse-applicative, streaming-commons - , unix, unordered-containers + , hashable, hspec, iproute, network, optparse-applicative, psqueues + , streaming-commons, time, unix, unordered-containers }: mkDerivation { pname = "dprox"; - version = "0.1.2.1"; - sha256 = "16z7qx76qy2gjz2j630maa2jgiqhphi8vpphbdywgk1abg7iwhrz"; + version = "0.2.0"; + sha256 = "0hylymdpvnh353rg9gh8d9m9ag8hfxjh2ndrdxvhapbpddbbz3qm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base bytestring containers dns iproute network - optparse-applicative streaming-commons unix unordered-containers + attoparsec base bytestring containers dns hashable iproute network + optparse-applicative psqueues streaming-commons time unix + unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring containers dns hspec iproute network - optparse-applicative streaming-commons unix unordered-containers + attoparsec base bytestring containers dns hashable hspec iproute + network optparse-applicative psqueues streaming-commons time unix + unordered-containers ]; description = "a lightweight DNS proxy server"; license = lib.licenses.bsd3; @@ -81642,8 +81965,8 @@ self: { ({ mkDerivation, base, containers, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.4.2"; - sha256 = "1cagf93vaz41hl5vm1xqvzdds82h2cck294apr5b082nscv6r9bc"; + version = "0.0.4.4"; + sha256 = "1kh10iykk6gqzl78smrwv1zl8dcy0ns2raisx5qchcvrdgshzdiy"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; @@ -81660,10 +81983,12 @@ self: { pname = "either-result"; version = "0.3.1.0"; sha256 = "1l4539j0ynn5jl0rh9bhjxlgvr0sn3bf8ws1zrlbfk15524znqhm"; + revision = "1"; + editedCabalFile = "1bmcvhjw53nhkzm99dzjq1mvj8s7b27ji2h8av5zy2wsniknrzbm"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base doctest hspec transformers ]; testToolDepends = [ doctest-discover hspec-discover ]; - description = "‘MonadFail’ instance for a wrapper of ‘ExceptT String m a’"; + description = "The simplest ‘MonadFail’ instance"; license = lib.licenses.asl20; }) {}; @@ -88048,8 +88373,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.1.4"; - sha256 = "151jlcrp80f8riyf8rxzvggyxq3k2mg2fi81r7wnc4in6gzsc0qj"; + version = "1.0.1.6"; + sha256 = "1yqld2b6lbxl9sw9yp3dy184189nhfs7q4shnyrzc0m000hxgwkj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88317,6 +88642,8 @@ self: { pname = "fast-tags"; version = "2.0.0"; sha256 = "0q2ijh1pdxzm57557vln195mmxs15wra9159vpsjvjda4gnd7bs6"; + revision = "1"; + editedCabalFile = "18q3hzl178a3hzxmvb79y1g9r29b6dxfq9nczwk2g3pqmi9qnbmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88818,6 +89145,38 @@ self: { broken = true; }) {}; + "fbrnch" = callPackage + ({ mkDerivation, aeson, async, base, bugzilla-redhat, bytestring + , config-ini, directory, email-validate, extra, filepath, haxr + , http-conduit, http-directory, http-query, lens, lens-aeson, mtl + , network-uri, optparse-applicative, pretty-terminal, process + , rpmbuild-order, simple-cmd, simple-cmd-args, text, time + , typed-process, unordered-containers, utf8-string, xdg-basedir + }: + mkDerivation { + pname = "fbrnch"; + version = "0.7.1"; + sha256 = "05gs3r9c67xvpkpg968aj0ym39qakazbycjlb8wnys5ijc0iwa7w"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring directory filepath haxr http-query lens + lens-aeson mtl text time unordered-containers + ]; + executableHaskellDepends = [ + aeson async base bugzilla-redhat bytestring config-ini directory + email-validate extra filepath http-conduit http-directory + http-query network-uri optparse-applicative pretty-terminal process + rpmbuild-order simple-cmd simple-cmd-args text time typed-process + utf8-string xdg-basedir + ]; + doHaddock = false; + description = "Build and create Fedora package repos and branches"; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fca" = callPackage ({ mkDerivation, base, bytestring, containers, cryptohash, hashable , text, unordered-containers @@ -88879,8 +89238,8 @@ self: { ({ mkDerivation, base, doctest, first-class-families, Glob }: mkDerivation { pname = "fcf-containers"; - version = "0.5.0"; - sha256 = "0j4ij4iw5axjp56zhxb3kn6ls1l8m2ckqx6620y1yjhz3ja608f2"; + version = "0.6.0"; + sha256 = "09sr1xqdjzfk5gysd7hi66xadwcfrjq4q3vakmdilc14lw833wgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base first-class-families ]; @@ -90789,8 +91148,8 @@ self: { }: mkDerivation { pname = "finitary"; - version = "2.0.0.0"; - sha256 = "19b0sm9lb5k459bhq51srx5rcdgk9rjhfha34a3kcsmlqam9fak7"; + version = "2.1.1.0"; + sha256 = "1ip1l809d7wnhiyz522g34kzsvv2r9hz1l065jqlrwf1pnhgsv0c"; libraryHaskellDepends = [ base bitvec finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise primitive template-haskell @@ -90809,20 +91168,21 @@ self: { ({ mkDerivation, base, binary, bitvec, coercible-utils, deepseq , finitary, finite-typelits, ghc-typelits-extra , ghc-typelits-knownnat, hashable, hedgehog, hedgehog-classes - , transformers, vector, vector-binary-instances, vector-instances + , integer-gmp, primitive, vector, vector-binary-instances + , vector-instances }: mkDerivation { pname = "finitary-derive"; - version = "2.2.0.0"; - sha256 = "11nkryzbhkbz4v2i4kwaggw67nlhs5jljqczmvliyz1df75f5kh3"; + version = "3.0.0.1"; + sha256 = "1l8xh7azssfgwvr78jaklj6dagmjpbx5ad4j6kzx104khj0skpqy"; libraryHaskellDepends = [ base binary bitvec coercible-utils deepseq finitary finite-typelits - ghc-typelits-extra ghc-typelits-knownnat hashable transformers - vector vector-binary-instances vector-instances + ghc-typelits-extra ghc-typelits-knownnat hashable integer-gmp + primitive vector vector-binary-instances vector-instances ]; testHaskellDepends = [ base binary deepseq finitary finite-typelits hashable hedgehog - hedgehog-classes + hedgehog-classes vector ]; description = "Flexible and easy deriving of type classes for finitary types"; license = lib.licenses.gpl3Plus; @@ -90838,6 +91198,8 @@ self: { pname = "finitary-optics"; version = "1.0.0.0"; sha256 = "0is930yhcd1iqgbxn42ldzbh408inpsprw9psvnx61j6qm6p4cd7"; + revision = "2"; + editedCabalFile = "17qm24b8v61h9m0vjxcx6c89qm93c5lc5y3nb79b7xzfzx3y4zv4"; libraryHaskellDepends = [ base finitary finite-typelits optics-core ]; @@ -92249,8 +92611,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; - version = "1.0.21"; - sha256 = "1zig5jwqflcs6akhxqkn9h7iwq7ypaz4cx7zwbqfy7sap6sdq2il"; + version = "1.0.22"; + sha256 = "1xsifahlma8x130d8hc1k5hzcf1kr8qg8xxh67lshbvarrg19air"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; @@ -93787,8 +94149,8 @@ self: { }: mkDerivation { pname = "forsyde-shallow"; - version = "3.4.0.0"; - sha256 = "0czrgfx22j94xp56mf4cwrz2rdw2id77va89xpjxxrhdzwzfsvcn"; + version = "3.4.0.1"; + sha256 = "0im5xf8dcalsjk85fyvih042apv3wl54k3jlmdjg7fnm3mgxj1yj"; libraryHaskellDepends = [ base directory old-time process random ]; testHaskellDepends = [ base directory doctest hspec old-time process QuickCheck random @@ -93975,34 +94337,6 @@ self: { }) {}; "fourmolu" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec - , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative - , path, path-io, syb, text - }: - mkDerivation { - pname = "fourmolu"; - version = "0.2.0.0"; - sha256 = "1jak0xgd6gcbw7icyrblvqnvzjyyakpw2zfnqj1z958qyg763v52"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory dlist exceptions - filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text - ]; - executableHaskellDepends = [ - base directory ghc-lib-parser gitrev optparse-applicative text - ]; - testHaskellDepends = [ - base containers filepath hspec path path-io text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - }) {}; - - "fourmolu_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative @@ -94028,7 +94362,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fp-ieee" = callPackage @@ -95614,8 +95947,8 @@ self: { }: mkDerivation { pname = "fswatcher"; - version = "0.2.2"; - sha256 = "0rdvh9310qbnp6vh3janr60nla33kyfy23yfzbzsca8ridr7ab7w"; + version = "0.3.0"; + sha256 = "0bn3pnk7jra4p20hm4ydvnqibfh3h9kc5lswvs8s02wlzf5z5a9f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -98355,6 +98688,21 @@ self: { license = lib.licenses.mit; }) {}; + "generic-labels" = callPackage + ({ mkDerivation, base, Cabal, generic-lens-core, inspection-testing + }: + mkDerivation { + pname = "generic-labels"; + version = "0.1.0.1"; + sha256 = "0wv4wsg53zrj01d6ddz6vpdjy427ag76snm1m14775vqq4n00v3z"; + revision = "1"; + editedCabalFile = "0kdxjh0sa16l1gcgdw9mnpd1zs0w1al47mvy912bzmm2m1dmbjdk"; + libraryHaskellDepends = [ base generic-lens-core ]; + testHaskellDepends = [ base Cabal inspection-testing ]; + description = "Generically extract and replace collections of record fields"; + license = lib.licenses.bsd3; + }) {}; + "generic-lens" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text @@ -99635,8 +99983,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.4.0.1"; - sha256 = "0q0clfmq7spfplxr6dxhq0d39f5l95yfr87ixnv2cn0ahcx7fpi7"; + version = "0.4.1.0"; + sha256 = "06sbiyqy63ymqafdw14yz6aww412v3g6vsqq0v99vph3yzhn8xxp"; libraryHaskellDepends = [ base bytestring cereal containers iproute lens mmap reinterpret-cast text @@ -100243,8 +100591,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.6.3.3"; - sha256 = "1psrr6iaa7k5f3zz7j82crg052n3x1h2dljyb16qzbv98bqny6nb"; + version = "0.6.3.4"; + sha256 = "0x3z9zlghcd22v6hidby72w6g11xl6cbwyskzcjlv0235csr5v98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100398,8 +100746,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.10.3.20201220"; - sha256 = "04df1j997m48vjxkfcp07d9vsxgpqi315zvfri1y1qxdg5g4vlmb"; + version = "8.10.4.20210206"; + sha256 = "1zzglnpbnj9ijna6g3rmykqir3iqcg2afmjg9q0ng3imbv40slhs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -100410,6 +100758,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib_9_0_1_20210207" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.0.1.20210207"; + sha256 = "1fi62pq18s63w4y6xrjq9zlcra8dk5xqjax8kyyvfrjaaxqci8qk"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty @@ -100417,8 +100786,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.3.20201220"; - sha256 = "0k68w2v5x68sxqcd7xm94khmr4gqxbj4jdsaac3m1wcy66bjriir"; + version = "8.10.4.20210206"; + sha256 = "07j3j67hxz43l1kkdfanghd935wiccvmw7sgk47fjymw6fdx92p2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -100429,6 +100798,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser_9_0_1_20210207" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, hpc + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.0.1.20210207"; + sha256 = "1gikdcgcgw1paxs5igxgxdfvpjp23963f6vn83m0a6vr88n2haah"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim hpc pretty process time transformers + unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser-ex" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit @@ -100436,8 +100826,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.17"; - sha256 = "16qbyvczncdb25g7mjdvxsn7m3j98649jy1pnv90vmyrn8l4m897"; + version = "8.10.0.19"; + sha256 = "0qdkqv7ss9b2mnf39gpbq7i50ypccnl3wdmxiq148zrxbglzfqw9"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot ghc-boot-th uniplate ]; @@ -100449,6 +100839,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser-ex_9_0_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.0.0.3"; + sha256 = "1kc6p5ciymq8rbgk4jj1hawmjhkj1yjzkxj9jjyqlgzs09i3dsw3"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -101046,6 +101456,27 @@ self: { license = lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_7_5" = callPackage + ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.7.5"; + sha256 = "1xraiil3nq02jdb4blkmsrdp36qhykv2xvwg3kaiyw5bgfl15gl3"; + libraryHaskellDepends = [ + base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck + ]; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra , integer-gmp, tasty, tasty-hunit, template-haskell, transformers @@ -101104,15 +101535,16 @@ self: { }) {}; "ghc-vis" = callPackage - ({ mkDerivation, base, cairo, containers, deepseq, fgl - , ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text, transformers - , xdot + ({ mkDerivation, base, Cabal, cairo, containers, deepseq, fgl + , filepath, ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text + , transformers, xdot }: mkDerivation { pname = "ghc-vis"; - version = "0.9"; - sha256 = "134m5hzpbggifvigw2f4q6ci1lm5r2457va8lb0j7daiadq7xhcw"; + version = "0.9.2"; + sha256 = "1i7sx0ffbgfskhj27wnh9f8qldf4fqxmshlmqvajsrg9n5v5i772"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl svgcairo text transformers xdot @@ -101154,24 +101586,25 @@ self: { "ghci-dap" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , directory, filepath, ghc, ghc-boot, ghc-paths, ghc-prim, ghci - , haskeline, haskell-dap, process, text, time, transformers, unix + , directory, exceptions, filepath, ghc, ghc-boot, ghc-paths + , ghc-prim, ghci, haskeline, haskell-dap, process, text, time + , transformers, unix }: mkDerivation { pname = "ghci-dap"; - version = "0.0.14.0"; - sha256 = "0gnawjk1bzrcinazygwal4kfnqq780v7q4lm0xrvjb50cvixkjpf"; + version = "0.0.15.0"; + sha256 = "1m4ypd2d9bjdkdqrnqijc1na5g14mmjrcr5msgr7spsnskhzi4yg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap process text - time transformers + array base bytestring containers deepseq directory exceptions + filepath ghc ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap + process text time transformers ]; executableHaskellDepends = [ - array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap process text - time transformers unix + array base bytestring containers deepseq directory exceptions + filepath ghc ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap + process text time transformers unix ]; description = "ghci-dap is a GHCi having DAP interface"; license = lib.licenses.bsd3; @@ -101329,65 +101762,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghcide_0_7_0_0" = callPackage - ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, case-insensitive, containers, cryptohash-sha1 - , data-default, deepseq, directory, extra, filepath, fingertree - , fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check, ghc-paths - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat - , hls-plugin-api, hslogger, implicit-hie-cradle, lens, lsp-test - , mtl, network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake - , shake-bench, sorted-list, stm, syb, tasty, tasty-expected-failure - , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time - , transformers, unix, unordered-containers, utf8-string, yaml - }: - mkDerivation { - pname = "ghcide"; - version = "0.7.0.0"; - sha256 = "165dbwbcpl2r7jqsjk859c42yas8h877mx37d0jnx8vm47fdy484"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - case-insensitive containers cryptohash-sha1 data-default deepseq - directory extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-paths Glob haddock-library hashable haskell-lsp - haskell-lsp-types heapsize hie-bios hie-compat hls-plugin-api - hslogger implicit-hie-cradle lens mtl network-uri opentelemetry - parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa - rope-utf16-splay safe safe-exceptions shake sorted-list stm syb - text time transformers unix unordered-containers utf8-string - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize - hie-bios hls-plugin-api lens lsp-test optparse-applicative process - safe-exceptions shake text unordered-containers - ]; - testHaskellDepends = [ - aeson base binary bytestring containers data-default directory - extra filepath ghc ghc-typelits-knownnat haddock-library - haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test - network-uri optparse-applicative process QuickCheck - quickcheck-instances record-dot-preprocessor record-hasfield - rope-utf16-splay safe safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text - ]; - benchmarkHaskellDepends = [ - aeson base directory filepath shake shake-bench text yaml - ]; - description = "The core of an IDE"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ maralorn ]; - broken = true; - }) {shake-bench = null;}; - "ghcide" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, case-insensitive, containers, cryptohash-sha1 @@ -101395,8 +101769,8 @@ self: { , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob , haddock-library, hashable, haskell-lsp, haskell-lsp-types - , heapsize, hie-bios, hie-compat, hls-plugin-api, hslogger - , implicit-hie-cradle, lens, lsp-test, mtl, network-uri + , heapsize, hie-bios, hie-compat, hls-plugin-api, hp2pretty + , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri , opentelemetry, optparse-applicative, parallel, prettyprinter , prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield @@ -101408,8 +101782,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "0.7.2.0"; - sha256 = "1d35vfwg906djfr2klrql7crgcyabfad12akalx25jc6c7pacv1d"; + version = "0.7.3.0"; + sha256 = "0iak2bwkp0x66cl9axcxq00vmf4yn6y0h8ih4wq6mnavmplbyi3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101443,6 +101817,73 @@ self: { benchmarkHaskellDepends = [ aeson base directory filepath shake shake-bench text yaml ]; + benchmarkToolDepends = [ hp2pretty ]; + description = "The core of an IDE"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + broken = true; + }) {shake-bench = null;}; + + "ghcide_0_7_4_0" = callPackage + ({ mkDerivation, aeson, array, async, base, base16-bytestring + , binary, bytestring, bytestring-encoding, case-insensitive + , containers, cryptohash-sha1, data-default, deepseq, Diff + , directory, dlist, extra, filepath, fingertree, fuzzy, ghc + , ghc-boot, ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat + , hiedb, hls-plugin-api, hp2pretty, hslogger, implicit-hie-cradle + , lens, lsp-test, mtl, network-uri, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, record-dot-preprocessor, record-hasfield + , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions + , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , tasty-rerun, text, time, transformers, unix, unordered-containers + , utf8-string, vector, yaml + }: + mkDerivation { + pname = "ghcide"; + version = "0.7.4.0"; + sha256 = "00f2p18g6w7vf2a344fr4k0rg7spnbri76d1by7403g1daqwkar9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async base base16-bytestring binary bytestring + bytestring-encoding case-insensitive containers cryptohash-sha1 + data-default deepseq Diff directory dlist extra filepath fingertree + fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths + Glob haddock-library hashable haskell-lsp haskell-lsp-types + heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger + implicit-hie-cradle lens mtl network-uri opentelemetry parallel + prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie + rope-utf16-splay safe safe-exceptions shake sorted-list + sqlite-simple stm syb text time transformers unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory extra + filepath ghc gitrev hashable haskell-lsp haskell-lsp-types heapsize + hie-bios hiedb hls-plugin-api lens lsp-test optparse-applicative + process safe-exceptions shake text unordered-containers + ]; + testHaskellDepends = [ + aeson base binary bytestring containers data-default directory + extra filepath ghc ghc-typelits-knownnat haddock-library + haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test + network-uri optparse-applicative process QuickCheck + quickcheck-instances record-dot-preprocessor record-hasfield + rope-utf16-splay safe safe-exceptions shake tasty + tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun + text + ]; + benchmarkHaskellDepends = [ + aeson base directory extra filepath optparse-applicative shake + shake-bench text yaml + ]; + benchmarkToolDepends = [ hp2pretty ]; description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -101984,7 +102425,7 @@ self: { description = "Gdk bindings"; license = lib.licenses.lgpl21; hydraPlatforms = lib.platforms.none; - }) {gtk4 = null;}; + }) {inherit (pkgs) gtk4;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf @@ -102194,7 +102635,7 @@ self: { license = lib.licenses.lgpl21; hydraPlatforms = lib.platforms.none; broken = true; - }) {gtk4 = null;}; + }) {inherit (pkgs) gtk4;}; "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -102376,7 +102817,7 @@ self: { description = "Gtk bindings"; license = lib.licenses.lgpl21; hydraPlatforms = lib.platforms.none; - }) {gtk4 = null;}; + }) {inherit (pkgs) gtk4;}; "gi-gtk-declarative" = callPackage ({ mkDerivation, async, base, containers, data-default-class @@ -103800,8 +104241,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.3.5"; - sha256 = "0z2sb9avhkq2mgj0pwlji5c2sjxd71628q1i3nhlbajfyms1bsqz"; + version = "1.3.6"; + sha256 = "07cxai2h6alyka0bsfch7vfjsvp3s9d48jw4n6z74kmxq3zdrgxh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107932,8 +108373,8 @@ self: { }: mkDerivation { pname = "goldplate"; - version = "0.1.2"; - sha256 = "1qbh23sqx0jvwrmhb88683z3rx31jy99xh8h24iqv1ykmjvmqwvf"; + version = "0.1.3"; + sha256 = "109qhyq0n4w1jdz7y2hd8cjf44pikavv6mfnmf65vyfjangjq610"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109471,8 +109912,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.11.0.0"; - sha256 = "1jg0cdyq0z1r752cx9mnbxj2rxd5s723zfvpk3mwcsvx5ygkhm0p"; + version = "0.11.1.0"; + sha256 = "093gk2w2qrvarcv7xn0d0saa1j35cy0isw5vz04h08gy37s2nspc"; libraryHaskellDepends = [ aeson base conduit containers exceptions hspec-expectations megaparsec parser-combinators scientific text transformers @@ -109640,8 +110081,8 @@ self: { }: mkDerivation { pname = "graphula"; - version = "2.0.0.2"; - sha256 = "1fqrjfr9pl9619fhrkl3khpb2lg3svzp644hvzn0bpcnxqj5p41z"; + version = "2.0.0.3"; + sha256 = "1hmay1g8j1b8pq98blq1sizc61h7lj782sajlwrllgvxc826rjm2"; libraryHaskellDepends = [ base containers directory generics-eot HUnit mtl persistent QuickCheck random semigroups temporary text transformers unliftio @@ -109984,6 +110425,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell_1_2_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hint, hspec, semigroups + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "1.2.0.1"; + sha256 = "13hshwnhl0wdnnkqamgdgw2awsh1pynwfg35c34m5fcphbmxwmms"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + description = "Haskell binding for Gremlin graph query language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific @@ -110005,6 +110468,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell-core_0_1_3_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, hspec-discover, QuickCheck + , scientific, semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.3.6"; + sha256 = "1mfdi9sr0ic15bck6dv1k70cd0lnvimap9lqyhim2piz0f8jr53k"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + testToolDepends = [ doctest doctest-discover hspec-discover ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -110510,8 +110996,8 @@ self: { ({ mkDerivation, base, generic-data, groups }: mkDerivation { pname = "groups-generic"; - version = "0.1.0.0"; - sha256 = "1rnil9qashpvrjxmziymf447pnqpqpnga0lxlk7413y4dprn2rad"; + version = "0.2.0.0"; + sha256 = "0a13x4dc114qz5r97cpg2bbdch1kn6gfmndf9glqx2nbhx6qg654"; libraryHaskellDepends = [ base generic-data groups ]; description = "Generically derive Group instances"; license = lib.licenses.bsd3; @@ -113329,19 +113815,20 @@ self: { "hadolint" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , directory, filepath, gitrev, hspec, HsYAML, HUnit + , cryptonite, directory, filepath, gitrev, hspec, HsYAML, HUnit , language-docker, megaparsec, mtl, optparse-applicative, parallel , ShellCheck, split, text, void }: mkDerivation { pname = "hadolint"; - version = "1.20.0"; - sha256 = "1wb2q26najfmmgvj35wvinvip4l1d3k5mazrang4cr3ch8v1nv6w"; + version = "1.22.1"; + sha256 = "0138hn6c7lrq9xjsmngdj1h2m2ayxx6wqqgjw66pv7sgxsfy0zji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring containers directory filepath HsYAML - language-docker megaparsec mtl parallel ShellCheck split text void + aeson async base bytestring containers cryptonite directory + filepath HsYAML language-docker megaparsec mtl parallel ShellCheck + split text void ]; executableHaskellDepends = [ base containers gitrev language-docker megaparsec @@ -114791,8 +115278,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.11.0.1"; - sha256 = "1w4zxjs6253rxkfhhsvcvpfzzslaxyb3m2c6nbh22l6a1li9bcm9"; + version = "0.11.0.2"; + sha256 = "1ndg8zmcc5a9z9qcc5z5nwssywxighnqxa4pzc5iy7kw4x9bm3kn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -117437,15 +117924,12 @@ self: { }) {}; "haskell-dap" = callPackage - ({ mkDerivation, base, containers, unix }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "haskell-dap"; - version = "0.0.14.0"; - sha256 = "1n4w7kvsy7dri07840i6rm6b7fl425f8r3fglbcss42g674k35di"; - isLibrary = true; - isExecutable = true; + version = "0.0.15.0"; + sha256 = "1wk6813pwwnph7w1waci9q6r0glsjpayk27kr43zddwd2v0abcld"; libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base unix ]; description = "Haskell implementation of the DAP interface data"; license = lib.licenses.bsd3; }) {}; @@ -117459,8 +117943,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.33.0"; - sha256 = "1v4dzjv1w0jdp5dyq3qrbdw34433b5xg6wk5hg87agzc3mllbkqa"; + version = "0.0.34.0"; + sha256 = "00z9yhs2c34rdki404gcwf938a2lshr0a7mrvzpknk70n1a0gall"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117837,12 +118321,13 @@ self: { "haskell-language-server" = callPackage ({ mkDerivation, aeson, base, binary, blaze-markup, brittany , bytestring, containers, data-default, deepseq, directory, extra - , filepath, floskell, fourmolu, ghc, ghc-boot-th, ghc-paths, ghcide - , gitrev, hashable, haskell-lsp, hie-bios, hls-class-plugin - , hls-eval-plugin, hls-explicit-imports-plugin, hls-hlint-plugin - , hls-plugin-api, hls-retrie-plugin, hls-tactics-plugin, hslogger - , hspec, hspec-core, hspec-expectations, lens, lsp-test, mtl - , optparse-applicative, optparse-simple, ormolu, process + , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths + , ghcide, gitrev, hashable, haskell-lsp, hie-bios, hls-class-plugin + , hls-eval-plugin, hls-explicit-imports-plugin + , hls-haddock-comments-plugin, hls-hlint-plugin, hls-plugin-api + , hls-retrie-plugin, hls-splice-plugin, hls-tactics-plugin + , hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test + , mtl, optparse-applicative, optparse-simple, ormolu, process , regex-tdfa, safe-exceptions, shake, stm, stylish-haskell, tasty , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit , tasty-rerun, temporary, text, transformers, unordered-containers @@ -117850,8 +118335,8 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "0.8.0.0"; - sha256 = "0s02llij5qb1z3na43zg51p5r80jpgwxkdv4mzi6m5xb7pppax42"; + version = "0.9.0.0"; + sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117861,17 +118346,18 @@ self: { ]; executableHaskellDepends = [ aeson base binary brittany bytestring containers deepseq directory - extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide - gitrev hashable haskell-lsp hie-bios hls-class-plugin - hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin - hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens - mtl optparse-applicative optparse-simple ormolu process regex-tdfa - safe-exceptions shake stylish-haskell temporary text transformers - unordered-containers with-utf8 + extra filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths + ghcide gitrev hashable haskell-lsp hie-bios hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin + hls-haddock-comments-plugin hls-hlint-plugin hls-plugin-api + hls-retrie-plugin hls-splice-plugin hls-tactics-plugin hslogger + lens mtl optparse-applicative optparse-simple ormolu process + regex-tdfa safe-exceptions shake stylish-haskell temporary text + transformers unordered-containers with-utf8 ]; testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default - directory extra filepath haskell-lsp hie-bios hls-plugin-api + directory extra filepath ghcide haskell-lsp hie-bios hls-plugin-api hslogger hspec hspec-core hspec-expectations lens lsp-test process stm tasty tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit tasty-rerun temporary text transformers @@ -117880,8 +118366,6 @@ self: { testToolDepends = [ ghcide ]; description = "LSP server for GHC"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-lexer" = callPackage @@ -117924,6 +118408,36 @@ self: { license = lib.licenses.mit; }) {}; + "haskell-lsp_0_23_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.23.0.0"; + sha256 = "07vyfqqvgaxg06yrawiwfffv511jlamhh4p7i0hwx60xdgpg11xh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "haskell-lsp_0_24_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable @@ -117993,6 +118507,24 @@ self: { license = lib.licenses.mit; }) {}; + "haskell-lsp-types_0_23_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, data-default + , deepseq, filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.23.0.0"; + sha256 = "0dz0980681khfn229aky3bsclj86xkril2y0ln3wr7g9v77ypbq7"; + libraryHaskellDepends = [ + aeson base binary bytestring data-default deepseq filepath hashable + lens network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "haskell-lsp-types_0_24_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text @@ -118467,8 +118999,8 @@ self: { pname = "haskell-src"; version = "1.0.3.1"; sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; - revision = "2"; - editedCabalFile = "1qrhcyr0y7j8la3970pg80w3h3pprsp3nisgg1l41wfsr2m7smnf"; + revision = "3"; + editedCabalFile = "0hjridmgm95lrb9qs972zicipsqcfwpr35gwkzxncpgwcm0vn0b6"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -119992,8 +120524,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.18.0"; - sha256 = "13j8hsyj7x30s6rl8pigvkcwn9ahrwd85y4i8z6728rsjj2ygih3"; + version = "0.19.0"; + sha256 = "0yyrka8hr6jsl7w59j3xmnvzq4gnwz4gybjar2zq1g096shdpk7c"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -120124,43 +120656,44 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring - , cereal, conduit, containers, data-default, deepseq, filepath - , hashable, haskoin-core, haskoin-node, haskoin-store-data, hedis - , hspec, hspec-discover, http-types, monad-logger, mtl, network - , nqe, optparse-applicative, QuickCheck, random - , rocksdb-haskell-jprupp, rocksdb-query, scotty, string-conversions - , text, time, transformers, unliftio, unordered-containers, wai - , warp + , cereal, conduit, containers, data-default, deepseq, ekg-core + , ekg-statsd, filepath, foldl, hashable, haskoin-core, haskoin-node + , haskoin-store-data, hedis, hspec, hspec-discover, http-types + , lens, monad-control, monad-logger, mtl, network, nqe + , optparse-applicative, QuickCheck, random, rocksdb-haskell-jprupp + , rocksdb-query, scotty, stm, string-conversions, text, time + , transformers, unliftio, unordered-containers, wai, warp, wreq }: mkDerivation { pname = "haskoin-store"; - version = "0.39.0"; - sha256 = "1a1bhsjxb1nj49b5xjv78h89xsc5ffrf9qq1n12ak54ckvw0rgmv"; + version = "0.42.2"; + sha256 = "03xys3m0cdkjbabcrgc96sdb8ws3rrzq794ggnkwigwzgnav0gm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cereal conduit containers - data-default deepseq hashable haskoin-core haskoin-node - haskoin-store-data hedis http-types monad-logger mtl network nqe - random rocksdb-haskell-jprupp rocksdb-query scotty - string-conversions text time transformers unliftio - unordered-containers wai warp + data-default deepseq ekg-core ekg-statsd foldl hashable + haskoin-core haskoin-node haskoin-store-data hedis http-types lens + monad-control monad-logger mtl network nqe random + rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions + text time transformers unliftio unordered-containers wai warp wreq ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring cereal conduit containers - data-default deepseq filepath hashable haskoin-core haskoin-node - haskoin-store-data hedis http-types monad-logger mtl network nqe - optparse-applicative random rocksdb-haskell-jprupp rocksdb-query - scotty string-conversions text time transformers unliftio - unordered-containers wai warp + data-default deepseq ekg-core ekg-statsd filepath foldl hashable + haskoin-core haskoin-node haskoin-store-data hedis http-types lens + monad-control monad-logger mtl network nqe optparse-applicative + random rocksdb-haskell-jprupp rocksdb-query scotty stm + string-conversions text time transformers unliftio + unordered-containers wai warp wreq ]; testHaskellDepends = [ aeson aeson-pretty base base64 bytestring cereal conduit containers - data-default deepseq hashable haskoin-core haskoin-node - haskoin-store-data hedis hspec http-types monad-logger mtl network - nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty - string-conversions text time transformers unliftio - unordered-containers wai warp + data-default deepseq ekg-core ekg-statsd foldl hashable + haskoin-core haskoin-node haskoin-store-data hedis hspec http-types + lens monad-control monad-logger mtl network nqe QuickCheck random + rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions + text time transformers unliftio unordered-containers wai warp wreq ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -120173,21 +120706,22 @@ self: { ({ mkDerivation, aeson, base, bytestring, cereal, containers , data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network - , QuickCheck, scotty, string-conversions, text, wreq + , QuickCheck, scotty, string-conversions, text + , unordered-containers, wreq }: mkDerivation { pname = "haskoin-store-data"; - version = "0.38.1"; - sha256 = "0x3p0fylfc8llv94nmjaz9537qp2jwm5zlbs8mw7b4lh9z69f3ba"; + version = "0.42.1"; + sha256 = "17yfbd4vp9xx551bybpkiiv6w1x8067xmyrfff7zak3glzb3piva"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network - scotty string-conversions text wreq + scotty string-conversions text unordered-containers wreq ]; testHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core hspec http-client http-types lens mtl network - QuickCheck scotty string-conversions text wreq + QuickCheck scotty string-conversions text unordered-containers wreq ]; testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; @@ -120860,10 +121394,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "haskus-utils-types"; - version = "1.5"; - sha256 = "1mbgnx4i82g9bq1qpvjjs9yb683gfja5bws8y26mzjl4igk6izsy"; - revision = "1"; - editedCabalFile = "1mjwmk5prbrb91dbhxg9pp47zf5cfnnm07h3f2m902af3l0yjiih"; + version = "1.5.1"; + sha256 = "1nm5nn45r2c9f20j7v0v3abkbglyi45wmyrigy1v65c5lk4g57r5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Haskus types utility modules"; @@ -123404,8 +123936,8 @@ self: { ({ mkDerivation, async, base, io-streams, time }: mkDerivation { pname = "heartbeat-streams"; - version = "0.1.0.2"; - sha256 = "059dx7paaniwmxgyzapv0542jf8yb4vzbg8501d2j779ixvzm80d"; + version = "0.1.0.3"; + sha256 = "004dkld0friilhb9j1fhibzndchkljxzqm6k99zli4h83q787wlf"; libraryHaskellDepends = [ async base io-streams time ]; description = "Heartbeats for io-streams"; license = lib.licenses.bsd3; @@ -123716,8 +124248,8 @@ self: { ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { pname = "hedgehog-fakedata"; - version = "0.0.1.3"; - sha256 = "0h0cf4y25453n52d4y1ximzdc9l04b17byd9kgjvc3c279866f1i"; + version = "0.0.1.4"; + sha256 = "1pa8kf6pxsvmfy8r29xk486cdi38881blqj1lcnjya98ilb6ldx3"; libraryHaskellDepends = [ base fakedata hedgehog random ]; testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; @@ -123859,8 +124391,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.14.1"; - sha256 = "0n7hwg8mp4v512g7s8cblmai0j00l1149bbdacm6s7d0plnk0qqd"; + version = "0.14.2"; + sha256 = "1zm8llpbbvr5f5s0i4qsn025734s1mamfvm1dgxw4p87m9zhprlm"; libraryHaskellDepends = [ async base bytestring bytestring-lexing containers deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm @@ -125106,31 +125638,31 @@ self: { "hevm" = callPackage ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base , base16-bytestring, binary, brick, bytestring, cereal, containers - , cryptonite, data-dword, deepseq, directory, fgl, filepath, free - , haskeline, here, HUnit, lens, lens-aeson, libff, megaparsec - , memory, monad-par, mtl, multiset, operational, optparse-generic - , process, QuickCheck, quickcheck-text, regex-tdfa, restless-git - , rosezipper, s-cargot, sbv, scientific, secp256k1, semver-range - , tasty, tasty-hunit, tasty-quickcheck, temporary, text - , text-format, time, transformers, tree-view, unordered-containers - , vector, vty, witherable, wreq + , cryptonite, data-dword, Decimal, deepseq, directory, fgl + , filepath, free, haskeline, here, HUnit, lens, lens-aeson, libff + , megaparsec, memory, monad-par, mtl, multiset, operational + , optparse-generic, process, QuickCheck, quickcheck-text + , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific + , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, text-format, time, transformers, tree-view + , unordered-containers, vector, vty, witherable, wreq }: mkDerivation { pname = "hevm"; - version = "0.42.0"; - sha256 = "0p736bxsg91l7n82xad52j5gqvyx6ik7hbmlnnz5bsrnsm05maxz"; + version = "0.44.1"; + sha256 = "1ygrksnqav1cw9pq1x2xi0na5fxy0phyc0v48nkzpis868gy0b97"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ abstract-par aeson ansi-wl-pprint base base16-bytestring binary - brick bytestring cereal containers cryptonite data-dword deepseq - directory fgl filepath free haskeline lens lens-aeson megaparsec - memory monad-par mtl multiset operational optparse-generic process - QuickCheck quickcheck-text regex-tdfa restless-git rosezipper - s-cargot sbv scientific semver-range temporary text text-format - time transformers tree-view unordered-containers vector vty - witherable wreq + brick bytestring cereal containers cryptonite data-dword Decimal + deepseq directory fgl filepath free haskeline lens lens-aeson + megaparsec memory monad-par mtl multiset operational + optparse-generic process QuickCheck quickcheck-text regex-tdfa + restless-git rosezipper s-cargot sbv scientific semver-range + temporary text text-format time transformers tree-view + unordered-containers vector vty witherable wreq ]; librarySystemDepends = [ libff secp256k1 ]; executableHaskellDepends = [ @@ -125398,8 +125930,8 @@ self: { }: mkDerivation { pname = "hexpat-streamparser"; - version = "0.0.1"; - sha256 = "09klv9if55rlhjrh7cw68kk9z3mrwm1p2agb7a23j8a68iga5gvi"; + version = "0.0.2"; + sha256 = "11g78dkr9dp4kgz8zmckgq66587qahdhxyhcn03ajr0b07ab27z3"; libraryHaskellDepends = [ base bytestring hexpat List mtl parser-combinators text transformers @@ -127071,8 +127603,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "5.3.1"; - sha256 = "008s8zm9qs972b7v5kkmr8l3i9kc6zm7yj33mkw6dv69b7h3c01l"; + version = "5.3.2"; + sha256 = "129gkn8qg68wsd60mq8yk7hrqsc8sd8v56xn41m5ii3hriq1mmv7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127763,6 +128295,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "histogram-simple" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "histogram-simple"; + version = "1.0"; + sha256 = "11x8v0svvsc0impf59vixbsaxh5nwvyc9wmw9xkshd4k4a30bdb8"; + libraryHaskellDepends = [ base containers ]; + description = "Simple Data.Map-based histogram"; + license = lib.licenses.bsd3; + }) {}; + "historian" = callPackage ({ mkDerivation, base, containers, directory, filepath, process , regex-compat, regex-posix @@ -128266,8 +128809,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.20.3"; - sha256 = "1wy45ppcakml2wk021yr8kqv0q0x85vms8kx0npjawzbs498qqx9"; + version = "1.20.4"; + sha256 = "1fsdh4k0lrlx3n81hns8h2dh917i0cmh1iax55d9q7jlxvy5bq95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128359,17 +128902,19 @@ self: { }) {}; "hledger-flow" = callPackage - ({ mkDerivation, base, containers, exceptions, foldl, HUnit - , optparse-applicative, path, path-io, stm, text, time, turtle + ({ mkDerivation, base, containers, exceptions, filepath, foldl + , gitrev, HUnit, optparse-applicative, path, path-io, stm, text + , time, turtle }: mkDerivation { pname = "hledger-flow"; - version = "0.14.2.0"; - sha256 = "17a21rf2gj9hp7q0q7gg4znwa2j8xgrlxaq15akjn20sqp8l23ni"; + version = "0.14.3.0"; + sha256 = "113lr6b47fs3900wrn8fg1kxcbvfh91gla7585h13miz3wyjbdyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions foldl path path-io stm text time turtle + base containers exceptions filepath foldl gitrev path path-io stm + text time turtle ]; executableHaskellDepends = [ base optparse-applicative path text turtle @@ -128467,8 +129012,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.20.3"; - sha256 = "0pm6ckim1krkg4x7azspsnc1alwynqnjdhxrda764xyrz9s0r8cp"; + version = "1.20.4"; + sha256 = "17fs3jh3wx1hgzijqpw0s57hq6hq43fadplmqkcjw1ikgm8h0zyw"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -128544,8 +129089,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.20.3"; - sha256 = "02g6xdxif67fjj6rjskw69cxhx2irwv7sk0b1slr20nch122pzl1"; + version = "1.20.4"; + sha256 = "0y9jyv4mphzyla70z365l5dwg50chsng011bazzpfwr6w889803i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128591,8 +129136,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.20.3"; - sha256 = "1dz3lwp86dlmdrnj5hda12219x03xw8csxk0bjysn43rjzxag4q4"; + version = "1.20.4"; + sha256 = "06psp5r6blj3s1z8zg515jgw58pyxy43qinh5cl161fxcl8ldfn4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128879,21 +129424,22 @@ self: { "hls-eval-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory - , extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide, hashable - , haskell-lsp, haskell-lsp-types, hls-plugin-api - , parser-combinators, pretty-simple, QuickCheck, safe-exceptions - , shake, temporary, text, time, transformers, unordered-containers + , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide + , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens + , megaparsec, mtl, parser-combinators, pretty-simple, QuickCheck + , safe-exceptions, shake, temporary, text, time, transformers + , unordered-containers }: mkDerivation { pname = "hls-eval-plugin"; - version = "0.1.0.5"; - sha256 = "1vfsvhn7b5w537hsri6bz36c547pxv13jyjvj1a5934jzyzvv9qn"; + version = "0.2.0.0"; + sha256 = "0l85qia3gsdafxmkidr26sxgajvp46hcphkb1l8vm6q7h6jgj0d5"; libraryHaskellDepends = [ - aeson base containers deepseq Diff directory extra filepath ghc - ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types - hls-plugin-api parser-combinators pretty-simple QuickCheck - safe-exceptions shake temporary text time transformers - unordered-containers + aeson base containers deepseq Diff directory dlist extra filepath + ghc ghc-boot-th ghc-paths ghcide hashable haskell-lsp + haskell-lsp-types hls-plugin-api lens megaparsec mtl + parser-combinators pretty-simple QuickCheck safe-exceptions shake + temporary text time transformers unordered-containers ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -128925,6 +129471,25 @@ self: { pname = "hls-explicit-imports-plugin"; version = "0.1.0.0"; sha256 = "0il51ndiw16h5kgclwzx8p1pwv6ph808406bh52nq1bjyadlwkk2"; + revision = "1"; + editedCabalFile = "1mmsgs0n0x0q8zdzc617pi24wadgjr7hxrwqw6ihv004ahzdmjms"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide haskell-lsp-types + hls-plugin-api shake text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + + "hls-explicit-imports-plugin_0_1_0_1" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , haskell-lsp-types, hls-plugin-api, shake, text + , unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "0.1.0.1"; + sha256 = "0n36yk21wh9wklp8bnrg4b6qck2nf34m8p3fpilwpnzfchk6wr1y"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide haskell-lsp-types hls-plugin-api shake text unordered-containers @@ -128932,7 +129497,6 @@ self: { description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-haddock-comments-plugin" = callPackage @@ -128941,10 +129505,8 @@ self: { }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "0.1.0.0"; - sha256 = "12zs6yq39jpg3x6w9y5a5jri5rfh8qpxawdhmhiqm067zjnj9xi4"; - revision = "1"; - editedCabalFile = "0kddmrlmcsa1d22mqzw1wsh82x4nn0ff4xbwci7585i9z61mzhg2"; + version = "0.1.1.0"; + sha256 = "1kqkdbwx34k109dk3bl57hk2mcqw1cjj7l5382qfwy5bky4zjihn"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide haskell-lsp-types hls-plugin-api text unordered-containers @@ -128956,26 +129518,22 @@ self: { "hls-hlint-plugin" = callPackage ({ mkDerivation, aeson, apply-refact, base, binary, bytestring , containers, data-default, deepseq, Diff, directory, extra - , filepath, ghc, ghcide, hashable, haskell-lsp, hlint - , hls-plugin-api, hslogger, lens, regex-tdfa, shake, temporary - , text, transformers, unordered-containers + , filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp + , hlint, hls-plugin-api, hslogger, lens, regex-tdfa, shake + , temporary, text, transformers, unordered-containers }: mkDerivation { pname = "hls-hlint-plugin"; - version = "0.1.0.0"; - sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq"; - revision = "1"; - editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s"; + version = "0.2.0.0"; + sha256 = "0v822s8m6iy7s0sld06gwh3ly20na0624s5g4642kkb2facbhm7d"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc ghcide hashable - haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa shake - temporary text transformers unordered-containers + deepseq Diff directory extra filepath ghc ghc-exactprint ghcide + hashable haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa + shake temporary text transformers unordered-containers ]; description = "Hlint integration plugin with Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-plugin-api" = callPackage @@ -128985,10 +129543,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "0.6.0.0"; - sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi"; - revision = "2"; - editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji"; + version = "0.7.0.0"; + sha256 = "1cpl65ay55k3lvwsvqzwbg0c6lkzmiki2qvk6lj2dn6rcry9gk55"; libraryHaskellDepends = [ aeson base containers data-default Diff hashable haskell-lsp hslogger lens process regex-tdfa shake text unix @@ -129006,8 +129562,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "0.1.0.0"; - sha256 = "1h928dvycyj4lxhn73zv58hgvc4yccr5dv7bbc6nsq62762f75j4"; + version = "0.1.1.0"; + sha256 = "0wlrqqx2230xxvc1bl5gyx3cavs74c74bl4v3ib4v48wffgswbbj"; libraryHaskellDepends = [ aeson base containers deepseq directory extra ghc ghcide hashable haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions @@ -129015,24 +129571,21 @@ self: { ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc - , ghc-exactprint, ghcide, haskell-lsp, hls-exactprint-utils - , hls-plugin-api, lens, retrie, shake, syb, text, transformers - , unordered-containers + , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie + , shake, syb, text, transformers, unordered-containers }: mkDerivation { pname = "hls-splice-plugin"; - version = "0.1.0.0"; - sha256 = "10zqgczp1mx81ac8fh59dp1hipfh09w4hnxylqjhj6c6wzgwa4cj"; + version = "0.3.0.0"; + sha256 = "1mi9951hgq7mcwry5mdi4ywxk3jkzs47x7q4nvm2svkpvgnbfhdv"; libraryHaskellDepends = [ aeson base containers dlist foldl ghc ghc-exactprint ghcide - haskell-lsp hls-exactprint-utils hls-plugin-api lens retrie shake - syb text transformers unordered-containers + haskell-lsp hls-plugin-api lens retrie shake syb text transformers + unordered-containers ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; @@ -129049,6 +129602,8 @@ self: { pname = "hls-tactics-plugin"; version = "0.5.1.0"; sha256 = "150hbhdj0rxiyslqfvwzqiyyc0pdvkbfjizv33ldbq8gmwn6lf52"; + revision = "1"; + editedCabalFile = "03g175y8hg962w7npphw9laaq9j0xf6nw6p04jd4y6d20pnjn1dl"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide @@ -131248,8 +131803,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.7.0"; - sha256 = "1kj72jn0sfvf68lf9n2v7v2qqw1g3kjyr6s6zlyvs6p2k3fw4ync"; + version = "0.8.0"; + sha256 = "122caz296w8sfc0ma4zigssha8vbr8abgj9ajsr83jh9k68jy3d9"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -131265,8 +131820,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.7.1"; - sha256 = "1fhqlckfznmd5dhzsxgm40lynm790j8g4srf6y3g632dv7lccjwn"; + version = "0.8.0"; + sha256 = "0vkf5ajmdy7h88vfz2aq5zzq4mrnl4wi0dqn0rzzbr3rjpip42j6"; libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src mtl process temporary text @@ -131278,13 +131833,15 @@ self: { }) {}; "hoppy-runtime" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath }: + ({ mkDerivation, base, Cabal, containers, directory, filepath + , hoppy-generator + }: mkDerivation { pname = "hoppy-runtime"; - version = "0.7.0"; - sha256 = "0rkyili7kbxj22rvs4056vhcgwpjzgigmwcrj6iph5pfzxnnl40q"; + version = "0.8.0"; + sha256 = "123mn1sfwy01jyb803r4rhdqpdafmbkyip149ga1pvlaj272mlqy"; libraryHaskellDepends = [ - base Cabal containers directory filepath + base Cabal containers directory filepath hoppy-generator ]; description = "C++ FFI generator - Runtime support"; license = lib.licenses.asl20; @@ -131296,8 +131853,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.7.1"; - sha256 = "1y7xi347xq60p66avxgjyzxn9q7amjg1s43b9fln4v8f9ca0pwn7"; + version = "0.8.0"; + sha256 = "0ysbnhabnrr0jb8f9a06fqqxv2sy7ahj92jhw2bifnvjffk1pnqd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -131761,8 +132318,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.34.3"; - sha256 = "0gwqmv3p3g9551n405bxrwm7a5ysx3q72q04k5qmicb3mxwwxnff"; + version = "0.34.4"; + sha256 = "1xszy00al5zzga64gh7nvgqc93242f61kqy8lb09jkm98a8fs4bl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132371,25 +132928,25 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, exceptions, fields-json, hpqtypes, lifted-base - , log-base, monad-control, mtl, safe, semigroups, tasty - , tasty-hunit, text, text-show, transformers, uuid-types + , cryptohash, deepseq, exceptions, extra, fields-json, hpqtypes + , lifted-base, log-base, monad-control, mtl, QuickCheck, safe + , semigroups, tasty, tasty-bench, tasty-hunit, text, text-show + , time, transformers, uuid-types }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.10.3.0"; - sha256 = "1ifr6z89ki541b9x3kpyf10vbn3anhfcq8ppqwyp5zvmkx0q3wqs"; - revision = "1"; - editedCabalFile = "0pa13k78w0xm59pvlsd9rmg9ddi3jkc918j5i0hb4vlxcaivq34y"; + version = "1.10.4.0"; + sha256 = "0qlxhq4vkr0qq1ckazb0lng9mbnljh32xsmcpbp5qm01bngadz56"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions - fields-json hpqtypes lifted-base log-base monad-control mtl safe - semigroups text text-show + extra fields-json hpqtypes lifted-base log-base monad-control mtl + safe semigroups text text-show ]; testHaskellDepends = [ - base exceptions hpqtypes lifted-base log-base monad-control tasty - tasty-hunit text transformers uuid-types + base exceptions hpqtypes lifted-base log-base monad-control + QuickCheck tasty tasty-hunit text time transformers uuid-types ]; + benchmarkHaskellDepends = [ base deepseq tasty-bench ]; description = "Extra utilities for hpqtypes library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -132898,6 +133455,24 @@ self: { license = lib.licenses.bsd3; }) {GeoIP = null;}; + "hs-aws-lambda" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, deepseq, http-client, http-types, safe-exceptions + , text, unliftio + }: + mkDerivation { + pname = "hs-aws-lambda"; + version = "0.1.0.2"; + sha256 = "078qkvxbjdsqgjmfq4fcpndb8c8cyz4g8s1q0ankpy359dvgxkv8"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers deepseq + http-client http-types safe-exceptions text unliftio + ]; + testHaskellDepends = [ base ]; + description = "A modern and easy-to-use wrapper for Docker-based Lambda implementations"; + license = lib.licenses.publicDomain; + }) {}; + "hs-bibutils" = callPackage ({ mkDerivation, base, syb }: mkDerivation { @@ -134955,8 +135530,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.2.2"; - sha256 = "1zw26rp206w5wq3qb2y35wjis2a3qvyip7k35f3ls4y530gw39bq"; + version = "0.1.2.4"; + sha256 = "17dhhjbynr7afjibv6fys45m2al422b6q3z7ncfycpwp6541qifm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135508,15 +136083,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "hslua_1_3_0" = callPackage + "hslua_1_3_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "1.3.0"; - sha256 = "1dfh1jax6yrk5sf9q8qnq1qgr541xkwwnz9y3q6r8wflvwlj7cal"; + version = "1.3.0.1"; + sha256 = "1mz8zk13dhgaf24hmmjqnn5hcln96iw73mcjwjilag8388wq72k7"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions mtl text @@ -135568,6 +136143,22 @@ self: { license = lib.licenses.mit; }) {}; + "hslua-module-path" = callPackage + ({ mkDerivation, base, filepath, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-path"; + version = "0.1.0.1"; + sha256 = "1zxfljcn74rky26ijqmba6grpj0h9plgr47wxdaf7gcz1y8dhn68"; + libraryHaskellDepends = [ base filepath hslua text ]; + testHaskellDepends = [ + base filepath hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module to work with file paths"; + license = lib.licenses.mit; + }) {}; + "hslua-module-system" = callPackage ({ mkDerivation, base, containers, directory, exceptions, hslua , tasty, tasty-hunit, tasty-lua, temporary, text @@ -136414,6 +137005,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "hspec-need-env_0_1_0_6" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover + , hspec-expectations, setenv, transformers + }: + mkDerivation { + pname = "hspec-need-env"; + version = "0.1.0.6"; + sha256 = "0drbjdm6wld2bnfmv2jqhw4ija9v85pa4p5aq9qgh1gs6c5d50bq"; + libraryHaskellDepends = [ base hspec-core hspec-expectations ]; + testHaskellDepends = [ base hspec hspec-core setenv transformers ]; + testToolDepends = [ hspec-discover ]; + description = "Read environment variables for hspec tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-parsec" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, parsec }: mkDerivation { @@ -138430,7 +139037,7 @@ self: { license = lib.licenses.mit; }) {}; - "http-client_0_7_4" = callPackage + "http-client_0_7_5" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -138439,8 +139046,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.4"; - sha256 = "1a4vhhn8y5qcqd4i2q7pl9jqfrsh65nkv32qcsc80cjy2bcqivjs"; + version = "0.7.5"; + sha256 = "11p4szyrdl0ck2iixdrq2dcjz9dlv4pd36ymkipmq7c28l1cvy7k"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -139924,8 +140531,8 @@ self: { pname = "hum"; version = "0.2.0.0"; sha256 = "144b1161rvlmayklvgm7cajs0jz5bhlbcgrq288pvymlyl4f962b"; - revision = "1"; - editedCabalFile = "07d19lqi5djdsda976qr1w8ps535dxxjsp0lr43b62cinw2ssnki"; + revision = "2"; + editedCabalFile = "03hh7nyqchskkp4iqcq335mnpdsvgdw8d1pf3dp7p4wmsk20kwmk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139945,8 +140552,6 @@ self: { ]; description = "A TUI MPD client, inspired by ncmpcpp"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "human-parse" = callPackage @@ -140323,8 +140928,8 @@ self: { }: mkDerivation { pname = "husk-scheme"; - version = "3.19.3"; - sha256 = "0bb4iph3pp26rm9sdsjsshbig3misd1yr4waqblj8vr9fmrpx084"; + version = "3.20"; + sha256 = "11pghca4msm5nw1zdw3qlxzhmcwl9xg5hyvjd9z7869a3qahid5q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -141135,8 +141740,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "4.0.2"; - sha256 = "166gi8mj2ljv4xcjrhi2pgjmnj112998fzbzjfpf5ckj54d20ch9"; + version = "4.0.3"; + sha256 = "1s3wj5ih9mc7vp0w9rymw22w1yxp8z3qi7qmza9qw00aail8c5dg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141848,8 +142453,8 @@ self: { }: mkDerivation { pname = "hxt"; - version = "9.3.1.18"; - sha256 = "0836k65px3w9c5h1h2bmzq5a7mp6ajxwvfg3pfr2kbxwkgc0j63j"; + version = "9.3.1.21"; + sha256 = "1y2kyb7hyhx0vpkfyd0f11v2v7khk57qyfgqzk442x8qcibm3d9a"; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri @@ -141896,8 +142501,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hxt-charproperties"; - version = "9.4.0.0"; - sha256 = "1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm"; + version = "9.5.0.0"; + sha256 = "0jm98jddbsd60jc2bz8wa71rslagbaqf00ia7fvfsaiaa54nk0r8"; libraryHaskellDepends = [ base ]; description = "Character properties and classes for XML and Unicode"; license = lib.licenses.mit; @@ -142004,10 +142609,8 @@ self: { }: mkDerivation { pname = "hxt-regex-xmlschema"; - version = "9.2.0.3"; - sha256 = "1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l"; - revision = "1"; - editedCabalFile = "0vg9vnfjmq1ma6zwwv4yvfih6wbslksvsvy9b41i4f81l0hh7ia8"; + version = "9.2.0.7"; + sha256 = "0ynrf65m7abq2fjnarlwq6i1r99pl89npibxx05rlplcgpybrdmr"; libraryHaskellDepends = [ base bytestring hxt-charproperties parsec text ]; @@ -142712,8 +143315,8 @@ self: { pname = "hyphenation"; version = "0.8"; sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii"; - revision = "2"; - editedCabalFile = "0y10glmsgnc67f2y8d6irgwyz9fahg9dv2sidqx1r6rfbs02416i"; + revision = "3"; + editedCabalFile = "0krjvrk5hzcs101b5h95ai51wwq1fj04q1ryn63j1qmj22jpn4ki"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -144600,8 +145203,8 @@ self: { }: mkDerivation { pname = "imperative-edsl"; - version = "0.8"; - sha256 = "0mz6yy472wvcg4ywjhaaqi0cxyy9l437pw4rkwd2j392n6hlfbar"; + version = "0.8.1"; + sha256 = "1z1a7b7m69m9xagvfa6xx3l1j0s7lrlvp4n09lra1x3q7lpfgnra"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -144915,8 +145518,8 @@ self: { }: mkDerivation { pname = "in-other-words"; - version = "0.1.1.0"; - sha256 = "0f11si2bnxw2bm5mfnnqh9cfwhlzdcqkw5dfjql1y618db808am9"; + version = "0.2.0.0"; + sha256 = "0adl539jilc3rnwx9ir39y97f6h60xavzhhc8pa9vc6gqp1v4g20"; libraryHaskellDepends = [ async base exceptions monad-control mtl stm transformers transformers-base @@ -144930,6 +145533,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "in-other-words-plugin" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, hspec + , hspec-discover, in-other-words, syb, transformers + }: + mkDerivation { + pname = "in-other-words-plugin"; + version = "0.1.0.0"; + sha256 = "02c6qprny0x1qs5zpcma07vr3ikrksr18gqxpvf9hx55w3pnni0w"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra in-other-words syb + transformers + ]; + testHaskellDepends = [ + base containers ghc ghc-tcplugins-extra hspec in-other-words syb + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Disambiguate obvious uses of effects when using in-other-words"; + license = lib.licenses.bsd3; + }) {}; + "inbox" = callPackage ({ mkDerivation, async, base, error-or, text, time }: mkDerivation { @@ -145843,8 +146467,8 @@ self: { }: mkDerivation { pname = "inline-asm"; - version = "0.4.0.1"; - sha256 = "19djbqfidl8spii2y5a4qi5a6k2dhh9kg4lafxx58w60118rsv6z"; + version = "0.4.0.2"; + sha256 = "01npi02i8wf9b0pa18cgl78ma6r9xqz0i7dc3khkj1725w5wkhvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146136,21 +146760,21 @@ self: { ({ mkDerivation, aeson, aeson-extra, base, binary, bytestring , containers, directory, ekg-core, exceptions, hslogger , http-client, http-client-tls, http-types, HUnit, network, process - , random, regex-base, regex-tdfa, retry, scientific, servant - , servant-server, stm, sysinfo, text, time, transformers, unix - , unordered-containers, wai, warp + , random, regex-base, regex-compat, regex-pcre, regex-tdfa, retry + , scientific, servant, servant-server, stm, sysinfo, text, time + , transformers, unix, unordered-containers, wai, warp }: mkDerivation { pname = "instana-haskell-trace-sdk"; - version = "0.4.0.0"; - sha256 = "0cg1i7whiwg07zsby5zr3q3pqg24js3zvrd2rwlpfvqx1pkf3qxh"; + version = "0.5.0.1"; + sha256 = "1414c9jahmkszpag40iyzrr0g346dp9l1ssz60693ivcm0q16pii"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-extra base bytestring containers directory ekg-core exceptions hslogger http-client http-client-tls http-types network - process random regex-base regex-tdfa retry scientific stm sysinfo - text time unix unordered-containers wai + process random regex-base regex-compat regex-pcre regex-tdfa retry + scientific stm sysinfo text time unix unordered-containers wai ]; executableHaskellDepends = [ aeson base binary bytestring hslogger http-client http-types @@ -146160,7 +146784,8 @@ self: { testHaskellDepends = [ aeson aeson-extra base bytestring directory ekg-core exceptions hslogger http-client http-types HUnit process random regex-base - regex-tdfa retry scientific text unix unordered-containers + regex-compat regex-pcre regex-tdfa retry scientific text unix + unordered-containers ]; description = "SDK for adding custom Instana tracing support to Haskell applications"; license = lib.licenses.mit; @@ -146997,8 +147622,8 @@ self: { pname = "intervals"; version = "0.9.1"; sha256 = "1s9pj2dah94smq769q4annxv2grdx376wvhzl4rsq85kjppf5a6z"; - revision = "1"; - editedCabalFile = "0fz1g5nlh87qznpm5cnj6rn65wi9nw8k7daw43jng1f2v0svvxng"; + revision = "2"; + editedCabalFile = "1nrpc95wwifnlk7p9nw6xgcc74zw1k6krhvll7rr18ddjgfgv07x"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ @@ -147193,6 +147818,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "invert" = callPackage + ({ mkDerivation, base, containers, criterion, generic-deriving + , hashable, unordered-containers, vector + }: + mkDerivation { + pname = "invert"; + version = "1.0"; + sha256 = "18q070bawfnyi4wl6rxb6l5ihda0xzmlb8g1z0sg46vghvbs985v"; + revision = "2"; + editedCabalFile = "1829iy3jg0zwms16cqd4rdg5khl348ih44b3mz7l7cy9wlci3cli"; + libraryHaskellDepends = [ + base containers generic-deriving hashable unordered-containers + vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Automatically generate a function's inverse"; + license = lib.licenses.asl20; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -147408,6 +148053,8 @@ self: { pname = "io-streams"; version = "1.5.2.0"; sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3"; + revision = "1"; + editedCabalFile = "1dcadj5gv1m2yy97zsbq5x67vsblp8gy58a0kl5di9vkbgrcw46n"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -149364,12 +150011,13 @@ self: { "j" = callPackage ({ mkDerivation, base, bytestring, repa, tasty, tasty-hunit, unix + , vector }: mkDerivation { pname = "j"; - version = "0.2.1.1"; - sha256 = "14mmqdkh73idqsxsvgvz5nfv7n0ashj35amawzy63zs80hfmqcf2"; - libraryHaskellDepends = [ base bytestring repa unix ]; + version = "0.2.2.0"; + sha256 = "1lmk6zw5w51d6aglykiyp9qpa656qs9imf99nalzn7qldsz81aqd"; + libraryHaskellDepends = [ base bytestring repa unix vector ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; license = lib.licenses.bsd3; @@ -151017,8 +151665,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.11"; - sha256 = "1h9v71pvzi761ml0dpkmhd7w2l36s1v3rsq9zbshw87762710fy1"; + version = "1.0.12"; + sha256 = "0baav0mvprja5jdmndan6psxqm37173yvrjrr04kfxs9568dvzyf"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -151648,8 +152296,8 @@ self: { }: mkDerivation { pname = "jsonifier"; - version = "0.1.0.6"; - sha256 = "0yhczdq3m79xbg04hcahl2c75kipm5szahr7bmj8xjml4zxzd3bk"; + version = "0.1.1"; + sha256 = "09w92adnjskx7cxyki415nqxdzqfz78rcqisk1g862r92907ibwf"; libraryHaskellDepends = [ base bytestring ptr-poker scientific text ]; @@ -154564,6 +155212,22 @@ self: { broken = true; }) {}; + "kparams" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "kparams"; + version = "0.1.0.0"; + sha256 = "0q1ma3qm2anpr6w4xa78wh97b7pzy85ggjiiwbd0gb7b0vwbglx0"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + doHaddock = false; + description = "Extracts values from /proc/cmdline"; + license = lib.licenses.mit; + }) {}; + "kqueue" = callPackage ({ mkDerivation, base, c2hs, directory, filepath, mtl, time, unix }: @@ -155086,8 +155750,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.13"; - sha256 = "1a3gpr0gf1dhvy6lcqbgkf0iznjg62yav2xfnzps48wba5585dj0"; + version = "1.0.14"; + sha256 = "01yi2si0gakmjk66jmm93hz50nl7xa1zhmhcrhqn8ip0mkpncnqk"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -157810,8 +158474,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.0.2"; - sha256 = "01c42wyjvnd1wp665p2khjsm1apc9kw3gw6mnlwbdgsimhj8v4z0"; + version = "2.1.0"; + sha256 = "1nj6jcmara4x8y292q5qacli6hmfhahw856a0nyngca2c8m5mwr1"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -158107,8 +158771,8 @@ self: { pname = "lazy-io-streams"; version = "0.1.0.0"; sha256 = "022x0sikvdsvpp0gh7q82sdpd5kxd2zmprdpmf7z4c3hf4xk9vxy"; - revision = "1"; - editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm"; + revision = "2"; + editedCabalFile = "01r6i81rxm6rng50yhfj84z3dvhcbap10sfqigg01mfmy4zn9pnl"; libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; license = lib.licenses.bsd3; @@ -158887,8 +159551,8 @@ self: { pname = "lens"; version = "4.19.2"; sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j"; - revision = "3"; - editedCabalFile = "1anqghjbi0wyvqpg7qcbph5rfq78sjpdavrajh4z6f20kzy4mn45"; + revision = "5"; + editedCabalFile = "1r9rhblsw1g2y2lyf8vhps05hvx6jxs5r6y1rf868hxz0z242i7q"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -158952,8 +159616,8 @@ self: { pname = "lens-aeson"; version = "1.1"; sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p"; - revision = "3"; - editedCabalFile = "10zm8r29c3hb5saxv3ryr67nsg8rf4dk67yjwysasd3jpkxghj5p"; + revision = "4"; + editedCabalFile = "1wgk0nd0fxgdbqb6mkslj3gyrs9vdxpb83hvj2n2dcswg3ahwdsy"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -159152,19 +159816,15 @@ self: { }) {}; "lens-process" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath - , lens, process, tasty, tasty-hunit + ({ mkDerivation, base, filepath, lens, process, tasty, tasty-hunit }: mkDerivation { pname = "lens-process"; - version = "0.3.0.2"; - sha256 = "1bv6z7309bq9jv2lzr79bcbwg1pkhy728pnrjnl3c3nv807a3igk"; - revision = "2"; - editedCabalFile = "1l71hi0a5yn5x9w4br5bzypa25zdlqw6jcb69z3bhb6dx53197ma"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.4.0.0"; + sha256 = "1gms2bxa1sygpid09cg3nk1kyhkg4s38dqs0gd77ia2aln6zd7qg"; libraryHaskellDepends = [ base filepath lens process ]; testHaskellDepends = [ - base doctest filepath lens process tasty tasty-hunit + base filepath lens process tasty tasty-hunit ]; description = "Optics for system processes"; license = lib.licenses.bsd3; @@ -159812,14 +160472,14 @@ self: { }) {}; "libBF" = callPackage - ({ mkDerivation, base, deepseq }: + ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "libBF"; - version = "0.5.1"; - sha256 = "0iwbkfbp26z1zmnk28mnkvyh8k0i0bx56wl2jwygdnqvl5lmfv6i"; + version = "0.6"; + sha256 = "01dh44fj1fhg912hw6p0r1ng7spm59xpzwc1rps8p2lcsicj4gvw"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base deepseq ]; + libraryHaskellDepends = [ base deepseq hashable ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A binding to the libBF library"; @@ -160853,21 +161513,17 @@ self: { }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage - ({ mkDerivation, base, Cabal, cmdargs, containers, directory - , process - }: + ({ mkDerivation, base, Cabal, containers, directory, process }: mkDerivation { pname = "licensor"; - version = "0.4.1"; - sha256 = "0p1wnyff2v23405v42ks5m3lyxhcahmcs3vh2qc5kz4q7ybnks7b"; + version = "0.4.3"; + sha256 = "19ydisxc5yzm0ccj76p7sg39cpjg5c57wd3gaybc5k7bqrlv14c6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal containers directory process ]; - executableHaskellDepends = [ - base Cabal cmdargs containers directory - ]; + executableHaskellDepends = [ base Cabal containers directory ]; description = "A license compatibility helper"; license = lib.licenses.mit; }) {}; @@ -160928,6 +161584,27 @@ self: { license = lib.licenses.mpl20; }) {}; + "lifetimes" = callPackage + ({ mkDerivation, base, containers, hspec, monad-stm + , safe-exceptions, stm, transformers, zenhack-prelude + }: + mkDerivation { + pname = "lifetimes"; + version = "0.1.0.0"; + sha256 = "192bzz4nqqi2kdk9x4nxlwmx0mf0sshqdcnx1dgyjh5z9k29rww5"; + libraryHaskellDepends = [ + base containers monad-stm stm transformers zenhack-prelude + ]; + testHaskellDepends = [ + base containers hspec monad-stm safe-exceptions stm transformers + zenhack-prelude + ]; + description = "Flexible manual resource management"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "lift-generics" = callPackage ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim , hspec, hspec-discover, mtl, template-haskell, th-compat @@ -161461,36 +162138,6 @@ self: { }) {}; "linear" = callPackage - ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq - , distributive, doctest, ghc-prim, hashable, HUnit, lens, random - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , transformers, transformers-compat, unordered-containers, vector - , void - }: - mkDerivation { - pname = "linear"; - version = "1.21.3"; - sha256 = "12gn571cfchrj9zir30c86vib3ppjia5908di21pnsfy6dmw6994"; - revision = "1"; - editedCabalFile = "17cbb44yyfcxz9fybv05yxli8gdfka415dwrp7vh804q7qxs5vna"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - adjunctions base base-orphans binary bytes cereal containers - deepseq distributive ghc-prim hashable lens random reflection - semigroupoids semigroups tagged template-haskell transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base binary bytestring deepseq doctest HUnit lens reflection - simple-reflect test-framework test-framework-hunit vector - ]; - description = "Linear Algebra"; - license = lib.licenses.bsd3; - }) {}; - - "linear_1_21_4" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes , bytestring, cereal, containers, deepseq, distributive, ghc-prim , hashable, HUnit, lens, random, reflection, semigroupoids @@ -161514,7 +162161,6 @@ self: { ]; description = "Linear Algebra"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -161556,6 +162202,32 @@ self: { broken = true; }) {}; + "linear-base" = callPackage + ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim + , hashable, hashtables, hedgehog, mmorph, primitive, random + , random-shuffle, storable-tuple, tasty, tasty-hedgehog, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "linear-base"; + version = "0.1.0"; + sha256 = "00n7rmvkjg42n1pba1y1lziw9a8gyhix15rw13qsyymi8bdr8k82"; + libraryHaskellDepends = [ + base containers ghc-prim hashable primitive storable-tuple text + transformers vector + ]; + testHaskellDepends = [ + base containers hedgehog mmorph storable-tuple tasty tasty-hedgehog + text vector + ]; + benchmarkHaskellDepends = [ + base deepseq gauge hashable hashtables random random-shuffle + unordered-containers + ]; + description = "Standard library for linear types"; + license = lib.licenses.mit; + }) {}; + "linear-circuit" = callPackage ({ mkDerivation, base, comfort-array, comfort-graph, containers , lapack, netlib-ffi, non-empty, QuickCheck, transformers @@ -162752,8 +163424,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-singleton"; - version = "1.0.0.4"; - sha256 = "0mb2kwj3gvykwh0iywwzqdnma27nxs1hl1rvnp3qxi893p4ikyiw"; + version = "1.0.0.5"; + sha256 = "1vbhg04dral59b6f43xcykgi6war5mcflmczwcmqfhy7lgb86r3n"; libraryHaskellDepends = [ base ]; description = "Easily and clearly create lists with only one element in them"; license = lib.licenses.isc; @@ -164194,8 +164866,8 @@ self: { pname = "log-domain"; version = "0.13"; sha256 = "0isl8rs0k5088sxapfh351sff3lh7r1qkgwz8lmai3gvqasb3avv"; - revision = "2"; - editedCabalFile = "1dylv7gijrm3jn9d1gab9xfqk7xpfb9qrlkaaqpf7b3q8qdswqzs"; + revision = "3"; + editedCabalFile = "10ajmxkjbbkdrkasgfd5hhjcbggrylrg00m1lafac53v97hqpyp1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable @@ -164673,21 +165345,6 @@ self: { broken = true; }) {}; - "logict_0_7_0_3" = callPackage - ({ mkDerivation, base, mtl, tasty, tasty-hunit }: - mkDerivation { - pname = "logict"; - version = "0.7.0.3"; - sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r"; - revision = "1"; - editedCabalFile = "13hxmzaxd5iv9hjad5kw9infq0lxsgypqqb2z1i1939604a90qp4"; - libraryHaskellDepends = [ base mtl ]; - testHaskellDepends = [ base mtl tasty tasty-hunit ]; - description = "A backtracking logic-programming monad"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "logict" = callPackage ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }: mkDerivation { @@ -165551,6 +166208,24 @@ self: { broken = true; }) {}; + "lsfrom" = callPackage + ({ mkDerivation, base, directory, filepath, simple-cmd + , simple-cmd-args + }: + mkDerivation { + pname = "lsfrom"; + version = "0.1"; + sha256 = "04cv4x88r10b9zkfiy1kclq3dm79akg1p16djfad8h5x988c7bq1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base filepath simple-cmd simple-cmd-args + ]; + testHaskellDepends = [ base directory filepath simple-cmd ]; + description = "List dir files starting from a specific name"; + license = lib.licenses.bsd3; + }) {}; + "lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, dependent-map, directory, filepath @@ -165608,6 +166283,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "lsp-test_0_11_0_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, text, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.11.0.7"; + sha256 = "01var9nm3kpw65jaz4rvky35ibrpfjyhfas9bi8avrw1vh2ybkcn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath Glob + haskell-lsp lens mtl parser-combinators process text transformers + unix unordered-containers + ]; + testHaskellDepends = [ + aeson base data-default directory filepath haskell-lsp hspec lens + text unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-test_0_12_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -166727,6 +167430,8 @@ self: { pname = "machines"; version = "0.7.1"; sha256 = "0ayajyzaczdazfsmamlm5vap43x2mdm4w8v5970y1xlxh4rb3bs1"; + revision = "1"; + editedCabalFile = "1cp850vwzn213n0k9s5i62889a1wvmyi05jw6kmazaczcbcs7jsq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -169488,36 +170193,37 @@ self: { "matterhorn" = callPackage ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat - , brick, brick-skylighting, bytestring, cheapskate, checkers - , config-ini, connection, containers, data-clist, directory - , filepath, gitrev, hashable, Hclip, mattermost-api - , mattermost-api-qc, microlens-platform, mtl, network-uri, process - , random, semigroups, skylighting-core, split, stm, stm-delay - , strict, tasty, tasty-hunit, tasty-quickcheck, temporary, text - , text-zipper, time, timezone-olson, timezone-series, transformers - , Unique, unix, unordered-containers, utf8-string, uuid, vector - , vty, word-wrap, xdg-basedir + , brick, brick-skylighting, bytestring, checkers, commonmark + , commonmark-extensions, config-ini, connection, containers + , data-clist, directory, filepath, gitrev, hashable, Hclip + , mattermost-api, mattermost-api-qc, microlens-platform, mtl + , network-uri, parsec, process, random, semigroups + , skylighting-core, split, stm, stm-delay, strict, tasty + , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time + , timezone-olson, timezone-series, transformers, Unique, unix + , unordered-containers, utf8-string, uuid, vector, vty, word-wrap + , xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "50200.11.0"; - sha256 = "0wvw3wbv2sii1bjc8nmwyb1k0hzixfkfvpkmlkwa2my564vvmgz8"; + version = "50200.12.0"; + sha256 = "0rsxgc4igcjhddfil01la1sbnglvr08mf7gfi9fr6pf7sb9w6qbq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aspell-pipe async base base-compat brick brick-skylighting - bytestring cheapskate config-ini connection containers data-clist - directory filepath gitrev hashable Hclip mattermost-api - microlens-platform mtl network-uri process random semigroups - skylighting-core split stm stm-delay strict temporary text - text-zipper time timezone-olson timezone-series transformers unix - unordered-containers utf8-string uuid vector vty word-wrap - xdg-basedir + bytestring commonmark commonmark-extensions config-ini connection + containers data-clist directory filepath gitrev hashable Hclip + mattermost-api microlens-platform mtl network-uri parsec process + random semigroups skylighting-core split stm stm-delay strict + temporary text text-zipper time timezone-olson timezone-series + transformers unix unordered-containers utf8-string uuid vector vty + word-wrap xdg-basedir ]; executableHaskellDepends = [ base text ]; testHaskellDepends = [ - base bytestring cheapskate checkers containers mattermost-api + base bytestring checkers commonmark containers mattermost-api mattermost-api-qc tasty tasty-hunit tasty-quickcheck text time Unique uuid ]; @@ -169536,8 +170242,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.9.0"; - sha256 = "08whhlkr3ayimn66lwinvv0ci8zbhk5i7sz1fk5r1dp7mg2jzgig"; + version = "50200.10.0"; + sha256 = "0pbp4f0gwhap8d9chn6c2zf22ic3r32302zir4a5r6cmgg4vscgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169561,8 +170267,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.9.0"; - sha256 = "0rcbsf5hrp2fd9jqmcr07gg2y0xg4ksasrqfxrc7n4mgw0a409i6"; + version = "50200.10.0"; + sha256 = "0cv7l5g63ar7ii704j8q3y5hsvbmljm8cmgdw6p2shqigv8slzci"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -173756,7 +174462,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "mmorph" = callPackage + "mmorph_1_1_3" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; @@ -173767,6 +174473,22 @@ self: { ]; description = "Monad morphisms"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mmorph" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.1.4"; + sha256 = "1hxyyh0x58kjdsyf1kj2kibjxzk2d9rcabv2y9vrpb59w85lqanz"; + revision = "1"; + editedCabalFile = "0xvwjcfpy6243wiwgyckmwc1nbw31y32n3hrrswdjw21znz894yl"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = lib.licenses.bsd3; }) {}; "mmsyn2" = callPackage @@ -174201,8 +174923,8 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.3.0"; - sha256 = "184vhcnpwjsvxwbdsipz7kc2xylfwfqflbbbyipag610w07a3qk2"; + version = "0.3.3.1"; + sha256 = "0h4ssb4wy4ac6vd5jcbvp0r2fr1jmyc60hg56s7ym50bbymj5wp3"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -175268,19 +175990,19 @@ self: { "monad-metrics-extensible" = callPackage ({ mkDerivation, base, dependent-map, dependent-sum, ekg, ekg-core - , exceptions, hspec, mtl, stm, text + , exceptions, hspec, mtl, stm, text, time }: mkDerivation { pname = "monad-metrics-extensible"; - version = "0.1.0.1"; - sha256 = "044hvhnf7wsgd18cac2j3bfw2vbxfnra736l6qndfx07mkv1nz5n"; + version = "0.1.1.0"; + sha256 = "14ahi50c6pd30zywjbsffn3p090ib57h6as2ad8jqxywjalxd8dm"; libraryHaskellDepends = [ base dependent-map dependent-sum ekg ekg-core exceptions mtl stm - text + text time ]; testHaskellDepends = [ base dependent-map dependent-sum ekg ekg-core exceptions hspec mtl - stm text + stm text time ]; description = "An extensible and type-safe wrapper around EKG metrics"; license = lib.licenses.bsd3; @@ -178222,8 +178944,8 @@ self: { }: mkDerivation { pname = "mu-avro"; - version = "0.4.0.3"; - sha256 = "01sygrx80jfi6xygrgj2chqjr0fllld807p26rggfdzwp9p6pc9b"; + version = "0.4.0.4"; + sha256 = "06f3l7fwgx17cfa80a2inzx9255nqvk5q5fnlzvwhslymi8mb6xd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178443,6 +179165,8 @@ self: { pname = "mu-protobuf"; version = "0.4.2.0"; sha256 = "07mgld1cmpynhdih7ppki8xw85zpknv0ipn7fvn79bj53s0nx6vg"; + revision = "1"; + editedCabalFile = "12zp8g0v8f924dsc3c0ynzqcv2j4c4xl6dh72mz11nmxi9la51s7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178485,8 +179209,8 @@ self: { }: mkDerivation { pname = "mu-schema"; - version = "0.3.1.1"; - sha256 = "0n30xn2z1dl4n28mbfnif8csvz0namll0hab1r7mhnamp0yc3gs8"; + version = "0.3.1.2"; + sha256 = "0q4a1anqrx6d5n0br26lb4x8gw10gasv8ggiw4fgcaly2sd09rs1"; libraryHaskellDepends = [ aeson base bytestring containers first-class-families sop-core template-haskell text th-abstraction unordered-containers uuid @@ -180466,8 +181190,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.7.2"; - sha256 = "0vkc39hx55hqwgkhqm80ckabbjaq4f9840msznf71glzihzg8k0n"; + version = "0.1.7.3"; + sha256 = "1yf9ni64q19ci6ripcjh0pvpklxyi0fzigb33ss05wswlal385rc"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ mysql ]; @@ -180979,10 +181703,8 @@ self: { ({ mkDerivation, base, named, servant }: mkDerivation { pname = "named-servant"; - version = "0.3.0"; - sha256 = "14a55ww538c39wmacazdchrinc098yw9kbv44z4dw1739zhsghb6"; - revision = "1"; - editedCabalFile = "1xrbz9vhb61wkjb1amswvpb9sfslg1258vqlm880angc18i3dyi7"; + version = "0.3.1"; + sha256 = "01wy971gf178i866wly5fs86ll2rwkjp3n99ni0rdxw6p1hnq447"; libraryHaskellDepends = [ base named servant ]; description = "support records and named (from the named package) parameters in servant"; license = lib.licenses.bsd3; @@ -180996,10 +181718,8 @@ self: { }: mkDerivation { pname = "named-servant-client"; - version = "0.3.0"; - sha256 = "1ilzhvdvspd8wddv6yypvl6whbzsa3pzqz2a8ikmk0l3vkskv60d"; - revision = "1"; - editedCabalFile = "19frg1vj2zzibdrbmxdmjfas31z5hwhy7kjkk28vm20y51h4lir3"; + version = "0.3.1"; + sha256 = "1q6xzg5sgjy52jp378jm9dq2wl283mnnpslc8fq0pdly2v6d7z6i"; libraryHaskellDepends = [ base named named-servant servant servant-client-core ]; @@ -181015,10 +181735,8 @@ self: { }: mkDerivation { pname = "named-servant-server"; - version = "0.3.0"; - sha256 = "14v1sgfz6agsbiy2938chy0vi4j4jd1swdhwb9g2yg068m3262k3"; - revision = "1"; - editedCabalFile = "0880w18l18hjnrpf0j4z0rd98waai3431gzakqm53zh8zs75lcll"; + version = "0.3.1"; + sha256 = "168xvsdkln5pgf6iqs1qzy07b9ichzpqhx95j79hrba941jzd19y"; libraryHaskellDepends = [ base named named-servant servant servant-server text ]; @@ -182213,8 +182931,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.3.5"; - sha256 = "0y5jkkixrbm25z1vyhk5qmql1962jhhl6ifz8ba7fiwdv8qi1ndk"; + version = "0.4.3.6"; + sha256 = "1whi7v16zqa26c8a4a36g5p8gddk69acnxar3pgybyc58y9af0i1"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -182237,8 +182955,8 @@ self: { }: mkDerivation { pname = "net-spider-cli"; - version = "0.2.0.5"; - sha256 = "011s533mv5flvmq58vsr2fnydk954lkyfif6d9fs87555dwiskyd"; + version = "0.2.0.6"; + sha256 = "0byd87p7h6vrdmg7j7ypjq2mcks8a7axi9j9qnjv283y4n56nxw1"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -182258,8 +182976,8 @@ self: { }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.2.0.3"; - sha256 = "0mjp5mvfp4hq8kna5f0pwmyc7s43ghhw91hc94n6xf6y4dnx0c2c"; + version = "0.2.0.4"; + sha256 = "13kw1yvppkh2z6zzlf5qfyfw2yyyvn48dr49ijvdrh0c11n4125l"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -183820,18 +184538,20 @@ self: { "network-uri" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, parsec - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, th-compat }: mkDerivation { pname = "network-uri"; - version = "2.6.3.0"; - sha256 = "08x7myvjasm326byi3jz1hgv2fqk0vvkfiwi8zlc4b2xy64i6750"; - libraryHaskellDepends = [ base deepseq parsec template-haskell ]; - testHaskellDepends = [ - base criterion deepseq HUnit test-framework test-framework-hunit - test-framework-quickcheck2 + version = "2.6.4.1"; + sha256 = "111m485rx2kyqdymi1x6sl08hi6lp34q3f41yqcx99086swnv1ap"; + libraryHaskellDepends = [ + base deepseq parsec template-haskell th-compat ]; + testHaskellDepends = [ + base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq HUnit ]; description = "URI manipulation"; license = lib.licenses.bsd3; }) {}; @@ -184271,10 +184991,8 @@ self: { }: mkDerivation { pname = "newtype-generics"; - version = "0.5.4"; - sha256 = "0cprfg4n0z62cnix1qrbc79bfdd4s50b05fj9m9hk6vm1pc3szq0"; - revision = "1"; - editedCabalFile = "1id9a6prj2bzdsyfsfr0pnfy9p8v9wlw59x12fny6y2szfcxcrv7"; + version = "0.6"; + sha256 = "04bymwhkvlsgcsd0v630mndrzf0xnh3v81ba6nfzwcvbg3ksr2wa"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -184448,8 +185166,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.9.1"; - sha256 = "0ib0xzs815q29a2v1m550g7cm5cr7l6lkslmi0lpcxpfgpi08ccv"; + version = "0.4.9.2"; + sha256 = "064zbwamkkd5cx0wjisa019pprb4pg2mmm5n6a948f3dn0zpmlwx"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -188504,8 +189222,8 @@ self: { }: mkDerivation { pname = "opaleye-sqlite"; - version = "0.0.1.0"; - sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq"; + version = "0.0.1.1"; + sha256 = "02wpy2q3j6z91kjrwl9qyka74rqhbs7dlgfrc6nvpnl1ssp9vps0"; libraryHaskellDepends = [ base base16-bytestring bytestring case-insensitive contravariant direct-sqlite pretty product-profunctors profunctors semigroups @@ -188527,8 +189245,8 @@ self: { }: mkDerivation { pname = "opaleye-trans"; - version = "0.5.1"; - sha256 = "11vfp8rb46fvrhryyw9k66cbfnd920n5r4mcasdcnxhn1n8hc7i4"; + version = "0.5.2"; + sha256 = "0vszkxbgk4cqiaz4q8vgsc56yzh37dg7np2315h6bpvp1hy8fcs0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190236,6 +190954,8 @@ self: { pname = "optparse-generic"; version = "1.4.4"; sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74"; + revision = "1"; + editedCabalFile = "14vbfbl2va3s2pa4qjyyny1i15s2iw9993ld5b0qsqdv1z6nfjz1"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -191885,8 +192605,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.9.0"; - sha256 = "18hxvzrl4b9y3343nissbcxrl4g8x82yrinyir9ifgmpz5ikg248"; + version = "0.3.9.1"; + sha256 = "0kyml1bmzjp6by86inlmyx8qkl4f92yibmhc477sglv9m8haw0wx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -192179,21 +192899,21 @@ self: { "pandoc-plantuml-diagrams" = callPackage ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover - , mtl, pandoc-types, process, SHA, utf8-string + , mtl, pandoc-types, process, SHA, text, utf8-string }: mkDerivation { pname = "pandoc-plantuml-diagrams"; - version = "0.1.0.4"; - sha256 = "1fshgv5wl56z3w0yimwv5dbi7dal600anb5wkxd5n3jlpmp8fwky"; + version = "0.1.1.0"; + sha256 = "19wd13vwf7v2v57wiv4s2y68zrvk6rcy1w2wxxad4cv5bb65wnfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory pandoc-types process SHA utf8-string + base bytestring directory pandoc-types process SHA text utf8-string ]; executableHaskellDepends = [ base pandoc-types ]; testHaskellDepends = [ base bytestring directory hspec hspec-discover mtl pandoc-types - process SHA utf8-string + process SHA text utf8-string ]; testToolDepends = [ hspec-discover ]; description = "Render and insert PlantUML diagrams with Pandoc"; @@ -192269,15 +192989,15 @@ self: { }) {}; "pandoc-sidenote" = callPackage - ({ mkDerivation, base, monad-gen, pandoc, pandoc-types }: + ({ mkDerivation, base, mtl, pandoc-types, text }: mkDerivation { pname = "pandoc-sidenote"; - version = "0.19.0.0"; - sha256 = "0vz8w1dgzm0hipwfz5a1m41xkjdindr3373x6ip6vqv9h2gzzbb3"; + version = "0.22.1.0"; + sha256 = "1ci30gav385ygcvqs2x3w7lp8y1m7myf9jci3idxrd4w7csdg7f3"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base monad-gen pandoc pandoc-types ]; - executableHaskellDepends = [ base pandoc-types ]; + libraryHaskellDepends = [ base mtl pandoc-types text ]; + executableHaskellDepends = [ base mtl pandoc-types text ]; description = "Convert Pandoc Markdown-style footnotes into sidenotes"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -192391,8 +193111,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.5"; - sha256 = "1cw6wm122zwbn61980vqr2prsc3qpnnaqgk0m3wvxs03dygarpja"; + version = "0.3.6"; + sha256 = "12slj2jy688k4ndngwmjjkdvl2ryljv3siwal874pdficx0dffxg"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -193826,6 +194546,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "parser-combinators_1_3_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "1.3.0"; + sha256 = "0is45q3q6ngfqvzpwwga9phbwk45v7g1q2x1rlm95a7q946yy44k"; + libraryHaskellDepends = [ base ]; + description = "Lightweight package providing commonly useful parser combinators"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "parser-combinators-tests" = callPackage ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations , hspec-megaparsec, megaparsec, megaparsec-tests @@ -193850,6 +194582,28 @@ self: { broken = true; }) {}; + "parser-combinators-tests_1_3_0" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations + , hspec-megaparsec, megaparsec, megaparsec-tests + , parser-combinators, QuickCheck + }: + mkDerivation { + pname = "parser-combinators-tests"; + version = "1.3.0"; + sha256 = "0sw6ws7za93y3lbmxp6jp1k17zi3wdg7698ab133kcw82f6mzba2"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base hspec hspec-expectations hspec-megaparsec megaparsec + megaparsec-tests parser-combinators QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Test suite of parser-combinators"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { @@ -194279,8 +195033,8 @@ self: { }: mkDerivation { pname = "password"; - version = "2.1.0.0"; - sha256 = "1v8hbjy0r6l0c6r0l4832z9whadx195fzxpn9l19zjb5ylz1zmqc"; + version = "2.1.1.0"; + sha256 = "1x3nv3bn0rp0f6rayrzp7yvw7x1ly7vjygcl6wdq86y0k1ca2wby"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory template-haskell text @@ -194302,8 +195056,8 @@ self: { }: mkDerivation { pname = "password-instances"; - version = "2.0.0.1"; - sha256 = "1az6j3yh92nr1ksh4f966y7v8v81l9l14r8qfakf5h62iznwqv2q"; + version = "2.0.0.2"; + sha256 = "03dl3b530m02y7mv2lvssamhakswa3d9bj2r2ndvg78wi0vm5xp1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base http-api-data password persistent text @@ -196017,8 +196771,8 @@ self: { }: mkDerivation { pname = "peregrin"; - version = "0.3.0"; - sha256 = "0jhvd69avl5wy2fcsx93ng2yll97gagylwd264dv7qjaa4m6hqs2"; + version = "0.3.1"; + sha256 = "1hiv9rzpjmjywwc4j6bqkqvqwv2gr6d512hv0l6m5c6idsyk2v12"; libraryHaskellDepends = [ base bytestring postgresql-simple text ]; testHaskellDepends = [ base hspec pg-harness-client postgresql-simple resource-pool text @@ -197034,30 +197788,30 @@ self: { "persistent-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers - , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger - , persistent, persistent-template, persistent-test, QuickCheck - , resource-pool, resourcet, sqlite, system-fileio, system-filepath - , temporary, text, time, transformers, unliftio-core - , unordered-containers + , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th + , monad-logger, mtl, persistent, persistent-template + , persistent-test, QuickCheck, resource-pool, resourcet, sqlite + , system-fileio, system-filepath, temporary, text, time + , transformers, unliftio-core, unordered-containers }: mkDerivation { pname = "persistent-sqlite"; - version = "2.11.0.0"; - sha256 = "1kfijsn00brqm42ypaa66bmwq41r9n6h66r6jmgldhzpcbv46sfv"; + version = "2.11.1.0"; + sha256 = "04rdzcckdkvs8nisx0hh96sdfyly82yr8c0mx6nsxpyi7m52by9j"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring conduit containers microlens-th monad-logger - persistent resource-pool resourcet text time transformers + mtl persistent resource-pool resourcet text time transformers unliftio-core unordered-containers ]; librarySystemDepends = [ sqlite ]; testHaskellDepends = [ - base bytestring containers exceptions fast-logger hspec HUnit - monad-logger persistent persistent-template persistent-test - QuickCheck resourcet system-fileio system-filepath temporary text - time transformers unliftio-core + base bytestring conduit containers exceptions fast-logger hspec + HUnit microlens monad-logger mtl persistent persistent-template + persistent-test QuickCheck resourcet system-fileio system-filepath + temporary text time transformers unliftio-core ]; description = "Backend for the persistent library using sqlite3"; license = lib.licenses.mit; @@ -197837,8 +198591,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-examples"; - version = "0.6.2.1"; - sha256 = "0k9cwvfdxf13izbww7g08p0x702xgmm7dck3mjk4maajjfia34zm"; + version = "0.7.0.0"; + sha256 = "1dwqkl9223rmz503gclzs0l00mi9gkk542fwpvw71hd121hl4qvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197934,8 +198688,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-properties"; - version = "0.3.0.1"; - sha256 = "0b3wnzlka9dapk1478jr35pnd3ykj3mn5nkhvmwjdsxigzzaa1wf"; + version = "0.4.0.0"; + sha256 = "194sg4crm5z4lqqzr8apjgnbcl5h6ddkqk8crja41c5q3d5mpih5"; libraryHaskellDepends = [ base phonetic-languages-common phonetic-languages-rhythmicity phonetic-languages-vector ukrainian-phonetics-basic vector @@ -197948,10 +198702,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.1.2.0"; - sha256 = "1ljblyk0m1fs3n2gj72w6gs62dxjk5gsn8x6p7fwlwhvaa316wm3"; + version = "0.2.0.0"; + sha256 = "0cvn2l0ds5nyz4inx354l8r9m4bkqjic7plpjgvhih8f4b53j6ln"; libraryHaskellDepends = [ base ]; - description = "Allows to estimate the rhythmicity metrices for the text (usually, the Ukrainian poetic one)"; + description = "Allows to estimate the rhythmicity properties for the text (usually, the Ukrainian poetic one)"; license = lib.licenses.mit; }) {}; @@ -197998,8 +198752,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.3.0.0"; - sha256 = "17akng54rj8mn4ic9h1a806b03nqsigkyjggfskf4k1z9x84hdf4"; + version = "0.4.0.0"; + sha256 = "03vin7gng1sqifyy0s83igmd41bxxwrp7ck9j7bxhnqq0qmg5d7n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198059,8 +198813,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-lists-examples"; - version = "0.6.0.0"; - sha256 = "0y843gymz9wf7hmp8asxmd90rdlgxz2b1pgi27mpglr7xmhpfr34"; + version = "0.7.0.0"; + sha256 = "1y3ad4lxapd9nblijn09i36f3xl6g9hxqmn8adcza74f4cq8pgyb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198088,8 +198842,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.1.2.0"; - sha256 = "1vxjq0ki7slmgp1sq481srnqzcy8sazl0c2vqdkyz0hsx5hi8lyv"; + version = "0.2.0.0"; + sha256 = "1y7cki8c07q9423b54cjvy9k6a9byarpww3px50bc91ivirda6zr"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -198105,8 +198859,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-lists"; - version = "0.3.0.0"; - sha256 = "094fyljkvfi2snj41j00xqflhabnsp5hn50xp6dvmpcr12k6nvs0"; + version = "0.4.0.0"; + sha256 = "01awd747w67m4rnm9zgsb8j28756fpvyml1j613kz33fp5s91ml2"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-common ukrainian-phonetics-basic @@ -198123,8 +198877,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-lists-double"; - version = "0.1.0.0"; - sha256 = "1mx282gq9b2m718zrjjqxk1a17qdw5mdipmb818jr5ccrb81yhsl"; + version = "0.2.0.0"; + sha256 = "1ci63bhlk8xzf111njg97xs1ibamiv04k19wsfnhvxs3zzyzgrj0"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-common ukrainian-phonetics-basic @@ -198961,6 +199715,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes_4_3_15" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.15"; + sha256 = "01hvzm7cp6y3wrdhca3wlb99y0az0rjy5lscmnds0v6i767kyxk1"; + libraryHaskellDepends = [ + base exceptions mmorph mtl transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -200202,6 +200980,31 @@ self: { broken = true; }) {}; + "pixiv" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptohash-md5, directory, exceptions, filepath, http-client + , http-client-tls, lens, monad-control, mtl, process, servant + , servant-client, servant-client-core, template-haskell, temporary + , text, time, transformers, transformers-base, zip-archive + }: + mkDerivation { + pname = "pixiv"; + version = "0.1.0"; + sha256 = "001pfzijh7ibcyinmw0l8yvw0kxsvmniw993qx9b6zlzf689cpp6"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash-md5 directory + exceptions filepath http-client http-client-tls lens monad-control + mtl process servant servant-client servant-client-core + template-haskell temporary text time transformers transformers-base + zip-archive + ]; + testHaskellDepends = [ + aeson base bytestring http-client http-client-tls + ]; + description = "Pixiv API binding based on servant-client"; + license = lib.licenses.bsd3; + }) {}; + "piyo" = callPackage ({ mkDerivation, base, extra, sdl2, sdl2-gfx, sdl2-image , sdl2-mixer, sdl2-ttf, text @@ -201974,6 +202777,21 @@ self: { broken = true; }) {}; + "polysemy-mocks" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, polysemy + , template-haskell + }: + mkDerivation { + pname = "polysemy-mocks"; + version = "0.1.0.0"; + sha256 = "04cgajjrlbiqij54k6agm1p6h4hv5lldb9f9yrzbwm0v69d02bs7"; + libraryHaskellDepends = [ base polysemy template-haskell ]; + testHaskellDepends = [ base hspec polysemy ]; + testToolDepends = [ hspec-discover ]; + description = "Mocking framework for polysemy effects"; + license = lib.licenses.bsd3; + }) {}; + "polysemy-optics" = callPackage ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: mkDerivation { @@ -202250,10 +203068,8 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.2.0.0"; - sha256 = "1a3vf0r69263gpq1aass2x5wcmgrfk16pnsf4wsvrnka5lgnsijp"; - revision = "1"; - editedCabalFile = "1srihzg6wm2ydg6kr3q2n7pqk4wp4mhqscansi670pdzblv7ljkn"; + version = "0.2.0.1"; + sha256 = "199yq3nzdhdglggk1pfayv8p6rahs9xzzm1hjkjd74asfbkf9wqg"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -202412,8 +203228,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.5"; - sha256 = "0y1plyfvjfbm4xwmc3khd4h089pk96p1krxchv5pnwqf0agxi5sv"; + version = "0.1.0.6"; + sha256 = "12av8vgnj9iy0bdcb13gc4x28n3c7ahb3221xla78sss5r4rhq0z"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -203997,8 +204813,6 @@ self: { ]; description = "REST API for any Postgres database"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgrest-ws" = callPackage @@ -205809,8 +206623,8 @@ self: { pname = "primitive"; version = "0.7.1.0"; sha256 = "1w53i4mk248g58xrffmksznr4nmn2bbbycajzpcqfxx5ybyyrsvb"; - revision = "1"; - editedCabalFile = "0nllkqvfrplhslfgbqgpn0r5k4mj5wlfixjxrpjz6vb73xwi5977"; + revision = "2"; + editedCabalFile = "1m08slj8m596z4pqsw3ag25ijhzlv9ki809ydh4nbin141bpsdgn"; libraryHaskellDepends = [ base deepseq transformers ]; testHaskellDepends = [ base base-orphans ghc-prim QuickCheck quickcheck-classes-base @@ -206410,6 +207224,8 @@ self: { pname = "process"; version = "1.6.11.0"; sha256 = "0nv8c2hnx1l6xls6b61l8sm7j250qfbj1fjj5n6m15ppk9f0d9jd"; + revision = "1"; + editedCabalFile = "136mp45m1jh27yayb0gx4giybp6imh7hbr774fsb2m9vj2l52b27"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -206742,16 +207558,15 @@ self: { "product-profunctors" = callPackage ({ mkDerivation, base, bifunctors, contravariant, criterion - , deepseq, profunctors, tagged, template-haskell + , deepseq, profunctors, tagged, template-haskell, th-abstraction }: mkDerivation { pname = "product-profunctors"; - version = "0.11.0.1"; - sha256 = "0lwwjnpxgkgk02179j8jj9c1zvaw4f406i9gm7ngqczl8y796q3l"; - revision = "1"; - editedCabalFile = "07k4g2jpxdh2n60b2wkngw6pklfh5fwf9360ih9m88dr7mi5c88n"; + version = "0.11.0.2"; + sha256 = "13q1zq5gli21khsxrgiwqilqfasb16hks5w0ikkm1i735z0pf97l"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell + th-abstraction ]; testHaskellDepends = [ base profunctors ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -210259,9 +211074,11 @@ self: { }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.7.0"; - sha256 = "1i5h5j7cy94ab41x9aqkiv7vyx5h7cda8v1jccpna8lr7ccicczp"; - setupHaskellDepends = [ base Cabal directory filepath process ]; + version = "0.8.0"; + sha256 = "0k8zl9gzwfnnxkfclb20v0q3rl42bs1g9iw9vm5j0fhr934w38gs"; + setupHaskellDepends = [ + base Cabal directory filepath process qtah-generator + ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; description = "Qt bindings for Haskell - C++ library"; @@ -210276,8 +211093,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.7.0"; - sha256 = "09svfzi73gjy4bsz4snp1mciqin25xqr6n3kya8367q4j01mdrrv"; + version = "0.8.0"; + sha256 = "0wn0514xckbsj1phndb2b924lxh24sbngjgrvsn3sjg305vzizvr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -210290,23 +211107,21 @@ self: { }) {}; "qtah-generator" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, haskell-src, hoppy-generator, hoppy-std, mtl, process + ({ mkDerivation, base, bytestring, containers, directory, filepath + , haskell-src, hoppy-generator, hoppy-std, mtl, process , transformers }: mkDerivation { pname = "qtah-generator"; - version = "0.7.1"; - sha256 = "0iizb1af1j9g4lvdz81c2cl57r6ffv07kqgls6cl9pgp43ikrjjb"; + version = "0.8.0"; + sha256 = "1s782f1gagj1av8xv30qjqs5r05i3fr7a05dp213i6p818kj20r1"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ + libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src hoppy-generator hoppy-std mtl process transformers ]; - doHaddock = false; + executableHaskellDepends = [ base ]; description = "Generator for Qtah Qt bindings"; license = lib.licenses.lgpl3; hydraPlatforms = lib.platforms.none; @@ -210320,9 +211135,11 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.7.0"; - sha256 = "0wndmrrz4c3gfx9wjj9v13zjjpjandg2qkq7fkxp5z3rgw4hmm8f"; - setupHaskellDepends = [ base Cabal directory filepath ]; + version = "0.8.0"; + sha256 = "187x961030hfw79xs0m9xgplm8jlglynya4ndsax378vdpnbrrgw"; + setupHaskellDepends = [ + base Cabal directory filepath qtah-generator + ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -211860,16 +212677,18 @@ self: { }) {}; "quote-quot" = callPackage - ({ mkDerivation, base, tasty, tasty-quickcheck, template-haskell }: + ({ mkDerivation, base, tasty, tasty-bench, tasty-quickcheck + , template-haskell + }: mkDerivation { pname = "quote-quot"; - version = "0.1.0.0"; - sha256 = "124rgim8bb4x9rqsvc05dcbz739anj2xg8q9v9s0fpjkv6qwl79b"; + version = "0.2.0.0"; + sha256 = "0sj862037gdljwiv5s4yh0vjfppzf226z7sxb5f7y1k23rijsx0w"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base tasty tasty-quickcheck template-haskell ]; - benchmarkHaskellDepends = [ base template-haskell ]; + benchmarkHaskellDepends = [ base tasty-bench template-haskell ]; description = "Divide without division"; license = lib.licenses.bsd3; }) {}; @@ -212458,12 +213277,12 @@ self: { ({ mkDerivation, base, criterion, hspec }: mkDerivation { pname = "rampart"; - version = "1.1.0.1"; - sha256 = "0b0c8qkkj2xqmdd53q198kwm0n7qvdyh6qxmp24mqkpjcrskh6vl"; + version = "1.1.0.2"; + sha256 = "1lvzgdagjzvkxcdbc43n144vbva5vlvsjziz80rjzm7kg3mslg1r"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; - description = "🏰 Determine how intervals relate to each other"; + description = "Determine how intervals relate to each other"; license = lib.licenses.isc; }) {}; @@ -213387,8 +214206,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.12"; - sha256 = "00xhs04jrrbi1n2sx86v4pd3sggyk2682s3zxfmhb16zysh3hdx2"; + version = "1.0.13"; + sha256 = "0ydg5xlf10g1wp18bwpr3mg9x29fyc1c5g22rn4szy0cs6hvqx6m"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -213404,8 +214223,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.1.3"; - sha256 = "154zxrv9w904bgrgwb623zkqxzp200ivhwfpcwlb8r2903jmw7vq"; + version = "1.1.4"; + sha256 = "1b2d5agip0zw10nmkr45gwhzpaga9nsdqv62xil11gadhaqji2f7"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -213544,8 +214363,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.3.3"; - sha256 = "0c2q48vbqkvhd0m3sahn7ja8bxpj9xkgw2hkg9chrhj0amyp5xzk"; + version = "9.4.1"; + sha256 = "1m8bqjqp413sm86v0i2083hnsq7h11hlmmqch1pxbgpv5678jq0q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213606,8 +214425,8 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.3"; - sha256 = "0kxnl7vvqkmrq2cjwgrb4342bvr8a57v652f2pd5yvndamcz5m3w"; + version = "0.3.1"; + sha256 = "1kn86izm2wpqj59nnpxw34n37bh1w5y7h9rd59c1pcymhp29n6qd"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -213829,8 +214648,8 @@ self: { pname = "rcu"; version = "0.2.4"; sha256 = "1zl6gl6b9x2ppxzrvb356216f7gi1kpwxsqb0w220f86wyzf9gbr"; - revision = "1"; - editedCabalFile = "07blx598aqwkfgicsl7g7i9gf49550ln8zz0gp4g3kyxq8pvmphb"; + revision = "2"; + editedCabalFile = "1lblpsgprk26nplfzxkclvj6gsaim1b97njvrq564crryn6hn2wz"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -215220,6 +216039,17 @@ self: { broken = true; }) {}; + "redesigned-carnival" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "redesigned-carnival"; + version = "1.0.0.0"; + sha256 = "0qgb6w402fbpilb3gwa7r5v1lxx6dzk8g66cigsw062jfhdiy1hx"; + libraryHaskellDepends = [ base ]; + description = "Package for dependency confusion"; + license = lib.licenses.publicDomain; + }) {}; + "redis" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , exceptions, mtl, network, old-time, utf8-string @@ -215622,8 +216452,8 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.6.1"; - sha256 = "124sqpcii62jh2n2vfskg9jc8ic4hhlwmwim40f6a0dmhdnsh8lx"; + version = "0.6.2"; + sha256 = "1xfy6sl6kl9k7vvlvwg8fb3kdpqd0fl1c9wcfwgdqb874a4xn6dz"; libraryHaskellDepends = [ aeson base bytestring deepseq exceptions mtl QuickCheck template-haskell text these-skinny @@ -215647,22 +216477,6 @@ self: { }) {}; "refinery" = callPackage - ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph - , mtl, QuickCheck - }: - mkDerivation { - pname = "refinery"; - version = "0.2.0.0"; - sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq"; - libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; - testHaskellDepends = [ - base checkers exceptions hspec logict mmorph mtl QuickCheck - ]; - description = "Toolkit for building proof automation systems"; - license = lib.licenses.bsd3; - }) {}; - - "refinery_0_3_0_0" = callPackage ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph , mtl, QuickCheck }: @@ -215676,7 +216490,6 @@ self: { ]; description = "Toolkit for building proof automation systems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reflection" = callPackage @@ -218269,8 +219082,8 @@ self: { pname = "repa"; version = "3.4.1.4"; sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "7"; - editedCabalFile = "0j0nqp6xvwis83h1hwm9910xjfxh13nddy61dlli0wdzzddpb8ah"; + revision = "8"; + editedCabalFile = "0bhkiav26m61lzjkxjldals136viixyg88xf1bbihsp9kzkbv6as"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -221858,8 +222671,8 @@ self: { }: mkDerivation { pname = "rope-utf16-splay"; - version = "0.3.1.0"; - sha256 = "1ilcgwmdwqnp95vb7652fc03ji9dnzy6cm24pvbiwi2mhc4piy6b"; + version = "0.3.2.0"; + sha256 = "0yacy3iqx52nz2ja6fx5di7z3xjzakcmld2l1gixyawfvhavh17p"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -222443,14 +223256,14 @@ self: { }) {}; "rpmbuild-order" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , directory, extra, fgl, filepath, hspec, optparse-applicative - , process, simple-cmd, simple-cmd-args, unix + ({ mkDerivation, base, case-insensitive, containers, directory + , extra, fgl, filepath, hspec, optparse-applicative, process + , simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.3.1"; - sha256 = "01k1lw0gxxsnl4wqzsynl6xkrnim5fjmdj6jb6b0bgd5jd1y0fyj"; + version = "0.4.3.2"; + sha256 = "1510v4gbylzpdh7l23r4z6xhqmjalay3crxg2216lz8j0mb4sbq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222458,8 +223271,7 @@ self: { process ]; executableHaskellDepends = [ - base bytestring directory extra fgl optparse-applicative - simple-cmd-args + base directory extra fgl optparse-applicative simple-cmd-args ]; testHaskellDepends = [ base extra hspec simple-cmd unix ]; description = "Order RPM packages by dependencies"; @@ -222983,8 +223795,8 @@ self: { }: mkDerivation { pname = "runhs"; - version = "1.0.0.8"; - sha256 = "177xak0p91xn827cnpa374l94lmmym2yrrcsxzjd9752hdzyw7k3"; + version = "1.0.0.9"; + sha256 = "1i2g706997wkqj081pqxj8nq6nhj94x4kf5q0fnj39fp35fmak6q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -223963,8 +224775,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; - version = "1.0.10"; - sha256 = "01i74s62kp9gbwj4jwphvn8z7gsbryczx5gn9a6cd92r29393bkm"; + version = "1.0.11"; + sha256 = "00haa87rpwhy89zg31k0fwizg97i65kqx5gzikm4fjxr7j8ds1xb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; @@ -228629,10 +229441,8 @@ self: { }: mkDerivation { pname = "servant-cassava"; - version = "0.10"; - sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; - revision = "7"; - editedCabalFile = "0n4nbm0axa9qd805jb3gja2p2fiwvhjpvdi5rhlwh4shm9crppcy"; + version = "0.10.1"; + sha256 = "0hf7v35yyfqxc20hgq755laba7lziz2vsy7y8cj8nhczcc67smq0"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -229381,8 +230191,8 @@ self: { pname = "servant-iCalendar"; version = "0.1.0.1"; sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; - revision = "7"; - editedCabalFile = "0yf5gccdilswzabzysc2mrxxq84xdx7k18a647bksimwd44x2i68"; + revision = "8"; + editedCabalFile = "10ka19ga7slcv4cb2f0ncfbkz52bbrm8jkxma8qksz6hm48wxjya"; libraryHaskellDepends = [ base data-default http-media iCalendar servant ]; @@ -235840,23 +236650,26 @@ self: { }) {}; "slack-web" = callPackage - ({ mkDerivation, aeson, base, containers, errors, hspec - , http-api-data, http-client, http-client-tls, megaparsec, mtl + ({ mkDerivation, aeson, base, containers, deepseq, errors, fakepull + , hashable, hspec, http-api-data, http-client, http-client-tls + , megaparsec, mtl, QuickCheck, quickcheck-instances, scientific , servant, servant-client, servant-client-core, text, time - , transformers + , transformers, unordered-containers }: mkDerivation { pname = "slack-web"; - version = "0.2.0.11"; - sha256 = "14ngln71sn5i26041m4v614vq4qhr44pzlgyxliyqw08dxn25la7"; + version = "0.2.1.0"; + sha256 = "01bwiq3b97bznn3sc51vi7q8xkjdslvqqh250fk7arcaq6hkkiw1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base containers errors http-api-data http-client - http-client-tls megaparsec mtl servant servant-client - servant-client-core text time transformers + aeson base containers deepseq errors hashable http-api-data + http-client http-client-tls megaparsec mtl scientific servant + servant-client servant-client-core text time transformers + unordered-containers ]; testHaskellDepends = [ - aeson base containers errors hspec http-api-data megaparsec text - time + aeson base fakepull hspec QuickCheck quickcheck-instances text time ]; description = "Bindings for the Slack web API"; license = lib.licenses.mit; @@ -240448,8 +241261,8 @@ self: { ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; - version = "1.0.1.2"; - sha256 = "0b7czphkra6q6a5xm30pjh5b4cdvz87fzb2pv17dpxai0mb3c0r6"; + version = "1.0.1.3"; + sha256 = "1ji0jnq6d0c0yn4ka8pj838ff04ynj6d3vcv6xy3dl8v3si1mybd"; libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = lib.licenses.isc; @@ -241733,8 +242546,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.1.1"; - sha256 = "0b81f6v18dyd5zia6drqn3jqncj3sp8cscrhlrcwvbljs1j8fd0j"; + version = "0.1.2"; + sha256 = "1iqm96f9c6csv4dzr6l7cyiv99nmbc9739xhycg2gvpm9sncmxrb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -246138,8 +246951,8 @@ self: { }: mkDerivation { pname = "stripe-scotty"; - version = "1.0.0.4"; - sha256 = "0gkagcq2brl4kav6ha333fyl9npgllwws4ixz0z6nas6xf2953pk"; + version = "1.0.0.6"; + sha256 = "1x7dsk2m66ka8qd76mj5aww52rjs0b49vx1lws5bl2xl0asyb03v"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text unordered-containers @@ -246206,8 +247019,8 @@ self: { }: mkDerivation { pname = "stripe-wreq"; - version = "1.0.1.4"; - sha256 = "08c5jkxri3ix19m04w6md1mwc9wd8fgsqr7v3dxzab51ylfivdcr"; + version = "1.0.1.6"; + sha256 = "1lwwyzj4gi6rav8al3mkld4vq8rdvi4ir1y51nywflkcfiqjjjsx"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text unordered-containers wreq @@ -246251,19 +247064,17 @@ self: { "strive" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, markdown-unlit - , template-haskell, text, time, transformers + , http-client, http-client-tls, http-types, template-haskell, text + , time, transformers }: mkDerivation { pname = "strive"; - version = "5.0.12"; - sha256 = "1fdwmcpgfw7maw4lf4mw3qs8fiwxdsv518xjjmrp5w3hfjdlqgmz"; + version = "5.0.13"; + sha256 = "137kqb3lvqyzvarcgvc8ifphj2927z01pcl752sna9vcvj7q7wp6"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; - testToolDepends = [ markdown-unlit ]; description = "A client for the Strava V3 API"; license = lib.licenses.mit; }) {}; @@ -248624,8 +249435,8 @@ self: { }: mkDerivation { pname = "symantic-parser"; - version = "0.0.0.20210102"; - sha256 = "00gmcbn1amdr9nx54wia898gc7437563g9gpvlkhsg9r7197acid"; + version = "0.1.0.20210201"; + sha256 = "0c7vqxd0dagn7l3k4khbqvwg51y6a40m0f5qf587vj4rpjalc473"; libraryHaskellDepends = [ array base bytestring containers ghc-prim hashable template-haskell text transformers unordered-containers @@ -248945,8 +249756,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.8.1"; - sha256 = "0560h3k360316q05wwylpbcvadp9dxzywbp206xm2wslpl1d9m8v"; + version = "3.8.2"; + sha256 = "04lv8v42bs4qjjcia39grfxmabiv41dipgg5b58xgiv4ay884nfm"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -251110,15 +251921,15 @@ self: { license = lib.licenses.mit; }) {}; - "tasty_1_4_0_3" = callPackage + "tasty_1_4_1" = callPackage ({ mkDerivation, ansi-terminal, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.4.0.3"; - sha256 = "044kxp33qnsaxh8s1ja73149acf9xys36x4fs6lz6nyd8id3w497"; + version = "1.4.1"; + sha256 = "0ixfsjjdps0an6iy8cqb41h6kjjli9sg0xw531jwci8xlr7g0a17"; libraryHaskellDepends = [ ansi-terminal base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth @@ -251212,6 +252023,17 @@ self: { broken = true; }) {}; + "tasty-bench" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.2.1"; + sha256 = "0gw0hlpkpwn7hpvwn9i8zqghrzjvhdrhr2q9y4r4ykhqv7y95zy3"; + libraryHaskellDepends = [ base containers deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { @@ -251806,8 +252628,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "1.0.1.1"; - sha256 = "1mkph7g4ybvy4h4rblr60bnalj5jf1acfgdqcw0ggwmbhfbzbg68"; + version = "1.1.0.0"; + sha256 = "1v1ikl4jy02c0jlvm4di8ndm7fbyr8235ydppp953d7qb8yilsyp"; libraryHaskellDepends = [ base directory filemanip filepath logict optparse-applicative prettyprinter tagged tasty @@ -252591,17 +253413,17 @@ self: { }) {}; "telegraph" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, deriving-aeson + ({ mkDerivation, aeson, base, bytestring, conduit , generic-data-surgery, http-client, http-client-tls, http-conduit , in-other-words, mtl, optics-th, text }: mkDerivation { pname = "telegraph"; - version = "1.1.1"; - sha256 = "031p8qpz7gw86qy8iy5syp9g074ksfvkqv0rmv52hn2y1489hzng"; + version = "1.2.0"; + sha256 = "158wbdzgs4dnrfhhds1dbpmrns8p29qbg5sfph2qaigs1ygf3z58"; libraryHaskellDepends = [ - aeson base bytestring conduit deriving-aeson generic-data-surgery - http-client http-conduit in-other-words mtl optics-th text + aeson base bytestring conduit generic-data-surgery http-client + http-conduit in-other-words mtl optics-th text ]; testHaskellDepends = [ base http-client http-client-tls in-other-words @@ -253685,23 +254507,26 @@ self: { }) {}; "tesla" = callPackage - ({ mkDerivation, aeson, base, bytestring, casing, containers - , exceptions, generic-deriving, HUnit, lens, lens-aeson - , monad-logger, mtl, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, unliftio-core, vector, wreq + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, casing + , containers, cryptonite, exceptions, generic-deriving, HUnit, lens + , lens-aeson, memory, monad-logger, mtl, random, retry, tagsoup + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , time, unliftio-core, vector, wreq }: mkDerivation { pname = "tesla"; - version = "0.3.0.1"; - sha256 = "0idn4pgzkg1n1xq5z3qihrb7nrpaxba3y98vcx52nl35c4flps4p"; + version = "0.3.1.0"; + sha256 = "1fwrhmxqpliyq92v1j6jcqxi5iyh7s8rj17mybvgkwh5aprwsdp8"; libraryHaskellDepends = [ - aeson base bytestring casing containers exceptions generic-deriving - lens lens-aeson monad-logger mtl template-haskell text time + aeson base base64-bytestring bytestring casing containers + cryptonite exceptions generic-deriving lens lens-aeson memory + monad-logger mtl random retry tagsoup template-haskell text time unliftio-core vector wreq ]; testHaskellDepends = [ - aeson base bytestring casing containers exceptions generic-deriving - HUnit lens lens-aeson monad-logger mtl tasty tasty-hunit + aeson base base64-bytestring bytestring casing containers + cryptonite exceptions generic-deriving HUnit lens lens-aeson memory + monad-logger mtl random retry tagsoup tasty tasty-hunit tasty-quickcheck template-haskell text time unliftio-core vector wreq ]; @@ -254456,8 +255281,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.1"; - sha256 = "1pp52g4jwyf0w0xpja7gamd39g3acfclc3q29ldpzpfbhnl23n27"; + version = "0.12.1.1"; + sha256 = "04clgbbzva9yxzkn9nf176mqj1lrv64h13awk86l4lrcfbb7kgh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254558,6 +255383,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-ascii" = callPackage + ({ mkDerivation, base, bytestring, deepseq, hashable, optics-core + , parsec, template-haskell, text + }: + mkDerivation { + pname = "text-ascii"; + version = "1.0.0"; + sha256 = "1mwm3ss54c927rdj8dlfw7v2l0maz12mkxb5ss3g1ngdkiwd0bsx"; + libraryHaskellDepends = [ + base bytestring deepseq hashable optics-core parsec + template-haskell text + ]; + description = "ASCII string and character processing"; + license = lib.licenses.asl20; + }) {}; + "text-binary" = callPackage ({ mkDerivation, base, binary, text }: mkDerivation { @@ -255205,6 +256046,8 @@ self: { pname = "text-show-instances"; version = "3.8.4"; sha256 = "1vsrf4vjq4z759srnzvyk3hn90ck4k91vy8cn625m8hy1zddqj2q"; + revision = "1"; + editedCabalFile = "1z7kgnxm9r9dgnqn4fyrfv3k8k2dac7g2hsf649jaxhh898z6dm6"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -255648,8 +256491,8 @@ self: { }: mkDerivation { pname = "th-compat"; - version = "0.1"; - sha256 = "11v1mdm0pf6wnbsvccm1gnziinabgdpp7qdrcmm53yv3pj8yaalw"; + version = "0.1.1"; + sha256 = "1y83yq5ac067a631bd4kg0d14yp8hc23a0dsqsgbqdn279c21ylm"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base base-compat hspec mtl template-haskell @@ -257099,15 +257942,15 @@ self: { license = lib.licenses.gpl3; }) {}; - "tidal_1_7" = callPackage + "tidal_1_7_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, network, parsec , primitive, random, text, transformers, vector, weigh }: mkDerivation { pname = "tidal"; - version = "1.7"; - sha256 = "1kqk9ny1fvgzkmv0kiprbi7l5pwmwkz8f7zycyksqxb6wkrs3v1k"; + version = "1.7.1"; + sha256 = "0fksrydrmjph3ghggijr9hq3xa5wfnqgzm4qxiqravsj70s9m2n4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -258676,8 +259519,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.5.4"; - sha256 = "0dx436m7rb52s1dgkckcpi8imfwf8234pnl1cmvn43x5h6jvyhnf"; + version = "1.5.5"; + sha256 = "0j1rxxq5lzs584nk19610mk7mmsqqkgfxw2qj74ibb1zsk7baj4a"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class hourglass memory mtl network transformers x509 @@ -259229,10 +260072,10 @@ self: { }: mkDerivation { pname = "tokyocabinet-haskell"; - version = "0.0.6"; - sha256 = "1cav27hnl49ghl6f7mhyaqmvfdqib6s76z251vai4vih9psis8rk"; + version = "0.0.7"; + sha256 = "1fmj46wvl6ayx30r5r538vnygz32s1877m2f9zf7nb2zyiz5vmcb"; revision = "1"; - editedCabalFile = "1mk2nwi51zm0b2081db26xipwa0yd53ikhxa5vd8fp8x2w52wliw"; + editedCabalFile = "07kx002x3yh1klhxn9fq0bi2pfy4mdqacg3caqklmdl22dkh74lq"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet ]; testHaskellDepends = [ base bytestring directory HUnit mtl ]; @@ -259875,40 +260718,39 @@ self: { , containers, criterion, data-default, data-default-class , data-interval, deepseq, directory, extended-reals, filepath , finite-field, ghc-prim, hashable, hashtables, haskeline, heaps - , intern, lattices, log-domain, loop, megaparsec, mtl, multiset - , mwc-random, OptDir, optparse-applicative, parsec, pretty, primes - , primitive, process, pseudo-boolean, queue, QuickCheck, scientific - , semigroups, sign, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-th, template-haskell, temporary, text, time, transformers - , transformers-compat, unbounded-delays, unordered-containers - , vector, vector-space, xml-conduit, zlib + , intern, lattices, log-domain, loop, megaparsec, MIP, mtl + , multiset, mwc-random, OptDir, optparse-applicative, parsec + , pretty, primes, primitive, process, pseudo-boolean, queue + , QuickCheck, scientific, semigroups, sign, stm, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, template-haskell, temporary, text + , time, transformers, transformers-compat, unbounded-delays + , unordered-containers, vector, vector-space, xml-conduit, zlib }: mkDerivation { pname = "toysolver"; - version = "0.6.0"; - sha256 = "0hd3rwbv8k62qnw9spwx6gl0j4syivvrigjcdgc53llbqzdjr0v1"; - revision = "3"; - editedCabalFile = "02dmyy2agp6x59dcagqmbwk46bn8q1y4ragk5yggajsw4gbm5gvn"; + version = "0.7.0"; + sha256 = "1r8z8fg3iyz5cc7cmwv29i7gwdcb789s7p6yklfgmz8w314m83gj"; + revision = "1"; + editedCabalFile = "1gnpyqjrcpsc2qjnnajr77j5x0xnyxpsmcxqa2qfbahw0r9qvmfw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring bytestring-builder bytestring-encoding - case-insensitive clock containers data-default-class data-interval - deepseq extended-reals filepath finite-field ghc-prim hashable - hashtables heaps intern lattices log-domain loop megaparsec mtl - multiset mwc-random OptDir pretty primes primitive process - pseudo-boolean queue scientific semigroups sign stm - template-haskell temporary text time transformers - transformers-compat unordered-containers vector vector-space - xml-conduit zlib + case-insensitive clock containers data-default data-default-class + data-interval deepseq directory extended-reals filepath + finite-field ghc-prim hashable hashtables heaps intern lattices + log-domain loop megaparsec MIP mtl multiset mwc-random OptDir + pretty primes primitive process pseudo-boolean queue scientific + semigroups sign stm template-haskell temporary text time + transformers transformers-compat unordered-containers vector + vector-space xml-conduit zlib ]; executableHaskellDepends = [ ansi-wl-pprint array base bytestring bytestring-builder clock - containers data-default data-default-class directory filepath - haskeline intern megaparsec mtl mwc-random OptDir - optparse-applicative parsec process pseudo-boolean scientific - temporary text time transformers transformers-compat - unbounded-delays vector + containers data-default-class filepath haskeline intern megaparsec + MIP mtl mwc-random OptDir optparse-applicative parsec + pseudo-boolean scientific text time transformers + transformers-compat unbounded-delays vector ]; testHaskellDepends = [ array base bytestring bytestring-builder containers @@ -260197,18 +261039,18 @@ self: { }) {}; "trackit" = callPackage - ({ mkDerivation, base, brick, fsnotify, mtl, optparse-generic - , process, process-extras, stm, text, time, vty + ({ mkDerivation, base, brick, fsnotify, microlens-platform, mtl + , optparse-generic, process, process-extras, stm, text, time, vty }: mkDerivation { pname = "trackit"; - version = "0.6.3"; - sha256 = "0bjsvz1kc6i2zpzdcjrrncqs3rpl7rfp961njhihymazffhsx3l2"; + version = "0.7.2"; + sha256 = "1ha28wdc4dabr9qxkbpg9fasfnplicb2pyrn9zmija204nigbcdj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick fsnotify mtl optparse-generic process process-extras stm - text time vty + base brick fsnotify microlens-platform mtl optparse-generic process + process-extras stm text time vty ]; description = "A command-line tool for live monitoring"; license = lib.licenses.bsd3; @@ -261666,8 +262508,8 @@ self: { pname = "trifecta"; version = "2.1"; sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs"; - revision = "3"; - editedCabalFile = "0ag08di787zqzz70nwhsfigsvqbmbg7bkq011znq145yg750jcwl"; + revision = "4"; + editedCabalFile = "0frzfh7xmaypbxcmszjvzbakz52p0fx79jg6ng0ygaaj62inv4ss"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal array base blaze-builder blaze-html blaze-markup @@ -263886,6 +264728,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "type-natural_1_1_0_0" = callPackage + ({ mkDerivation, base, constraints, equational-reasoning, ghc + , ghc-typelits-knownnat, ghc-typelits-natnormalise + , ghc-typelits-presburger, integer-logarithms, QuickCheck + , quickcheck-instances, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "type-natural"; + version = "1.1.0.0"; + sha256 = "0asyjp426931j4ym2qvx5xy9fjyf734sy02gscpd1d0fa8d1xbjm"; + libraryHaskellDepends = [ + base constraints equational-reasoning ghc ghc-typelits-knownnat + ghc-typelits-natnormalise ghc-typelits-presburger + integer-logarithms template-haskell + ]; + testHaskellDepends = [ + base equational-reasoning integer-logarithms QuickCheck + quickcheck-instances tasty tasty-discover tasty-hunit + tasty-quickcheck template-haskell + ]; + testToolDepends = [ tasty-discover ]; + description = "Type-level natural and proofs of their properties"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "type-of-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim @@ -263893,8 +264762,8 @@ self: { }: mkDerivation { pname = "type-of-html"; - version = "1.6.1.2"; - sha256 = "0dgfj4jk9bs6fjmmvsjxjpnvrd4nxmrnhdgvmawlfs5nib4r4al6"; + version = "1.6.2.0"; + sha256 = "18cwsblbmdh301d4jy3b70rnfni2vf3yzg71353hahv2rgfilh3j"; libraryHaskellDepends = [ base bytestring containers double-conversion ghc-prim text ]; @@ -265054,6 +265923,20 @@ self: { broken = true; }) {}; + "ucl" = callPackage + ({ mkDerivation, base, bytestring, containers, libucl, text, time + }: + mkDerivation { + pname = "ucl"; + version = "0.2.0.0"; + sha256 = "1ccf9zavmsk0msq4gz6alv5z32qwnap8a4zvajmqps69bh66b9wv"; + libraryHaskellDepends = [ base bytestring containers text time ]; + libraryPkgconfigDepends = [ libucl ]; + testHaskellDepends = [ base containers ]; + description = "Datatype and parser for the Universal Configuration Language (UCL) using libucl"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) libucl;}; + "uconv" = callPackage ({ mkDerivation, base, icu }: mkDerivation { @@ -266358,8 +267241,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.14.5.0"; - sha256 = "0c30dd5x1bgk40gzfa5wdrnlam0j41z0cpd1dhmcj6fzwd1l2nra"; + version = "0.15.0.0"; + sha256 = "0cgl2xnmp0m73iizmhbl33vgc6mf1wzj49nf9xm1c1d70ak21g1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266412,8 +267295,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.5.5.0"; - sha256 = "08pzazvgg0nldybbj1558xvipn3wafqm9491fk2xcrf4na5pc42l"; + version = "0.6.0.0"; + sha256 = "08c97g221xcbsrwzyv36gikilim2yz2v2kkrhqvaj102v7ygh6ih"; libraryHaskellDepends = [ base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity phonetic-languages-ukrainian uniqueness-periods-vector @@ -266926,6 +267809,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-simple" = callPackage + ({ mkDerivation, base, bytestring, zenhack-prelude }: + mkDerivation { + pname = "unix-simple"; + version = "0.1.0.0"; + sha256 = "0f6hvfs651ciwnpshh9n2655jl8yddwhbpw7gqbn0fa3y6b214kc"; + libraryHaskellDepends = [ base bytestring zenhack-prelude ]; + testHaskellDepends = [ base bytestring zenhack-prelude ]; + description = "Straightforward bindings to the posix API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "unix-time" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover , old-locale, old-time, QuickCheck, time @@ -267096,8 +267993,8 @@ self: { }: mkDerivation { pname = "unliftio-streams"; - version = "0.1.1.0"; - sha256 = "0qp78c610anqpgpd13pz24x68kcpc69z2wjrz6a3qixvqjvp72bw"; + version = "0.1.1.1"; + sha256 = "1r9yn710nwx4h2ky2pmlhmap5ydx4fhcaq119dq7cysnygzi5q2n"; libraryHaskellDepends = [ base bytestring io-streams text unliftio-core ]; @@ -267868,6 +268765,8 @@ self: { pname = "uri-encode"; version = "1.5.0.7"; sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"; + revision = "1"; + editedCabalFile = "172mgdd8dgy8wphgl9vbvp26lrzp01prr5jshbng4rlhpyd340p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269326,18 +270225,16 @@ self: { }) {}; "validate-input" = callPackage - ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy - , QuickCheck, semigroups, string-conversions, text + ({ mkDerivation, base, bytestring, hspec, mtl, pcre-heavy + , QuickCheck, semigroups, string-conversions, text, transformers }: mkDerivation { pname = "validate-input"; - version = "0.4.0.0"; - sha256 = "1yd187xa762b6zwjsyh3qp11sn3cnwh8g5imp0izk7a22x5y5yi0"; - revision = "1"; - editedCabalFile = "0qfwr05111adjfy6j0cbhrzyxgl3ngfpm0irf1hcgmfxnb8psqli"; + version = "0.5.0.0"; + sha256 = "09bp771b4ccm3r635i5cdkcrqlfkd5rlgrh9ijknd42bpw9byvzi"; libraryHaskellDepends = [ - base bytestring either mtl pcre-heavy semigroups string-conversions - text + base bytestring mtl pcre-heavy semigroups string-conversions text + transformers ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Input validation combinator library"; @@ -270149,24 +271046,6 @@ self: { }) {}; "vector" = callPackage - ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit - , primitive, QuickCheck, random, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, transformers - }: - mkDerivation { - pname = "vector"; - version = "0.12.1.2"; - sha256 = "1g8i806ph9l789pv2k665bbxlmsbwfwzml1mi9xv683g7xl2fviv"; - libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; - testHaskellDepends = [ - base base-orphans HUnit primitive QuickCheck random semigroups - tasty tasty-hunit tasty-quickcheck template-haskell transformers - ]; - description = "Efficient Arrays"; - license = lib.licenses.bsd3; - }) {}; - - "vector_0_12_2_0" = callPackage ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit , primitive, QuickCheck, random, tasty, tasty-hunit , tasty-quickcheck, template-haskell, transformers @@ -270182,7 +271061,6 @@ self: { ]; description = "Efficient Arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vector-algorithms" = callPackage @@ -270193,6 +271071,8 @@ self: { pname = "vector-algorithms"; version = "0.8.0.4"; sha256 = "0fxg6w0vh5g2vzw4alajj9ywdijfn9nyx28hbckhmwwbfxb6l5vn"; + revision = "1"; + editedCabalFile = "10zjr2cdsaxb71z9svl7h2bxrxbhr19ckqy9p2mhkvhg7ar60ixz"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -271666,8 +272546,6 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vivid-osc" = callPackage @@ -271680,8 +272558,6 @@ self: { testHaskellDepends = [ base bytestring cereal microspec time ]; description = "Open Sound Control encode/decode"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vivid-supercollider" = callPackage @@ -271701,8 +272577,6 @@ self: { ]; description = "Implementation of SuperCollider server specifications"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vk-aws-route53" = callPackage @@ -271751,6 +272625,77 @@ self: { license = lib.licenses.publicDomain; }) {}; + "vocoder" = callPackage + ({ mkDerivation, base, random, vector, vector-fftw }: + mkDerivation { + pname = "vocoder"; + version = "0.1.0.0"; + sha256 = "04j0rrf7i1cghk53dwy5y5s3igxsqa6ih94rgfrjf2prx3rwmbr2"; + libraryHaskellDepends = [ base random vector vector-fftw ]; + description = "Phase vocoder"; + license = lib.licenses.bsd2; + }) {}; + + "vocoder-audio" = callPackage + ({ mkDerivation, base, conduit, conduit-audio, containers + , mono-traversable, vector, vector-fftw, vocoder, vocoder-conduit + }: + mkDerivation { + pname = "vocoder-audio"; + version = "0.1.0.0"; + sha256 = "1hwnsmnqxwrbfjgv9rvprxnzpyb3w4nybzsz98fqvh9lslajrq4p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base conduit conduit-audio containers mono-traversable vector + vector-fftw vocoder vocoder-conduit + ]; + description = "Phase vocoder for conduit-audio"; + license = lib.licenses.bsd2; + }) {}; + + "vocoder-conduit" = callPackage + ({ mkDerivation, base, conduit, gauge, hspec, mono-traversable + , QuickCheck, vector, vector-fftw, vocoder + }: + mkDerivation { + pname = "vocoder-conduit"; + version = "0.1.0.0"; + sha256 = "0a1zhxzypxik62rzk5l6crv1413662gjq31qslvavwd248xn00dk"; + libraryHaskellDepends = [ + base conduit mono-traversable vector vector-fftw vocoder + ]; + testHaskellDepends = [ + base conduit hspec QuickCheck vector vector-fftw vocoder + ]; + benchmarkHaskellDepends = [ + base conduit gauge vector vector-fftw vocoder + ]; + description = "Phase vocoder for Conduit"; + license = lib.licenses.bsd2; + }) {}; + + "vocoder-dunai" = callPackage + ({ mkDerivation, base, dunai, gauge, hspec, QuickCheck, vector + , vector-fftw, vocoder + }: + mkDerivation { + pname = "vocoder-dunai"; + version = "0.1.0.0"; + sha256 = "1bns914d8yxyj9mblknw7n5xijf6vn8y099vzp3f9grjls81y4pw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dunai vector vector-fftw vocoder ]; + testHaskellDepends = [ + base dunai hspec QuickCheck vector vector-fftw vocoder + ]; + benchmarkHaskellDepends = [ + base dunai gauge vector vector-fftw vocoder + ]; + description = "Phase vocoder for Dunai and Rhine"; + license = lib.licenses.bsd2; + }) {}; + "voicebase" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL , hspec, http-client, http-client-openssl, lens, lens-aeson @@ -272036,8 +272981,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.9"; - sha256 = "00k23g4qszrhwbbc746y1z50mcnxw9b99rqfdqx6ncnzblc6b63z"; + version = "3.9.1"; + sha256 = "1rdhkxrjxcvdx3hd74xcgx28nd8ca8la5kclbxwbgciby8plpymv"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -274193,8 +275138,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.13"; - sha256 = "1yqgfx7bsjk97dxcrqwddfhi8mdw0q6cbgs5abaxqjlxh3rhihdx"; + version = "3.3.14"; + sha256 = "0whmh6dbl7321a2kg6ypngw5kgvvxqdk161li0l4hr3wqqddlc93"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -276016,36 +276961,37 @@ self: { }) {}; "what4" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors - , bimap, bv-sized, bytestring, containers, data-binary-ieee754 + ({ mkDerivation, attoparsec, base, bifunctors, bimap, bv-sized + , bytestring, config-value, containers, data-binary-ieee754 , deepseq, deriving-compat, directory, exceptions, extra, filepath , fingertree, ghc-prim, hashable, hashtables, hedgehog, io-streams - , lens, mtl, panic, parameterized-utils, process, QuickCheck - , scientific, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, text, th-abstraction, transformers + , lens, libBF, mtl, panic, parameterized-utils, prettyprinter + , process, QuickCheck, scientific, tasty, tasty-hedgehog + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , th-abstraction, th-lift, th-lift-instances, transformers , unordered-containers, utf8-string, vector, versions, zenc }: mkDerivation { pname = "what4"; - version = "1.0"; - sha256 = "0yyyq2gzl7srjq6inj1dqdhpxd58r1rhjajwxi0gr5pmxfzv7k8w"; - revision = "1"; - editedCabalFile = "04ab8nvnngb3bjv94mkcr17hh2m943m4pyk3klbnmpwyp9ip6pmf"; + version = "1.1"; + sha256 = "1656h3865vzd96ggibm1wkhnpmjrx6crv87kgmwphfy8hgl5j8kq"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-wl-pprint attoparsec base bifunctors bimap bv-sized bytestring + attoparsec base bifunctors bimap bv-sized bytestring config-value containers data-binary-ieee754 deepseq deriving-compat directory exceptions extra filepath fingertree ghc-prim hashable hashtables - io-streams lens mtl panic parameterized-utils process scientific - template-haskell temporary text th-abstraction transformers - unordered-containers utf8-string vector versions zenc + io-streams lens libBF mtl panic parameterized-utils prettyprinter + process scientific template-haskell temporary text th-abstraction + th-lift th-lift-instances transformers unordered-containers + utf8-string vector versions zenc ]; executableHaskellDepends = [ base parameterized-utils ]; testHaskellDepends = [ base bv-sized bytestring containers data-binary-ieee754 hedgehog - parameterized-utils QuickCheck tasty tasty-hedgehog tasty-hunit - tasty-quickcheck text transformers versions + libBF parameterized-utils QuickCheck tasty tasty-hedgehog + tasty-hunit tasty-quickcheck text transformers versions ]; description = "Solver-agnostic symbolic values support for issuing queries"; license = lib.licenses.bsd3; @@ -276224,6 +277170,8 @@ self: { pname = "wide-word"; version = "0.1.1.2"; sha256 = "10sj7nca2sba74bkiicnp95xrfq2j1al93ggw3z24982nm9x3j8r"; + revision = "1"; + editedCabalFile = "1gqw8d8j3wml0431lq1ygl5a3n36ymp1i77m7qaw0mz3ss982gl2"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -276589,8 +277537,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "0.0.0.4"; - sha256 = "1mph0zaz2dnhpchyiyspqsjghd8kn8sbqnhbyjmag51l2wr418vb"; + version = "0.0.0.5"; + sha256 = "1j12mh8zap8c0lb358bzk4sq29h64lv0jrwq9r4nssx4yybrz9gg"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring containers hspec QuickCheck text @@ -277721,10 +278669,8 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.3.2"; - sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; - revision = "1"; - editedCabalFile = "0gz674sb266hv6si9l79c3bv7n2nbssl1262c24in79sk27887gb"; + version = "0.5.3.3"; + sha256 = "0zv51048p0r7vhamml3ps9nr11yi9fxz2w31qcz053bw3z9ivwxw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -278338,8 +279284,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.17"; - sha256 = "03raxspm7k5byx2gg5a2avgf7c3idcjq0vd7jh01vpv1mamap712"; + version = "1.1.18"; + sha256 = "0idxk1q0gsh1hq56w8jxnsb58p8z8d45qgj6zqzsszlccwzgr24f"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -278885,8 +279831,8 @@ self: { }: mkDerivation { pname = "xdot"; - version = "0.3.0.2"; - sha256 = "0k3lklghlj51nslv8pi8anj78hls2srmdr6hz5yibfhvycpib0c2"; + version = "0.3.0.3"; + sha256 = "06pgs74b3llyhhp2rr9a3rvgycnvg395q5ib9vwdiv9pqgq31kia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -282680,7 +283626,7 @@ self: { broken = true; }) {}; - "yesod-auth-oauth2_0_6_2_1" = callPackage + "yesod-auth-oauth2_0_6_2_2" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, errors , hoauth2, hspec, http-client, http-conduit, http-types, memory , microlens, safe-exceptions, text, uri-bytestring, yesod-auth @@ -282688,8 +283634,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.2.1"; - sha256 = "1kzz271y69l47wikfmfix5v9csh6xy7cv8b36gxzlwr6vil59bmy"; + version = "0.6.2.2"; + sha256 = "176iz5mg9jhrp8kp61f12j1jw3icnqp10dxln7046p1nqam0nv3d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -282786,6 +283732,34 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-bin_1_6_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, http-client, http-client-tls, http-reverse-proxy + , http-types, network, optparse-applicative, process + , project-template, say, split, stm, streaming-commons, tar, text + , time, transformers, transformers-compat, unliftio + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.1"; + sha256 = "0saz5dcygyf91f8hqvsy9wpcc5pg7vd9gcp891fiz4cywsrqpzwx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal conduit conduit-extra containers + data-default-class directory file-embed filepath fsnotify + http-client http-client-tls http-reverse-proxy http-types network + optparse-applicative process project-template say split stm + streaming-commons tar text time transformers transformers-compat + unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib + ]; + description = "The yesod helper executable"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -283529,8 +284503,8 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "2.0.0.2"; - sha256 = "1wlwzxc2amnq1ma2lvclrc3dzhh8s6d8ffz6yk9rq88aijgvw35m"; + version = "2.0.0.3"; + sha256 = "1qj3qsrzjh0w0hc9ngbxd82pkwb8jylhf0nihhnk4dvrdqm2yvyb"; libraryHaskellDepends = [ aeson base bytestring containers http-link-header network-uri text unliftio yesod-core @@ -286270,8 +287244,8 @@ self: { pname = "zippers"; version = "0.3"; sha256 = "0hrsgk8sh9g3438kl79131s6vjydhivgya04yxv3h70m7pky1dpm"; - revision = "1"; - editedCabalFile = "1pdlng2wnzqg2fbafp78mxp3whsy0683x14gzdnif7pmhpzs145f"; + revision = "2"; + editedCabalFile = "131rmvifqf3dcvh9lnpjnm28ss7nzra1n2qnxa1fypnx1zmmljva"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base fail lens profunctors semigroupoids semigroups diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix index af317c92a5..4d66478f33 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -18,16 +18,6 @@ self: super: { # https://github.com/spacchetti/spago/issues/512 spago = self.callPackage ../tools/purescript/spago/spago.nix { }; - # HLS and its fork of ghcide that it uses - # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh - haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; - hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { }; - hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { }; - hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { }; - hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { }; - hls-class-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-class-plugin.nix { }; - hls-eval-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-eval-plugin.nix { }; - nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; # cabal2nix --revision https://github.com/hasura/ci-info-hs.git diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index ab54223785..89db33c5a8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.763"; + version = "1.10.2.774"; src = fetchurl { + # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "042d5bk59wv145fvjrk72g4hvaq7j2p4a2d1pg13b433qfkchgia"; + sha256 = "0z3j8m9k7prmx6n3kpyhj04pjdg7y0plyxv4kp7789shanr6y4qp"; }; nativeBuildInputs = [ @@ -20,6 +21,8 @@ stdenv.mkDerivation rec { binPath = lib.makeBinPath [ rlwrap jdk ]; in '' + runHook preInstall + clojure_lib_dir=$out bin_dir=$out/bin @@ -38,6 +41,8 @@ stdenv.mkDerivation rec { wrapProgram $bin_dir/clj --prefix PATH : $out/bin:${binPath} installManPage clj.1 clojure.1 + + runHook postInstall ''; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix index 358fff039c..aaf368017f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix @@ -46,8 +46,7 @@ in b=$(basename $f) if [ "$b" = mix ]; then continue; fi wrapProgram $f \ - --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \ - --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt + --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" done substituteInPlace $out/bin/mix \ @@ -69,6 +68,6 @@ in license = licenses.epl10; platforms = platforms.unix; - maintainers = with maintainers; [ havvy couchemar ankhers Br1ght0ne ]; + maintainers = teams.beam.members; }; }) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index 4429dc1eaf..538b422490 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -3,11 +3,10 @@ # TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 , openjdk8 ? null # javacSupport , unixODBC ? null # odbcSupport -, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport +, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null , parallelBuild ? false -, systemd +, systemd, wxSupport ? true }: - { baseName ? "erlang" , version , sha256 ? null @@ -21,7 +20,7 @@ , javacSupport ? false, javacPackages ? [ openjdk8 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , withSystemd ? stdenv.isLinux # systemd support in epmd -, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] +, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" @@ -126,7 +125,7 @@ in stdenv.mkDerivation ({ ''; platforms = platforms.unix; - maintainers = with maintainers; [ sjmackenzie couchemar gleber ]; + maintainers = teams.beam.members; license = licenses.asl20; } // meta); } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix index 8db532b421..ac1a52e1bb 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8sIF+jvhRoKNfvPs/WjMZmysAeEjOKaiqi7bY0Bbcxw="; + sha256 = "sha256-NLPmuS7HTPY8OfeppqVhrj4iVZix4orr1oYilcXaAqI="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix index 895054fac4..397be81e7c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix @@ -87,7 +87,7 @@ buildRebar3 { downloadPage = "https://github.com/rvirding/lfe/releases"; license = licenses.asl20; - maintainers = with maintainers; [ yurrriq ankhers ]; + maintainers = teams.beam.members; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix index 13b64e8cb6..d611cb7693 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.3.26"; - sha256 = "0klxnf6nhsib9b2mdls1x2wbpi04gmgwxajbn593rzalh5y5l7ip"; + version = "7.3.27"; + sha256 = "00z0vadxazm2flks9g8qmchj2pwkli880kg313jgbb1mx3shc84x"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix index 9ee0c9c9e7..42aa28b65e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.14"; - sha256 = "1xm1s2w9fsd8q7kjbpqw8s4bs7ggziwws23m0ykkmvmd0l3cm2b8"; + version = "7.4.15"; + sha256 = "0mvp7b16sy9j36v9v1mhixwz16hi8mhax7rwpqy3sv24jc1bxmqv"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix index 5779c836dd..a4aa4842df 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.1"; - sha256 = "1vmx9rhks8v2198f9d6cq62bway5mrfsz72garjdwcyi82ppckn4"; + version = "8.0.2"; + sha256 = "1rm3gc2h9l0zd1ccawpg1wxqm8v8rllq417f2w5pqcdf7sgah3q0"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 1133ad2009..d6030a4bf1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -218,9 +218,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "1"; + patch = "2"; }; - sha256 = "08ckkhd0ix6j9873a7gr507c72d4cmnv5lwvprlljdca9i8p2dzs"; + sha256 = "1l98b7s9sf16a5w8y0fdn7a489l3gpykjasws1j67bahhc6li2c1"; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; @@ -234,9 +234,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "1"; + patch = "2"; }; - sha256 = "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c"; + sha256 = "03f1fdw6yk2mypa9pbmgk26r8y1hhmw801l6g36zry9zsvz7aqgx"; pythonVersion = "3.6"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; @@ -251,9 +251,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "1"; + patch = "2"; }; - sha256 = "18xc5kwidj5hjwbr0w8v1nfpg5l4lk01z8cn804zfyyz8xjqhx5y"; # linux64 + sha256 = "0fx1kp13cgx3rijd0zf8rdjbai6mfhc9is4xfc7kl5cpd88hhkwd"; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; @@ -264,9 +264,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "1"; + patch = "2"; }; - sha256 = "04nv0mkalaliphbjw7y0pmb372bxwjzwmcsqkf9kwsik99kg2z7n"; # linux64 + sha256 = "10xdx7q04fzy4v4rbj9bbdw8g9y68qgaih7z2n0s5aknj0bizafp"; # linux64 pythonVersion = "3.6"; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index cfa1ac7189..b4e9343b5d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -45,7 +45,7 @@ in with passthru; stdenv.mkDerivation rec { inherit pname version; src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-src.tar.bz2"; + url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-src.tar.bz2"; inherit sha256; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix index 6fd0ee2e92..f301fd15f0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -54,7 +54,7 @@ in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; inherit sha256; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch index 0b78caf7e0..15d03830e0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch @@ -1,13 +1,14 @@ ---- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py 2017-10-03 11:49:20.000000000 +0100 -+++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py 2017-11-21 13:20:51.398607530 +0000 -@@ -17,18 +17,14 @@ +--- a/lib_pypy/_tkinter/tklib_build.py ++++ b/lib_pypy/_tkinter/tklib_build.py +@@ -17,19 +17,14 @@ elif sys.platform == 'win32': incdirs = [] linklibs = ['tcl85', 'tk85'] libdirs = [] -elif sys.platform == 'darwin': -- incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/'] -- linklibs = ['tcl', 'tk'] -- libdirs = [] +- # homebrew +- incdirs = ['/usr/local/opt/tcl-tk/include'] +- linklibs = ['tcl8.6', 'tk8.6'] +- libdirs = ['/usr/local/opt/tcl-tk/lib'] else: # On some Linux distributions, the tcl and tk libraries are # stored in /usr/include, so we must check this case also diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix index 61fc497024..ff27ca8ec2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -1,3 +1,10 @@ +# Tests for the Python interpreters, package sets and environments. +# +# Each Python interpreter has a `passthru.tests` which is the attribute set +# returned by this function. For example, for Python 3 the tests are run with +# +# $ nix-build -A python3.tests +# { stdenv , python , runCommand @@ -7,6 +14,8 @@ }: let + # Test whether the interpreter behaves in the different types of environments + # we aim to support. environmentTests = let envs = let inherit python; @@ -83,6 +92,7 @@ let in lib.mapAttrs testfun envs; + # Integration tests involving the package set. # All PyPy package builds are broken at the moment integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 860ffc0aea..5eccebf024 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.9.4"; + version = "0.11.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "0h3lbznzxqmsv2816vr6y244sfdchj13yhbav86zy2m79p8b5lgq"; + sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto="; }; buildInputs = [ rakudo makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 7141849a5e..208c74981d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q1.2"; + version = "2021.Q1.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "+oAetAHJ530e3IFPJDQiQn5vbUKeI1z0oF3Gy6mRVGM="; + sha256 = "x9VzPALIlgE3eIKY4/qbFg5w+zd2W/jbqFXgJfpvLP4="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix index 1e3c2bcd2e..6fa4a6e0a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext +{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , pcre, itstool, gperf, vala, lmdb, libsoup @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "appstream"; - version = "0.13.1"; + version = "0.14.0"; outputs = [ "out" "dev" ]; @@ -14,9 +14,17 @@ stdenv.mkDerivation rec { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "16nxaw4fx78maldi3kvr8fiwzhmy5276wd4x2fxny16zzf01098j"; + sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q="; }; + patches = [ + # Fix hardcoded paths + (substituteAll { + src = ./fix-paths.patch; + libstemmer_includedir = "${lib.getDev libstemmer}/include"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 @@ -25,14 +33,6 @@ stdenv.mkDerivation rec { buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ]; - prePatch = '' - substituteInPlace meson.build \ - --replace /usr/include ${libstemmer}/include - - substituteInPlace data/meson.build \ - --replace /etc $out/etc - ''; - mesonFlags = [ "-Dapidocs=false" "-Ddocs=false" diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch new file mode 100644 index 0000000000..0da72a78cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch @@ -0,0 +1,29 @@ +diff --git a/data/meson.build b/data/meson.build +index 1eb3dfb0..623b66ec 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -26,4 +26,4 @@ i18n.merge_file ( + ) + + install_data ('appstream.conf', +- install_dir: get_option('sysconfdir')) ++ install_dir: get_option('prefix') / 'etc') +diff --git a/meson.build b/meson.build +index dc1fb1a5..5ee03b73 100644 +--- a/meson.build ++++ b/meson.build +@@ -108,12 +108,12 @@ if get_option ('gir') + dependency('gobject-introspection-1.0', version: '>=1.56') + endif + +-stemmer_inc_dirs = include_directories(['/usr/include']) ++stemmer_inc_dirs = include_directories(['@libstemmer_includedir@']) + if get_option('stemming') + stemmer_lib = cc.find_library('stemmer', required: true) + if not cc.has_header('libstemmer.h') + if cc.has_header('libstemmer/libstemmer.h') +- stemmer_inc_dirs = include_directories('/usr/include/libstemmer') ++ stemmer_inc_dirs = include_directories('@libstemmer_includedir@/libstemmer') + else + error('Unable to find Snowball header "libstemmer.h". Please ensure libstemmer/Snowball is installed properly in order to continue.') + endif diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix index 9ae1cce684..0bcb4741ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix @@ -4,7 +4,7 @@ mkDerivation { pname = "appstream-qt"; - inherit (appstream) version src prePatch; + inherit (appstream) version src patches; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix index bf50401a21..75b26695e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb"; + sha256 = "sha256-fXu7GI2UR9QiBGP2n2pEFRjz9ZwA+BAK9zxhNnoYWt4="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cfitsio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cfitsio/default.nix index 28bb076177..a430bc3179 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cfitsio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cfitsio/default.nix @@ -1,21 +1,18 @@ -{ fetchurl, lib, stdenv - -# Optional dependencies -, bzip2 ? null }: +{ fetchurl, lib, stdenv, bzip2 }: stdenv.mkDerivation rec { pname = "cfitsio"; - version = "3.47"; + version = "3.49"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "1vzlxnrjckz78p2wf148v2z3krkwnykfqvlj42sz3q711vqid1a1"; + sha256 = "1cyl1qksnkl3cq1fzl4dmjvkd6329b57y9iqyv44wjakbh6s4rav"; }; buildInputs = [ bzip2 ]; patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}"; + configureFlags = "--with-bzip2=${bzip2.out}"; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix index eb55178db0..9c89279cd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.4"; + version = "2.9.6"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "1sb0z5ryh34y80ghlr2agsl64gayjmxpl96l9fjaylf5k2m3fg2b"; + sha256 = "sha256-RdOfog5FOw5XESyDFX68Lb2MUyCeUuPaq/0UVNTjNKo="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix index 702015e5d3..233e01e038 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/onqtam/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix index 5166efea21..0a9a4684e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.2"; + version = "1.2.18"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "0nilqf3cssi6z8bxxpmc7zxsh7apgwmx8mm7nfc6c5d40z3nyjpk"; + sha256 = "sha256-ENR+YJhs/FH4Fw+p6rpDEU7r3eC6bmscSBPYbwIaqt0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix index 3e4b68ec79..4efc713bb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jWKm64RvVkeA/Zvy8VIAXMykuqv2FEzsduN2zcPm4ME="; + sha256 = "sha256-tdMdIudB8zZWXF+Q0YhFo9Q4VHjLJh3rdfQsYhgo2DU="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index 92cf619ab5..d6a1b44fe4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf -, gflags, abseil-cpp, libnsl +, gflags, libnsl }: stdenv.mkDerivation rec { - version = "1.34.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.35.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0p6si9i0gg885ag2x87a7jyzhgd5lhx2bh2vjj2ra1jn6y3vg6qk"; + sha256 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd"; fetchSubmodules = true; }; patches = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ] + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ] ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" - "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix index 115547a72f..70b2c4d1e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtk-engines-2.20.2"; src = fetchurl { - url = "ftp://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"; + url = "mirror://gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"; sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix index c30d678e02..2c9bac002f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.46.1"; + version = "1.46.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2"; + sha256 = "2D+hYChmcMA+uJAkBgbYr6fqajqBjorRfu7Y2XZIe9c="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/inih/default.nix b/third_party/nixpkgs/pkgs/development/libraries/inih/default.nix index 11e49f7ddc..cc97973278 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/inih/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/inih/default.nix @@ -2,23 +2,17 @@ stdenv.mkDerivation rec { pname = "inih"; - version = "r52"; + version = "r53"; src = fetchFromGitHub { owner = "benhoyt"; repo = pname; rev = version; - sha256 = "0lsvm34zabvi1xlximybzvgc58zb90mm3b9babwxlqs05jy871m4"; + sha256 = "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6"; }; nativeBuildInputs = [ meson ninja ]; - mesonFlags = [ - "-Ddefault_library=shared" - "-Ddistro_install=true" - "-Dwith_INIReader=true" - ]; - meta = with lib; { description = "Simple .INI file parser in C, good for embedded systems"; homepage = "https://github.com/benhoyt/inih"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 71b0d7b9a9..b7754a186d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; + patches = [ + # Fix for https://github.com/open-source-parsers/jsoncpp/issues/1235. + (fetchpatch { + url = "https://github.com/open-source-parsers/jsoncpp/commit/ac2870298ed5b5a96a688d9df07461b31f83e906.patch"; + sha256 = "02wswhiwypmf1jn3rj9q1fw164kljiv4l8h0q6wyijzr77hq4wsg"; + }) + ]; + /* During darwin bootstrap, we have a cp that doesn't understand the * --reflink=auto flag, which is used in the default unpackPhase for dirs */ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix index 9706cda03f..e35f838591 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DENABLE_TESTS=OFF" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: + "-DCONFIG_RUNTIME_CPU_DETECT=0" ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaudec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaudec/default.nix new file mode 100644 index 0000000000..a243e56c2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libaudec/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub +, libsndfile, libsamplerate +, meson, ninja, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "libaudec"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "zrythm"; + repo = "libaudec"; + rev = "v${version}"; + sha256 = "1570m2dfia17dbkhd2qhx8jjihrpm7g8nnyg6n4wif4vv229s7dz"; + }; + + buildInputs = [ libsndfile libsamplerate ]; + nativeBuildInputs = [ meson ninja pkg-config ]; + + meta = with lib; { + homepage = "https://www.zrythm.org"; + description = "A library for reading and resampling audio files"; + license = licenses.agpl3Plus; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libav/default.nix index 93d6e0d209..ad95edb68c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libav/default.nix @@ -127,6 +127,10 @@ let license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; platforms = with platforms; linux ++ darwin; + knownVulnerabilities = + lib.optional (lib.versionOlder version "12.1") "CVE-2017-9051" + ++ lib.optionals (lib.versionOlder version "12.3") [ "CVE-2018-5684" "CVE-2018-5766" ] + ++ lib.optionals (lib.versionOlder version "12.4") [ "CVE-2019-9717" "CVE-2019-9720" ]; }; }; # libavFun diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix index a2dfe1322f..0127c1ebe8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix @@ -47,9 +47,8 @@ stdenv.mkDerivation rec { gtkModule = "/lib/gtk-2.0/"; }; - meta = { + meta = with lib; { description = "An implementation of the XDG Sound Theme and Name Specifications"; - longDescription = '' libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops @@ -57,12 +56,12 @@ stdenv.mkDerivation rec { PulseAudio, OSS, GStreamer, null) and is designed to be portable. ''; - homepage = "http://0pointer.de/lennart/projects/libcanberra/"; - - license = lib.licenses.lgpl2Plus; - + license = licenses.lgpl2Plus; maintainers = [ ]; - platforms = lib.platforms.unix; + platforms = platforms.unix; + # canberra-gtk-module.c:28:10: fatal error: 'gdk/gdkx.h' file not found + # #include + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcyaml/default.nix new file mode 100644 index 0000000000..b316b6b639 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libcyaml/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub +, libyaml +}: + +stdenv.mkDerivation rec { + pname = "libcyaml"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "tlsa"; + repo = "libcyaml"; + rev = "v${version}"; + sha256 = "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93"; + }; + + buildInputs = [ libyaml ]; + + makeFlags = [ "VARIANT=release" "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/tlsa/libcyaml"; + description = "C library for reading and writing YAML"; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix index 5a8f1f0031..e7a877962c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libebml"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7"; + sha256 = "04bn1i7g4vwmkv3hv26rmcb59zkl2rh37qnfjm52j560bjlyd7im"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libebur128/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libebur128/default.nix index ba4f84f8c8..db6c9f93fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libebur128/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libebur128/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.5"; pname = "libebur128"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; rev = "v${version}"; - sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"; + sha256 = "sha256-B6MOSbLfPvadXtXHSvxZCIpAH1Bnj6sItYRp+xH5HDA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix index f38f09410f..01c10dab60 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix @@ -1,12 +1,12 @@ { fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }: stdenv.mkDerivation rec { - version = "20201210"; + version = "20201230"; pname = "libewf"; src = fetchurl { url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; - sha256 = "sha256-dI1We2bsBRDcyqd6HLC7eBE99dpzSkhHtNgt0ZE4aDc="; + sha256 = "sha256-10r4jPzsA30nHQzjdg/VkwTG1PwOskwv8Bra34ZPMgc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix index 59916bfb33..d99cf6ef62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkg-config, fetchpatch +, exiv2, libgsf, rpm, pkg-config , gstreamerSupport ? true, gst_all_1 ? null # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -20,28 +20,15 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg_3 != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.9"; + pname = "libextractor"; + version = "1.11"; src = fetchurl { - url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh"; + url = "mirror://gnu/libextractor/${pname}-${version}.tar.gz"; + sha256 = "sha256-FvYzq4dGo4VHxKHaP0WRGSsIJa2DxDNvBXW4WEPYvY8="; }; - patches = [ - ./fix-gcc8-build.patch - # Fixes build with exiv2 0.27 - (fetchpatch { - name = "libextractor-exiv2-0.27.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53"; - sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6"; - }) - (fetchpatch { - name = "CVE-2019-15531.patch"; - url = "https://git.gnunet.org/libextractor.git/patch/?id=d2b032452241708bee68d02aa02092cfbfba951a"; - sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw"; - excludes = [ "ChangeLog" ]; - }) - ] ++ lib.optionals gstreamerSupport [ + patches = lib.optionals gstreamerSupport [ # Libraries cannot be wrapped so we need to hardcode the plug-in paths. (substituteAll { @@ -76,12 +63,11 @@ stdenv.mkDerivation rec { # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. - # FIXME: Tests currently fail and the test framework appears to be deeply - # broken anyway. doCheck = false; - #postInstall = "make check"; + doInstallCheck = true; + installCheckPhase = "make check"; - meta = { + meta = with lib; { description = "Simple library for keyword extraction"; longDescription = @@ -105,9 +91,9 @@ stdenv.mkDerivation rec { additional MIME types are detected. ''; - license = lib.licenses.gpl2Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = lib.platforms.linux; + maintainers = [ maintainers.jorsn ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch b/third_party/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch deleted file mode 100644 index e04d09be89..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c -index 072ffc5..a105840 100644 ---- a/src/plugins/ole2_extractor.c -+++ b/src/plugins/ole2_extractor.c -@@ -345,9 +345,8 @@ process_star_office (GsfInput *src, - gsf_input_read (src, size, (unsigned char*) buf); - if ( (buf[0] != 0x0F) || - (buf[1] != 0x0) || -- (0 != strncmp (&buf[2], -- "SfxDocumentInfo", -- strlen ("SfxDocumentInfo"))) || -+ (0 != strcmp (&buf[2], -+ "SfxDocumentInfo")) || - (buf[0x11] != 0x0B) || - (buf[0x13] != 0x00) || /* pw protected! */ - (buf[0x12] != 0x00) ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix index dc83592412..255ddfa22a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix @@ -1,32 +1,40 @@ -{ lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala +{ lib +, stdenv +, fetchurl +, glib +, intltool +, menu-cache +, pango +, pkg-config +, vala , extraOnly ? false -, withGtk3 ? false, gtk2, gtk3 }: +, withGtk3 ? false, gtk2, gtk3 +}: + let gtk = if withGtk3 then gtk3 else gtk2; inherit (lib) optional; in stdenv.mkDerivation rec { - name = if extraOnly - then "libfm-extra-${version}" - else "libfm-${version}"; - version = "1.3.1"; + pname = if extraOnly + then "libfm-extra" + else "libfm"; + version = "1.3.2"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"; + sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU="; }; nativeBuildInputs = [ vala pkg-config intltool ]; - buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; + buildInputs = [ glib gtk pango ] + ++ optional (!extraOnly) menu-cache; - configureFlags = [ - "--sysconfdir=/etc" - ] ++ optional extraOnly "--with-extra-only" - ++ optional withGtk3 "--with-gtk=3"; + configureFlags = [ "--sysconfdir=/etc" ] + ++ optional extraOnly "--with-extra-only" + ++ optional withGtk3 "--with-gtk=3"; - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - ]; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm postInstall = optional (!extraOnly) '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix index 86e3f4274f..2cd7da0784 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgdata"; - version = "0.17.13"; + version = "0.18.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga"; + sha256 = "8MIBEvpTcrYsASVvJorvUTGhYd/COGjzk+z3uLN1JYA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgroove/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgroove/default.nix index 963bf722b2..f14524df0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgroove/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgroove/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ffmpeg_3, SDL2, chromaprint, libebur128 }: stdenv.mkDerivation rec { version = "4.3.0"; @@ -11,10 +11,17 @@ stdenv.mkDerivation rec { sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd"; }; - patches = [ ./no-warnings-as-errors.patch ]; + patches = [ + ./no-warnings-as-errors.patch + (fetchpatch { + name = "update-for-ffmpeg-3.0.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-update-for-ffmpeg-3.0.patch?h=libgroove&id=a9f3bd2a5afd3227733414a5d54c7a2aa0a1249e"; + sha256 = "0800drk9df1kwbv80f2ffv77xk888249fk0d961rp2a305hvyrk0"; + }) + ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ libav SDL2 chromaprint libebur128 ]; + buildInputs = [ ffmpeg_3 SDL2 chromaprint libebur128 ]; meta = with lib; { description = "Streaming audio processing library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix index ed5f67d437..061fe51ed5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix @@ -1,26 +1,16 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { pname = "libhugetlbfs"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "https://github.com/libhugetlbfs/libhugetlbfs/releases/download/${version}/libhugetlbfs-${version}.tar.gz"; - sha256 = "11b7k8xvgx68rjzidm12a6l6b23hwi7hj149y9xxfz2j5kmakp4l"; + sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp"; }; outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; - patches = [ - # Don't check that 32-bit and 64-bit libraries don't get installed - # to the same place if only one platform is being built for. - # Can be removed if build succeeds without it. - (fetchpatch { - url = "https://groups.google.com/forum/message/raw?msg=libhugetlbfs/IswjDAygfwA/PKy7MZbVAAAJ"; - sha256 = "00fyrhn380d6swil8pcf4x0krl1113ghswrvjn3m9czc3h4p385a"; - }) - ]; - postConfigure = '' patchShebangs ld.hugetlbfs ''; @@ -34,8 +24,8 @@ stdenv.mkDerivation rec { "LIBDIR64=$(lib)/$(LIB64)" "EXEDIR=$(bin)/bin" "DOCDIR=$(doc)/share/doc/libhugetlbfs" - ] ++ map (n: "MANDIR${n}=$(man)/share/man/man${n}") - (lib.genList (n: toString (n + 1)) 8); + "MANDIR=$(man)/share/man" + ]; # Default target builds tests as well, and the tests want a static # libc. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix index 974f1f6674..2e75894eb8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.5"; + version = "0.1.6"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-xf/hzTzhxKJDL5Way0Qbrs8pXCvAQ+ADtgJO2GbEvmc="; + sha256 = "sha256-X+mFl0YZpnt6zzvVTGZN7PROVUaQ8ZmU3T0EgyoZX6g="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index f56e6a9a5c..647fb6825a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.4.15"; + version = "4.4.21"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "16a31c0n5lix4r5xk7p447xlxbrhdlmj11kb4y1krb5fx8hf65cl"; + sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI="; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix index 8a8d9adf53..f95d39a02d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , substituteAll , fetchFromGitHub -, fetchpatch , pkg-config , meson , ninja @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.9.2"; + version = "2.12.0"; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0xl5f6a32hmli29b0rfp54h7vnagxdv9qa2r871mrgrr6fzjwvbn"; + sha256 = "1mq9as98q4wyka404f8xwfc44cn5j4bsk0fch5pf07v81sagc1q9"; }; patches = [ @@ -36,17 +35,6 @@ stdenv.mkDerivation rec { src = ./glib-devdoc.patch; glib_devdoc = glib.devdoc; }) - - # Install pygobject overrides to our prefix instead of python3 one. - # https://github.com/fedora-modularity/libmodulemd/pull/469 - (fetchpatch { - url = "https://github.com/fedora-modularity/libmodulemd/commit/f72a4bea092f4d84cfc48a3e820eb10270e828d0.patch"; - sha256 = "1rrf94q1yf98w6b9bm67mb6w6qv1zqi306iv1vzspvjhsqvzmzpg"; - }) - (fetchpatch { - url = "https://github.com/fedora-modularity/libmodulemd/commit/021ab08006b5cf601ce153174fdf403b910b8273.patch"; - sha256 = "0z35jpnnzzb5bvmc2lglrpfnwarhky2jqmhq9avnnki22fdw89i6"; - }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 4c00d64258..40d814814c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.21"; + version = "8.0.23"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "08z40419aip26z6ss30g59mvnddb8dfam82l556jyj3gxs0irqbh"; + sha256 = "sha256-mvBklaaggP7WLacJePHLDGbwWO3V6p7ak0WmS/jsaI8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix index 72fbcd1ab0..2f8aab830d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "33"; + version = "34"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; + sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U="; }; nativeBuildInputs = [ flex bison ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index a6b1701671..c3852f2574 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1988l5rykpzvml1l7bi2hcax0gdc811vja0f92cnr7r01nz35zs9"; + sha256 = "sha256-tPNBgVTvP0PZQggnKUkWrqGCcCGvwG4WRPxWlRgwo1k="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 80e6e6fe66..a5b6e3b117 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.16.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0nrf03q3qrsvxf6kjpv69l49yfal79834a3jv75mzi6y674ach9g"; + sha256 = "sha256-mTxxiyN4t84BD4bBysvsrvP7L+DNbP6sMlcNFg4eMF8="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix index 443791f245..8bf2e2acff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; - doCheck = true; + doCheck = !stdenv.isi686; # tests fail on i686 meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix index 76466a1a9f..c11d698079 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix @@ -133,5 +133,10 @@ in stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ fpletz globin ]; + knownVulnerabilities = [ + "https://security.libvirt.org/2019/0008.html" + "https://security.libvirt.org/2019/0009.html" + "https://security.libvirt.org/2020/0001.html" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix index 102d658000..4397f65ac4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0h6kh8wy2b370y705pl2vp6vp18dkdsgdxh0243ji2v51kxbg157"; + sha256 = "sha256-pvAKfQkcvU21f+fuO0wSxjUJIdZU7XmBKACibIiEgdI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix index 3e8034f8ba..3b9c2768f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxls"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; - sha256 = "1y7wk55blk16hmvf9dz5ci84hlhv6pw6mnr1mfnibfw3gsxmzhyv"; + sha256 = "sha256-XazDTZS/IRWSbIDG+2nk570u1kA9Uc/0kEGpQXL143E="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix index 18b1f116b8..b98ae8e217 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "metal"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "brunocodutra"; repo = "metal"; rev = "v${version}"; - sha256 = "07n1aqyaixbd66l24km5ip3pkmidkx9m3saygf7cfp6vvbgmi42l"; + sha256 = "sha256-1I+EZtIz/2y4+dJGBONhTlUQGHgRdvXc1ZAOC9pmStw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix index 75d2a2db02..81465b61ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ndi"; - fullVersion = "4.5.3"; + fullVersion = "4.6.0"; version = builtins.head (builtins.splitVersion fullVersion); src = requireFile rec { name = "InstallNDISDK_v${version}_Linux.tar.gz"; - sha256 = "0w9f4a4a3xzg0nvmvrlda1wwkyi0m5aqvk07immmwgg7f1z1sqj5"; + sha256 = "19jrj2v7x1amdpc9pdq3042vm2l3szwqbzb83lirgbc24s2q043m"; message = '' In order to use NDI SDK version ${fullVersion}, you need to comply with NewTek's license and download the appropriate Linux tarball from: diff --git a/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix index c0c62deb0a..739c5e07d2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxml2, pkg-config, perl +{ lib, stdenv, fetchurl, libxml2, pkg-config , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? stdenv.hostPlatform.isStatic @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.31.0"; + version = "0.31.2"; pname = "neon"; src = fetchurl { - url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; - sha256 = "19dx4rsqrck9jl59y4ad9jf115hzh6pz1hcl2dnlfc84hc86ymc0"; + url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0y46dbhiblcvg8k41bdydr3fivghwk73z040ki5825d24ynf67ng"; }; patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; @@ -37,12 +37,10 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; - checkInputs = [ perl ]; - doCheck = false; # fails, needs the net - meta = with lib; { description = "An HTTP and WebDAV client library"; - homepage = "http://www.webdav.org/neon/"; + homepage = "https://notroj.github.io/neon/"; + changelog = "https://github.com/notroj/${pname}/blob/${version}/NEWS"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 2f901f0e41..452f72146d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0znhv7x81bvqijk5xhc5w760d5yy6vr5c2y271wpk9lkmxbbcpl1"; + sha256 = "sha256-ZmaxHm4MPd2q83PLduoavoynqRPEI79IpMfW32gkV14="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/podofo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/podofo/default.nix index e50a2111b4..ee99ab5de6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/podofo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/podofo/default.nix @@ -1,25 +1,16 @@ { lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch +, openssl, libpng, lua5, pkg-config, libidn, expat }: stdenv.mkDerivation rec { - version = "0.9.6"; + version = "0.9.7"; pname = "podofo"; src = fetchurl { url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; - sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"; + sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw"; }; - patches = [ - # https://sourceforge.net/p/podofo/tickets/24/ - (fetchpatch { - url = "https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch"; - extraPrefix = ""; - sha256 = "087h51x60zrakzx09baan77hwz99cwb5l1j802r5g4wj7pbjz0mb"; - }) - ]; - outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -41,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://podofo.sourceforge.net"; description = "A library to work with the PDF file format"; platforms = platforms.all; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index 7dddd2bc67..a4ac41d81d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -5,8 +5,7 @@ , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , alsaLib , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, flashplayerFix ? false, gdk-pixbuf -, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 +, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2, gdk-pixbuf , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs , developerBuild ? false , docs ? false @@ -108,10 +107,6 @@ stdenv.mkDerivation rec { libgnomeui = libgnomeui.out; gnome_vfs = gnome_vfs.out; })) - ++ lib.optional flashplayerFix (substituteAll { - src = ./dlopen-webkit-nsplugin.diff; - gtk = gtk2.out; - }) ++ lib.optional stdenv.isAarch64 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff deleted file mode 100644 index d2ebbf3b45..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index 19941d6..0ec15e2 100644 ---- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -121,7 +121,7 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -index 2fe69d1..b658e4a 100644 ---- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -857,7 +857,7 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp -index 2c9b465..56b3074 100644 ---- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp -+++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp -@@ -42,7 +42,7 @@ namespace WebKit { - #if PLATFORM(QT) - static void initializeGTK() - { -- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = reinterpret_cast(library.resolve("gtk_init_check")); -diff --git a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index b8c8f2a..e7f4dc5 100644 ---- a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -54,7 +54,7 @@ static Display *getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index ed41a4ac9b..288a0e30f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -1,10 +1,9 @@ { qtModule, stdenv, lib, fetchurl , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel -, fontconfig, gtk2, libwebp, libxml2, libxslt +, fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake , bison, flex, gdb, gperf, perl, pkg-config, python2, ruby , darwin -, flashplayerFix ? false }: let @@ -58,12 +57,6 @@ qtModule { ++ optional stdenv.cc.isGNU "-Wno-class-memaccess" # with clang this warning blows the log over Hydra's limit ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override" - ++ optionals flashplayerFix - [ - ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' - # this file used to exist in gdk_pixbuf? - ''-DNIXPKGS_LIBGDK2="${getLib gtk2}/lib/libgdk-x11-2.0"'' - ] ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; doCheck = false; # fails 13 out of 13 tests (ctest) diff --git a/third_party/nixpkgs/pkgs/development/libraries/reproc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/reproc/default.nix new file mode 100644 index 0000000000..6531414601 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/reproc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, cmake +}: + +stdenv.mkDerivation rec { + pname = "reproc"; + version = "14.1.0"; + + src = fetchFromGitHub { + owner = "DaanDeMeyer"; + repo = "reproc"; + rev = "v${version}"; + sha256 = "1n71wb50qv2dmhjgw7azx5gigbrp19l2n3d41g9p05l5l0y1qg0q"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DBUILD_SHARED_LIBS=ON" + "-DREPROC++=ON" + "-DREPROC_TEST=ON" + ]; + + meta = with lib; { + homepage = "https://github.com/DaanDeMeyer/reproc"; + description = "A cross-platform (C99/C++11) process library"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index dea8fcc675..e4ee3c4730 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.15.4"; + version = "6.15.5"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "06lddr6md4ypmywvi6qrrkw97c8ddz0flj43hzx32ia3iq2mw4w5"; + sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 2c4198d967..5bfef9e8ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "0m3khv7qidhfly634bf5w0ci5qnvndmihc4a836a0cy047pw9g6k"; + sha256 = "sha256-61hSBNbJlWkeVUXqT/y4h8FZvwXMXuG7+Spvzd4vzK4="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 7696b18e7c..151a0eef89 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.3.3"; + version = "4.0.3"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "1nmygb2yny0mdqp0mc6760gbxklq1jjm0c6s39qkdwzf3n9f8j7p"; + sha256 = "sha256-Bf3+w/kQtFpeUGp2zWVqja535EbaUw7DbhCw54B6A8k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/sharness/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sharness/default.nix new file mode 100644 index 0000000000..43a102686e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/sharness/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchurl +, perl +, perlPackages +, sharnessExtensions ? {} }: + +stdenv.mkDerivation rec { + pname = "sharness"; + version = "1.1.0-dev"; + + src = fetchFromGitHub { + owner = "chriscool"; + repo = pname; + rev = "3f238a740156dd2082f4bd60ced205e05894d367"; # 2020-12-09 + sha256 = "FCYskpIqkrpNaWCi2LkhEkiow4/rXLe+lfEWNUthLUg="; + }; + + # Used for testing + nativeBuildInputs = [ perl perlPackages.IOTty ]; + + outputs = [ "out" "doc" ]; + + makeFlags = [ "prefix=$(out)" ]; + + extensions = lib.mapAttrsToList (k: v: "${k}.sh ${v}") sharnessExtensions; + + postInstall = lib.optionalString (sharnessExtensions != {}) '' + extDir=$out/share/sharness/sharness.d + mkdir -p "$extDir" + linkExtensions() { + set -- $extensions + while [ $# -ge 2 ]; do + ln -s "$2" "$extDir/$1" + shift 2 + done + } + linkExtensions + ''; + + doCheck = true; + + meta = with lib; { + description = "Portable shell library to write, run and analyze automated tests adhering to Test Anything Protocol (TAP)"; + homepage = "https://github.com/chriscool/sharness"; + license = licenses.gpl2Only; + maintainers = [ maintainers.spacefrogg ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix index f8db8f3c37..3536ebd586 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , cmake , fetchurl -, fetchpatch , python , blas , lapack @@ -13,24 +12,15 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "5.6.1"; + version = "5.7.0"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "Frd5mex+fyFXqh0Eyh3kojccqBUOBW0klR0MWJZvKoM="; + sha256 = "jW3QlP7Mu41uzEE0DsFqZfq6yC7UQVAj9tfBwjkOovM="; }; - patches = [ - # Fixing an upstream regression in treating cmake prefix directories: - # https://github.com/LLNL/sundials/pull/58 - (fetchpatch { - url = "https://github.com/LLNL/sundials/commit/dd32ff9baa05618f36e44aadb420bbae4236ea1e.patch"; - sha256 = "kToAuma+2iHFyL1v/l29F3+nug4AdK5cPG6IcXv2afc="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 560a991c44..4e6e49d68c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.1.3"; + version = "2.2.3"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "1ia00bk6dc1176arf84lx08x4c7c74q7ycn7dqjnmyxkg3kmr21g"; + sha256 = "sha256-QYJ5dJQyVy0GLVKRcwb2WBK4IE1q/jXl1OQGau0HBSg="; }; # (bundled) blosc headers have a warning on some archs that it will be using diff --git a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix index 9134ade0e1..11e61e93a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix @@ -1,26 +1,41 @@ -{ stdenv, lib, fetchgit, meson, ninja }: +{ stdenv +, lib +, fetchgit +, meson +, ninja +}: stdenv.mkDerivation rec { pname = "tllist"; - version = "1.0.4"; + version = "1.0.5"; src = fetchgit { url = "https://codeberg.org/dnkl/tllist.git"; rev = version; - sha256 = "sha256-+u8p/VmI61SGRhZHaJBwgcVNetNOrYzg2NVQehbfRqg="; + sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg="; }; - nativeBuildInputs = [ - meson ninja - ]; + nativeBuildInputs = [ meson ninja ]; doCheck = true; meta = with lib; { homepage = "https://codeberg.org/dnkl/tllist"; description = "C header file only implementation of a typed linked list"; - maintainers = with maintainers; [ fionera ]; + longDescription = '' + Most C implementations of linked list are untyped. That is, their data + carriers are typically void *. This is error prone since your compiler + will not be able to help you correct your mistakes (oh, was it a + pointer-to-a-pointer... I thought it was just a pointer...). + + tllist addresses this by using pre-processor macros to implement dynamic + types, where the data carrier is typed to whatever you want; both + primitive data types are supported as well as aggregated ones such as + structs, enums and unions. + ''; + license = licenses.mit; + maintainers = with maintainers; [ fionera AndersonTorres ]; platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index c0c0218a31..48178e7740 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -2,21 +2,33 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v"; + sha256 = "0hk3bnzznxj047gwxdxw2v3w6jqq47996m7g72iwj6c2ai9g6h4m"; }; - configureFlags = [ "--enable-all" ]; + # almost same as Debian but for now using --enable-all instead of --enable-distro to ensure options.h gets installed + configureFlags = [ "--enable-all --enable-pkcs11 --enable-tls13 --enable-base64encode" ]; outputs = [ "out" "dev" "doc" "lib" ]; nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + # fix recursive cycle: + # build flags (including location of header files) are exposed in the + # public API of wolfssl, causing lib to depend on dev + substituteInPlace configure.ac \ + --replace '#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"' ' ' + substituteInPlace configure.ac \ + --replace '#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"' ' ' + ''; + + postInstall = '' # fix recursive cycle: # wolfssl-config points to dev, dev propagates bin diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 555f0cd1df..7e78691b20 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -115,7 +115,7 @@ , "indium" , "insect" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" @@ -200,6 +200,7 @@ , "stackdriver-statsd-backend" , "stf" , "stylelint" +, "svelte-language-server" , "svgo" , "swagger" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 0065061590..b40d868f2a 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -22,13 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1101.2" = { + "@angular-devkit/architect-0.1102.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1101.2"; + version = "0.1102.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.2.tgz"; - sha512 = "MLmBfHiiyPhbFSSAX4oMecPjEuBauOui5uBpI6BKNnk/7783fznbkbAKjXlOco7M81gkNeEoHMR8c+mOfcvv7g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.0.tgz"; + sha512 = "d9Da6SiTiDb5N1avxWLcPHSyWCq3G62TlROXxr32WkcQRko8wtgW5VOzgSkdmY2p6UTSME89naUojfzgu2Wh6g=="; }; }; "@angular-devkit/core-11.0.3" = { @@ -49,13 +49,13 @@ let sha512 = "O2oIcqpQKGvYJH88d/NCgLYZGc9laA1eo2d1s0FH1Udu4c2L+bAsviQqtTKNmzyaqODHrlkt+eKx7uakdwWtnQ=="; }; }; - "@angular-devkit/core-11.1.2" = { + "@angular-devkit/core-11.2.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "11.1.2"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.2.tgz"; - sha512 = "V7zOMqL2l56JcwXVyswkG+7+t67r9XtkrVzRcG2Z5ZYwafU+iKWMwg5kBFZr1SX7fM1M9E4MpskxqtagQeUKng=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.0.tgz"; + sha512 = "qqYEH8m/bwpngoLDMFuth8ykvoHxQ3aHHnAWfRXz9NXydwSfathG0VSYCctB126sK39JKIn+xq16CQAExxNu+Q=="; }; }; "@angular-devkit/schematics-11.0.3" = { @@ -76,13 +76,13 @@ let sha512 = "6qfR5w1jyk8MC+5Tfimz+Czsq3WlsVoB57dpxSZfhGGsv1Vxc8Q41y5f3BrAyEqHYjcH7NtaoLQoJjtra5KaAg=="; }; }; - "@angular-devkit/schematics-11.1.2" = { + "@angular-devkit/schematics-11.2.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "11.1.2"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.1.2.tgz"; - sha512 = "wIWI4+EPsjbN+23Rs0zE4GarKrUm8gMR3MpGAtlEmGG2ZsXEVdfiKUebBdWGrx0sEfgLN9JfePbZQFvqN5ifyw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.0.tgz"; + sha512 = "sMDacACJbA4pykiqgJf/RdW0damcf4mDqErGgEqs/bGG+SBUb8+wgt4cQnUwwVX5V2nMdvv7f0A84rgR6I3G2w=="; }; }; "@angular-devkit/schematics-cli-0.1100.3" = { @@ -319,31 +319,31 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/code-frame-7.12.11" = { + "@babel/code-frame-7.12.13" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"; - sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; }; }; - "@babel/compat-data-7.12.7" = { + "@babel/compat-data-7.12.13" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz"; - sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.13.tgz"; + sha512 = "U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg=="; }; }; - "@babel/core-7.12.10" = { + "@babel/core-7.12.16" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.10"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz"; - sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.16.tgz"; + sha512 = "t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw=="; }; }; "@babel/core-7.9.0" = { @@ -364,166 +364,166 @@ let sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; }; }; - "@babel/helper-annotate-as-pure-7.12.10" = { + "@babel/generator-7.12.15" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.12.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz"; + sha512 = "6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ=="; + }; + }; + "@babel/helper-annotate-as-pure-7.12.13" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz"; - sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; + sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; - sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; + sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; }; }; - "@babel/helper-compilation-targets-7.12.5" = { + "@babel/helper-compilation-targets-7.12.16" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.12.5"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; - sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.16.tgz"; + sha512 = "dBHNEEaZx7F3KoUYqagIhRIeqyyuI65xMndMZ3WwGwEBI609I4TleYQHcrS627vbKyNTXqShoN+fvYD9HuQxAg=="; }; }; - "@babel/helper-create-class-features-plugin-7.12.1" = { + "@babel/helper-create-class-features-plugin-7.12.16" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.12.1"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; - sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.16.tgz"; + sha512 = "KbSEj8l9zYkMVHpQqM3wJNxS1d9h3U9vm/uE5tpjMbaj3lTp+0noe3KPsV5dSD9jxKnf9jO9Ip9FX5PKNZCKow=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.7" = { + "@babel/helper-create-regexp-features-plugin-7.12.16" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.7"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz"; - sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.16.tgz"; + sha512 = "jAcQ1biDYZBdaAxB4yg46/XirgX7jBDiMHDbwYQOgtViLBXGxJpZQ24jutmBqAIB/q+AwB6j+NbBXjKxEY8vqg=="; }; }; - "@babel/helper-define-map-7.10.5" = { - name = "_at_babel_slash_helper-define-map"; - packageName = "@babel/helper-define-map"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; - sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; - }; - }; - "@babel/helper-explode-assignable-expression-7.12.1" = { + "@babel/helper-explode-assignable-expression-7.12.13" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; - sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz"; + sha512 = "5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw=="; }; }; - "@babel/helper-function-name-7.12.11" = { + "@babel/helper-function-name-7.12.13" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz"; - sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; }; }; - "@babel/helper-get-function-arity-7.12.10" = { + "@babel/helper-get-function-arity-7.12.13" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz"; - sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; }; }; - "@babel/helper-hoist-variables-7.10.4" = { + "@babel/helper-hoist-variables-7.12.13" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; - sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz"; + sha512 = "KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.7" = { + "@babel/helper-member-expression-to-functions-7.12.16" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.7"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; - sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz"; + sha512 = "zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ=="; }; }; - "@babel/helper-module-imports-7.12.5" = { + "@babel/helper-module-imports-7.12.13" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; - sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; + sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g=="; }; }; - "@babel/helper-module-transforms-7.12.1" = { + "@babel/helper-module-transforms-7.12.13" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; - sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz"; + sha512 = "acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA=="; }; }; - "@babel/helper-optimise-call-expression-7.12.10" = { + "@babel/helper-optimise-call-expression-7.12.13" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz"; - sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; }; }; - "@babel/helper-plugin-utils-7.10.4" = { + "@babel/helper-plugin-utils-7.12.13" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; - sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz"; + sha512 = "C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA=="; }; }; - "@babel/helper-remap-async-to-generator-7.12.1" = { + "@babel/helper-remap-async-to-generator-7.12.13" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; - sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz"; + sha512 = "Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA=="; }; }; - "@babel/helper-replace-supers-7.12.11" = { + "@babel/helper-replace-supers-7.12.13" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz"; - sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; + sha512 = "pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg=="; }; }; - "@babel/helper-simple-access-7.12.1" = { + "@babel/helper-simple-access-7.12.13" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; - sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; + sha512 = "0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { @@ -535,13 +535,13 @@ let sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; }; }; - "@babel/helper-split-export-declaration-7.12.11" = { + "@babel/helper-split-export-declaration-7.12.13" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz"; - sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; }; }; "@babel/helper-validator-identifier-7.12.11" = { @@ -553,49 +553,49 @@ let sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; }; - "@babel/helper-validator-option-7.12.11" = { + "@babel/helper-validator-option-7.12.16" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.12.11"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz"; - sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.16.tgz"; + sha512 = "uCgsDBPUQDvzr11ePPo4TVEocxj8RXjUVSC/Y8N1YpVAI/XDdUwGJu78xmlGhTxj2ntaWM7n9LQdRtyhOzT2YQ=="; }; }; - "@babel/helper-wrap-function-7.12.3" = { + "@babel/helper-wrap-function-7.12.13" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.12.3"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; - sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz"; + sha512 = "t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw=="; }; }; - "@babel/helpers-7.12.5" = { + "@babel/helpers-7.12.13" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; - sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.13.tgz"; + sha512 = "oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ=="; }; }; - "@babel/highlight-7.10.4" = { + "@babel/highlight-7.12.13" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; - sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz"; + sha512 = "kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww=="; }; }; - "@babel/parser-7.12.11" = { + "@babel/parser-7.12.16" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.11"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz"; - sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz"; + sha512 = "c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -607,130 +607,130 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.12.12" = { + "@babel/plugin-proposal-async-generator-functions-7.12.13" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz"; - sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz"; + sha512 = "1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA=="; }; }; - "@babel/plugin-proposal-class-properties-7.12.1" = { + "@babel/plugin-proposal-class-properties-7.12.13" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; - sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz"; + sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.12.1" = { + "@babel/plugin-proposal-dynamic-import-7.12.16" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.12.1"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; - sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.16.tgz"; + sha512 = "yiDkYFapVxNOCcBfLnsb/qdsliroM+vc3LHiZwS4gh7pFjo5Xq3BDhYBNn3H3ao+hWPvqeeTdU+s+FIvokov+w=="; }; }; - "@babel/plugin-proposal-export-default-from-7.12.1" = { + "@babel/plugin-proposal-export-default-from-7.12.13" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.1.tgz"; - sha512 = "z5Q4Ke7j0AexQRfgUvnD+BdCSgpTEKnqQ3kskk2jWtOBulxICzd1X9BGt7kmWftxZ2W3++OZdt5gtmC8KLxdRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz"; + sha512 = "idIsBT+DGXdOHL82U+8bwX4goHm/z10g8sGGrQroh+HCRcm7mDv/luaGdWJQMTuCX2FsdXS7X0Nyyzp4znAPJA=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.12.1" = { + "@babel/plugin-proposal-export-namespace-from-7.12.13" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; - sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; + sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw=="; }; }; - "@babel/plugin-proposal-json-strings-7.12.1" = { + "@babel/plugin-proposal-json-strings-7.12.13" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; - sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz"; + sha512 = "v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = { + "@babel/plugin-proposal-logical-assignment-operators-7.12.13" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; - sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz"; + sha512 = "fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; - sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz"; + sha512 = "Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.7" = { + "@babel/plugin-proposal-numeric-separator-7.12.13" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz"; - sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; + sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.12.1" = { + "@babel/plugin-proposal-object-rest-spread-7.12.13" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; - sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz"; + sha512 = "WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.12.1" = { + "@babel/plugin-proposal-optional-catch-binding-7.12.13" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; - sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz"; + sha512 = "9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.12.7" = { + "@babel/plugin-proposal-optional-chaining-7.12.16" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.12.7"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; - sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.16.tgz"; + sha512 = "O3ohPwOhkwji5Mckb7F/PJpJVJY3DpPsrt/F0Bk40+QMk9QpAIqeGusHWqu/mYqsM8oBa6TziL/2mbERWsUZjg=="; }; }; - "@babel/plugin-proposal-private-methods-7.12.1" = { + "@babel/plugin-proposal-private-methods-7.12.13" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; - sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz"; + sha512 = "sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.12.1" = { + "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; - sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; + sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -751,13 +751,13 @@ let sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; }; - "@babel/plugin-syntax-class-properties-7.12.1" = { + "@babel/plugin-syntax-class-properties-7.12.13" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; - sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -769,13 +769,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.12.1" = { + "@babel/plugin-syntax-export-default-from-7.12.13" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.1.tgz"; - sha512 = "dP5eGg6tHEkhnRD2/vRG/KJKRSg8gtxu2i+P/8/yFPJn/CfPU5G0/7Gks2i3M6IOVAPQekmsLN9LPsmXFFL4Uw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.13.tgz"; + sha512 = "gVry0zqoums0hA+EniCYK3gABhjYSLX1dVuwYpPw9DrLNA4/GovXySHVg4FGRsZht09ON/5C2NVx3keq+qqVGQ=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -787,13 +787,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.12.1" = { + "@babel/plugin-syntax-flow-7.12.13" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz"; - sha512 = "1lBLLmtxrwpm4VKmtVFselI/P3pX+G63fAtUUt6b2Nzgao77KNDwyuRt90Mj2/9pKobtt68FdvjfqohZjg/FCA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz"; + sha512 = "J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -814,13 +814,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.12.1" = { + "@babel/plugin-syntax-jsx-7.12.13" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"; - sha512 = "1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; + sha512 = "d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -877,373 +877,373 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.12.1" = { + "@babel/plugin-syntax-top-level-await-7.12.13" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; - sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; }; }; - "@babel/plugin-syntax-typescript-7.12.1" = { + "@babel/plugin-syntax-typescript-7.12.13" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz"; - sha512 = "UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; + sha512 = "cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w=="; }; }; - "@babel/plugin-transform-arrow-functions-7.12.1" = { + "@babel/plugin-transform-arrow-functions-7.12.13" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; - sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz"; + sha512 = "tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.12.1" = { + "@babel/plugin-transform-async-to-generator-7.12.13" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; - sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz"; + sha512 = "psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.12.1" = { + "@babel/plugin-transform-block-scoped-functions-7.12.13" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; - sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; + sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; }; }; - "@babel/plugin-transform-block-scoping-7.12.12" = { + "@babel/plugin-transform-block-scoping-7.12.13" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz"; - sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; + sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ=="; }; }; - "@babel/plugin-transform-classes-7.12.1" = { + "@babel/plugin-transform-classes-7.12.13" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; - sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz"; + sha512 = "cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA=="; }; }; - "@babel/plugin-transform-computed-properties-7.12.1" = { + "@babel/plugin-transform-computed-properties-7.12.13" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; - sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz"; + sha512 = "dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA=="; }; }; - "@babel/plugin-transform-destructuring-7.12.1" = { + "@babel/plugin-transform-destructuring-7.12.13" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; - sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz"; + sha512 = "Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ=="; }; }; - "@babel/plugin-transform-dotall-regex-7.12.1" = { + "@babel/plugin-transform-dotall-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; - sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; + sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.12.1" = { + "@babel/plugin-transform-duplicate-keys-7.12.13" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; - sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; + sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.12.1" = { + "@babel/plugin-transform-exponentiation-operator-7.12.13" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; - sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; + sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.12.10" = { + "@babel/plugin-transform-flow-strip-types-7.12.13" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.10.tgz"; - sha512 = "0ti12wLTLeUIzu9U7kjqIn4MyOL7+Wibc7avsHhj4o1l5C0ATs8p2IMHrVYjm9t9wzhfEO6S3kxax0Rpdo8LTg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.13.tgz"; + sha512 = "39/t9HtN+Jlc7EEY6oCSCf3kRrKIl2JULOGPnHZiaRjoYZEFaDXDZI32uE2NosQRh8o6N9B+8iGvDK7ToJhJaw=="; }; }; - "@babel/plugin-transform-for-of-7.12.1" = { + "@babel/plugin-transform-for-of-7.12.13" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; - sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz"; + sha512 = "xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ=="; }; }; - "@babel/plugin-transform-function-name-7.12.1" = { + "@babel/plugin-transform-function-name-7.12.13" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; - sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; + sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; }; }; - "@babel/plugin-transform-literals-7.12.1" = { + "@babel/plugin-transform-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; - sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; + sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.12.1" = { + "@babel/plugin-transform-member-expression-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; - sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; + sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; }; }; - "@babel/plugin-transform-modules-amd-7.12.1" = { + "@babel/plugin-transform-modules-amd-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; - sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz"; + sha512 = "JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.12.1" = { + "@babel/plugin-transform-modules-commonjs-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; - sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz"; + sha512 = "OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.12.1" = { + "@babel/plugin-transform-modules-systemjs-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; - sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz"; + sha512 = "aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA=="; }; }; - "@babel/plugin-transform-modules-umd-7.12.1" = { + "@babel/plugin-transform-modules-umd-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; - sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz"; + sha512 = "BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; - sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; + sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; }; }; - "@babel/plugin-transform-new-target-7.12.1" = { + "@babel/plugin-transform-new-target-7.12.13" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; - sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; + sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; }; }; - "@babel/plugin-transform-object-assign-7.12.1" = { + "@babel/plugin-transform-object-assign-7.12.13" = { name = "_at_babel_slash_plugin-transform-object-assign"; packageName = "@babel/plugin-transform-object-assign"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.1.tgz"; - sha512 = "geUHn4XwHznRAFiuROTy0Hr7bKbpijJCmr1Svt/VNGhpxmp0OrdxURNpWbOAf94nUbL+xj6gbxRVPHWIbRpRoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.13.tgz"; + sha512 = "4QxDMc0lAOkIBSfCrnSGbAJ+4epDBF2XXwcLXuBcG1xl9u7LrktNVD4+LwhL47XuKVPQ7R25e/WdcV+h97HyZA=="; }; }; - "@babel/plugin-transform-object-super-7.12.1" = { + "@babel/plugin-transform-object-super-7.12.13" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; - sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; + sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; }; }; - "@babel/plugin-transform-parameters-7.12.1" = { + "@babel/plugin-transform-parameters-7.12.13" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; - sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz"; + sha512 = "e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA=="; }; }; - "@babel/plugin-transform-property-literals-7.12.1" = { + "@babel/plugin-transform-property-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; - sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; + sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; }; }; - "@babel/plugin-transform-react-display-name-7.12.1" = { + "@babel/plugin-transform-react-display-name-7.12.13" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"; - sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz"; + sha512 = "MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA=="; }; }; - "@babel/plugin-transform-react-jsx-7.12.12" = { + "@babel/plugin-transform-react-jsx-7.12.16" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.12.12"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz"; - sha512 = "JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.16.tgz"; + sha512 = "dNu0vAbIk8OkqJfGtYF6ADk6jagoyAl+Ks5aoltbAlfoKv8d6yooi3j+kObeSQaCj9PgN6KMZPB90wWyek5TmQ=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.12.1" = { + "@babel/plugin-transform-react-jsx-source-7.12.13" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"; - sha512 = "keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz"; + sha512 = "O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q=="; }; }; - "@babel/plugin-transform-regenerator-7.12.1" = { + "@babel/plugin-transform-regenerator-7.12.13" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; - sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz"; + sha512 = "lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA=="; }; }; - "@babel/plugin-transform-reserved-words-7.12.1" = { + "@babel/plugin-transform-reserved-words-7.12.13" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; - sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; + sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; }; }; - "@babel/plugin-transform-runtime-7.12.10" = { + "@babel/plugin-transform-runtime-7.12.15" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.12.10"; + version = "7.12.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz"; - sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.15.tgz"; + sha512 = "OwptMSRnRWJo+tJ9v9wgAf72ydXWfYSXWhnQjZing8nGZSDFqU1MBleKM3+DriKkcbv7RagA8gVeB0A1PNlNow=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.12.1" = { + "@babel/plugin-transform-shorthand-properties-7.12.13" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; - sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; + sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; }; }; - "@babel/plugin-transform-spread-7.12.1" = { + "@babel/plugin-transform-spread-7.12.13" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; - sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz"; + sha512 = "dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.12.7" = { + "@babel/plugin-transform-sticky-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz"; - sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; + sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; }; }; - "@babel/plugin-transform-template-literals-7.12.1" = { + "@babel/plugin-transform-template-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; - sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz"; + sha512 = "arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.12.10" = { + "@babel/plugin-transform-typeof-symbol-7.12.13" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz"; - sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; + sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; }; }; - "@babel/plugin-transform-typescript-7.12.1" = { + "@babel/plugin-transform-typescript-7.12.16" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.12.1"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz"; - sha512 = "VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.16.tgz"; + sha512 = "88hep+B6dtDOiEqtRzwHp2TYO+CN8nbAV3eh5OpBGPsedug9J6y1JwLKzXRIGGQZDC8NlpxpQMIIxcfIW96Wgw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.12.1" = { + "@babel/plugin-transform-unicode-escapes-7.12.13" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; - sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; + sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.12.1" = { + "@babel/plugin-transform-unicode-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; - sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; + sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; }; }; "@babel/polyfill-7.12.1" = { @@ -1255,22 +1255,22 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.12.11" = { + "@babel/preset-env-7.12.16" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.12.11"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz"; - sha512 = "j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.16.tgz"; + sha512 = "BXCAXy8RE/TzX416pD2hsVdkWo0G+tYd16pwnRV4Sc0fRwTLRS/Ssv8G5RLXUGQv7g4FG7TXkdDJxCjQ5I+Zjg=="; }; }; - "@babel/preset-flow-7.12.1" = { + "@babel/preset-flow-7.12.13" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.12.1.tgz"; - sha512 = "UAoyMdioAhM6H99qPoKvpHMzxmNVXno8GYU/7vZmGaHk6/KqfDYL1W0NxszVbJ2EP271b7e6Ox+Vk2A9QsB3Sw=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.12.13.tgz"; + sha512 = "gcEjiwcGHa3bo9idURBp5fmJPcyFPOszPQjztXrOjUE2wWVqc6fIVJPgWPIQksaQ5XZ2HWiRsf2s1fRGVjUtVw=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -1291,22 +1291,31 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.12.7" = { + "@babel/preset-typescript-7.12.16" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.12.7"; + version = "7.12.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz"; - sha512 = "nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.16.tgz"; + sha512 = "IrYNrpDSuQfNHeqh7gsJsO35xTGyAyGkI1VxOpBEADFtxCqZ77a1RHbJqM3YJhroj7qMkNMkNtcw0lqeZUrzow=="; }; }; - "@babel/register-7.12.10" = { + "@babel/register-7.12.13" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.12.10.tgz"; - sha512 = "EvX/BvMMJRAA3jZgILWgbsrHwBQvllC5T8B29McyME8DvkdOxk4ujESfrMvME8IHSDvWXrmMXxPvA/lx2gqPLQ=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.12.13.tgz"; + sha512 = "fnCeRXj970S9seY+973oPALQg61TRvAaW0nRDe1f4ytKqM3fZgsNXewTZWmqZedg74LFIRpg/11dsrPZZvYs2g=="; + }; + }; + "@babel/runtime-7.12.13" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz"; + sha512 = "8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw=="; }; }; "@babel/runtime-7.12.5" = { @@ -1327,22 +1336,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/template-7.12.7" = { + "@babel/template-7.12.13" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; - sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; + sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; }; }; - "@babel/traverse-7.12.12" = { + "@babel/traverse-7.12.13" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz"; - sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz"; + sha512 = "3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA=="; }; }; "@babel/types-7.10.4" = { @@ -1354,13 +1363,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.12" = { + "@babel/types-7.12.13" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz"; - sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz"; + sha512 = "oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1579,6 +1588,24 @@ let sha512 = "HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg=="; }; }; + "@emmetio/abbreviation-2.2.0" = { + name = "_at_emmetio_slash_abbreviation"; + packageName = "@emmetio/abbreviation"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.0.tgz"; + sha512 = "NPGVUmnr7cLj4i6MKS4c8NjuoIIJROrruJl/8nXsp2MdbDRHvtfq25foySvv/NbfqTQm+P9JzVLDD9JxGIpvkQ=="; + }; + }; + "@emmetio/css-abbreviation-2.1.2" = { + name = "_at_emmetio_slash_css-abbreviation"; + packageName = "@emmetio/css-abbreviation"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.2.tgz"; + sha512 = "CvYTzJltVpLqJaCZ1Qn97LVAKsl2Uwl2fzir1EX/WuMY3xWxgc3BWRCheL6k65km6GyDrLVl6RhrrNb/pxOiAQ=="; + }; + }; "@emmetio/extract-abbreviation-0.1.6" = { name = "_at_emmetio_slash_extract-abbreviation"; packageName = "@emmetio/extract-abbreviation"; @@ -1588,6 +1615,15 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; + "@emmetio/scanner-1.0.0" = { + name = "_at_emmetio_slash_scanner"; + packageName = "@emmetio/scanner"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.0.tgz"; + sha512 = "8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA=="; + }; + }; "@emotion/is-prop-valid-0.8.8" = { name = "_at_emotion_slash_is-prop-valid"; packageName = "@emotion/is-prop-valid"; @@ -1930,22 +1966,22 @@ let sha512 = "HLZNtkETFUuCP76Wk/oF54+tVp6aPGzsoJRsmnkh78gloC9CGp8JK+LQUYfj9dtzcHDHq64/dAA2e4j2tzjhaQ=="; }; }; - "@fluentui/react-7.158.0" = { + "@fluentui/react-7.160.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.158.0"; + version = "7.160.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.158.0.tgz"; - sha512 = "9vFTB7jt0ztni9CAwqKu66qE1/WEcvp/CN9sJslFgrj+r6kJSjZ2+Uk7O0VblVSiRIhgWqLEhuEDaEdH5q5QIA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.160.0.tgz"; + sha512 = "ckbM7zFAob59vHqfKz+K9Gmivqp9YmAF1TIMJX6RKC/MEVpeA4s5G412/J0SgFNsWwwdCYaqh0UL9W/pnwuE8A=="; }; }; - "@fluentui/react-focus-7.17.1" = { + "@fluentui/react-focus-7.17.4" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.17.1"; + version = "7.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.1.tgz"; - sha512 = "Nulq2pE4pX6Pf+tGZl8uLp8VfqUzx3elC5v7QvYSBdjnZK8ykitdsa+Sd3PKYWW2EMlzVRSptlzbuJ6JyEDQKQ=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.4.tgz"; + sha512 = "L7MK538JOSpLQubyVxYZV1ftd3hViBQhcFftuJfah/mdekQkIcFTS0fsymQ4MK5i7bn13jE7lPM8QfH23wpaJg=="; }; }; "@fluentui/react-window-provider-1.0.1" = { @@ -1957,13 +1993,13 @@ let sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w=="; }; }; - "@fluentui/theme-1.7.1" = { + "@fluentui/theme-1.7.3" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.1.tgz"; - sha512 = "cwx8gJ0O9d+Z8g6Lq7BgDgH8XPfSloUSy0GN3fWHJGrDCBPcnmz6/GKbbvxw9PZ2t1iNcAzJEJNT6NyuOOobPA=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.3.tgz"; + sha512 = "S97i1SBL5ytQtZQpygAIvOnQSg9tFZM25843xCY40eWRA/eAdPixzWvVmV8PPQs/K5WmXhghepWaC1SjxVO90g=="; }; }; "@gardenapple/yargs-17.0.0-candidate.0" = { @@ -2047,13 +2083,13 @@ let sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; }; }; - "@graphql-tools/delegate-7.0.9" = { + "@graphql-tools/delegate-7.0.10" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "7.0.9"; + version = "7.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.9.tgz"; - sha512 = "nlelOb354cyweV+SpTXkoGZHKgJ1PwPkHWq/0RXM5LllQsR3OrSQKKWMrd1g9dyawEZbadCF3fDJJWSQ4HOg2g=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.10.tgz"; + sha512 = "6Di9ia5ohoDvrHuhj2cak1nJGhIefJmUsd3WKZcJ2nu2yZAFawWMxGvQImqv3N7iyaWKiVhrrK8Roi/JrYhdKg=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -2101,13 +2137,13 @@ let sha512 = "9acgDkkYeAHpuqhOa3E63NZPCX/iWo819Q320sCCMkydF1xgx0qCRYz/V03xPdpQETKRqBG2i2N2csneeEYYig=="; }; }; - "@graphql-tools/schema-7.1.2" = { + "@graphql-tools/schema-7.1.3" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.2.tgz"; - sha512 = "GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.3.tgz"; + sha512 = "ZY76hmcJlF1iyg3Im0sQ3ASRkiShjgv102vLTVcH22lEGJeCaCyyS/GF1eUHom418S60bS8Th6+autRUxfBiBg=="; }; }; "@graphql-tools/url-loader-6.8.0" = { @@ -2146,13 +2182,13 @@ let sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ=="; }; }; - "@grpc/grpc-js-1.2.5" = { + "@grpc/grpc-js-1.2.6" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.5.tgz"; - sha512 = "CBCNwedw8McnEBq9jvoiJikws16WN0OiHFejQPovY71XkFWSiIqgvydYiDwpvIYDJmhPQ7qZNzW9BPndhXbx1Q=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.6.tgz"; + sha512 = "wfYwFy7CvVEmBKzeDX1kQQYrv5NBpe8Z+VwXipFvqof3lCXKch7k+4T3grKtptaH5GQ5KP9iKwPr9hMDSynIUw=="; }; }; "@grpc/proto-loader-0.5.6" = { @@ -2722,22 +2758,22 @@ let sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.22" = { + "@joplin/fork-htmlparser2-4.1.23" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.22"; + version = "4.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.22.tgz"; - sha512 = "SJe+XezlNUN6p7ndRL1HqzfJtgz0JKI0UlXq+sBndRenyOuiSbPygYmU5rvxPG203mgPuOSI2a+qM+jlFCrvPw=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.23.tgz"; + sha512 = "nTbOVZJbF02d32AhvwhWME2uQbbCZsFYulMgqRZ/I4realfJgqkaUfXclLxYcyOPAjzngXd+Wb1/M/Pz6luXGw=="; }; }; - "@joplin/fork-sax-1.2.26" = { + "@joplin/fork-sax-1.2.27" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.26"; + version = "1.2.27"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.26.tgz"; - sha512 = "CZJ0WRXel6hzwmUIylZG9pr3FOW6bF30ppip3KK+7G8Lq6K0onS86/1u1IDT5wtwAKRQqWXr7NNOlCMPvdndJQ=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.27.tgz"; + sha512 = "ON/8pg90WCRHKj8HttziC7Rtef+DKSSDZD9J3zjHYUvrXB0pu+7eZvRP8vF3Y2MSZnlshtFGQqiIRbwk3GVA+Q=="; }; }; "@joplin/lib-1.0.18" = { @@ -2758,22 +2794,22 @@ let sha512 = "RDRYjuPCn1ltematEZQhgvZbIGBQ+2F3jgAdXpqByg71pmxrMZyOLLbNVYJyKK4w2Ecvmbpwuo0h9RbMb/56Ow=="; }; }; - "@joplin/turndown-4.0.44" = { + "@joplin/turndown-4.0.45" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.44"; + version = "4.0.45"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.44.tgz"; - sha512 = "o7t4/6fFwTlJc2oALaL+K2MJFOZh2+ybscK5XBZeAY81j0KTopoKE94FxIzOm1M20R1cNSXDRyWBKol/9GCIyA=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.45.tgz"; + sha512 = "u4J/ka4szy34ioQ5UVaCdLlfzfOxEQH/lDReHauYoNhH+H+EWt1qOwMh9A8fuTfoK2vnUUiPKHsWhOYCe+LRiw=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.26" = { + "@joplin/turndown-plugin-gfm-1.0.27" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.26"; + version = "1.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.26.tgz"; - sha512 = "Bl1QmWWe4XPUCWJKdXKP7Hyw6qANnbke6QRTfJPbeIKPZraOuL1zy7jTfRjQLHFxxT/8LXKmQ5sf9fz101MuWw=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.27.tgz"; + sha512 = "4BPgTSkhvxPI3tbjG4BPiBq0VuNZji1Y77DRWHb09GnzsrgwBI+gpo3EI6obkyIeRuN/03wzf98W5u1iau2vpQ=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -2785,13 +2821,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.18.0" = { + "@jsii/spec-1.20.1" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.18.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.18.0.tgz"; - sha512 = "NtIvTyKBFCpwmZpCX76WtIks+W6I0Rbo94SvDuLsMGV8KBgiIEfgLP47P57vKxaJkXLNiINMjFBOSTDwF3bWKg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.20.1.tgz"; + sha512 = "+ot9SPb/lFnRiPlhWUGLMp8owpr/pnpFX0/iIUhZ0kJ1LIAUde7TSuaz70mV6x+ES2wvVXKsgfu2WTMFHIAwZQ=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3379,13 +3415,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.146" = { + "@microsoft/load-themed-styles-1.10.147" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.146"; + version = "1.10.147"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.146.tgz"; - sha512 = "qQZ4J58J2VMe/XRpr2YRDusQB9uRBJ1SjJB76x7uH94t9hqxjVVxn2qL99Bl+ERbfrACZ9peGn2uamt4ponqZQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.147.tgz"; + sha512 = "fqkftQUoc2fjR9F+4uZkCt2hJhgZlkgM33k4qD4UdI75+SDOK9Zp5iU3dWzvwDWWVIXTOE+GKMFlmUtrlKZ+fg=="; }; }; "@mozilla/readability-0.4.1" = { @@ -3433,13 +3469,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-8.3.4" = { + "@netlify/build-9.1.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "8.3.4"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-8.3.4.tgz"; - sha512 = "DHDvJoM/CtlVuUQoeWzluE4nIabwOKJdIp7yfU/MkpXwXjI1RSPCRvmtzK7A1CUkTZ7sH0m2otgpihgf4pgslw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-9.1.2.tgz"; + sha512 = "GvAx6f3T8MZRHDEPNOsGdsAfW188FjKTGpA04G2QoMJdLHgzAp6gI6J6m7B9b16Sw7qs5U+JX2A9JjZRHmOAsg=="; }; }; "@netlify/cache-utils-1.0.6" = { @@ -3451,31 +3487,31 @@ let sha512 = "Pz/TzLZhMUACT+X7Un6jZCXgEUwLPVNbx69DQtEOMZ6hNBE1b1ErTHFbSaHA0KfDn/yqCII5vS274DERvNuRwg=="; }; }; - "@netlify/config-3.1.1" = { + "@netlify/config-4.0.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "3.1.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-3.1.1.tgz"; - sha512 = "FUOXzkn/iHrWU8wezWnAVsO7x/l2mPXBpcaP2X2BIcMzOePvzreHPCAplekjNof2Q1QPjHfo746Bd/CyMIUOeg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-4.0.1.tgz"; + sha512 = "qI/PxBx5RGuQbVgYOtbEJ498+yDWqfqetDOHYzxJEFZYpZjS5Effu4jt92amnW55pzOZvTk/vQZQx8zLb4N2WQ=="; }; }; - "@netlify/framework-info-2.1.1" = { + "@netlify/framework-info-2.3.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "2.1.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-2.1.1.tgz"; - sha512 = "JblagtBYtOwuxZy94jXPNc3p+QOuyx+kZurfduswYbT8VWPlyuiL4AQFKaIJvdZS6O9G8uKEiFGsKFhRTx6vAA=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-2.3.0.tgz"; + sha512 = "vqy9wbBRP8qWnkzA/OQsThr1+cfqapMrORJ4hWcrjhIPRmXIJtwB6OWuLIUalMeSGCwqZjYpKfudc4BLuxxvjw=="; }; }; - "@netlify/functions-utils-1.3.9" = { + "@netlify/functions-utils-1.3.12" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.9"; + version = "1.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.9.tgz"; - sha512 = "i3HE/2NXqjUvShOqWCwPsBLV7puloMK6R7u3O6M3m7WacYKD8nh7dwkNIZSq7QbEueljslH8rwzbNw5EtyKIHw=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.12.tgz"; + sha512 = "u2t6AVKsg9MuXicYETMqWubOXUayNdCU0GuMl2u5T3bz9E7mVCnCB4VVkEVDqlC8GnrdbVHzEu+OPmbv+dkzJA=="; }; }; "@netlify/git-utils-1.0.7" = { @@ -3559,67 +3595,67 @@ let sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; }; }; - "@netlify/zip-it-and-ship-it-2.1.3" = { + "@netlify/zip-it-and-ship-it-2.3.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "2.1.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.1.3.tgz"; - sha512 = "nYHM4dnlua/aCe74ZPZcIlWAN1QbyGDaWbJi+Qkb0VSe4yX6PYvPNeymABggDbA9xFhk+nEA98wSu2A/beHPfQ=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.3.0.tgz"; + sha512 = "dqYXA/e2ZY6bO7fvp18YKXLYE/CK8cAbjBE2mo339sA+xchoV3ryYEjsLpoYqFWofUBLQnCYahm4D9a4H7RT0A=="; }; }; - "@node-red/editor-api-1.2.8" = { + "@node-red/editor-api-1.2.9" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.8.tgz"; - sha512 = "p8kWDzQSKX/CJAC8sjk7ge4bW+3nLfb16Vew/ZQLMks9Q/KOnZRmFOzmn4D4Ao0/ZLawPMKEIhkmRzn429dAlw=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.9.tgz"; + sha512 = "KsN5Cp/YMfYM6E/rclWuEoNpTe3krRbKhc3X+TGOirZZ5JVW4qbpdP1p0jRmcBkhZPc1i6yOh5PE7qN7LoPH5A=="; }; }; - "@node-red/editor-client-1.2.8" = { + "@node-red/editor-client-1.2.9" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.8.tgz"; - sha512 = "D/BbK5JyQKwLKgrJqYBvmplXMHo0ZJoL/MZWQQnpITqcFGaPCPrH1BfQZrbx2H/N0NeOtNufHVmqJ/tBXA2KmQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.9.tgz"; + sha512 = "L8zDaeVLjo7dZzqVTTj0XcQFj6QlnLJOPpnpt9V0sSQDwWzA+lWTP6nNwUcXiGuchN/WeXQXrsfBEemHgKUNLg=="; }; }; - "@node-red/nodes-1.2.8" = { + "@node-red/nodes-1.2.9" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.8.tgz"; - sha512 = "jp5DRxvigsfyQfMslq9arr/PbI4rMCFdCE2NaKhAXtNbSEfX5FHWqgMuNtfvjAwiuyoAfT+TDqYYlK7n1BAQ/g=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.9.tgz"; + sha512 = "ZQ3NCzl7gC3KIGgjmRZTqO3W0W03nnu4r8IX/OeiM4ewlhDlrvfoejOX1zTtIHnmgzFM+FjweyLeWEQ7bpy8jA=="; }; }; - "@node-red/registry-1.2.8" = { + "@node-red/registry-1.2.9" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.8.tgz"; - sha512 = "/VAP+sQvyHiJgYHnAiBHzvCi6gOXvS7dv8wB/wgLcyOc1XQ+t8I1U6+m+Tp5MH+jFwmsZi9Ygwdsovi59iD4xA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.9.tgz"; + sha512 = "OxFbHU7UrisBEM0413KSsPRXzQCJIwNQtg1E+oPDiFuMtHwVhUiVicnqbo8IiftO58PsMkSL+Wj2+ta34phlgA=="; }; }; - "@node-red/runtime-1.2.8" = { + "@node-red/runtime-1.2.9" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.8.tgz"; - sha512 = "Z9IYd2bIxI0692tL1MgUIDZiss+SabPFHYgIzysUWiiUC1FyqPLJq2e3S5hHyIiBfepB0k7QjdRnAzgfbwvXfg=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.9.tgz"; + sha512 = "wcSq7MNVbRLaahKWHV5diqyeCWviKtr6VNzAmtIB+wH+omfx+OWiJEimu9x/56l9iv3mc9ew4PwtOMG07QNiTQ=="; }; }; - "@node-red/util-1.2.8" = { + "@node-red/util-1.2.9" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.8.tgz"; - sha512 = "fujIH4X/DXkPLDnIdfjkxFUf0NocsKV1Dx7i+Yrz0cmaSuBqDpA/p8Ngw/AtOhP3OLlLUNXvRPLoTgaw/gsGwg=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.9.tgz"; + sha512 = "a4JVRFaxkSpuVAHwwQ8yi+jwyhsflgZD7glGFlcPdfBXvcE4EiGxx1OFbNzI3JJ7pL+8sE0xxwfsZuY24IZahw=="; }; }; "@nodelib/fs.scandir-2.1.4" = { @@ -3667,40 +3703,40 @@ let sha512 = "oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="; }; }; - "@npmcli/git-2.0.4" = { + "@npmcli/git-2.0.6" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.4.tgz"; - sha512 = "OJZCmJ9DNn1cz9HPXXsPmUBnqaArot3CGYo63CyajHQk+g87rPXVOJByGsskQJhPsUUEXJcsZ2Q6bWd2jSwnBA=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.6.tgz"; + sha512 = "a1MnTfeRPBaKbFY07fd+6HugY1WAkKJzdiJvlRub/9o5xz2F/JtPacZZapx5zRJUQFIzSL677vmTSxEcDMrDbg=="; }; }; - "@npmcli/installed-package-contents-1.0.5" = { + "@npmcli/installed-package-contents-1.0.7" = { name = "_at_npmcli_slash_installed-package-contents"; packageName = "@npmcli/installed-package-contents"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.5.tgz"; - sha512 = "aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A=="; + url = "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz"; + sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/move-file-1.1.1" = { + "@npmcli/move-file-1.1.2" = { name = "_at_npmcli_slash_move-file"; packageName = "@npmcli/move-file"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.1.tgz"; - sha512 = "LtWTicuF2wp7PNTuyCwABx7nNG+DnzSE8gN0iWxkC6mpgm/iOPu0ZMTkXuCxmJxtWFsDxUaixM9COSNJEMUfuQ=="; + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"; + sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@npmcli/node-gyp-1.0.1" = { + "@npmcli/node-gyp-1.0.2" = { name = "_at_npmcli_slash_node-gyp"; packageName = "@npmcli/node-gyp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.1.tgz"; - sha512 = "pBqoKPWmuk9iaEcXlLBVRIA6I1kG9JiICU+sG0NuD6NAR461F+02elHJS4WkQxHW2W5rnsfvP/ClKwmsZ9RaaA=="; + url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz"; + sha512 = "yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="; }; }; "@npmcli/promise-spawn-1.3.2" = { @@ -3712,13 +3748,13 @@ let sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; }; }; - "@npmcli/run-script-1.8.1" = { + "@npmcli/run-script-1.8.3" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.8.1"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.1.tgz"; - sha512 = "G8c86g9cQHyRINosIcpovzv0BkXQc3urhL1ORf3KTe4TS4UBsg2O4Z2feca/W3pfzdHEJzc83ETBW4aKbb3SaA=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.3.tgz"; + sha512 = "ELPGWAVU/xyU+A+H3pEPj0QOvYwLTX71RArXcClFzeiyJ/b/McsZ+d0QxpznvfFtZzxGN/gz/1cvlqICR4/suQ=="; }; }; "@oclif/color-0.1.2" = { @@ -3811,13 +3847,13 @@ let sha512 = "bGHUdo5e7DjPJ0vTeRBMIrfqTRDBfyR5w0MP41u0n3r7YG5p14lvMmiCXxi6WDaP2Hw5nqx3PnkAIntCKZZN7g=="; }; }; - "@oclif/plugin-help-3.2.1" = { + "@oclif/plugin-help-3.2.2" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.1.tgz"; - sha512 = "vq7rn16TrQmjX3Al/k1Z5iBZWZ3HE8fDXs52OmDJmmTqryPSNvURH9WCAsqr0PODYCSR17Hy1VTzS0x7vVVLEQ=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.2.tgz"; + sha512 = "SPZ8U8PBYK0n4srFjCLedk0jWU4QlxgEYLCXIBShJgOwPhTTQknkUlsEwaMIevvCU4iCQZhfMX+D8Pz5GZjFgA=="; }; }; "@oclif/plugin-not-found-1.2.4" = { @@ -3874,13 +3910,13 @@ let sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; }; }; - "@octokit/openapi-types-3.4.1" = { + "@octokit/openapi-types-4.0.2" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "3.4.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-3.4.1.tgz"; - sha512 = "7Sjm3UwEAM11f+ck9+qlyEfgl8hCk5sSZBU2qcWY8+8ibowjqcwxhhtvY0/pjHPF8mcvmedFpGmmIYs2qM9/+Q=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-4.0.2.tgz"; + sha512 = "quqmeGTjcVks8YaatVGCpt7QpUTs2PK0D3mW5aEQqmFKOuIZ/CxwWrgnggPjqP3CNp6eALdQRgf0jUpcG8X1/Q=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -3964,13 +4000,22 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.7.1" = { + "@octokit/types-6.8.3" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.7.1"; + version = "6.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.7.1.tgz"; - sha512 = "OzRXbizUfixgzTjlSZQj+yuo0J9vAMOLtpsIm3JjQUsI3CcLXZnVaxRIWtYD+iwHznnvG9fJlPHM6SRp77fUcw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.8.3.tgz"; + sha512 = "ZNAy8z77ewKZ5LCX0KaUm4tWdgloWQ6FWJCh06qgahq/MH13sQefIPKSo0dBdPU3bcioltyZUcC0k8oHHfjvnQ=="; + }; + }; + "@open-policy-agent/opa-wasm-1.2.0" = { + name = "_at_open-policy-agent_slash_opa-wasm"; + packageName = "@open-policy-agent/opa-wasm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz"; + sha512 = "CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ=="; }; }; "@opencensus/core-0.0.8" = { @@ -4054,310 +4099,310 @@ let sha512 = "2TUGhTGkhgnxTciHCNAILPSeyXageJewRqfP9wOrx65sKd/jgvNYoY8nYf4EVWVMirDOxKDsmYgUkjdQrwb2dg=="; }; }; - "@ot-builder/bin-composite-types-0.10.37" = { + "@ot-builder/bin-composite-types-1.0.1" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.37.tgz"; - sha512 = "TJ4mDLP0sHES4HjUry9fJTEHGb8bC51nF0OqBDR+lNCt3OHi5VVtE1Ph8QqxoglfTypLfTyXRcP8kXC+vV0Q/g=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.1.tgz"; + sha512 = "OwX0d7IN7LhgeWiPPftMTcGYVisMPWXuvuLQHdc7gO+1Sg/7+XbMwXbdYI1PvJwqNlqKPE5+yVesjgVtt1RRwQ=="; }; }; - "@ot-builder/bin-util-0.10.37" = { + "@ot-builder/bin-util-1.0.1" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.37.tgz"; - sha512 = "RR93ek6moT25cNC3eCc9QsGWxj3vOlTfryNybDTUVFEwhXi2EWXJ+cOvjKPOxplNY17YxzxffhqXX0qdX/Y6JQ=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.1.tgz"; + sha512 = "LN6iR+Y/gmRkRoxW6VV5U1SIDRu9zQ5ZshePQukp1+gdJQJBrhmCrreL4XEEOQ/3AC67yuj6pAPi70jagqKxyA=="; }; }; - "@ot-builder/cli-help-shower-0.10.37" = { + "@ot-builder/cli-help-shower-1.0.1" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.37.tgz"; - sha512 = "nkSDmkUROYEVAkZqd60p0WYvWAIDyv2EVN0Bon7X8fxk4Kg92ApD6yzvRUY6WrZKIV+AAM37UUodURgLG3c/Vg=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.1.tgz"; + sha512 = "oCsKX1ecjd1L8uOmU1z0YziizRoOWN4NOhnDU+sLGtPYPnM9bOzKprfY6W99NFkTYu27N19glwFUPM/s0F+nNA=="; }; }; - "@ot-builder/cli-proc-0.10.37" = { + "@ot-builder/cli-proc-1.0.1" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.37.tgz"; - sha512 = "5X+DBnVQrByPwGz8UlVnsldpxIKgwbZG3RndI75y2HZc/rZ5fgaAuTyjVhqxrIpLeNBv3InnTybu3QBbAouiuQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.1.tgz"; + sha512 = "lR90Mb/Wmm2GZH0tBIGjfZhh/VxQl5YiwXVjQIo7UM5iFviHf44lYqVkn0vyE9D1IT5E/tA1OzDrjpIBG7WBKQ=="; }; }; - "@ot-builder/cli-shared-0.10.37" = { + "@ot-builder/cli-shared-1.0.1" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.37.tgz"; - sha512 = "tiRMqvsiQ+TlP+00kMC93AW1ti9ip6kTGstjzXkDhYD9nulyyGUO6Kwx27M0DS4hFcMQXeUDd65JAOaDN5XVcQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.1.tgz"; + sha512 = "I9Zd7gRiZdD+MFr13A9zH2CRvEkjZX91OfkDiAxpDM9ncKlnlZpbbIVp3nh0VCbUAad9lrdc+xI+MMwOEPKhIA=="; }; }; - "@ot-builder/common-impl-0.10.37" = { + "@ot-builder/common-impl-1.0.1" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.37.tgz"; - sha512 = "oEl8l7313MfTRoouKGaPw5oDO8W8vq7EbS6Zg7GIh7yX5cjdXfvjS8pb9Nn2MUPcBJZ7nCGWO4mCYMSNT9Llug=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.1.tgz"; + sha512 = "v0r2tPYO8MTmx6Eo6cPGCXYZe2ScX4zA9xAfqvXn//h0sr4K11k3F6ELLDY64zKASOhITcWgznU3Prt3ubpkjg=="; }; }; - "@ot-builder/errors-0.10.37" = { + "@ot-builder/errors-1.0.1" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.37.tgz"; - sha512 = "1dQK50SBwEP2QWV5NBZAYTIqvIOXGQTFS4LVAUYBhhXYgBkbh58g8Cyhd7MDqf/VlCohuhZ/VxHZDjFsZse0Kg=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.1.tgz"; + sha512 = "66pRCyZq/uESMHTb6Wz3FYwUr6YYnuJ+sJMGyfvOCCvwZzlUYiZZ9r0lPjh/lvZ3j1UYFG6OvpIgUeBCqean9w=="; }; }; - "@ot-builder/io-bin-cff-0.10.37" = { + "@ot-builder/io-bin-cff-1.0.1" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.37.tgz"; - sha512 = "Cyhw7PddXzzRwflhBNX2ta+kRmfCGhS8v+XtTOmS/WX/bPwJRJInf4DGYB+NmhCfK51dmNxA9SJEf/lHsVoSrw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.1.tgz"; + sha512 = "rEuNFXtyU0/a2xpqTHajIZ8YgEkVdB7XImODrs308zlkHdaWL6akOUgBNr866qj6kVWEdfnXkcF0ZCaRJYrCzA=="; }; }; - "@ot-builder/io-bin-encoding-0.10.37" = { + "@ot-builder/io-bin-encoding-1.0.1" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.37.tgz"; - sha512 = "N2N0aJMz/pyt/TEgo0d9mlJQuOEcYf63p6ZPxCgnaiweb8QRFQa71WoWqlHLrZYKQRg8TU1xdRrrLzn6MpV/KA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.1.tgz"; + sha512 = "50IRjuNn2vJny5QXFcEp7EccfHEVZ8TTp4TdA6w6pyNtqxyUSHukrqJTpnO30jitNS+NRSqdoI9EHDgZh2Z5IQ=="; }; }; - "@ot-builder/io-bin-ext-private-0.10.37" = { + "@ot-builder/io-bin-ext-private-1.0.1" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.37.tgz"; - sha512 = "WO/omCDnkA+4M6OTSATzSfDRCpHQPkbm2l8HjVEvCj9lENEGDlB10qVUfHhS9OJRGyQ1zC2Sgz1uCP7fUPmpPQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.1.tgz"; + sha512 = "+vWNtsB9YDoM6bYcADfQEw5g9BIM1qbNlYDtntas/3BcEkjtMC2hUmHfkjPYJCaLpJSROUTqH9n+3Ih+OLgvRw=="; }; }; - "@ot-builder/io-bin-font-0.10.37" = { + "@ot-builder/io-bin-font-1.0.1" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.37.tgz"; - sha512 = "fN5UpZ1YnAiU9qLTH/bhzNnL7dTPdDNoDKbcfoEYcBF0HxvbGM7nOqgOe95HP20uUGO9z6p6A7jdkcCIgM/+JA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.1.tgz"; + sha512 = "GQ605nx70kUD3Mu+4RZ7+GyO5Yp6zGG4+Lrw6Fpmyd7aCTchCeYkHAIAuIUtzkTo/xKTg+MDQqHUK1a9V9hQpw=="; }; }; - "@ot-builder/io-bin-glyph-store-0.10.37" = { + "@ot-builder/io-bin-glyph-store-1.0.1" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.37.tgz"; - sha512 = "g2GvPbzcNSSUcs/TmjpaLfCgDUDOkeO5/BwZsUyF8vesHdZXzCLIuZ34Hla18kDFNEujNY5lTYOblin9MLsuCw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.1.tgz"; + sha512 = "O51k7dReVjls62SfpIh+bNv053dxqRq+fbHBwU2mXo/klKk+T7NIQvaWqZpomUFlY3nrNv9AOAlAHZzjkHyIeA=="; }; }; - "@ot-builder/io-bin-layout-0.10.37" = { + "@ot-builder/io-bin-layout-1.0.1" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.37.tgz"; - sha512 = "8uEvHSC5X1bxBBNEKVz+/5yedVStOSFndAHI86pCcEim8538Ib/jZTTcwSlBs4cg4r4QDJ8EekkOt0TFjvY0qA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.1.tgz"; + sha512 = "dfdqHp77r5jixq0E/7v/PyrMWVKVtZPCEAa7QonPIfFxoG5a/nq9hzuXSLldg8GxuUXzEqV3waXB9sSo7KpOCg=="; }; }; - "@ot-builder/io-bin-metadata-0.10.37" = { + "@ot-builder/io-bin-metadata-1.0.1" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.37.tgz"; - sha512 = "hvb+b11sYjHhRQBBCEo0Ijwk62v9S+HMCydL4EHzWxWBtEXL6ELyqG3JeWDWbwFnQ1R/gHVjHOHacaW/8NsPYw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.1.tgz"; + sha512 = "c5DMb048oMO3WKkeszVif5OVN1ZCEGexBjPBS06zIeRB3F0X+/ZjCjbtx6WWXRvF9DkZDrDMAFDmG3dAhtPvdA=="; }; }; - "@ot-builder/io-bin-metric-0.10.37" = { + "@ot-builder/io-bin-metric-1.0.1" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.37.tgz"; - sha512 = "AL38lT4RPUTJ8I/gDu0zuW6F5drcIzhoDN1hPsmMwsQLApx+1Ea/7gJipWfU4ppE+R9dpULrHOyH3EdCH59owA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.1.tgz"; + sha512 = "vRodhi6NOZ3J91XtnhNRC/i4FyUhV4xFA3kavsJvuRa6kmubSmkqoH1xYGgIxvRxi3pRdfojGI9+a/usZ5DikA=="; }; }; - "@ot-builder/io-bin-name-0.10.37" = { + "@ot-builder/io-bin-name-1.0.1" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.37.tgz"; - sha512 = "KBgTi4FdMdo/CJoPEL3HU1910GS42Lfw03BEwn/AXmv8mZy4q4DkhSI5jFH9xf2g9d67Rm9Ms4IR01OtZIdasg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.1.tgz"; + sha512 = "GnOPDSjIFG2uR2tbEondXqEt2ArISyTn7yXJbYM3AG4hdY52xn/mFcEvidgHEYLDDOkxuxoNTBDnbeCg3LxEyA=="; }; }; - "@ot-builder/io-bin-sfnt-0.10.37" = { + "@ot-builder/io-bin-sfnt-1.0.1" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.37.tgz"; - sha512 = "HzYvTaydmgxTRr7o5sichmc0j4TJcFbZfhf3kU8fE2KUdagi+Ia9jms3YWz+AVFaxkd6vp7xAKSgoaYggXWtcQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.1.tgz"; + sha512 = "5TjEG3bEthvgn/LlQT/c2wSiPUeY+7jmfPr6+7G839avl/31FwxYIbhCjrjWbg/ceuo8NNRxvmi7H+m1HwjcBg=="; }; }; - "@ot-builder/io-bin-ttf-0.10.37" = { + "@ot-builder/io-bin-ttf-1.0.1" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.37.tgz"; - sha512 = "nLILmjrsN3J9HqVQP8AqfTSNdaIJaB7V/k5Csu+lFS6Qeozkpm5C43WFb+pjTo9rO+3ZUyQKtN0dBez6Mu5zfA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.1.tgz"; + sha512 = "nYRGtMLRDZdrSkCxp6sDjFeSeOEsCDTMFWBZrNSeRKINSvDmXpVJQCKLqx+TBZBykNb9Cf7+iCuNG5YfNUiEGg=="; }; }; - "@ot-builder/ot-0.10.37" = { + "@ot-builder/ot-1.0.1" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.37.tgz"; - sha512 = "H2OhGBya1uhb3LNbDn1uYhD7VH+RxVIc//DjPB9TTjRAxepzJhtDQA+xHr44Pfh+/gMhzOg6IZaE6w2hKCOi+A=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.1.tgz"; + sha512 = "l+nQjrTWO6De0OkX1ETC+7Pr8gArJL5L+2vhYdktiqe0tAC/odmu/dVINMenqOufC+DVzJLHhCyFNT/HrukGCA=="; }; }; - "@ot-builder/ot-encoding-0.10.37" = { + "@ot-builder/ot-encoding-1.0.1" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.37.tgz"; - sha512 = "xuSnN3LD3v6ovkHLeZebM8z4PYZkpW6tVrl2HqRaujIjuR0LpBSWQcLwqI1B8xUwfvpdPrmRABXGTDQEfH7XbA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.1.tgz"; + sha512 = "eY1L/Waa9J7OAu5xaggvied4qKnJobpfELVcrDTdsR85F7JJQMdV2P1o9oRS0tzf6nHMfhkCihV5IlLqLxS1eQ=="; }; }; - "@ot-builder/ot-ext-private-0.10.37" = { + "@ot-builder/ot-ext-private-1.0.1" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.37.tgz"; - sha512 = "dZk0SedGSAvmmHuY+kwqICz0ptrX0rvWVitp5nF/0kXS1sUr5x2xXrGIFm6/ZatyYek5tdGIMy6OjUyfv2lEew=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.1.tgz"; + sha512 = "VTagNcyvtC9EmfVHDAni78dYX97k+Hd1/ruDRSPAJhttLA5xiLWah9xAuPeQtBcglFx7375N8qA9f6CQgFBrBA=="; }; }; - "@ot-builder/ot-glyphs-0.10.37" = { + "@ot-builder/ot-glyphs-1.0.1" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.37.tgz"; - sha512 = "EGO3Ok6xOZLrpViokybKkCD5fyV/TOOdzD2WD5hNC9OUT3uSWUCVp8O5CN1xbJUC47Xsbx8L3WTKPLMDVfyurQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.1.tgz"; + sha512 = "FZfcl61XFO393QOBZK8hzRAdavVHW5tUKEzkZzlnDWJEhlZNUTqycn+nJWc5rwfMtQnnJ4UQ1DdJDUTaDZ2VHQ=="; }; }; - "@ot-builder/ot-layout-0.10.37" = { + "@ot-builder/ot-layout-1.0.1" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.37.tgz"; - sha512 = "sK0ERPlrujMfd/1yqxX5In5AZRbV/vqR0gCyZavd2iOWA5IrPS0jeUcF6TmpnWqSt8IvKL/syPHm2VEmEBEGtQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.1.tgz"; + sha512 = "1Kes3RWBnP+k6bCtQAASquh4zDHvJI7BcD+vS0FyerwvniarxGxw4CELmLN87xGrQBybmez/aftqXnRmhsjrRQ=="; }; }; - "@ot-builder/ot-metadata-0.10.37" = { + "@ot-builder/ot-metadata-1.0.1" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.37.tgz"; - sha512 = "KO+MhJXSHCVMRE0sVoqI/W91/SYC5JUM1yc09OvlHdb5RlCYk8RWDr/1G2VKIQifrbMMXpzeVVwAVOjKxOlH2w=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.1.tgz"; + sha512 = "YO6WGvXyhvSCmsGdkK/L37YzoMpFn6A8YoDgMJk4R0MPjoJuVta4srDv41RvOLVr9oDiYtiPFRw8BjkdEWrMbg=="; }; }; - "@ot-builder/ot-name-0.10.37" = { + "@ot-builder/ot-name-1.0.1" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.37.tgz"; - sha512 = "LIXAd02w3PIUaepM5Esct+Z1iUu/Lq/kxd3WNUL0OTmauZF2oh0qdK3dQHLtFBHOMHoWIXUKjOPDLw/YP1dUwA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.1.tgz"; + sha512 = "6L4SAwLALNOjifhX47HvXPkGKcX1HfpeGnzFtMDtgUi3muiYrKb3YJffV8vk8V1EQhiVTWJ1j7441SS6cY2m8g=="; }; }; - "@ot-builder/ot-sfnt-0.10.37" = { + "@ot-builder/ot-sfnt-1.0.1" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.37.tgz"; - sha512 = "VICXFcp8yzi6zkd4nwLrYh7p3Yx86KMqDRV39ODtM1g/2r887beIfBOONE1ll4Dy6FMXbtvWY1+OEcMPEjD+LA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.1.tgz"; + sha512 = "jmojZ36QbcDUIXX+UPYlKtkxklKSlV35Cpa4P4vWVAISqocmX3fFIQ+Xz7Ub1XeLnkcIf86ruOrDyoSytF5NHg=="; }; }; - "@ot-builder/ot-standard-glyph-namer-0.10.37" = { + "@ot-builder/ot-standard-glyph-namer-1.0.1" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.37.tgz"; - sha512 = "I1FsVaBOHMSPA6lPFo6SWwAYLmp+q1QNKYQtcRJmgW5G5lljIjCTptvpDzyXqgujgFvGUDz7UWPNzlRq/HwLNw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.1.tgz"; + sha512 = "yKgPw8neJZr/wa/mFWtPbi4sKTkfyYCo+Q0SONkjJLNchuI6i/w3ijX3EDf8R9/m4j65JhHKQ8wltKBnRgHlCQ=="; }; }; - "@ot-builder/prelude-0.10.37" = { + "@ot-builder/prelude-1.0.1" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.37.tgz"; - sha512 = "rUMCp2j3or0dSYr2hDkmNRexg9A24zzRRQWNHh5KF+6x4Crj5Sg41gx+sx+MohQqs8mu8CM3CZOV1b66P7ixPA=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.1.tgz"; + sha512 = "ocaoVx+QeYm5aYjzy+gD67cK1j/JGArqTjGXmo/ndjsBCvS9Ni9QpN4UEjoN2oz8rzr0sK4RhX9fJ7ufQ27gPA=="; }; }; - "@ot-builder/primitive-0.10.37" = { + "@ot-builder/primitive-1.0.1" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.37.tgz"; - sha512 = "GdYr1DUgWRUASpK9C85jklb/iHpdzgPmHs1fxud61QktqXJ21Wo1jvr5W0TaHsK3tGyeDjfSbEohMQhFKgZZOA=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.1.tgz"; + sha512 = "mRSNfNNf7qUmZJ23UJVK6VnITRKgGQC5X1I1DFlIve/YfTVe6SbH0AbBBcS4OsC/gXskLkywXX6rZChjSWDmTg=="; }; }; - "@ot-builder/rectify-0.10.37" = { + "@ot-builder/rectify-1.0.1" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.37.tgz"; - sha512 = "0gv45ARwPgBSWnpl7mmk+lTtIlTO0XBtoCBT8BbkXzXH4YxkB70fEsAX47GEhSpWzWWg9QgTrVUCBFXVj4i67A=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.1.tgz"; + sha512 = "IBA/v+6ksxUADQEpk1Nbc0jRwXhZD2CNPz8xmtPPqnRAE3b8JpxIjmu6zhn1pRx0E0AvtPdMfAilhNis7IzY9g=="; }; }; - "@ot-builder/stat-glyphs-0.10.37" = { + "@ot-builder/stat-glyphs-1.0.1" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.37.tgz"; - sha512 = "JTQQtR8CWclhAdJyKAvWH3O99wuaJFJKyAr+BRcXL5wJ6D68V9AQ8zY+weaIL7m1FZIOp5kf4nc4RmRodtCcNw=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.1.tgz"; + sha512 = "YgsglcyhfAHNpbPXdPoZD4DhqbaHzAhtocJ/cblaOQr+uE7LD66890is1kJ4mrKUYV4Ei0uLZDyw9ngixZGteg=="; }; }; - "@ot-builder/trace-0.10.37" = { + "@ot-builder/trace-1.0.1" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.37.tgz"; - sha512 = "phedlApvTXseNHId9T0Ab+6luHoATwkwk0l/JFEhVFIbMdvAcHwgAB/oxumsySlTscYuV/7dgGqCyYeeYicfjw=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.1.tgz"; + sha512 = "UZ7Fi+A+LEnkjagFeCiPlzFKSrBtY04l/B2iXqlC4gyfmwOzKGe+A8B0kVfjheePhteUm4808Yx3e419o2EepQ=="; }; }; - "@ot-builder/var-store-0.10.37" = { + "@ot-builder/var-store-1.0.1" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.37.tgz"; - sha512 = "yAEZBdo+X0m3WnFNLXFW2pkmhDx8EEvqxqR0A95KxZC1M6gtLdYesQGz5x1qnTn6cAvxOOhyclWsk3XcSJpvKw=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.1.tgz"; + sha512 = "IcoJ7U+Z+wjbFSL2qLuU0tIW9G/NR6sWI0r1bKgnBr0hE2Si4dj/D+GYjIVkRscfvI3x/5/XL2sWayuh2Pjvdg=="; }; }; - "@ot-builder/variance-0.10.37" = { + "@ot-builder/variance-1.0.1" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.37.tgz"; - sha512 = "I+ZvuTZ82Itr1/KwTkDyMrhx30rgmimMxYX6dOIvjrrheTJSPR3iKR7tFKszCuJSgx6GTITeikeyi6tH4/krGQ=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.1.tgz"; + sha512 = "cJ4eL1xyvJnPlEcrnKkZeqIw6NbPGAP2RFyEclBU2U4Freu2ZH1R8WqATbekdQqlOnwoZ1vgV8mH8EpNI3N8Uw=="; }; }; "@parcel/fs-1.11.0" = { @@ -4666,6 +4711,15 @@ let sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q=="; }; }; + "@sammacbeth/random-access-idb-mutable-file-0.1.1" = { + name = "_at_sammacbeth_slash_random-access-idb-mutable-file"; + packageName = "@sammacbeth/random-access-idb-mutable-file"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sammacbeth/random-access-idb-mutable-file/-/random-access-idb-mutable-file-0.1.1.tgz"; + sha512 = "jHnpuu2qtFgwCmhgrpCCk3/hU3XqXTqhidh4XmcTijkVsGwh1c2T0+r2hkHs1PRfsxeimx8qDAotphpRoYB2eg=="; + }; + }; "@samverschueren/stream-to-observable-0.3.1" = { name = "_at_samverschueren_slash_stream-to-observable"; packageName = "@samverschueren/stream-to-observable"; @@ -4675,13 +4729,22 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.1.2" = { + "@scarf/scarf-1.1.0" = { + name = "_at_scarf_slash_scarf"; + packageName = "@scarf/scarf"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.1.0.tgz"; + sha512 = "b2iE8kjjzzUo2WZ0xuE2N77kfnTds7ClrDxcz3Atz7h2XrNVoAPUoT75i7CY0st5x++70V91Y+c6RpBX9MX7Jg=="; + }; + }; + "@schematics/angular-11.2.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.1.2"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.1.2.tgz"; - sha512 = "ZhaB/QBwfWsvZYJplLH8VK/7vnFpUbk1nptjC106K/I38xlmWdB4pStLJK94eyJk0KlItnsPvE0a9KuLPKA/Ow=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.0.tgz"; + sha512 = "PtbyZ7TEEEae9Y5siSZYigWyk8iOSjZ10ThA7tRxm8gdcLjGimyyKr5TyjufIAvrXIYnBXNLgPkZG6s5CQIEyw=="; }; }; "@schematics/schematics-0.1100.3" = { @@ -4693,13 +4756,13 @@ let sha512 = "tzjKnjD90FQ4LgRN9ALT2qCqgJYZrAKoy1embFJRuGKA8vv1hTG4JonVDqQEUoNwTc9r/Ok2Z1eenAI9TSUd1A=="; }; }; - "@schematics/update-0.1101.2" = { + "@schematics/update-0.1102.0" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1101.2"; + version = "0.1102.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1101.2.tgz"; - sha512 = "WwMsIkhR3hq7gvfB5HsuTK2Sz9iZmpz0/AiFYRJbX+mXL/KgONcridyorW45Dg1Q2sRXVGiAUxWsQYzjmeLO7g=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.0.tgz"; + sha512 = "2hFt/2iPe6LqQvzYj4HvQ8us0e0lBU75rSK2yY6VfiZWR/qo7yk99YKI7JWFTLvLsNbhNnSG/9opXJHqqUoc3g=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4729,13 +4792,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.6.0" = { + "@serverless/components-3.6.2" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.6.0"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.6.0.tgz"; - sha512 = "zOGD1yN5n3WWdMuSUKVshawrllbucQBhmBTitcmEJTm8KIDwMxV7dMBGeO8RdhruvU3qO6eII3LiVTnV/G6eXg=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.6.2.tgz"; + sha512 = "JT8+t3J90WF/ZjizTbIUbmwzLJFAybP6S2T8TK9TtHl1imeeIIu69LcFAth7fFYdPn6LrACSEMZMXJ2+QlLM6w=="; }; }; "@serverless/core-1.1.2" = { @@ -4747,13 +4810,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.4.2" = { + "@serverless/enterprise-plugin-4.4.3" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.2.tgz"; - sha512 = "w5xD8R8tFK6B7QiLvWI5jqVHTtH1LdTyGp5eRcjkdJBa10/D2IZFpJimMAGsBxk9U1JGKO4j0miVnRHIW8ppeg=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.3.tgz"; + sha512 = "2HKtgzv4c9yr9dyecbTJlSnYWaIJL4TQJ4YtVORzeBAm812r8PDK1XS9X8tvLlk2+DF2gu+Tb/Umnxl2rqhqZg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -4765,13 +4828,13 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-3.10.0" = { + "@serverless/platform-client-3.11.0" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.10.0.tgz"; - sha512 = "+dSJxViCfXcMUB1GrvJXkbw8M0KoI6uf01SxWFD7dYY61ojlmErBPuGAMmyOLxc9SzfCG4rQDkrzfIqP77zrqw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.11.0.tgz"; + sha512 = "fC4Q6mjARGdkPrBzEdsiZIgC4To74P7ro9qbtjhre1K9O0tJvvFB7/TuF3F7Xdry4fSPG6RuqdEDEXYA4FwkZw=="; }; }; "@serverless/platform-client-china-2.1.4" = { @@ -4810,15 +4873,6 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-2.2.0" = { - name = "_at_serverless_slash_utils"; - packageName = "@serverless/utils"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-2.2.0.tgz"; - sha512 = "0TqmLwH9r2GAewvz9mhZ+TSyQBoE9ANuB4nNhn6lJvVUgzlzji3aqeFbAuDt+Z60ZkaIDNipU/J5Vf2Lo/QTQQ=="; - }; - }; "@serverless/utils-3.1.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; @@ -4972,13 +5026,13 @@ let sha512 = "+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw=="; }; }; - "@snyk/dep-graph-1.23.0" = { + "@snyk/dep-graph-1.23.1" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.23.0.tgz"; - sha512 = "qR0ENrbcNWHYmSRZCxjrlFy2T7i+rJjL6Rnd2e+NByJgn8zBmX6Qf5FjqNbZAI0AYjOlzXMZjGrbAbe4QkWV+w=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.23.1.tgz"; + sha512 = "bSlTRVJP0PHtvoilhE463AMt0fhsf9PxCEqJ28VHCVSe5QFzIlgGdljtytV+2DheadGwu27BgLGqPDGMdTBHRQ=="; }; }; "@snyk/docker-registry-v2-client-1.13.9" = { @@ -5188,130 +5242,130 @@ let sha512 = "2QBwlqi2SU83vTHibfdTxGiLdIqR0btNyMGfVl0bwA6FI85HnSYoGFLrdCnq2V0nxpbhuvwzcm2Ja81w0VkMGA=="; }; }; - "@textlint/ast-tester-2.3.1" = { + "@textlint/ast-tester-2.3.2" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.3.1.tgz"; - sha512 = "L9M2VNTYJ5sVdkPs9jH7s01Gg900Nuk7m9zQmCz9WFa3YyzJFEd7GCSmAvLMgX31jw5bbvvmj7DngymlP+PahQ=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.3.2.tgz"; + sha512 = "4e1kyqsHks5POcQmuh7ITVrU/dbYyRUfQarQbeVRPP271n2HnlgnoYyZ10yV2Sb/Ksw+lQf7DPSnwNewXdCWww=="; }; }; - "@textlint/ast-traverse-2.3.1" = { + "@textlint/ast-traverse-2.3.2" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.3.1.tgz"; - sha512 = "uOFKqm3M9by55Zl2ryZ7jOSiLdLhDmVgX0IG/MJfGKY1a/MSyt5qwy9cvZNcob6hNCPeRMW8boAH2uRJOwRcoQ=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.3.2.tgz"; + sha512 = "Dt1s/6x0XWhUNFH2rAa9gL6ODtq232BZuBHuHiOg+SrVwzl+VjOfa3fMQ0LoYixGSyDtwqAlksWcC0KyLz0eSw=="; }; }; - "@textlint/feature-flag-3.3.1" = { + "@textlint/feature-flag-3.3.2" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.3.1.tgz"; - sha512 = "0a1UopFf30UrmEDKFNATXlotMqwbLGjJa1GTuljL/AKn2Adz7rPawclW4pHf/b//K7Da5GOtuzbIfVAZSFQRxA=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.3.2.tgz"; + sha512 = "7ErQ/UF0IBAd+PkQNBD7yYCDqL2o6leErMDENSWAgUHWLy5TcHr3Orn7qswtBMW5gIyXW9lh+EpllwLJ5qv35w=="; }; }; - "@textlint/fixer-formatter-3.3.1" = { + "@textlint/fixer-formatter-3.3.2" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.3.1.tgz"; - sha512 = "ZPK66J61lv8UMdqJeG4YUPfKPlCom/jiv8kZkz5ELnLA587HLOlEIYLaNjKop0viW5z3Fz9cZd5glIHrPymiqQ=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.3.2.tgz"; + sha512 = "aTEyH/rHSzxRLrluSjNhDnMSgIYK60J5AAgprKJCkb9h3dDRuNoiJ+BXh5FXVSSm1tGF0d8pu+Ph8OFBgQOchQ=="; }; }; - "@textlint/kernel-3.4.1" = { + "@textlint/kernel-3.4.2" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.4.1.tgz"; - sha512 = "8ZpiLy5KgmIMjda7RNgbNzoHpDnF51OC0rmMBTUl5xFMrpOcmnKZ6qcnmP7hlyR1MQJxQVzG0PvWnLHFUZL53w=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.4.2.tgz"; + sha512 = "PpxAtvLGI9ewn+Dbt4j0KMfmMM39/AY3cikmZffu59nyTdIymXMeVMEVkpVZTEUk5OlL27RAON9FF+2u+0fshg=="; }; }; - "@textlint/linter-formatter-3.3.1" = { + "@textlint/linter-formatter-3.3.2" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.3.1.tgz"; - sha512 = "tBtOSfpZWr3AwIJ1vbBSD+fwB4JSEtCQIE+AgfFqO8eDMOssjxKgVtIPX9dwh3/+6vlc6KozBJjIfXoxLuaWlg=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.3.2.tgz"; + sha512 = "MRa8D1/x6pWycKTwb1QLjtY7GyjgcsYRfV0Gu0Aze5szCa3UDwZSewHycpcAGlIqr8AkqPRfyXi653M47eJ0rA=="; }; }; - "@textlint/markdown-to-ast-6.3.1" = { + "@textlint/markdown-to-ast-6.3.2" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.3.1.tgz"; - sha512 = "piqeTN6dzMr7ljlo7GbRBILMcZ8zW2H9raN48qH+HYhfrGZfEOmL5HAMMeF8h0sDz9CzTvZixEwGWLMdlwsb+A=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.3.2.tgz"; + sha512 = "uwndF3PRJ48wTVAEDSy0IAEVJg/scxpdZ1r+QKeGuFfdtaGSrtcgROI6qiVU1g/WNyNfQw+DAA7F8HfM+pmleg=="; }; }; - "@textlint/module-interop-1.2.1" = { + "@textlint/module-interop-1.2.2" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.2.1.tgz"; - sha512 = "ZvxTTvEm7nmkRctWKREfvNvnVtRxRbdUms8cqkiYbP2K0fRIMacrWpL8z8cdkkdNZbaYciaUnyE3be7UD4J8EA=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.2.2.tgz"; + sha512 = "B8HPS129lOqzEpRcafYl/OJ2TDxfBw1jGfEhebzwt3kGoMd5pQVih+hUIOl+SfAmLWqCDEniaKn0gw1s+hjSXA=="; }; }; - "@textlint/source-code-fixer-3.4.1" = { + "@textlint/source-code-fixer-3.4.2" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-3.4.1.tgz"; - sha512 = "FqL+xdjIU2hswS4Cmhf/bL7SWTpXkKoK/wb8Lmo9sNmEE481fc5Ey/s8JgxAaOHRpwOcmErGd16c3gXcG6Y2ow=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-3.4.2.tgz"; + sha512 = "mSGQNO8is21KcHgDh4S8Cx88r7uU+7xpzHLuEuzhgEZfgwz3+tnpk22TrEjNYe1V1+aseU9iCQegVQQr1wroKQ=="; }; }; - "@textlint/text-to-ast-3.3.1" = { + "@textlint/text-to-ast-3.3.2" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.3.1.tgz"; - sha512 = "aN1IY3u98Wig2PTF/eEJdb7XfCH5VEwZagGdG1vajx6sdc7Sc3265UVv9uEB/ypJDteYnURRICfTd6NCGwkVGA=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.3.2.tgz"; + sha512 = "+DKAP62ho21KID8IcKy1kP6K+kUZk+Z0MwvS9u2l39J0cK+vX523KI+sA6AXxEhOMDA8zhdIsBf3onGvrAtyhA=="; }; }; - "@textlint/textlint-plugin-markdown-5.3.1" = { + "@textlint/textlint-plugin-markdown-5.3.2" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.3.1.tgz"; - sha512 = "IhQVGW9YqylkuZ4AjOfLFtOWHPXtLMhWTVfvIFzMQ2TIpquIaybws8KiFN2yZzLBNNduF+PFvm+H2NRhR0w/lQ=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.3.2.tgz"; + sha512 = "6Ph7ESKR48tEz5Pnog3PpvF84LU3jkADvr4iBkkVz9vLQt3KbqGnmk8EV94Y0hLEX+UrZKWmH3cJfh6O1Zy/eA=="; }; }; - "@textlint/textlint-plugin-text-4.3.1" = { + "@textlint/textlint-plugin-text-4.3.2" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.3.1.tgz"; - sha512 = "IqtO6TWOfVaw8sXMdVVwsvEYuqYk13ApKXBVjjJoLux0g+6G1rCEhFSZtopkrpC1Srr/OZCfb4nk8/zx+5M6Ng=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.3.2.tgz"; + sha512 = "xnjad0bXaM6ZtgffuFKogHYkzXymUK3VTLP5MGA00kLitADlNUtwXQk82TebkXFcSPRhePU9+2XFipXNQDsg7g=="; }; }; - "@textlint/types-1.5.1" = { + "@textlint/types-1.5.2" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.1.tgz"; - sha512 = "YgPmxEeFUXuCjWOFx4p0afxFCHJbTf9Muw/6SJDLd/txQ6YrStst3Kvw+6QGefdJe44/UdiUYtI8sYa5T1ejaQ=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.2.tgz"; + sha512 = "IdS0h2MCzdY+wjM0+qvl8IW/IxhmVFAVrGu5TmIBpJkihIV7WMa3ITFXIVb0oqwnePUmyLBRIVsCtC66E3QbfQ=="; }; }; - "@textlint/utils-1.2.1" = { + "@textlint/utils-1.2.2" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.2.1.tgz"; - sha512 = "X/rLpqskTLWDPO5cvQO5CcA7zNnDimeBokwehiDwTg6aP9LYqFeOw5mKZ5lb4purY9zN9tLRxJGLle4Py1QobQ=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.2.2.tgz"; + sha512 = "7Mqcl9G9YYrPBv5d/tZ2NlWC66hTUpQEQxZEHDMTdF3gPmQUSNRNGjqUR9mhw00Wy8Wo6i3LUWuxwMT6heHNBQ=="; }; }; "@tokenizer/token-0.1.1" = { @@ -5692,15 +5746,6 @@ let sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; }; }; - "@types/express-serve-static-core-4.17.17" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.17.tgz"; - sha512 = "YYlVaCni5dnHc+bLZfY908IG1+x5xuibKZMGv8srKkvtul3wUuanYvpIj9GXXoWkQbaAdR+kgX46IETKUALWNQ=="; - }; - }; "@types/express-serve-static-core-4.17.18" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -5773,13 +5818,13 @@ let sha512 = "AaXSrIF99SjjtPVNmCmYb388HML+PKEJb/xmj4SbL2ZO0hHuETZZzyDIKfOqaEoAHZEuX4sC+FRFrHYJoIby6A=="; }; }; - "@types/graceful-fs-4.1.4" = { + "@types/graceful-fs-4.1.5" = { name = "_at_types_slash_graceful-fs"; packageName = "@types/graceful-fs"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz"; - sha512 = "mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg=="; + url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"; + sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw=="; }; }; "@types/graphlib-2.1.7" = { @@ -6178,22 +6223,13 @@ let sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; }; }; - "@types/node-12.19.15" = { + "@types/node-13.13.41" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.19.15"; + version = "13.13.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz"; - sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw=="; - }; - }; - "@types/node-13.13.40" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "13.13.40"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.40.tgz"; - sha512 = "eKaRo87lu1yAXrzEJl0zcJxfUMDT5/mZalFyOkT44rnQps41eS2pfWzbaulSPpQLFNy29bFqn+Y5lOTL8ATlEQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.41.tgz"; + sha512 = "qLT9IvHiXJfdrje9VmsLzun7cQ65obsBTmtU3EOnCSLFOoSHx1hpiRHoBnpdbyFqnzqdUUIv81JcEJQCB8un9g=="; }; }; "@types/node-14.11.1" = { @@ -6205,13 +6241,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.22" = { + "@types/node-14.14.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.22"; + version = "14.14.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz"; - sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.26.tgz"; + sha512 = "skWxepWOs+VArEBWd2S/VR3wUavioIIx9/HzW+UJiIjtwa6+kNXdsOeq7FfxDXf56hIcL0ieo2brwMgBJ1+lhw=="; }; }; "@types/node-6.14.13" = { @@ -6304,6 +6340,15 @@ let sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA=="; }; }; + "@types/pug-2.0.4" = { + name = "_at_types_slash_pug"; + packageName = "@types/pug"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.4.tgz"; + sha1 = "8772fcd0418e3cd2cc171555d73007415051f4b2"; + }; + }; "@types/q-1.5.4" = { name = "_at_types_slash_q"; packageName = "@types/q"; @@ -6403,6 +6448,15 @@ let sha512 = "8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q=="; }; }; + "@types/sass-1.16.0" = { + name = "_at_types_slash_sass"; + packageName = "@types/sass"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/sass/-/sass-1.16.0.tgz"; + sha512 = "2XZovu4NwcqmtZtsBR5XYLw18T8cBCnU2USFHTnYLLHz9fkhnoEMoDsqShJIOFsFhn5aJHjweiUUdTrDGujegA=="; + }; + }; "@types/semver-5.5.0" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -6529,13 +6583,13 @@ let sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uglify-js-3.11.1" = { + "@types/uglify-js-3.12.0" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.11.1"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz"; - sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.12.0.tgz"; + sha512 = "sYAF+CF9XZ5cvEBkI7RtrG9g2GtMBkviTnBxYYyq+8BWvO4QtXfwwR6a2LFwCi4evMKZfpv6U43ViYvv17Wz3Q=="; }; }; "@types/unist-2.0.3" = { @@ -6583,13 +6637,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.52.0" = { + "@types/vscode-1.53.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.52.0"; + version = "1.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz"; - sha512 = "Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.53.0.tgz"; + sha512 = "XjFWbSPOM0EKIT2XhhYm3D3cx3nn3lshMUcWNy1eqefk+oqRuBq8unVb6BYIZqXy9lQZyeUl7eaBCOZWv+LcXQ=="; }; }; "@types/webpack-4.41.25" = { @@ -6691,13 +6745,13 @@ let sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="; }; }; - "@typescript-eslint/eslint-plugin-4.14.2" = { + "@typescript-eslint/eslint-plugin-4.15.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.14.2"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.2.tgz"; - sha512 = "uMGfG7GFYK/nYutK/iqYJv6K/Xuog/vrRRZX9aEP4Zv1jsYXuvFUMDFLhUnc8WFv3D2R5QhNQL3VYKmvLS5zsQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.0.tgz"; + sha512 = "DJgdGZW+8CFUTz5C/dnn4ONcUm2h2T0itWD85Ob5/V27Ndie8hUoX5HKyGssvR8sUMkAIlUc/AMK67Lqa3kBIQ=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -6709,13 +6763,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.14.2" = { + "@typescript-eslint/experimental-utils-4.15.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.14.2"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.2.tgz"; - sha512 = "mV9pmET4C2y2WlyHmD+Iun8SAEqkLahHGBkGqDVslHkmoj3VnxnGP4ANlwuxxfq1BsKdl/MPieDbohCEQgKrwA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.0.tgz"; + sha512 = "V4vaDWvxA2zgesg4KPgEGiomWEBpJXvY4ZX34Y3qxK8LUm5I87L+qGIOTd9tHZOARXNRt9pLbblSKiYBlGMawg=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -6727,22 +6781,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.14.2" = { + "@typescript-eslint/parser-4.15.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.14.2"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.14.2.tgz"; - sha512 = "ipqSP6EuUsMu3E10EZIApOJgWSpcNXeKZaFeNKQyzqxnQl8eQCbV+TSNsl+s2GViX2d18m1rq3CWgnpOxDPgHg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.0.tgz"; + sha512 = "L6Dtbq8Bc7g2aZwnIBETpmUa9XDKCMzKVwAArnGp5Mn7PRNFjf3mUzq8UeBjL3K8t311hvevnyqXAMSmxO8Gpg=="; }; }; - "@typescript-eslint/scope-manager-4.14.2" = { + "@typescript-eslint/scope-manager-4.15.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.14.2"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.14.2.tgz"; - sha512 = "cuV9wMrzKm6yIuV48aTPfIeqErt5xceTheAgk70N1V4/2Ecj+fhl34iro/vIssJlb7XtzcaD07hWk7Jk0nKghg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.0.tgz"; + sha512 = "CSNBZnCC2jEA/a+pR9Ljh8Y+5TY5qgbPz7ICEk9WCpSEgT6Pi7H2RIjxfrrbUXvotd6ta+i27sssKEH8Azm75g=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -6754,13 +6808,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.14.2" = { + "@typescript-eslint/types-4.15.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.14.2"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.14.2.tgz"; - sha512 = "LltxawRW6wXy4Gck6ZKlBD05tCHQUj4KLn4iR69IyRiDHX3d3NCAhO+ix5OR2Q+q9bjCrHE/HKt+riZkd1At8Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.0.tgz"; + sha512 = "su4RHkJhS+iFwyqyXHcS8EGPlUVoC+XREfy5daivjLur9JP8GhvTmDipuRpcujtGC4M+GYhUOJCPDE3rC5NJrg=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -6781,13 +6835,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.14.2" = { + "@typescript-eslint/typescript-estree-4.15.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.14.2"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.2.tgz"; - sha512 = "ESiFl8afXxt1dNj8ENEZT12p+jl9PqRur+Y19m0Z/SPikGL6rqq4e7Me60SU9a2M28uz48/8yct97VQYaGl0Vg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.0.tgz"; + sha512 = "jG6xTmcNbi6xzZq0SdWh7wQ9cMb2pqXaUp6bUZOMsIlu5aOlxGxgE/t6L/gPybybQGvdguajXGkZKSndZJpksA=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -6799,31 +6853,31 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.14.2" = { + "@typescript-eslint/visitor-keys-4.15.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.14.2"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.2.tgz"; - sha512 = "KBB+xLBxnBdTENs/rUgeUKO0UkPBRs2vD09oMRRIkj5BEN8PX1ToXV532desXfpQnZsYTyLLviS7JrPhdL154w=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.0.tgz"; + sha512 = "RnDtJwOwFucWFAMjG3ghCG/ikImFJFEg20DI7mn4pHEx3vC48lIAoyjhffvfHmErRDboUPC7p9Z2il4CLb7qxA=="; }; }; - "@uifabric/foundation-7.9.21" = { + "@uifabric/foundation-7.9.24" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.21"; + version = "7.9.24"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.21.tgz"; - sha512 = "z58pcC0hJr6S0iYLxNFoqfrfLIMxbSxFHRirk5LDT2HXbiVIYbJwbK4O0InS+sz3chdx8GGSdIUz7muXeT/D+A=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.24.tgz"; + sha512 = "f9W6x6gqczgkayA89TsiGzdze2A8RJXc/GbANYvBad3zeyDlQahepMrlgRMOXcTiwZIiltTje+7ADtvD/o176Q=="; }; }; - "@uifabric/icons-7.5.18" = { + "@uifabric/icons-7.5.21" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.18"; + version = "7.5.21"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.18.tgz"; - sha512 = "gLPEccWlTER9NiXcOHZ+dSJ3tgLAQ4mTf3hTlKV7e7dKBTl95jzcemG5S2NJQ7xWPTH3+5K1Bpd+nqZo9EJw3w=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.21.tgz"; + sha512 = "ZTqLpdCZeCChcMWCgEyWUke2wJxfi3SNdSjNFXWK90SsDWlafg3s/eDd7+n6oRi4pHlF6eBnc4oTLR6PFXt8kQ=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -6835,13 +6889,13 @@ let sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A=="; }; }; - "@uifabric/react-hooks-7.13.9" = { + "@uifabric/react-hooks-7.13.11" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.13.9"; + version = "7.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.9.tgz"; - sha512 = "VtDg2b3ypYXX7MLp1STk1Fj6ZIeZktXnm0hu1Os/pGvq6xkuLRly5XP6ZSHitm8K7ZcMo48CcNL8smmiXprBQg=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.11.tgz"; + sha512 = "9qX4hiZ4MelUxOxx4IPl+vgn9/e43KkYTpYedl2QtUxFpDjsOVJ0jbG3Dkokyl+Kvw1gerYCT1SXL8UC4kG97w=="; }; }; "@uifabric/set-version-7.0.23" = { @@ -6853,22 +6907,22 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.19" = { + "@uifabric/styling-7.18.0" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.19"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.19.tgz"; - sha512 = "T5fjUCx0LbzUC8Myw15YCaBjdGbSrihWSiPHtLVW77k59yWAW947XnH73QngE8xU7kyKPH3AhQrUEBMB2NjHag=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.18.0.tgz"; + sha512 = "PuCSr2PeVDLTtyqOjS67QBgN7rDYf044oRvMEkSCP57p9Du8rIAJio0LQjVNRKo+QlmfgFzmT3XjpS2LYkhFIg=="; }; }; - "@uifabric/utilities-7.33.2" = { + "@uifabric/utilities-7.33.4" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.33.2"; + version = "7.33.4"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.2.tgz"; - sha512 = "v2c3IUJdpru/hoGNOwIW549O5D4XBAc5sLpB7RREGI5ywoWuIJlNyYtBEGOwhAY62J2blj11qi86Ep+oZDM/Kw=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.4.tgz"; + sha512 = "FgEL2+GWOHMNMQqmI5Mko293W3c9PWIc/WrlU6jQ5AU83M1BQSxhS0LPNnRbahukiEFNkosCOOKzKCNdjzkCwA=="; }; }; "@ungap/from-entries-0.2.1" = { @@ -7510,31 +7564,31 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webpack-cli/configtest-1.0.0" = { + "@webpack-cli/configtest-1.0.1" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.0.tgz"; - sha512 = "Un0SdBoN1h4ACnIO7EiCjWuyhNI0Jl96JC+63q6xi4HDUYRZn8Auluea9D+v9NWKc5J4sICVEltdBaVjLX39xw=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.1.tgz"; + sha512 = "B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ=="; }; }; - "@webpack-cli/info-1.2.1" = { + "@webpack-cli/info-1.2.2" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.1.tgz"; - sha512 = "fLnDML5HZ5AEKzHul8xLAksoKN2cibu6MgonkUj8R9V7bbeVRkd1XbGEGWrAUNYHbX1jcqCsDEpBviE5StPMzQ=="; - }; - }; - "@webpack-cli/serve-1.2.2" = { - name = "_at_webpack-cli_slash_serve"; - packageName = "@webpack-cli/serve"; version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.2.tgz"; - sha512 = "03GkWxcgFfm8+WIwcsqJb9agrSDNDDoxaNnexPnCCexP5SCE4IgFd9lNpSy+K2nFqVMpgTFw6SwbmVAVTndVew=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.2.tgz"; + sha512 = "5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ=="; + }; + }; + "@webpack-cli/serve-1.3.0" = { + name = "_at_webpack-cli_slash_serve"; + packageName = "@webpack-cli/serve"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.0.tgz"; + sha512 = "k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw=="; }; }; "@wry/context-0.4.4" = { @@ -8122,13 +8176,13 @@ let sha512 = "e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ=="; }; }; - "agentkeepalive-4.1.3" = { + "agentkeepalive-4.1.4" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.3.tgz"; - sha512 = "wn8fw19xKZwdGPO47jivonaHRTd+nGOMP1z11sgGeQzDy2xd5FG0R67dIMcKHDE2cJ5y+YXV30XVGUBPRSY7Hg=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz"; + sha512 = "+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ=="; }; }; "aggregate-error-3.1.0" = { @@ -8212,13 +8266,13 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; - "ajv-7.0.4" = { + "ajv-7.1.0" = { name = "ajv"; packageName = "ajv"; - version = "7.0.4"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-7.0.4.tgz"; - sha512 = "xzzzaqgEQfmuhbhAoqjJ8T/1okb6gAzXn/eQRNpAN1AEUoHJTNF9xCDRTtf/s3SKldtZfa+RJeTs+BQq+eZ/sw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-7.1.0.tgz"; + sha512 = "svS9uILze/cXbH0z2myCK2Brqprx/+JJYK5pHicT/GQiBfzzhUVAIT6MwqJg8y4xV/zoGsUeuPuwtoiKSGE15g=="; }; }; "ajv-errors-1.0.1" = { @@ -8959,13 +9013,13 @@ let sha512 = "iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ=="; }; }; - "apollo-server-core-2.19.2" = { + "apollo-server-core-2.20.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.19.2"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.2.tgz"; - sha512 = "liLgLhTIGWZtdQbxuxo3/Yv8j+faKQcI60kOL+uwfByGhoKLZEQp5nqi2IdMK6JXt1VuyKwKu7lTzj02a9S3jA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.20.0.tgz"; + sha512 = "tteFTl6y9c3MtuhePOs9IbCccaKVXELttLvefMzd7EfR3CPgIfIbxpy2ZEcDys8NteYXoJ+4LiM8Eh9kLgkKmQ=="; }; }; "apollo-server-env-2.4.5" = { @@ -8995,13 +9049,13 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.19.2" = { + "apollo-server-express-2.20.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.19.2"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.2.tgz"; - sha512 = "1v2H6BgDkS4QzRbJ9djn2o0yv5m/filbpiupxAsCG9f+sAoSlY3eYSj84Sbex2r5+4itAvT9y84WI7d9RBYs/Q=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.20.0.tgz"; + sha512 = "Bf2c/1J/ScXmioWi+0HFIsZ1bt8zFlI2VV/7oUn+Dd/lUBHLVfMNKvEJNMwjRkIrI9b9+eqANDrO6lf2ruC52w=="; }; }; "apollo-server-plugin-base-0.10.4" = { @@ -10057,6 +10111,15 @@ let sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; + "async-append-only-log-3.0.3" = { + name = "async-append-only-log"; + packageName = "async-append-only-log"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.0.3.tgz"; + sha512 = "w6F/oWReK4qyNBnCFe/cfYZHXMs07BZjS0LmpHQ5JByK5yEVzvvWGdNMStFPVbQhVJnT1PdmP+/LwEzmoe33qA=="; + }; + }; "async-done-1.3.2" = { name = "async-done"; packageName = "async-done"; @@ -10255,6 +10318,15 @@ let sha512 = "Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="; }; }; + "atomically-universal-0.1.1" = { + name = "atomically-universal"; + packageName = "atomically-universal"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/atomically-universal/-/atomically-universal-0.1.1.tgz"; + sha512 = "0bqmz+wKlA9hIiH/C4R3K8dpsVV6mM/X76QZ70LMHW0XzCDXzxdWD5gfkmRXxTM5txlbYE/06iz0IziohUQVzw=="; + }; + }; "attach-ware-1.1.1" = { name = "attach-ware"; packageName = "attach-ware"; @@ -10345,13 +10417,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.834.0" = { + "aws-sdk-2.842.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.834.0"; + version = "2.842.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.834.0.tgz"; - sha512 = "9WRULrn4qAmgXI+tEW/IG5s/6ixJGZqjPOrmJsFZQev7/WRkxAZmJAjcwd4Ifm/jsJbXx2FSwO76gOPEvu2LqA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.842.0.tgz"; + sha512 = "9vjVDxsLzNI79JChUgEHDUpv2obkTe35F3oGFGViKsf4C7xlOexzKOCfTRNcgzh0MON6rVDFpYBtF2LlEyDGKg=="; }; }; "aws-sign2-0.6.0" = { @@ -11515,6 +11587,15 @@ let sha512 = "nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA=="; }; }; + "binary-search-bounds-2.0.5" = { + name = "binary-search-bounds"; + packageName = "binary-search-bounds"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.5.tgz"; + sha512 = "H0ea4Fd3lS1+sTEB2TgcLoK21lLhwEJzlQv3IN47pJS976Gx4zoWe0ak3q+uYh60ppQxg9F16Ri4tS1sfD4+jA=="; + }; + }; "binaryextensions-2.3.0" = { name = "binaryextensions"; packageName = "binaryextensions"; @@ -11587,6 +11668,15 @@ let sha1 = "01fa8748785ca70955d5011217d1b3139969ca22"; }; }; + "bipf-1.4.0" = { + name = "bipf"; + packageName = "bipf"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bipf/-/bipf-1.4.0.tgz"; + sha512 = "8b2T/OWIRI73kcPXhI+jqK+0QyxRlZ6HIzQBK8tRxIZ2NO0dBxJ4T9eeX6XsYEHy2cqM69n+rOZyVjhvRUGRig=="; + }; + }; "bitcoin-core-2.3.0" = { name = "bitcoin-core"; packageName = "bitcoin-core"; @@ -11686,13 +11776,13 @@ let sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w=="; }; }; - "bittorrent-protocol-3.2.0" = { + "bittorrent-protocol-3.3.1" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.2.0.tgz"; - sha512 = "8xgCgK8xUg7MXZBxhqJapZy9hexHwN2TCD+b8m4yWg56/ZFfdkULxhxQkzuhpXyUfvKIKxeRzGmLT43li7FDKg=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.3.1.tgz"; + sha512 = "DJy0/jjqJD62PPJY79duCccmPMihp3KPowlmd7BLEU8FTtnDsYjso6BAx+pWwCKOeDORdc9RiJ7L72x3taCh6g=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -11704,13 +11794,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.16.0" = { + "bittorrent-tracker-9.16.1" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.16.0"; + version = "9.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.16.0.tgz"; - sha512 = "6VEaW1rYA6f8H2VATlrXrTtgqB4WF7+BMIuVMsoLPgdK43d5VDPdI/ky9gpeRHcY9qmVJv+kHfkwH8G16sNbNw=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.16.1.tgz"; + sha512 = "JjegXwpWK8xRTHd5sqKTVqPhlhzAqJrR37gSiciTa1UkSSM6SWKVUDq7ZiGS3d8FhqonDSuPLQ9wUOC2q2jeIA=="; }; }; "bl-1.2.3" = { @@ -11731,13 +11821,22 @@ let sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; }; }; - "bl-4.0.3" = { + "bl-4.0.4" = { name = "bl"; packageName = "bl"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz"; - sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="; + url = "https://registry.npmjs.org/bl/-/bl-4.0.4.tgz"; + sha512 = "7tdr4EpSd7jJ6tuQ21vu2ke8w7pNEstzj1O8wwq6sNNzO3UDi5MA8Gny/gquCj7r2C6fHudg8tKRGyjRgmvNxQ=="; + }; + }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; "blake2b-2.1.3" = { @@ -11839,13 +11938,13 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; - "block-stream2-2.0.0" = { + "block-stream2-2.1.0" = { name = "block-stream2"; packageName = "block-stream2"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/block-stream2/-/block-stream2-2.0.0.tgz"; - sha512 = "1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g=="; + url = "https://registry.npmjs.org/block-stream2/-/block-stream2-2.1.0.tgz"; + sha512 = "suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg=="; }; }; "blru-0.1.6" = { @@ -12298,6 +12397,15 @@ let sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; + "browser-hrtime-1.1.8" = { + name = "browser-hrtime"; + packageName = "browser-hrtime"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-hrtime/-/browser-hrtime-1.1.8.tgz"; + sha512 = "kzXheikaJsBtzUBlyVtPIY5r0soQePzjwVwT4IlDpU2RvfB5Py52gpU98M77rgqMCheoSSZvrcrdj3t6cZ3suA=="; + }; + }; "browser-launcher2-0.4.6" = { name = "browser-launcher2"; packageName = "browser-launcher2"; @@ -12613,6 +12721,15 @@ let sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; }; }; + "buffer-5.1.0" = { + name = "buffer"; + packageName = "buffer"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; + sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw=="; + }; + }; "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; @@ -12829,15 +12946,6 @@ let sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg=="; }; }; - "bufferstreams-2.0.1" = { - name = "bufferstreams"; - packageName = "bufferstreams"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-2.0.1.tgz"; - sha512 = "ZswyIoBfFb3cVDsnZLLj2IDJ/0ppYdil/v2EGlZXvoefO689FokEmFEldhN5dV7R2QBxFneqTJOMIpfqhj+n0g=="; - }; - }; "bufferutil-1.3.0" = { name = "bufferutil"; packageName = "bufferutil"; @@ -13432,13 +13540,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001183" = { + "caniuse-lite-1.0.30001185" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001183"; + version = "1.0.30001185"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001183.tgz"; - sha512 = "7JkwTEE1hlRKETbCFd8HDZeLiQIUcl8rC6JgNjvHCNaxOeNmQ9V4LvQXRUsKIV2CC73qKxljwVhToaA3kLRqTw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz"; + sha512 = "Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg=="; }; }; "canvas-2.6.1" = { @@ -13558,13 +13666,13 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.6" = { + "cdk8s-1.0.0-beta.8" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.6"; + version = "1.0.0-beta.8"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.6.tgz"; - sha512 = "L/J8c7/wSEY2POx5j9SnxxgEJ7V7mFYS3F9pGj2idUfj4GCHbMLCGXQ8bAPzaiWOFSEDVMOPBOangLEia+5RBw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.8.tgz"; + sha512 = "99jNfGUIVic0hZCWXTU1yQLJ5ww06O7egXkgjltlHS0Fom9MY4bzFpqlVTNlmKguEO5eK3OEjjkoek4qVpEbpw=="; }; }; "cdktf-0.1.0" = { @@ -13585,13 +13693,13 @@ let sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; }; }; - "chai-4.2.0" = { + "chai-4.3.0" = { name = "chai"; packageName = "chai"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; - sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; + url = "https://registry.npmjs.org/chai/-/chai-4.3.0.tgz"; + sha512 = "/BFd2J30EcOwmdOgXvVsmM48l0Br0nmZPlO0uOW4XKh6kpsUumRXBgPV+IlaqFaqr9cYbeoZAM1Npx0i4A+aiA=="; }; }; "chai-as-promised-7.1.1" = { @@ -14134,13 +14242,13 @@ let sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; }; }; - "chunk-store-stream-4.1.1" = { + "chunk-store-stream-4.2.0" = { name = "chunk-store-stream"; packageName = "chunk-store-stream"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.1.1.tgz"; - sha512 = "2nVS+VLMCHNW+S1Y3bOlCtUL4ABPA4zeAcP8E/m15AAc+8fw1elEKIhs/Wg5EZNSfqIk24kUd9rvewmGNPehGQ=="; + url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.2.0.tgz"; + sha512 = "90iueoPoqT2isnmy1fyqwzgFy5FokuaxQuijOQG1VgC/6DaXRfeYN0da8iWENkzqElWhqLxo8pWc7pH9dmxlcA=="; }; }; "ci-info-1.6.0" = { @@ -14269,6 +14377,15 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; + "clean-css-5.0.1" = { + name = "clean-css"; + packageName = "clean-css"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.0.1.tgz"; + sha512 = "F1zAGOowUCg8yxT0O4UR+nmbMauf3YwbiUS60CPxpzJU7ulpamGzQomFrJSK4w/HqHtMmQKSHJUNue+dQQYQdg=="; + }; + }; "clean-deep-3.4.0" = { name = "clean-deep"; packageName = "clean-deep"; @@ -14989,13 +15106,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.18.0" = { + "codemaker-1.20.1" = { name = "codemaker"; packageName = "codemaker"; - version = "1.18.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.18.0.tgz"; - sha512 = "sUVEg7pzW5HlWvC8OZvMoon9+8LZXA+5dIAqJD8GleosY16UOlOY2MlbLldRa34PXfqCODrXlktTbH93AELgHg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.20.1.tgz"; + sha512 = "AhDdoC0jhSw8VhbHBH2WN8CDp8PZKnO0YMAlZXG9BRLJnu4ztOQkYuB8BWipNydRHS3Zj1LQX4lPtTQkJN4vWg=="; }; }; "codepage-1.4.0" = { @@ -15943,13 +16060,13 @@ let sha1 = "7890482bf5c71af6c5ca192be3136aed74428aad"; }; }; - "consola-2.15.1" = { + "consola-2.15.3" = { name = "consola"; packageName = "consola"; - version = "2.15.1"; + version = "2.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/consola/-/consola-2.15.1.tgz"; - sha512 = "uNINF19d9f1/Pza5aNmQ/JlrmY4uPOW0BxID3Xvw5iOP6diJArUXp+JgcIQ4fR56qV+HB9o/ZRUnrnYd92LxZw=="; + url = "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz"; + sha512 = "9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw=="; }; }; "console-browserify-1.1.0" = { @@ -16024,13 +16141,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.3" = { + "constructs-3.3.18" = { name = "constructs"; packageName = "constructs"; - version = "3.3.3"; + version = "3.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.3.tgz"; - sha512 = "tus97CfZU14VcAdM5Qhg5OGMj89IAyxOyomt7h2Gup5EpBiMz6yIkOsxV9GAh30xmUKWSAwX56AD8QjzZCjIEQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.18.tgz"; + sha512 = "aoFeZLctXI17AYApAc9Ilg/kTY3m7e29VbxeGnNiKvrsj9+UyC1setKozYPxtxr1dVC0UTUrOEYdP1rIAVGffQ=="; + }; + }; + "constructs-3.3.5" = { + name = "constructs"; + packageName = "constructs"; + version = "3.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.5.tgz"; + sha512 = "qicg+YQ/8ftntU+PtvB+faUmGMCPMJyQ+Vo1Y7z2QdlDVRW1YJ5XVS4Skk4WlOfaJ9r/dvlSinB9+Vaw3Yb2Ww=="; }; }; "consume-http-header-1.0.0" = { @@ -16385,13 +16511,13 @@ let sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow=="; }; }; - "copy-anything-2.0.1" = { + "copy-anything-2.0.3" = { name = "copy-anything"; packageName = "copy-anything"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz"; - sha512 = "lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g=="; + url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz"; + sha512 = "GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ=="; }; }; "copy-concurrently-1.0.5" = { @@ -16466,13 +16592,13 @@ let sha512 = "WxZRTnt5RHxSAB9urnHFUtVBcIe1YjR4sfwHLsxakNoKkFhcie3HrV5QmNBgRQ5DkxmanRN3VSx4OrPVsNmAaQ=="; }; }; - "cordova-fetch-3.0.0" = { + "cordova-fetch-3.0.1" = { name = "cordova-fetch"; packageName = "cordova-fetch"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.0.tgz"; - sha512 = "N6mB/1GD8BNclxnfO85E4/s46nEJjIxYeJYHRGi6MjofhigJ3NlGwTCslbTcq8IOYEh0RdoA0mS4W2jA5UcWeQ=="; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.1.tgz"; + sha512 = "bxXk6H3FtGXpCtlO+XyXM4pa72azQomdurNeHbZai9eYBzA5vjyPnsgxsYcylLUc1wQFeR+XWQVfgJitx6ghEw=="; }; }; "cordova-lib-10.0.0" = { @@ -16646,6 +16772,15 @@ let sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; }; }; + "cpu-percentage-1.0.3" = { + name = "cpu-percentage"; + packageName = "cpu-percentage"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cpu-percentage/-/cpu-percentage-1.0.3.tgz"; + sha1 = "868fd9092f439d1ef95f4a85e5fa4b9f07efc95c"; + }; + }; "cpy-8.1.1" = { name = "cpy"; packageName = "cpy"; @@ -16691,13 +16826,13 @@ let sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; }; }; - "crc32-stream-4.0.1" = { + "crc32-stream-4.0.2" = { name = "crc32-stream"; packageName = "crc32-stream"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.1.tgz"; - sha512 = "FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw=="; + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz"; + sha512 = "DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w=="; }; }; "create-ecdh-4.0.4" = { @@ -16745,13 +16880,13 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "create-torrent-4.4.3" = { + "create-torrent-4.5.0" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.4.3"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.3.tgz"; - sha512 = "balXwhJEpD8F0rt1vNKJuxhYPWOHo82LVm50wRzUFVzZ8APciwtZntzIzDEX6dNnD4NoLL0AeYgosF7e+FVQBA=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.5.0.tgz"; + sha512 = "RvhI3/mMbvSGb+NbV2V1nax64fc47rRYXY8WJV47t4RfzM+P2p2zpAOYyBjKqz+CkBUexS9Mvgga4Rx53m+tyA=="; }; }; "cron-1.7.2" = { @@ -18365,15 +18500,6 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.2.0" = { - name = "debug"; - packageName = "debug"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; - }; - }; "debug-4.3.1" = { name = "debug"; packageName = "debug"; @@ -18590,6 +18716,15 @@ let sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; }; }; + "dedent-js-1.0.1" = { + name = "dedent-js"; + packageName = "dedent-js"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dedent-js/-/dedent-js-1.0.1.tgz"; + sha1 = "bee5fb7c9e727d85dffa24590d10ec1ab1255305"; + }; + }; "deep-eql-3.0.1" = { name = "deep-eql"; packageName = "deep-eql"; @@ -19391,6 +19526,15 @@ let sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; + "diff-5.0.0" = { + name = "diff"; + packageName = "diff"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"; + sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; + }; + }; "diff-match-patch-1.0.5" = { name = "diff-match-patch"; packageName = "diff-match-patch"; @@ -19679,15 +19823,6 @@ let sha512 = "cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg=="; }; }; - "dockerfile-ast-0.0.30" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.0.30"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.30.tgz"; - sha512 = "QOeP5NjbjoSLtnMz6jzBLsrKtywLEVPoCOAwA54cQpulyKb1gBnZ63tr6Amq8oVDvu5PXa3aifBVw+wcoCGHKg=="; - }; - }; "dockerfile-ast-0.1.0" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -20417,13 +20552,22 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.650" = { + "ejs-3.1.6" = { + name = "ejs"; + packageName = "ejs"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz"; + sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; + }; + }; + "electron-to-chromium-1.3.663" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.650"; + version = "1.3.663"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.650.tgz"; - sha512 = "j6pRuNylFBbroG6NB8Lw/Im9oDY74s2zWHBP5TmdYg73cBuL6cz//SMgolVa0gIJk/DSL+kO7baJ1DSXW1FUZg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.663.tgz"; + sha512 = "xkVkzHj6k3oRRGlmdgUCCLSLhtFYHDCTH7SeK+LJdJjnsLcrdbpr8EYmfMQhez3V/KPO5UScSpzQ0feYX6Qoyw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -20481,13 +20625,13 @@ let sha512 = "4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ=="; }; }; - "elliptic-6.5.3" = { + "elliptic-6.5.4" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz"; - sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; }; }; "email-validator-2.0.4" = { @@ -20518,6 +20662,15 @@ let sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ=="; }; }; + "emmet-2.3.0" = { + name = "emmet"; + packageName = "emmet"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emmet/-/emmet-2.3.0.tgz"; + sha512 = "/9jfXVKjODNt1QBpMkfUp2SlyYNfi0CcWLpiYCQmwnsLmME/To3lScw+Ip4V7Pasp0O0uYUU0Um0M9ewSIfx3g=="; + }; + }; "emoji-named-characters-1.0.2" = { name = "emoji-named-characters"; packageName = "emoji-named-characters"; @@ -20671,15 +20824,6 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "end-of-stream-1.4.1" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; - }; - }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -21283,6 +21427,15 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; + "esbuild-0.8.44" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.8.44"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.44.tgz"; + sha512 = "m9yyBZMgWuAB7e7tA2g9L4PovoLa5Xb73+Yg9uBBR2w3Fe4P9/nxqj/HLrw1k/rjdjF1eX1kNJRytboqOtRCCQ=="; + }; + }; "esc-exit-2.0.2" = { name = "esc-exit"; packageName = "esc-exit"; @@ -21715,13 +21868,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.3.1" = { + "esquery-1.4.0" = { name = "esquery"; packageName = "esquery"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; - sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; }; "esrecurse-4.3.0" = { @@ -22984,6 +23137,15 @@ let sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; }; }; + "fastintcompression-0.0.4" = { + name = "fastintcompression"; + packageName = "fastintcompression"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fastintcompression/-/fastintcompression-0.0.4.tgz"; + sha512 = "sRtejNHcWjJl0Fr+gsbybbgOKKj0sQYvv7rA787EbeFu1fMpmzjHuBW8fLBImSZeqDuR++TZU2n60mRrpAUR9g=="; + }; + }; "fastparse-1.1.2" = { name = "fastparse"; packageName = "fastparse"; @@ -23011,13 +23173,13 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; - "faunadb-4.0.2" = { + "faunadb-4.0.3" = { name = "faunadb"; packageName = "faunadb"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/faunadb/-/faunadb-4.0.2.tgz"; - sha512 = "YE+pvchQcH+kYCobywpV3LO3ZOWWrunu7DTNHFW2eT1SCECE+uOuHz7sFcA3vmxhcYvBpZ7mVTnrTFfZdH5LqQ=="; + url = "https://registry.npmjs.org/faunadb/-/faunadb-4.0.3.tgz"; + sha512 = "pfXX3pwyQQfsx+wO4u8m16gQyDPJRbpjMGk5fCzq0tCT/3mPyCVlc5zTorSdBWWmLFuResP9idFrWdqo+q2IEA=="; }; }; "faye-websocket-0.10.0" = { @@ -23317,13 +23479,13 @@ let sha512 = "hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="; }; }; - "filelist-1.0.1" = { + "filelist-1.0.2" = { name = "filelist"; packageName = "filelist"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz"; - sha512 = "8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ=="; + url = "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz"; + sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; }; }; "filename-regex-2.0.1" = { @@ -23425,6 +23587,15 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; + "filter-obj-1.1.0" = { + name = "filter-obj"; + packageName = "filter-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; + sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; + }; + }; "filter-obj-2.0.1" = { name = "filter-obj"; packageName = "filter-obj"; @@ -23794,13 +23965,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.143.1" = { + "flow-parser-0.144.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.143.1"; + version = "0.144.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.143.1.tgz"; - sha512 = "DWmnt0P1tieuQErYeWmxCNIkzm5Fqd5sMH685v/jCtu8CAvdLEwKi45jqYhij178k+NAy+FNe2jDvQNs7WLBIA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.144.0.tgz"; + sha512 = "si2lCamPs0N1QcTiQY8p9RxvVsVGbx4rpkX6dcfUQ2OOvEg6Cya7LItlPqcx54Gtakdx1St6TseQlV8nafYW5g=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -24217,13 +24388,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.9.3" = { + "fp-ts-2.9.5" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.9.3"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.3.tgz"; - sha512 = "NjzcHYgigcbPQ6yJ52zwgsVDwKz3vwy9sjbxyzcvfXQm+j1BGeOPRuzLKEwsLyE4Xut6gG1FXJtsU9/gUB7tXg=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.5.tgz"; + sha512 = "MiHrA5teO6t8zKArE3DdMPT/Db6v2GUt5yfWnhBTrrsVfeCJUUnV6sgFvjGNBKDmEMqVwRFkEePL7wPwqrLKKA=="; }; }; "fragment-cache-0.2.1" = { @@ -24334,13 +24505,13 @@ let sha512 = "KhjJmZAs2eqfhCb6PdPx4RcZtheGTz86tpTC5JTvqBn/xda+Nb+0C7dCyjOSN7T76H6a56LvH0SVXQMchLXDRw=="; }; }; - "fs-chunk-store-2.0.2" = { + "fs-chunk-store-2.0.3" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.2.tgz"; - sha512 = "4nSngo6KyoGguscb5sTxjcxOvtRiMxuQl4vFK9SnYYMjmy08Nm095ACoM3lxj1KmCuxO4JMnuo4EebMWHlagjQ=="; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.3.tgz"; + sha512 = "qQi93nHX3880gtoQPt1hKQcuYBNVfCbMk8OVRDqR0cJ0riheELW25ry9yl7pII8E9gOAONTGKBD5N/zGHFSVQg=="; }; }; "fs-constants-1.0.0" = { @@ -24604,13 +24775,13 @@ let sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA=="; }; }; - "fsevents-2.3.1" = { + "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz"; - sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; }; "fstream-0.1.31" = { @@ -24856,15 +25027,6 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; - "geoip-country-4.0.53" = { - name = "geoip-country"; - packageName = "geoip-country"; - version = "4.0.53"; - src = fetchurl { - url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.53.tgz"; - sha512 = "nfSIkLmt432isig80keqzkWo0N87CE1Ezv+T0SIFx6z7DNSRenKQn+v4EHts3RguJ0x/hg9skTOjaTLeqGyrfw=="; - }; - }; "get-amd-module-type-3.0.0" = { name = "get-amd-module-type"; packageName = "get-amd-module-type"; @@ -24919,13 +25081,13 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; - "get-intrinsic-1.1.0" = { + "get-intrinsic-1.1.1" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz"; - sha512 = "M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -26063,13 +26225,13 @@ let sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.6" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; }; }; "graceful-readlink-1.0.1" = { @@ -26180,13 +26342,13 @@ let sha512 = "xjsSaB6yKt9jarFNNdivl2VOx52WySYhxPgf8Y16g6GKZyAzBoIFiwyGw5PJDlOSUa6cpmzn6o7z8fVMbSAbkg=="; }; }; - "graphql-subscriptions-1.1.0" = { + "graphql-subscriptions-1.2.0" = { name = "graphql-subscriptions"; packageName = "graphql-subscriptions"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.1.0.tgz"; - sha512 = "6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA=="; + url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.2.0.tgz"; + sha512 = "uXvp729fztqwa7HFUFaAqKwNMwwOfsvu4HwOu7/35Cd44bNrMPCn97mNGN0ybuuZE36CPXBTaW/4U/xyOS4D9w=="; }; }; "graphql-tag-2.11.0" = { @@ -27107,13 +27269,13 @@ let sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653"; }; }; - "highlight.js-10.5.0" = { + "highlight.js-10.6.0" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.5.0"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.5.0.tgz"; - sha512 = "xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.6.0.tgz"; + sha512 = "8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ=="; }; }; "highlight.js-8.2.0" = { @@ -27972,15 +28134,6 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; - "iconv-lite-0.5.2" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz"; - sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; - }; - }; "iconv-lite-0.6.2" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -28935,15 +29088,6 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; - "ip-address-6.4.0" = { - name = "ip-address"; - packageName = "ip-address"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ip-address/-/ip-address-6.4.0.tgz"; - sha512 = "c5uxc2WUTuRBVHT/6r4m7HIr/DfV0bF6DvLH3iZGSK8wp8iMwwZSgIq2do0asFf8q9ECug0SE+6+1ACMe4sorA=="; - }; - }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -30843,6 +30987,15 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; + "jitdb-2.0.7" = { + name = "jitdb"; + packageName = "jitdb"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/jitdb/-/jitdb-2.0.7.tgz"; + sha512 = "Ymkv6cQg6NUPXu6890NY4/xWgn08+YYz4gy9VMerzgC1jx5L38ggzfz6m2ylm0COoHE4Ni5QlxO43+lJoTGPuw=="; + }; + }; "jju-1.4.0" = { name = "jju"; packageName = "jju"; @@ -30951,13 +31104,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.20.2" = { + "jquery.terminal-2.21.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.20.2"; + version = "2.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.2.tgz"; - sha512 = "f3heC+hG2NE9tuJmGI3g5fR/KoD1/G31rJlXjVYPU2oBqbPQXRiiYvW78mm4aK9+IClYhMoqXiKxdzWIxjAxxA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.21.0.tgz"; + sha512 = "Cd2uediwjcWaKbag/+WtF25coudkPLnH7RSg8oKH80BsUiPi/3aQIVBTKVB7Gw3viGwN6VV3G3TsuvKBqPrKTg=="; }; }; "js-base64-2.6.4" = { @@ -31221,49 +31374,58 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jsii-1.18.0" = { + "jsesc-3.0.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz"; + sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; + }; + }; + "jsii-1.20.1" = { name = "jsii"; packageName = "jsii"; - version = "1.18.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.18.0.tgz"; - sha512 = "5s+kOLF9yJOWjJD3UyaRYGT/PGaPvs0hNBDMtZqJ5AH8yIgjfJz+3+eHDXPLK0ffGaZF83sysiUueA5+Stxkww=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.20.1.tgz"; + sha512 = "e4LS9u4QhhsqDN/JlK7JHDhYXhg3fiw+nq1xU5EeAtHQJvmM7CXTXhgDT9FjtnkWbnnjCOd0hgLcE8yIIZ8Lkw=="; }; }; - "jsii-pacmak-1.18.0" = { + "jsii-pacmak-1.20.1" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.18.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.18.0.tgz"; - sha512 = "j1gRTaCn+IQ1R2a2uLqCfohY+unI/hD8Zedw9TOCTBjpASDDbDd9DMbOGnQBZ9G2nRq4SUIPg5eVOKPovpTI+w=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.20.1.tgz"; + sha512 = "mNViMzB+wqDKowjmcOMa4qLmkhZ4GAs2wOjNiHcWTN9ZtdyjG5BoRgJrKChlRYQfjRuE+EmqiHpZyH8IzPo8SQ=="; }; }; - "jsii-reflect-1.18.0" = { + "jsii-reflect-1.20.1" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.18.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.18.0.tgz"; - sha512 = "IXLdYl+zWVeUModJT51bOIgPjHGhnk8W/LxBMxIIN+VpFHkcPiZX1P7MfOCWIermAkrxVQOHpPbWEKoeUFl7CQ=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.20.1.tgz"; + sha512 = "TkimkYu25H6YtfKRz7D/ZXbquXbhylS60TxgSPZC85iItCpZMwTlbIdvnpBKasx8e7MtJO6xYoAHEYHRhs8djQ=="; }; }; - "jsii-rosetta-1.18.0" = { + "jsii-rosetta-1.20.1" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.18.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.18.0.tgz"; - sha512 = "gPBt689vGjR9CqmfYHusSsFr/v4v9qcJAKaCqc3uan2nGCe/lugxR416YnhkpsVQBZdT+H4EA2Lp+yjqj9kMUw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.20.1.tgz"; + sha512 = "3F01+B8zahWD4GhTMWPzlaGhuGvdPdYyIdhIe1bkHCYJuL1ttcf+ulCxVeF4qkBAxB2+/cfHBvEMHfSMoYCISA=="; }; }; - "jsii-srcmak-0.1.214" = { + "jsii-srcmak-0.1.222" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.214"; + version = "0.1.222"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.214.tgz"; - sha512 = "xhRdmv3s+xa1NQRebHfx639VJ8Tk/0Mrq4fCCX4O+67b6CgZaWKRkpQiy1Rl8Osv0kh9YfJdAWXV4RpZiXTfrg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.222.tgz"; + sha512 = "OLeezlo5ag/GoW+7YmiYVfE8zItDmV+rFcovlfYQCjCnksg6nX/e0t1mXOeLmCSetUNnu0DNrzwuqiO4hhgODQ=="; }; }; "json-bigint-0.2.3" = { @@ -31851,13 +32013,13 @@ let sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; }; }; - "jszip-3.5.0" = { + "jszip-3.6.0" = { name = "jszip"; packageName = "jszip"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz"; - sha512 = "WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz"; + sha512 = "jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ=="; }; }; "junk-3.1.0" = { @@ -31977,13 +32139,13 @@ let sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ=="; }; }; - "k-bucket-5.0.0" = { + "k-bucket-5.1.0" = { name = "k-bucket"; packageName = "k-bucket"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-5.0.0.tgz"; - sha512 = "r/q+wV/Kde62/tk+rqyttEJn6h0jR7x+incdMVSYTqK73zVxVrzJa70kJL49cIKen8XjIgUZKSvk8ktnrQbK4w=="; + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-5.1.0.tgz"; + sha512 = "Fac7iINEovXIWU20GPnOMLUbjctiS+cnmyjC4zAUgvs3XPf1vo9akfCHkigftSic/jiKqKl+KA3a/vFcJbHyCg=="; }; }; "k-rpc-3.7.0" = { @@ -32293,13 +32455,13 @@ let sha512 = "wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q=="; }; }; - "known-css-properties-0.20.0" = { + "known-css-properties-0.21.0" = { name = "known-css-properties"; packageName = "known-css-properties"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.20.0.tgz"; - sha512 = "URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw=="; + url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz"; + sha512 = "sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw=="; }; }; "known-css-properties-0.5.0" = { @@ -33625,6 +33787,15 @@ let sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; + "lodash.constant-3.0.0" = { + name = "lodash.constant"; + packageName = "lodash.constant"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.constant/-/lodash.constant-3.0.0.tgz"; + sha1 = "bfe05cce7e515b3128925d6362138420bd624910"; + }; + }; "lodash.debounce-4.0.8" = { name = "lodash.debounce"; packageName = "lodash.debounce"; @@ -33697,15 +33868,6 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; - "lodash.find-4.6.0" = { - name = "lodash.find"; - packageName = "lodash.find"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; - sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1"; - }; - }; "lodash.findkey-4.6.0" = { name = "lodash.findkey"; packageName = "lodash.findkey"; @@ -33805,6 +33967,15 @@ let sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; }; }; + "lodash.has-4.5.2" = { + name = "lodash.has"; + packageName = "lodash.has"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz"; + sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; + }; + }; "lodash.identity-2.4.1" = { name = "lodash.identity"; packageName = "lodash.identity"; @@ -34048,6 +34219,15 @@ let sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; }; }; + "lodash.keys-4.2.0" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"; + sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"; + }; + }; "lodash.map-4.6.0" = { name = "lodash.map"; packageName = "lodash.map"; @@ -34057,15 +34237,6 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; - "lodash.max-4.0.1" = { - name = "lodash.max"; - packageName = "lodash.max"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.max/-/lodash.max-4.0.1.tgz"; - sha1 = "8735566c618b35a9f760520b487ae79658af136a"; - }; - }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -34210,6 +34381,15 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; + "lodash.size-4.2.0" = { + name = "lodash.size"; + packageName = "lodash.size"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.size/-/lodash.size-4.2.0.tgz"; + sha1 = "71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86"; + }; + }; "lodash.snakecase-4.1.1" = { name = "lodash.snakecase"; packageName = "lodash.snakecase"; @@ -34363,6 +34543,15 @@ let sha1 = "abf514436b3cb705001627978cbcf30b1280eea4"; }; }; + "lodash.values-4.3.0" = { + name = "lodash.values"; + packageName = "lodash.values"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"; + sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"; + }; + }; "lodash.xorby-4.7.0" = { name = "lodash.xorby"; packageName = "lodash.xorby"; @@ -35011,13 +35200,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.13" = { + "make-fetch-happen-8.0.14" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.13"; + version = "8.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.13.tgz"; - sha512 = "rQ5NijwwdU8tIaBrpTtSVrNCcAJfyDRcKBC76vOQlyJX588/88+TE+UpjWl4BgG7gCkp29wER7xcRqkeg+x64Q=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz"; + sha512 = "EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ=="; }; }; "make-iterator-1.0.1" = { @@ -35407,13 +35596,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.8" = { + "marked-1.2.9" = { name = "marked"; packageName = "marked"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.8.tgz"; - sha512 = "lzmFjGnzWHkmbk85q/ILZjFoHHJIQGF+SxGEfIdGk/XhiTPhqGs37gbru6Kkd48diJnEyYwnG67nru0Z2gQtuQ=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.9.tgz"; + sha512 = "H8lIX2SvyitGX+TRdtS06m1jHMijKN/XjfH6Ooii9fvxMlh8QdqBfBDkGUpMWH2kQNrtixjzYUa3SH8ROTgRRw=="; }; }; "marked-terminal-3.3.0" = { @@ -35659,22 +35848,22 @@ let sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; }; }; - "mdast-util-from-markdown-0.8.4" = { + "mdast-util-from-markdown-0.8.5" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz"; - sha512 = "jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw=="; + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz"; + sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; }; }; - "mdast-util-to-markdown-0.6.2" = { + "mdast-util-to-markdown-0.6.5" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; - version = "0.6.2"; + version = "0.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.2.tgz"; - sha512 = "iRczns6WMvu0hUw02LXsPDJshBIwtUPbvHBWo19IQeU0YqmzlA8Pd30U8V7uiI0VPkxzS7A/NXBXH6u+HS87Zg=="; + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz"; + sha512 = "XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ=="; }; }; "mdast-util-to-nlcst-4.0.1" = { @@ -35902,13 +36091,13 @@ let sha1 = "7890b01d52c00c8ebc9d533e1f8eb17e3034871a"; }; }; - "memory-chunk-store-1.3.0" = { + "memory-chunk-store-1.3.2" = { name = "memory-chunk-store"; packageName = "memory-chunk-store"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.0.tgz"; - sha512 = "6LsOpHKKhxYrLhHmOJdBCUtSO7op5rUs1pag0fhjHo0QiXRyna0bwYf4EmQuL7InUeF2J7dUMPr6VMogRyf9NA=="; + url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.2.tgz"; + sha512 = "EBcbwpdQlzT5aNV0FTT+RAfh1cGEssjiCcRGcTk57mKsnZlRMOtH4Cfk/AqQnkz8xP2dUF+/lgpmErSGwwE1FA=="; }; }; "memory-fs-0.3.0" = { @@ -36298,13 +36487,13 @@ let sha512 = "jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g=="; }; }; - "micromark-2.11.3" = { + "micromark-2.11.4" = { name = "micromark"; packageName = "micromark"; - version = "2.11.3"; + version = "2.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromark/-/micromark-2.11.3.tgz"; - sha512 = "oph5YYkVqR2U9OtWBcXYysZMtrdIvi8dfSeyEdr1wFr3Bk6YwI6THosX2AzKnhdps7mVUbXiqhmosu9DcA+xlQ=="; + url = "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz"; + sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA=="; }; }; "micromatch-2.3.11" = { @@ -36937,13 +37126,13 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-6.1.4" = { + "mobx-6.1.6" = { name = "mobx"; packageName = "mobx"; - version = "6.1.4"; + version = "6.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.1.4.tgz"; - sha512 = "DorvGl+ssJ9i5Sef90XzcIuOBMa2kWSC+PidTLHtgBX4f1bXOd+NKtujSjaRnQMDLTRkCzfJEFcC08hEjzCVaA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.1.6.tgz"; + sha512 = "3by0Avodad/3cdPAuJuj8jWXhe1YByHKaEkonD9yOdcMoMuot2jrjlSXmQPhR1bJpNHfSsOx122tM9Pv3IzFWA=="; }; }; "mobx-react-7.1.0" = { @@ -36982,13 +37171,13 @@ let sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; }; }; - "mocha-8.2.1" = { + "mocha-8.3.0" = { name = "mocha"; packageName = "mocha"; - version = "8.2.1"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; - sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz"; + sha512 = "TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q=="; }; }; "mock-require-3.0.3" = { @@ -37117,6 +37306,15 @@ let sha512 = "Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA=="; }; }; + "moment-timezone-0.5.33" = { + name = "moment-timezone"; + packageName = "moment-timezone"; + version = "0.5.33"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz"; + sha512 = "PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w=="; + }; + }; "monotonic-timestamp-0.0.9" = { name = "monotonic-timestamp"; packageName = "monotonic-timestamp"; @@ -37189,13 +37387,13 @@ let sha512 = "2/PRtGGiqPc/VEhbm7xAQ+gbb7yzHjjMAv6MpAifr5pCpbh3fQUdj93uNgwPiTppAGu8HFKe3PeU+OdRyAxStA=="; }; }; - "mp4-stream-3.1.0" = { + "mp4-stream-3.1.2" = { name = "mp4-stream"; packageName = "mp4-stream"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.0.tgz"; - sha512 = "ZQQjf0VEiqPucwRvmT3e0pfZfMSE3nc5ngGUiN1+2VMxCtrInrlAjZ2K6jpNmxSZ/roiQne/ovYJYTeOvZDXPw=="; + url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.2.tgz"; + sha512 = "AviUjTA6aER9DFVFPNYd4KrEKfhw2Pi8OKBY46r39ORmyX8qfaYx6XBIUGFCl67gX4+Giv2FLF+Gh6P3g81xrQ=="; }; }; "mpath-0.5.2" = { @@ -37225,6 +37423,15 @@ let sha512 = "GzgeeCirQpB59FyhHvf8BLiIYgxctPSxuSyaF2vWnkt7paX7jtuQ8Gpl+DkHCxZmYuv7GQE6zcUAegpafd0MqQ=="; }; }; + "mri-1.1.6" = { + name = "mri"; + packageName = "mri"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mri/-/mri-1.1.6.tgz"; + sha512 = "oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ=="; + }; + }; "mrmr-0.1.10" = { name = "mrmr"; packageName = "mrmr"; @@ -37486,13 +37693,13 @@ let sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ=="; }; }; - "multistream-4.0.1" = { + "multistream-4.1.0" = { name = "multistream"; packageName = "multistream"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multistream/-/multistream-4.0.1.tgz"; - sha512 = "LNPIR/LD0JUw2beGlSv4sgTSnGbZp16d/PG2rnIrYjkeCaepNmBTobuiaNQATCPiYgn+BBuQTm70UlvwRfLZ3Q=="; + url = "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz"; + sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; }; "munin-plugin-0.0.9" = { @@ -37765,15 +37972,6 @@ let sha512 = "s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="; }; }; - "nanoid-3.1.12" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; - sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; - }; - }; "nanoid-3.1.20" = { name = "nanoid"; packageName = "nanoid"; @@ -38162,13 +38360,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-6.1.6" = { + "netlify-6.1.7" = { name = "netlify"; packageName = "netlify"; - version = "6.1.6"; + version = "6.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-6.1.6.tgz"; - sha512 = "hjXoiqKHetP+OD/DmOLHeTW/AZvsitFCz5d1mOAivrnQXVKrKRS6XHbsLELiUuXv8hW1PrWnImFF0VdLPKo0wA=="; + url = "https://registry.npmjs.org/netlify/-/netlify-6.1.7.tgz"; + sha512 = "6eSG7gtjOKNDUMjk/s35auWJJ4o03j+iy6eY4L3Fe2p0FoSm6x5wGk0ZCnD9o0QCleXubSJIPe6MCYa/fwdpqg=="; }; }; "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = { @@ -38180,13 +38378,13 @@ let sha512 = "5Rvi17CKgPpZTazEV2wkSj4IbS2zJpoKuytaYCyvemV/CMVeZUUPRwNPWm7+NjxObqJHgzUyi2FmWql8HfWhGA=="; }; }; - "netlify-redirect-parser-3.0.2" = { + "netlify-redirect-parser-3.0.3" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.2.tgz"; - sha512 = "ZpYwJh/aTBAYuS9dLTVTfDu1rf/+qJ3hsjiawW7A2NmIErN9qb9k08s5I6AUwPQlG4U50MtUnUwpHyMobcbkzA=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.3.tgz"; + sha512 = "Enafs4wGjLXry4SREr0Rhc6A3k7hLhlJA/+M/jYzoDza9aK+xTV6Y0rHmWFW1ffUe2fN8kyrtxW++Fdipxffbw=="; }; }; "netlify-redirector-0.2.1" = { @@ -38595,15 +38793,6 @@ let sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; }; }; - "node-gyp-4.0.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz"; - sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA=="; - }; - }; "node-gyp-5.1.1" = { name = "node-gyp"; packageName = "node-gyp"; @@ -39901,13 +40090,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.158.0" = { + "office-ui-fabric-react-7.160.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.158.0"; + version = "7.160.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.158.0.tgz"; - sha512 = "kMOEK/487tLEo4ws3IY3tL2vs0wwtDDPWkv/B9HEnV7begq00whn53X7Uw75sRjrRDJo1s8gZcF95EY/EJXBhA=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.160.0.tgz"; + sha512 = "HMEqVKCjCmWckgnwNZtOZfSffrkfoAiUlqyi5Ypzs/QJsnUaclwhPPo8mwfWGEDInsrLgfT6OQvehWqWBfusJg=="; }; }; "omggif-1.0.10" = { @@ -40081,13 +40270,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.18.0" = { + "oo-ascii-tree-1.20.1" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.18.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.18.0.tgz"; - sha512 = "++zVwRSnfwwx8BRBfPz7xdKUnOf7RYeX1RTklO37btNcbHPvRlKSZ9o1/D9SRGzmHf3lV4zKVbYTN1VOWfQvjA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.20.1.tgz"; + sha512 = "imKW5pdztAEqtl5pmNTM9Rva53XOcuY91YL9jTuwFGJpBGqT6pnyxXJOFdwc5TRaQr9+GdpWTpByGRvgNPbdvQ=="; }; }; "opal-runtime-1.0.11" = { @@ -40774,22 +40963,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-0.10.37" = { + "ot-builder-1.0.1" = { name = "ot-builder"; packageName = "ot-builder"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.37.tgz"; - sha512 = "9V9v49oxGZUDosB63AlR1k6J5nAMJKUaRflYbwYy8o2/u9YMyujfAfqwDqAoWz12Q2Xdc9GllVA8TpPTw03acQ=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.1.tgz"; + sha512 = "tx0ZlR8KGohvVketGtOmd5nClqvdoWPxMwugihnkzSu2z75b1uAgEfiJ2gvZLix+re20trKq/HooYv+iQ+kmjA=="; }; }; - "otb-ttc-bundle-0.10.37" = { + "otb-ttc-bundle-1.0.1" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "0.10.37"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.37.tgz"; - sha512 = "y3ziaqX+obzc9NMeXFvVz9+q2Hf9Nhu03lNbY/Iz1AjhfBHi7kMF9giW7ljmCTfdEg26crfOCBi2RbAUA2+3+g=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.1.tgz"; + sha512 = "dkdU3V3jqOLOSABpKYzl1mocygPZUhv6DjJSip5Hp2L7PVsDKv1xS+TNf+SQSBlPYPXLzP6cwvbDvwsqeeCEBw=="; }; }; "ow-0.21.0" = { @@ -41332,15 +41521,6 @@ let sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA=="; }; }; - "pacote-11.1.14" = { - name = "pacote"; - packageName = "pacote"; - version = "11.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.14.tgz"; - sha512 = "6c5OhQelaJFDfiw/Zd8MfGCvvFHurSdeGzufZMPvRFImdbNOYFciOINf3DtUNUaU3h98eCb749UyHDsgvL19+A=="; - }; - }; "pacote-11.2.4" = { name = "pacote"; packageName = "pacote"; @@ -41350,6 +41530,15 @@ let sha512 = "GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ=="; }; }; + "pacote-11.2.6" = { + name = "pacote"; + packageName = "pacote"; + version = "11.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/pacote/-/pacote-11.2.6.tgz"; + sha512 = "xCl++Hb3aBC7LaWMimbO4xUqZVsEbKDVc6KKDIIyAeBYrmMwY1yJC2nES/lsGd8sdQLUosgBxQyuVNncZ2Ru0w=="; + }; + }; "pad-0.0.5" = { name = "pad"; packageName = "pad"; @@ -41746,13 +41935,13 @@ let sha512 = "to8zT7+o6bVTyP35r2QgG1svuFGMFO1mE6ri1oWHgL9tlgnOtfjmfHmA3mOuP9HTIU/8OiZw0NG5zbyqVLxhvA=="; }; }; - "parse-torrent-9.1.1" = { + "parse-torrent-9.1.3" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.1.tgz"; - sha512 = "QQePPIN0cX6bEjwAT6x2o5fUgOsz2SwXlZqzz2uvt12+uiCrgU4WYAsy3wEthQWLZQpn1utMbSbHCRDvjAnhMA=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.3.tgz"; + sha512 = "/Yr951CvJM8S6TjMaqrsmMxeQEAjDeCX+MZ3hGXXc7DG2wqzp/rzOsHtDzIVqN6NsFRCqy6wYLF/W7Sgvq7bXw=="; }; }; "parse-torrent-file-2.1.4" = { @@ -42061,13 +42250,13 @@ let sha512 = "nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA=="; }; }; - "patel-0.33.1" = { + "patel-0.34.0" = { name = "patel"; packageName = "patel"; - version = "0.33.1"; + version = "0.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz"; - sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg=="; + url = "https://registry.npmjs.org/patel/-/patel-0.34.0.tgz"; + sha512 = "3EvIzxbIFknpPa9QL2LYW+B35qFwER3Dn674KSC9Hc7DIuLJ7YMUJOR4dvCMPmpj/lB4fDvfr/VYV7FKKLEpFA=="; }; }; "path-browserify-0.0.1" = { @@ -43006,13 +43195,22 @@ let sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="; }; }; - "polished-3.6.7" = { + "polished-3.7.0" = { name = "polished"; packageName = "polished"; - version = "3.6.7"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.6.7.tgz"; - sha512 = "b4OViUOihwV0icb9PHmWbR+vPqaSzSAEbgLskvb7ANPATVXGiYv/TQFHQo65S53WU9i5EQ1I03YDOJW7K0bmYg=="; + url = "https://registry.npmjs.org/polished/-/polished-3.7.0.tgz"; + sha512 = "1tnvQ2wsxfR/DyPE2Xu9sRbnLAwXAarCWiZJ8Hfirw59bTigqjbzEWSAmzYizT6ocQW995V8n7RP48jq50DjJA=="; + }; + }; + "polyraf-1.1.0" = { + name = "polyraf"; + packageName = "polyraf"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/polyraf/-/polyraf-1.1.0.tgz"; + sha512 = "wKRyhZQE6AC70nJyMCWbwd/dX4S6UsFz+58qAF8HTpCn6C7pvr63FiH4vR9vT6VrhZrJKuT7A81ea/lIslS0bA=="; }; }; "poor-mans-t-sql-formatter-1.6.10" = { @@ -43205,13 +43403,13 @@ let sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; }; }; - "postcss-load-config-3.0.0" = { + "postcss-load-config-3.0.1" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.0.0.tgz"; - sha512 = "lErrN8imuEF1cSiHBV8MiR7HeuzlDpCGNtaMyYHlOBuJHHOGw6S4xOMZp8BbXPr7AGQp14L6PZDlIOpfFJ6f7w=="; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.0.1.tgz"; + sha512 = "/pDHe30UYZUD11IeG8GWx9lNtu1ToyTsZHnyy45B4Mrwr/Kb6NgYl7k753+05CJNKnjbwh4975amoPJ+TEjHNQ=="; }; }; "postcss-media-query-parser-0.2.3" = { @@ -43862,6 +44060,15 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; + "prettier-plugin-svelte-2.1.4" = { + name = "prettier-plugin-svelte"; + packageName = "prettier-plugin-svelte"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.1.4.tgz"; + sha512 = "fQfcIyl04VNWI3+JeseT+gLljs2bJJifbKmrTe8yMnTCdv0unfM1jnY2p4etzCfOj6skC1FPFaqBayYk3+7ZZg=="; + }; + }; "prettier-stylelint-0.4.2" = { name = "prettier-stylelint"; packageName = "prettier-stylelint"; @@ -43961,6 +44168,15 @@ let sha512 = "4gaK1skD2gwscCfkswYQRmddUb2GJZtzDGRjHWadVHtK/DIKFufa12MvES6/xu1tVbUYeia5bmLcwJtZJQUqnw=="; }; }; + "pretty-quick-3.1.0" = { + name = "pretty-quick"; + packageName = "pretty-quick"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.0.tgz"; + sha512 = "DtxIxksaUWCgPFN7E1ZZk4+Aav3CCuRdhrDSFZENb404sYMtuo9Zka823F+Mgeyt8Zt3bUiCjFzzWYE9LYqkmQ=="; + }; + }; "pretty-time-1.1.0" = { name = "pretty-time"; packageName = "pretty-time"; @@ -44240,6 +44456,15 @@ let sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; }; }; + "promise-retry-2.0.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + }; "promise.prototype.finally-3.1.2" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; @@ -44258,6 +44483,15 @@ let sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; + "promisify-4loc-1.0.0" = { + name = "promisify-4loc"; + packageName = "promisify-4loc"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promisify-4loc/-/promisify-4loc-1.0.0.tgz"; + sha512 = "u/XtndUyqqDXAuhFEgFgkpjHG8IizREoj80j5dL4t41eE9yH0gzFPyOD21/VnikdPJtRziuqf6ryTu1HoTjyog=="; + }; + }; "promisify-child-process-4.1.1" = { name = "promisify-child-process"; packageName = "promisify-child-process"; @@ -44672,6 +44906,24 @@ let sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843"; }; }; + "pull-async-1.0.0" = { + name = "pull-async"; + packageName = "pull-async"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-async/-/pull-async-1.0.0.tgz"; + sha1 = "146b36e3e043d7a666b59a14165fdd3bef3cf44c"; + }; + }; + "pull-awaitable-1.0.0" = { + name = "pull-awaitable"; + packageName = "pull-awaitable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-awaitable/-/pull-awaitable-1.0.0.tgz"; + sha512 = "tfufzU9wMd1rM38tcgunaKMUNGXMj1Qms1ygEw+ZerkMmLAwilEtMsyzrDSLhNlnfhSzHXovOarieSNrTD1ovQ=="; + }; + }; "pull-block-filter-1.0.0" = { name = "pull-block-filter"; packageName = "pull-block-filter"; @@ -45095,6 +45347,15 @@ let sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew=="; }; }; + "pull-thenable-1.0.0" = { + name = "pull-thenable"; + packageName = "pull-thenable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-thenable/-/pull-thenable-1.0.0.tgz"; + sha512 = "gio2Yanuj5lcN8X+VXtx6F2iWxnhxfaHSKaSJHUzJMNNboEz48/+udzZFDaya8kAwj3DbuFFt1pbb8m1tIS6PQ=="; + }; + }; "pull-through-1.0.18" = { name = "pull-through"; packageName = "pull-through"; @@ -45275,6 +45536,15 @@ let sha512 = "wCDN1KkAWOMXsiV0XxH/CggHqOYeXvyn00t9Zjp5RKsLZ2rzg/lLJIMAVxYLyh79T168W3fBYcG5TRRJAlQr6g=="; }; }; + "push-stream-11.0.0" = { + name = "push-stream"; + packageName = "push-stream"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/push-stream/-/push-stream-11.0.0.tgz"; + sha512 = "rDVD2f3wOztI/59/fukGLwZkUOC55674hncsSwgKF/yLlkkL594AoWTlkF6SGF0x8O5o1j92ObXk8Cxc1llhYg=="; + }; + }; "push-stream-to-pull-stream-1.0.3" = { name = "push-stream-to-pull-stream"; packageName = "push-stream-to-pull-stream"; @@ -45491,13 +45761,13 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; - "query-string-6.13.8" = { + "query-string-6.14.0" = { name = "query-string"; packageName = "query-string"; - version = "6.13.8"; + version = "6.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-6.13.8.tgz"; - sha512 = "jxJzQI2edQPE/NPUOusNjO/ZOGqr1o2OBa/3M00fU76FsLXDVbJDv/p7ng5OdQyorKrkRz1oqfwmbe5MAMePQg=="; + url = "https://registry.npmjs.org/query-string/-/query-string-6.14.0.tgz"; + sha512 = "In3o+lUxlgejoVJgwEdYtdxrmlL0cQWJXj0+kkI7RWVo7hg5AhFtybeKlC9Dpgbr8eOC4ydpEh8017WwyfzqVQ=="; }; }; "querystring-0.2.0" = { @@ -45581,6 +45851,15 @@ let sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; }; }; + "quicktask-1.0.1" = { + name = "quicktask"; + packageName = "quicktask"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quicktask/-/quicktask-1.0.1.tgz"; + sha512 = "+jhR01aSsi6Iw9wbYumKusRK72QK1ub2oE0kOnRyMkMdD/rXMMGW/TVl5edjcLjuuIKP1ezkr+xQzUMD5/4JHw=="; + }; + }; "quicktask-1.1.0" = { name = "quicktask"; packageName = "quicktask"; @@ -45671,6 +45950,15 @@ let sha512 = "maAX1cnBkzIZ89O4tSQUOF098xjGMC8N+9vuY/WfHwg87THw6odD2Br35donlj5e6KnB1SB0QBHhTQhhDHuTPQ=="; }; }; + "random-access-chrome-file-1.1.4" = { + name = "random-access-chrome-file"; + packageName = "random-access-chrome-file"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-chrome-file/-/random-access-chrome-file-1.1.4.tgz"; + sha512 = "xZW1BT26g+gl8AF1kC/oXX97jCMVoLIbf6yx4eVMwLgOddGhhkJygimnfERSEmhUKiGs3DTymNao6wf/P23Nkg=="; + }; + }; "random-access-file-2.1.5" = { name = "random-access-file"; packageName = "random-access-file"; @@ -45680,6 +45968,24 @@ let sha512 = "lqmUGgF9X+LD0XSeWSHcs7U2nSLYp+RQvkDDqKWoxW8jcd13tZ00G6PHV32OZqDIHmS9ewoEUEa6jcvyB7UCvg=="; }; }; + "random-access-idb-1.2.1" = { + name = "random-access-idb"; + packageName = "random-access-idb"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-idb/-/random-access-idb-1.2.1.tgz"; + sha512 = "5rZRPhjgfR222n+dmZtRYhu0CF9dDEwxaS+UgeWursIWPmNirR6BajzOB4wG5I7WAeYZea9HCqYKk/Tin3s9cA=="; + }; + }; + "random-access-idb-mutable-file-0.3.0" = { + name = "random-access-idb-mutable-file"; + packageName = "random-access-idb-mutable-file"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-idb-mutable-file/-/random-access-idb-mutable-file-0.3.0.tgz"; + sha512 = "CdVAoFNNDn5uAgYOJ8J3ICSaFzaMOa95XnYcX+taj4jirJuRASiTyQSOGR+Z0K8ZkBGuj0A8ivyeRAWuxRCgQA=="; + }; + }; "random-access-memory-3.1.2" = { name = "random-access-memory"; packageName = "random-access-memory"; @@ -45689,6 +45995,15 @@ let sha512 = "wIfh4OZ9T+FRNf6rbXLvEb4FfSxyZpvGnC5kC7Xi39SyPkRYfeJyR9Xwa13iLbNyoNKNIkTFUE4g9lXFb1ZflA=="; }; }; + "random-access-storage-1.3.0" = { + name = "random-access-storage"; + packageName = "random-access-storage"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.3.0.tgz"; + sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA=="; + }; + }; "random-access-storage-1.4.1" = { name = "random-access-storage"; packageName = "random-access-storage"; @@ -45698,6 +46013,15 @@ let sha512 = "DbCc2TIzOxPaHF6KCbr8zLtiYOJQQQCBHUVNHV/SckUQobCBB2YkDtbLdxGnPwPNpJfEyMWxDAm36A2xkbxxtw=="; }; }; + "random-access-web-2.0.3" = { + name = "random-access-web"; + packageName = "random-access-web"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-web/-/random-access-web-2.0.3.tgz"; + sha512 = "nN3AAgl4/lTOYMk5Qm44SzFsglOmaG2d0Kh0603umh35+rk9QXYLFf0nFJ0GOv9INBsP9iT1lub24r8PjyCtvA=="; + }; + }; "random-bytes-1.0.0" = { name = "random-bytes"; packageName = "random-bytes"; @@ -45923,13 +46247,13 @@ let sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; }; - "react-dev-utils-11.0.1" = { + "react-dev-utils-11.0.2" = { name = "react-dev-utils"; packageName = "react-dev-utils"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.1.tgz"; - sha512 = "rlgpCupaW6qQqvu0hvv2FDv40QG427fjghV56XyPcP5aKtOAPzNAhQ7bHqk1YdS2vpW1W7aSV3JobedxuPlBAA=="; + url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.2.tgz"; + sha512 = "xG7GlMoYkrgc2M1kDCHKRywXMDbFnjOB+/VzpytQyYBusEzR8NlGTMmUbvN86k94yyKu5XReHB8eZC2JZrNchQ=="; }; }; "react-devtools-core-4.10.1" = { @@ -45950,13 +46274,13 @@ let sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; }; }; - "react-error-overlay-6.0.8" = { + "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; - version = "6.0.8"; + version = "6.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.8.tgz"; - sha512 = "HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw=="; + url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz"; + sha512 = "nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="; }; }; "react-is-16.13.1" = { @@ -45995,13 +46319,13 @@ let sha512 = "X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="; }; }; - "react-tabs-3.1.2" = { + "react-tabs-3.2.0" = { name = "react-tabs"; packageName = "react-tabs"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-tabs/-/react-tabs-3.1.2.tgz"; - sha512 = "OKS1l7QzSNcn+L2uFsxyGFHdXp9YsPGf/YOURWcImp7xLN36n0Wz+/j9HwlwGtlXCZexwshScR5BrcFbw/3P9Q=="; + url = "https://registry.npmjs.org/react-tabs/-/react-tabs-3.2.0.tgz"; + sha512 = "q7oNapNRoYTQq8gDhApXwdBheuuN5qQ4YvUaQUAkb6OSSttJulBAvxJ0FS6W5uojvMxbbIZKu1f2I+GXISoLjw=="; }; }; "read-1.0.7" = { @@ -46094,13 +46418,22 @@ let sha512 = "D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA=="; }; }; - "read-package-json-fast-1.2.1" = { + "read-package-json-fast-1.2.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.1.tgz"; - sha512 = "OFbpwnHcv74Oa5YN5WvbOBfLw6yPmPcwvyJJw/tj9cWFBF7juQUDLDSZiOjEcgzfweWeeROOmbPpNN1qm4hcRg=="; + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz"; + sha512 = "39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ=="; + }; + }; + "read-package-json-fast-2.0.1" = { + name = "read-package-json-fast"; + packageName = "read-package-json-fast"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.1.tgz"; + sha512 = "bp6z0tdgLy9KzdfENDIw/53HWAolOVoQTRWXv7PUiqAo3YvvoUVeLr7RWPWq+mu7KUOu9kiT4DvxhUgNUBsvug=="; }; }; "read-package-tree-5.3.1" = { @@ -46490,13 +46823,13 @@ let sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; - "redis-commands-1.6.0" = { + "redis-commands-1.7.0" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz"; - sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ=="; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz"; + sha512 = "nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="; }; }; "redis-parser-2.6.0" = { @@ -47372,6 +47705,15 @@ let sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; }; }; + "resolve-1.20.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + }; + }; "resolve-1.7.1" = { name = "resolve"; packageName = "resolve"; @@ -47381,13 +47723,13 @@ let sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; }; }; - "resolve-2.0.0-next.2" = { + "resolve-2.0.0-next.3" = { name = "resolve"; packageName = "resolve"; - version = "2.0.0-next.2"; + version = "2.0.0-next.3"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.2.tgz"; - sha512 = "oHC2H45OCkhIeS45uW5zCsSinW+hgWwRtfobOhmkXiO4Q6e6fpZpBuBkZxAqTfoC1O6VIclqK6RjyeGVaxEYtA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz"; + sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; }; }; "resolve-alpn-1.0.0" = { @@ -47876,13 +48218,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.38.4" = { + "rollup-2.38.5" = { name = "rollup"; packageName = "rollup"; - version = "2.38.4"; + version = "2.38.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz"; - sha512 = "B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.38.5.tgz"; + sha512 = "VoWt8DysFGDVRGWuHTqZzT02J0ASgjVq/hPs9QcBOGMd7B+jfTr/iqMVEyOi901rE3xq+Deq66GzIT1yt7sGwQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -48011,13 +48353,13 @@ let sha1 = "44e00858ebebc0133d58e40b2cd8a1fbb04203f5"; }; }; - "rss-parser-3.10.0" = { + "rss-parser-3.11.0" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.10.0.tgz"; - sha512 = "TC6FNvEmdFeaW6r/60MSJT7cp4d95X4M9As+mvNtxRx7YXHxpV95syMnWZthZSeD1BRN7SEKdq6c3nxMLQRopw=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.11.0.tgz"; + sha512 = "oTLoYW+bNqNwkz8OpGinBU9s3As0sdczQjETIZFgyAdi7AopyhoVFGPIyFMYXXEY8hayKzD5CH+4CtmiPtJ89g=="; }; }; "rss-parser-3.7.1" = { @@ -48083,22 +48425,22 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-parallel-1.1.10" = { + "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; - sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; - "run-parallel-limit-1.0.6" = { + "run-parallel-limit-1.1.0" = { name = "run-parallel-limit"; packageName = "run-parallel-limit"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.6.tgz"; - sha512 = "yFFs4Q2kECi5mWXyyZj3UlAZ5OFq5E07opABC+EmhZdjEkrxXaUwFqOaaNF4tbayMnBxrsbujpeCYTVjGufZGQ=="; + url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.1.0.tgz"; + sha512 = "jJA7irRNM91jaKc3Hcl1npHsFLOXOoTkPCUL1JEa1R82O2miplXXRaGdjW/KM/98YQWDhJLiSs793CnXfblJUw=="; }; }; "run-queue-1.0.3" = { @@ -48353,13 +48695,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.32.6" = { + "sass-1.32.7" = { name = "sass"; packageName = "sass"; - version = "1.32.6"; + version = "1.32.7"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz"; - sha512 = "1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.7.tgz"; + sha512 = "C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A=="; }; }; "sax-0.5.8" = { @@ -49460,13 +49802,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.31.0" = { + "simple-git-2.34.2" = { name = "simple-git"; packageName = "simple-git"; - version = "2.31.0"; + version = "2.34.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.31.0.tgz"; - sha512 = "/+rmE7dYZMbRAfEmn8EUIOwlM2G7UdzpkC60KF86YAfXGnmGtsPrKsym0hKvLBdFLLW019C+aZld1+6iIVy5xA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.34.2.tgz"; + sha512 = "/EX4FtcpAj5L/Bs5zgaBGYDrnkrKflFVNppNLH9VXpIjZBLHx5cZ6/mOYJCoKXKlLRuk3iTvzrIsHo7v42zWHg=="; }; }; "simple-markdown-0.4.4" = { @@ -49874,13 +50216,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.13.1" = { + "snyk-docker-plugin-4.16.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.13.1"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.13.1.tgz"; - sha512 = "KS2G2cBdwKhyRta85uv3q/xUmFSC9lVCu8MUxgm7IDNn8ImjmCIkSp5SsI0qu5jYXJhZZnX6jjj5gzI0QP0WXw=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.16.0.tgz"; + sha512 = "bsKvWJ2ic5vzCcpjRWDTMumfXNuyIiQfsDcpNb/Hhev3UhKu6vb3KXaS6kPg360r5o/KxY7xOjW1L9VjZ0zZeA=="; }; }; "snyk-go-parser-1.4.1" = { @@ -49901,22 +50243,13 @@ let sha512 = "7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q=="; }; }; - "snyk-gradle-plugin-3.12.2" = { + "snyk-gradle-plugin-3.12.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.12.2"; + version = "3.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.2.tgz"; - sha512 = "tooWdLxgX6uJnzpfeHQbRy097ZI/p7/kII9ECqEO11dqeZEW8zvVnmzy+93CiyAY9OtsSTjJaDLzMxy+y6odCA=="; - }; - }; - "snyk-module-1.9.1" = { - name = "snyk-module"; - packageName = "snyk-module"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.9.1.tgz"; - sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.3.tgz"; + sha512 = "1LdlB/tDGqeeh5xgJYmv2Rw9eeYsbZ9VX9MS+u6V/DwdzbiXZvFeqexdCqwVOKwBtYUeQfg/QXm5AAd0hQwxCA=="; }; }; "snyk-module-2.1.0" = { @@ -49982,13 +50315,13 @@ let sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; }; }; - "snyk-poetry-lockfile-parser-1.1.2" = { + "snyk-poetry-lockfile-parser-1.1.5" = { name = "snyk-poetry-lockfile-parser"; packageName = "snyk-poetry-lockfile-parser"; - version = "1.1.2"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.2.tgz"; - sha512 = "qaLNhVw/og6LXRmSuPiXcwre07ybJWh8RASF3aumk5R0cmxCU3YLmJ7pfi/N+PMpwiHCfSZFOMIGIL9jXcX9zQ=="; + url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.5.tgz"; + sha512 = "HR5XjWyueRZc0mWlcXD+OidyDnZ83tgAqJN+n7DGxqTv1z00eogkTxsW2DwNvXevF7ItoBaN80t14oicNQ8GlA=="; }; }; "snyk-policy-1.14.1" = { @@ -50000,13 +50333,13 @@ let sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g=="; }; }; - "snyk-python-plugin-1.19.2" = { + "snyk-python-plugin-1.19.4" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.2"; + version = "1.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.2.tgz"; - sha512 = "n5Z7WiMTNtrBaDE9blnYVoX5fyXeMVhDNrQ/q21lHRAvDKDCY9tNNfduUjOVG6HbIH89mW8lLUdBNAMu/hpl+Q=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.4.tgz"; + sha512 = "d1c/QKb3Il3xF1HY0IYoqQ+16+i0Ex5ai+J4KqOMbcKFvNcfkiOSPpCsrgSNJtBa50srbRleUrILdorALxaV2w=="; }; }; "snyk-resolve-1.0.1" = { @@ -50018,13 +50351,13 @@ let sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; }; }; - "snyk-resolve-deps-4.4.0" = { + "snyk-resolve-deps-4.7.2" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "4.4.0"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz"; - sha512 = "aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ=="; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz"; + sha512 = "Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg=="; }; }; "snyk-sbt-plugin-2.11.0" = { @@ -50090,13 +50423,13 @@ let sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; }; }; - "socket.io-3.1.0" = { + "socket.io-3.1.1" = { name = "socket.io"; packageName = "socket.io"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz"; - sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz"; + sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA=="; }; }; "socket.io-adapter-0.2.0" = { @@ -50378,13 +50711,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-1.3.0" = { + "sonic-boom-1.3.2" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.3.0.tgz"; - sha512 = "4nX6OYvOYr6R76xfQKi6cZpTO3YSWe/vd+QdIfoH0lBy0MnPkeAbb2rRWgmgADkXUeCKPwO1FZAKlAVWAadELw=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.3.2.tgz"; + sha512 = "/B4tAuK2+hIlR94GhhWU1mJHWk5lt0CEuBvG0kvk1qIAzQc4iB1TieMio8DCZxY+Y7tsuzOxSUDOGmaUm3vXMg=="; }; }; "sorcery-0.10.0" = { @@ -51053,6 +51386,15 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; + "ssb-db2-1.11.2" = { + name = "ssb-db2"; + packageName = "ssb-db2"; + version = "1.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.11.2.tgz"; + sha512 = "nwo7Ope08o6yVSbSH3F0YbU/X8rLw79b+s+++X07Aheg9GBaZOgTUp8DgF9ZDywkqqUPSG7agyX+o/icmYCe/g=="; + }; + }; "ssb-ebt-5.6.7" = { name = "ssb-ebt"; packageName = "ssb-ebt"; @@ -51062,13 +51404,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.3.0" = { + "ssb-friends-4.4.3" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.3.0"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.3.0.tgz"; - sha512 = "5NgtiuYM8M2g8crzQF2nCpenM70zhsb6PNeL6B0iXalAl/IN2wwEWSUhU8++2gTh9dZ7icZJ8nC/kCzIoUdmgA=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.3.tgz"; + sha512 = "9LY+XH05epjsJD7MPyuz1OHnErfNI4DJbAqMgees3DtEOfb2wYjeTzfsR3xUnayCgHJQ0p3SVmUhQVyKAy0xkg=="; }; }; "ssb-git-0.5.0" = { @@ -51125,6 +51467,15 @@ let sha512 = "FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ=="; }; }; + "ssb-keys-8.0.2" = { + name = "ssb-keys"; + packageName = "ssb-keys"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.0.2.tgz"; + sha512 = "u2U9t5YLbFShKQzr+ayMx9cYNvUJzDeOScodMwfP5zM3+/1AStvc5W91knZGllGwsmGjNC57KW+whRun+H/dBQ=="; + }; + }; "ssb-links-3.0.10" = { name = "ssb-links"; packageName = "ssb-links"; @@ -51278,6 +51629,15 @@ let sha512 = "r/34OHn5wDkVUu0UNdKdPjmd3cPDmgknA5nK+gXBZj9ugSDwmdDsfEUavGtA7hlO+He1pC4EXtBa14dqgTqJCg=="; }; }; + "ssb-sort-1.1.3" = { + name = "ssb-sort"; + packageName = "ssb-sort"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-sort/-/ssb-sort-1.1.3.tgz"; + sha512 = "oPsF8lGgcHcIb4F1GddV3CbZTJZ0OzxI9fHXH0Zc7ZjqjFlYdqMDxFSuvqJnmtDydJcswyGANiziP1ghd69jOw=="; + }; + }; "ssb-unix-socket-1.0.0" = { name = "ssb-unix-socket"; packageName = "ssb-unix-socket"; @@ -52619,13 +52979,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylelint-13.9.0" = { + "stylelint-13.10.0" = { name = "stylelint"; packageName = "stylelint"; - version = "13.9.0"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz"; - sha512 = "VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.10.0.tgz"; + sha512 = "eDuLrL0wzPKbl5/TbNGZcbw0lTIGbDEr5W6lCODvb1gAg0ncbgCRt7oU0C2VFDvbrcY0A3MFZOwltwTRmc0XCw=="; }; }; "stylelint-8.4.0" = { @@ -52907,6 +53267,33 @@ let sha512 = "zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA=="; }; }; + "svelte-3.32.3" = { + name = "svelte"; + packageName = "svelte"; + version = "3.32.3"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte/-/svelte-3.32.3.tgz"; + sha512 = "5etu/wDwtewhnYO/631KKTjSmFrKohFLWNm1sWErVHXqGZ8eJLqrW0qivDSyYTcN8GbUqsR4LkIhftNFsjNehg=="; + }; + }; + "svelte-preprocess-4.6.8" = { + name = "svelte-preprocess"; + packageName = "svelte-preprocess"; + version = "4.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.6.8.tgz"; + sha512 = "yrT+vuHPoGnNx5Oxa6gMqWV5ZhLgA4isfhUOBwv9iVqZAro9/Nyy8XF5sahAglfMmnCxJkDZSwg7CdAwGpVxhw=="; + }; + }; + "svelte2tsx-0.1.169" = { + name = "svelte2tsx"; + packageName = "svelte2tsx"; + version = "0.1.169"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.169.tgz"; + sha512 = "E4AM2WGMdsYWe8z3BQXbvKQ9dWrOPDrO9xx5V7e+5MHFhyof1a5ZupY6LprJlwQYmWm0Vj9HUGkm8fdVFCfnhA=="; + }; + }; "sver-compat-1.5.0" = { name = "sver-compat"; packageName = "sver-compat"; @@ -53033,13 +53420,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.41.1" = { + "swagger-ui-dist-3.43.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.41.1"; + version = "3.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.41.1.tgz"; - sha512 = "Wg3RqMBp8dSYEwyvXOWuOTwh3fTxYxmtAvLjEbUwRlPXKEHcde3BG/v2zjswrDVcumUpPQ6Cp5RG3LMz6M0YIw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.43.0.tgz"; + sha512 = "PtE+g23bNbYv8qqAVoPBqNQth8hU5Sl5ZsQ7gHXlO5jlCt31dVTiKI9ArHIT1b23ZzUYTnKsFgPYYFoiWyNCAw=="; }; }; "swagger2openapi-6.2.3" = { @@ -53628,13 +54015,13 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; - "terminal-kit-1.45.9" = { + "terminal-kit-1.47.0" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.45.9"; + version = "1.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.45.9.tgz"; - sha512 = "uf648u2bfWz3lX9iBVgdTebIMVc78OE0cgEGuuNQWWKU8soaf+R09fYQWTpMRiz59nKxn78s8wZptGmt/hAyfQ=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.47.0.tgz"; + sha512 = "wyfslVEOJrB2kmZyUEkTKtd4jlNTVR9G1ogkrs7a1VMk55t83+m8sMDJTNuEqfwYXvWbRyGD8pyhv9vyl9xc5w=="; }; }; "terminal-link-2.1.1" = { @@ -54528,6 +54915,15 @@ let sha512 = "2Ulkc8T7mXJ2l0W476YC/A209PR38Nw8PuaCNtk9uI3t1zzFdGQeWYGQvmj2PZkVvRC/Yoi4xQKMRnWc/N29tQ=="; }; }; + "too-hot-1.0.0" = { + name = "too-hot"; + packageName = "too-hot"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/too-hot/-/too-hot-1.0.0.tgz"; + sha512 = "RqtHvVffaf+ORMlpFjEWh3czDy6Q5wFfdGq9JXVBXu2L8/ssjDTnong8f1+I2xWGlKslXUkHU7m1HBj6MyoLqw=="; + }; + }; "too-wordy-0.1.6" = { name = "too-wordy"; packageName = "too-wordy"; @@ -54537,13 +54933,13 @@ let sha512 = "MV5F74YF9+UYsvwXGXTh+5YP3EqH/ivwWfyFE2/YHWQQxm9jDPmkIC23nkN133Ye4nO3HTXmiMcfGqJ5xRPfOA=="; }; }; - "too-wordy-0.2.2" = { + "too-wordy-0.3.1" = { name = "too-wordy"; packageName = "too-wordy"; - version = "0.2.2"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.2.2.tgz"; - sha512 = "ePZfjs1ajL4b8jT4MeVId+9Ci5hJCzAtNIEXIHyFYmKmQuX+eHC/RNv6tuLMUhrGrhJ+sYWW/lBF/LKILHGZEA=="; + url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.3.1.tgz"; + sha512 = "qfKDd/kxLEmbOqdtWnp/Gw1EEvW5ONZB3HehzkHNKFIx3bUrfda6qdOzxJ74vkaIaJbZyRFkBHkbY078fjAd5A=="; }; }; "topo-2.0.2" = { @@ -55104,24 +55500,6 @@ let sha512 = "RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg=="; }; }; - "ttf2woff-2.0.2" = { - name = "ttf2woff"; - packageName = "ttf2woff"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.2.tgz"; - sha512 = "X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA=="; - }; - }; - "ttf2woff2-3.0.0" = { - name = "ttf2woff2"; - packageName = "ttf2woff2"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-3.0.0.tgz"; - sha512 = "5/Web6B0lF/STNAQ0d5vAlRRquuWsNj8wOmKQ9ql9Bsgbx8MsLnNzaBG9vBcSE4s4Ry1QOr/MyUrDUIVgVPEfw=="; - }; - }; "ttl-1.3.1" = { name = "ttl"; packageName = "ttl"; @@ -55302,13 +55680,13 @@ let sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; - "type-2.1.0" = { + "type-2.2.0" = { name = "type"; packageName = "type"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz"; - sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="; + url = "https://registry.npmjs.org/type/-/type-2.2.0.tgz"; + sha512 = "M/u37b4oSGlusaU8ZB96BfFPWQ8MbsZYXB+kXGMiDj6IKinkcNaQvmirBuWj8mAXqP6LYn1rQvbTYum3yPhaOA=="; }; }; "type-check-0.3.2" = { @@ -55491,6 +55869,24 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; + "typedarray-to-buffer-4.0.0" = { + name = "typedarray-to-buffer"; + packageName = "typedarray-to-buffer"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-4.0.0.tgz"; + sha512 = "6dOYeZfS3O9RtRD1caom0sMxgK59b27+IwoNy8RDPsmslSGOyU+mpTamlaIW7aNKi90ZQZ9DFaZL3YRoiSCULQ=="; + }; + }; + "typedfastbitset-0.2.1" = { + name = "typedfastbitset"; + packageName = "typedfastbitset"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typedfastbitset/-/typedfastbitset-0.2.1.tgz"; + sha512 = "B2B+wo5gC7VRAqcFEiUCjS6CJ1vmeYZ7uzY3Jsu6UNStHiF+W0vkhZAmQaj5m9sC2KVrpyHGRzGuhz3M6+n/8A=="; + }; + }; "typeforce-1.18.0" = { name = "typeforce"; packageName = "typeforce"; @@ -55527,13 +55923,13 @@ let sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; }; }; - "typescript-3.9.7" = { + "typescript-3.9.9" = { name = "typescript"; packageName = "typescript"; - version = "3.9.7"; + version = "3.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz"; - sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz"; + sha512 = "kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w=="; }; }; "typescript-4.0.3" = { @@ -55554,13 +55950,13 @@ let sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; }; }; - "typescript-4.1.3" = { + "typescript-4.1.5" = { name = "typescript"; packageName = "typescript"; - version = "4.1.3"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; - sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz"; + sha512 = "6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -55662,13 +56058,13 @@ let sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; }; }; - "uglify-js-3.12.6" = { + "uglify-js-3.12.7" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.6"; + version = "3.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz"; - sha512 = "aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.7.tgz"; + sha512 = "SIZhkoh+U/wjW+BHGhVwE9nt8tWJspncloBcFapkpGRwNPqcH8pzX36BXe3TPBjzHWPMUZotpCigak/udWNr1Q=="; }; }; "uglify-js-3.4.10" = { @@ -56076,13 +56472,13 @@ let sha512 = "vLUezxCnjzz+ya4pYouRQVMT8k82Rk4fIj406UidRnSFJdGXFaQyQklAnalsQHJrLqAlaYPkXPUa1upfVSHGCA=="; }; }; - "unified-message-control-3.0.2" = { + "unified-message-control-3.0.3" = { name = "unified-message-control"; packageName = "unified-message-control"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.2.tgz"; - sha512 = "lhF8fKjDo2cIPx1re5X1QinqUonl+AN6F0XfEaab8w/hjqX7FZAhzu4P8g6pmYp09ld+HSWFwdRJj+Y8xD0q7Q=="; + url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.3.tgz"; + sha512 = "oY5z2n8ugjpNHXOmcgrw0pQeJzavHS0VjPBP21tOcm7rc2C+5Q+kW9j5+gqtf8vfW/8sabbsK5+P+9QPwwEHDA=="; }; }; "union-0.5.0" = { @@ -57013,6 +57409,15 @@ let sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d"; }; }; + "utf8-3.0.0" = { + name = "utf8"; + packageName = "utf8"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz"; + sha512 = "E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="; + }; + }; "utf8-byte-length-1.0.4" = { name = "utf8-byte-length"; packageName = "utf8-byte-length"; @@ -58147,6 +58552,15 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; + "vscode-css-languageservice-5.0.0" = { + name = "vscode-css-languageservice"; + packageName = "vscode-css-languageservice"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.0.0.tgz"; + sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; + }; + }; "vscode-debugadapter-testsupport-1.44.0" = { name = "vscode-debugadapter-testsupport"; packageName = "vscode-debugadapter-testsupport"; @@ -58174,6 +58588,15 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; + "vscode-emmet-helper-2.1.2" = { + name = "vscode-emmet-helper"; + packageName = "vscode-emmet-helper"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.2.tgz"; + sha512 = "Fy6UNawSgxE3Kuqi54vSXohf03iOIrp1A74ReAgzvGP9Yt7fUAvkqF6No2WAc34/w0oWAHAeqoBNqmKKWh6U5w=="; + }; + }; "vscode-html-languageservice-2.1.12" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; @@ -58183,6 +58606,15 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; + "vscode-html-languageservice-4.0.0" = { + name = "vscode-html-languageservice"; + packageName = "vscode-html-languageservice"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.0.tgz"; + sha512 = "UmC+GS0IqBeZnOAmdtQvaDzoH1c5/un+b7qALUziu/Y4SOPXso5dF+YkJeTqsde6YU2pLm78RtMDzl9BParwbw=="; + }; + }; "vscode-json-languageservice-3.11.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; @@ -58768,13 +59200,13 @@ let sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ=="; }; }; - "watchpack-2.1.0" = { + "watchpack-2.1.1" = { name = "watchpack"; packageName = "watchpack"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.1.0.tgz"; - sha512 = "UjgD1mqjkG99+3lgG36at4wPnUXNvis2v1utwTgQ43C22c4LD71LsYMExdWXh4HZ+RmW+B0t1Vrg2GpXAkTOQw=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz"; + sha512 = "Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw=="; }; }; "watchpack-chokidar2-2.0.1" = { @@ -58795,6 +59227,15 @@ let sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c"; }; }; + "wawoff2-1.0.2" = { + name = "wawoff2"; + packageName = "wawoff2"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wawoff2/-/wawoff2-1.0.2.tgz"; + sha512 = "qxuTwf5tAP/XojrRc6cmR0hGvqgD3XUxv2fzfzURKPDfE7AeHmtRuankVxdJ4DRdSKXaE5QlyJT49yBis2vb6Q=="; + }; + }; "wbuf-1.7.3" = { name = "wbuf"; packageName = "wbuf"; @@ -59074,13 +59515,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.112.3" = { + "webtorrent-0.114.1" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.112.3"; + version = "0.114.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.112.3.tgz"; - sha512 = "CKe3udf2psctyd/GBNfZgz9bnXugvFTiU5GJCkcg4MKdd63qf0d8CS8bOYxwyir+EqvmgQQgJRO56b4PftI+PA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.114.1.tgz"; + sha512 = "RJqwy6cTG1kysvd3xX2CJIAMeC/3e5M/MPu4MuZKcBxa2I+D75nONoNjP0cLTnE+gVb0MFQSQU93ln/2/f6k6g=="; }; }; "well-known-symbols-2.0.0" = { @@ -59722,13 +60163,13 @@ let sha512 = "P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg=="; }; }; - "workerpool-6.0.2" = { + "workerpool-6.1.0" = { name = "workerpool"; packageName = "workerpool"; - version = "6.0.2"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; - sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz"; + sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; }; }; "wrap-ansi-2.1.0" = { @@ -59965,6 +60406,15 @@ let sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; }; }; + "ws-7.4.3" = { + name = "ws"; + packageName = "ws"; + version = "7.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz"; + sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -61061,29 +61511,37 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.1.2"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.1.2.tgz"; - sha512 = "qOAkxCzBPm+QdXpSHxLERw1Vag8S0JHMY0zCwtG63XFvwHZCIihHRkOR3xHDWlVnGTmnUixg4Mt5s/4GGPuDJg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.0.tgz"; + sha512 = "waIR5Nqc2wcYXZh/Mgm+4Iyvu0nzKAhvmKiJjcJ+f2UuPRMLdNAInTvhdpfgKaNdmiArxNa6UntRIu+EavGc9Q=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1101.2" - sources."@angular-devkit/core-11.1.2" - sources."@angular-devkit/schematics-11.1.2" + sources."@angular-devkit/architect-0.1102.0" + sources."@angular-devkit/core-11.2.0" + sources."@angular-devkit/schematics-11.2.0" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.4" - sources."@npmcli/installed-package-contents-1.0.5" - sources."@npmcli/move-file-1.1.1" - sources."@npmcli/node-gyp-1.0.1" + (sources."@npmcli/git-2.0.6" // { + dependencies = [ + sources."promise-retry-2.0.1" + ]; + }) + sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/move-file-1.1.2" + sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.1" - sources."@schematics/angular-11.1.2" - sources."@schematics/update-0.1101.2" + (sources."@npmcli/run-script-1.8.3" // { + dependencies = [ + sources."read-package-json-fast-2.0.1" + ]; + }) + sources."@schematics/angular-11.2.0" + sources."@schematics/update-0.1102.0" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.1.3" + sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" @@ -61098,7 +61556,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -61107,7 +61564,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."builtins-1.0.3" @@ -61130,12 +61587,10 @@ in sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-4.3.1" - sources."debuglog-1.0.1" sources."defaults-1.0.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."dezalgo-1.0.3" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" (sources."encoding-0.1.13" // { @@ -61144,7 +61599,7 @@ in ]; }) sources."env-paths-2.2.0" - sources."err-code-1.1.2" + sources."err-code-2.0.3" sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."external-editor-3.1.0" @@ -61167,7 +61622,7 @@ in }) sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -61212,7 +61667,11 @@ in sources."log-symbols-4.0.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - sources."make-fetch-happen-8.0.13" + (sources."make-fetch-happen-8.0.14" // { + dependencies = [ + sources."promise-retry-2.0.1" + ]; + }) sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" @@ -61243,24 +61702,28 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.3.1" - sources."ora-5.2.0" + sources."open-7.4.0" + sources."ora-5.3.0" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-11.1.14" + sources."pacote-11.2.4" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" - sources."promise-retry-1.1.1" + (sources."promise-retry-1.1.1" // { + dependencies = [ + sources."err-code-1.1.2" + sources."retry-0.10.1" + ]; + }) sources."psl-1.8.0" sources."puka-1.0.1" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."read-package-json-fast-1.2.1" + sources."read-package-json-fast-1.2.2" sources."readable-stream-3.6.0" - sources."readdir-scoped-modules-1.1.0" (sources."request-2.88.2" // { dependencies = [ sources."uuid-3.4.0" @@ -61268,7 +61731,7 @@ in }) sources."resolve-1.19.0" sources."restore-cursor-3.1.0" - sources."retry-0.10.1" + sources."retry-0.12.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."rxjs-6.6.3" @@ -61404,7 +61867,7 @@ in sources."async-lock-1.2.8" sources."balanced-match-1.0.0" sources."base64-js-0.0.2" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."bops-0.0.7" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -61489,7 +61952,7 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" (sources."get-stream-4.1.0" // { dependencies = [ sources."pump-3.0.0" @@ -61514,7 +61977,7 @@ in sources."mimic-response-1.0.1" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" (sources."gulp-vinyl-zip-2.2.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -61653,7 +62116,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.12.6" + sources."uglify-js-3.12.7" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -61693,17 +62156,17 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.13.3"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.13.3.tgz"; - sha512 = "N6eUF/1JBENunuXcpt0d2t5fRLuZndobKMxKTMyqguEH3Fy9cRhEopirxbXskEDCf7Dh2jUdlL/b+4e3fpG7rw=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.14.0.tgz"; + sha512 = "j9xCEhsE+xkR6tYYONv+MSlv7/OIQHj9G2JYq5vOauC4RNRLYSmo5I94LKliqUZDrZb4HpByhcL/nUcNxu5fNw=="; }; dependencies = [ sources."abab-2.0.5" sources."acorn-6.4.2" sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" - sources."agent-base-5.1.1" + sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -61717,6 +62180,7 @@ in sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" + sources."browser-hrtime-1.1.8" sources."browser-process-hrtime-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.1" @@ -61752,13 +62216,13 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."getpass-0.1.7" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."html-encoding-sniffer-1.0.2" sources."http-signature-1.2.0" - sources."https-proxy-agent-4.0.0" + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" sources."is-docker-2.1.1" @@ -61868,9 +62332,9 @@ in sources."@angular-devkit/core-11.0.3" sources."@angular-devkit/schematics-11.0.3" sources."@angular-devkit/schematics-cli-0.1100.3" - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -61895,11 +62359,11 @@ in sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.11.1" // { + (sources."@types/uglify-js-3.12.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61942,14 +62406,14 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserslist-4.16.3" sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.4.3" @@ -61970,7 +62434,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.663" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.5.0" @@ -62007,7 +62471,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-4.0.0" sources."human-signals-1.1.1" @@ -62106,7 +62570,7 @@ in sources."readable-stream-3.6.0" sources."readdirp-3.5.0" sources."rechoir-0.6.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -62175,7 +62639,7 @@ in sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."watchpack-2.1.0" + sources."watchpack-2.1.1" sources."wcwidth-1.0.1" (sources."webpack-5.9.0" // { dependencies = [ @@ -62233,127 +62697,135 @@ in sources."@apollographql/graphql-language-service-types-2.0.2" sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.12.16" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/generator-7.12.15" + sources."@babel/types-7.12.13" sources."semver-5.7.1" ]; }) (sources."@babel/generator-7.12.11" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-annotate-as-pure-7.12.10" // { + (sources."@babel/helper-annotate-as-pure-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.5" // { + (sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" // { + dependencies = [ + sources."@babel/types-7.12.13" + ]; + }) + (sources."@babel/helper-compilation-targets-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - (sources."@babel/helper-define-map-7.10.5" // { + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + (sources."@babel/helper-explode-assignable-expression-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-explode-assignable-expression-7.12.1" // { + (sources."@babel/helper-function-name-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-function-name-7.12.11" // { + (sources."@babel/helper-get-function-arity-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-get-function-arity-7.12.10" // { + (sources."@babel/helper-hoist-variables-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/helper-hoist-variables-7.10.4" - (sources."@babel/helper-member-expression-to-functions-7.12.7" // { + (sources."@babel/helper-member-expression-to-functions-7.12.16" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-module-imports-7.12.5" // { + (sources."@babel/helper-module-imports-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-module-transforms-7.12.1" // { + (sources."@babel/helper-module-transforms-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-optimise-call-expression-7.12.10" // { + (sources."@babel/helper-optimise-call-expression-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/helper-plugin-utils-7.10.4" - (sources."@babel/helper-remap-async-to-generator-7.12.1" // { + sources."@babel/helper-plugin-utils-7.12.13" + (sources."@babel/helper-remap-async-to-generator-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-replace-supers-7.12.11" // { + (sources."@babel/helper-replace-supers-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-simple-access-7.12.1" // { + (sources."@babel/helper-simple-access-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-split-export-declaration-7.12.11" // { + (sources."@babel/helper-split-export-declaration-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - (sources."@babel/helpers-7.12.5" // { + sources."@babel/helper-validator-option-7.12.16" + (sources."@babel/helper-wrap-function-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + (sources."@babel/helpers-7.12.13" // { + dependencies = [ + sources."@babel/types-7.12.13" + ]; + }) + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" + sources."@babel/plugin-syntax-flow-7.12.13" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -62361,67 +62833,68 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-syntax-typescript-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.10" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-typescript-7.12.1" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.11" // { + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-syntax-typescript-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-typescript-7.12.16" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + (sources."@babel/preset-env-7.12.16" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" sources."semver-5.7.1" ]; }) - sources."@babel/preset-flow-7.12.1" + sources."@babel/preset-flow-7.12.13" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.7" - (sources."@babel/register-7.12.10" // { + sources."@babel/preset-typescript-7.12.16" + (sources."@babel/register-7.12.13" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.12.5" - (sources."@babel/template-7.12.7" // { + sources."@babel/runtime-7.12.13" + (sources."@babel/template-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/traverse-7.12.12" // { + (sources."@babel/traverse-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/generator-7.12.15" + sources."@babel/types-7.12.13" ]; }) sources."@babel/types-7.10.4" @@ -62451,9 +62924,15 @@ in }) (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.1" + sources."@oclif/plugin-help-3.2.2" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" sources."lru-cache-6.0.0" sources."semver-7.3.4" + sources."supports-color-7.2.0" ]; }) (sources."@oclif/config-1.17.0" // { @@ -62556,7 +63035,7 @@ in sources."@types/cors-2.8.8" sources."@types/ejs-2.7.0" sources."@types/express-4.17.7" - sources."@types/express-serve-static-core-4.17.17" + sources."@types/express-serve-static-core-4.17.18" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" (sources."@types/graphql-upload-8.0.4" // { @@ -62580,7 +63059,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -62603,14 +63082,14 @@ in sources."@vue/cli-ui-addon-widgets-4.5.11" (sources."@vue/compiler-core-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" sources."source-map-0.6.1" ]; }) sources."@vue/compiler-dom-3.0.5" (sources."@vue/compiler-sfc-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" sources."source-map-0.6.1" ]; }) @@ -62702,7 +63181,7 @@ in sources."lru-cache-6.0.0" ]; }) - (sources."apollo-server-core-2.19.2" // { + (sources."apollo-server-core-2.20.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."uuid-8.3.2" @@ -62710,7 +63189,7 @@ in }) sources."apollo-server-env-3.0.0" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.19.2" + sources."apollo-server-express-2.20.0" sources."apollo-server-plugin-base-0.10.4" sources."apollo-server-types-0.6.3" sources."apollo-tracing-0.12.2" @@ -62838,7 +63317,7 @@ in ]; }) sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" (sources."capital-case-1.0.4" // { dependencies = [ sources."tslib-2.1.0" @@ -63065,7 +63544,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.663" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -63143,6 +63622,7 @@ in sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."fill-range-7.0.1" + sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" @@ -63157,7 +63637,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.143.1" + sources."flow-parser-0.144.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -63180,7 +63660,7 @@ in sources."generic-names-2.0.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -63253,7 +63733,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphql-14.7.0" (sources."graphql-anywhere-4.2.7" // { dependencies = [ @@ -63261,7 +63741,7 @@ in ]; }) sources."graphql-extensions-0.12.8" - sources."graphql-subscriptions-1.1.0" + sources."graphql-subscriptions-1.2.0" sources."graphql-tag-2.12.0" sources."graphql-tools-4.0.8" sources."graphql-type-json-0.3.2" @@ -63731,7 +64211,8 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."query-string-6.13.8" + sources."query-string-6.14.0" + sources."queue-microtask-1.2.2" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -63800,7 +64281,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -63810,9 +64291,9 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."roarr-2.15.4" - sources."rss-parser-3.10.0" + sources."rss-parser-3.11.0" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" @@ -64052,7 +64533,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.6.0" sources."type-is-1.6.18" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."unbzip2-stream-1.4.3" (sources."undefsafe-2.0.3" // { dependencies = [ @@ -64323,13 +64804,13 @@ in sha512 = "Q1OfB3hpa4TtM6x5a2gJmZncpQYx0hFt4ohdgv4Ms67kcAVwL29QQ2NDbNqfKr15IzlNAhLGueCzxG6dMjdnbQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/generator-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/generator-7.12.15" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/types-7.12.12" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/types-7.12.13" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -64404,33 +64885,33 @@ in sha512 = "bBFO/imgikyrGd6urHfiZDmceZzAMfWeAmt5Fd9du5B+rv6IIJsDZMrTcalKUhwL6NdM0mBwkFcLmQvjm8UMOw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + (sources."@babel/core-7.12.16" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.11" // { + (sources."@babel/generator-7.12.15" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -64448,7 +64929,7 @@ in sources."ejs-3.1.5" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" - sources."filelist-1.0.1" + sources."filelist-1.0.2" sources."fs-extra-5.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -64464,7 +64945,7 @@ in ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" @@ -64500,7 +64981,7 @@ in sources."parse-passwd-1.0.0" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-5.7.1" @@ -64537,7 +65018,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -64751,7 +65232,7 @@ in sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) sources."fs.realpath-1.0.0" @@ -64772,17 +65253,17 @@ in sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) sources."lodash-4.2.1" @@ -64805,7 +65286,7 @@ in sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" ]; }) sources."pify-2.3.0" @@ -64817,7 +65298,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.6" @@ -64931,7 +65412,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -64945,7 +65426,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -65022,7 +65503,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -65213,7 +65694,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."electrum-client-git://github.com/janoside/electrum-client" - sources."elliptic-6.5.3" + sources."elliptic-6.5.4" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -65250,10 +65731,10 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-6.0.4" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -65418,7 +65899,7 @@ in sources."readable-stream-3.6.0" sources."redent-2.0.0" sources."redis-2.8.0" - sources."redis-commands-1.6.0" + sources."redis-commands-1.7.0" sources."redis-parser-2.6.0" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" @@ -65429,7 +65910,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."right-align-0.1.3" sources."rimraf-2.4.5" sources."ripemd160-2.0.2" @@ -65558,7 +66039,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.40" + sources."@types/node-13.13.41" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -65681,7 +66162,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-1.2.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -65814,6 +66295,7 @@ in sources."qap-3.3.1" sources."qs-6.5.2" sources."query-string-1.0.1" + sources."queue-microtask-1.2.2" sources."random-access-file-2.1.5" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -65843,10 +66325,10 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.7.1" sources."router-0.6.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-series-1.1.9" sources."rusha-0.8.13" sources."rx-2.5.3" @@ -65963,13 +66445,13 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.6"; + version = "1.0.0-beta.8"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.6.tgz"; - sha512 = "x6sJTGaSPoyQbcKbxkKxmgdGXLpyO+qbgt6GgN9guIk28dgkoqZG9CcfmwjAs+OXoY4ZiyNKvNO4w9ljW/+XOQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.8.tgz"; + sha512 = "3gtzVdy2/KcfUsXmbEuehe8O1L1EtjzEvfzBYcQtZ1VYJK+X95H2UXlDwI6ug+K8A/Fmnrh2TjtIq1Vakv0fcQ=="; }; dependencies = [ - sources."@jsii/spec-1.18.0" + sources."@jsii/spec-1.20.1" sources."@types/node-10.17.51" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -65979,10 +66461,10 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.6" + sources."cdk8s-1.0.0-beta.8" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.18.0" // { + (sources."codemaker-1.20.1" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -65991,7 +66473,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.3" + sources."constructs-3.3.5" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -66018,8 +66500,8 @@ in }) sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" - sources."graceful-fs-4.2.4" + sources."get-intrinsic-1.1.1" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-arguments-1.1.0" @@ -66039,31 +66521,31 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.18.0" // { + (sources."jsii-1.20.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.18.0" // { + (sources."jsii-pacmak-1.20.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.18.0" // { + (sources."jsii-reflect-1.20.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.18.0" // { + (sources."jsii-rosetta-1.20.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.214" // { + (sources."jsii-srcmak-0.1.222" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -66085,7 +66567,7 @@ in sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.18.0" + sources."oo-ascii-tree-1.20.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -66117,7 +66599,7 @@ in sources."string.prototype.trimstart-1.0.3" sources."strip-ansi-6.0.0" sources."tslib-2.1.0" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."universalify-2.0.0" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" @@ -66160,12 +66642,12 @@ in sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA=="; }; dependencies = [ - sources."@jsii/spec-1.18.0" + sources."@jsii/spec-1.20.1" sources."@skorfmann/terraform-cloud-1.7.1" sources."@types/archiver-5.1.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/readline-sync-1.4.3" sources."@types/stream-buffers-3.0.3" sources."@types/uuid-8.3.0" @@ -66191,7 +66673,7 @@ in sources."axios-0.21.1" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" @@ -66218,10 +66700,10 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.0.2" sources."concat-map-0.0.1" - sources."constructs-3.3.3" + sources."constructs-3.3.18" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" - sources."crc32-stream-4.0.1" + sources."crc32-stream-4.0.2" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-1.2.0" @@ -66258,9 +66740,9 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" @@ -66302,7 +66784,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.18.0" // { + (sources."jsii-1.20.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66310,10 +66792,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.18.0" // { + (sources."jsii-pacmak-1.20.1" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.18.0" + sources."codemaker-1.20.1" sources."decamelize-5.0.0" sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66321,7 +66803,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.18.0" // { + (sources."jsii-reflect-1.20.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66329,7 +66811,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.18.0" // { + (sources."jsii-rosetta-1.20.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66337,7 +66819,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.214" // { + (sources."jsii-srcmak-0.1.222" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66398,7 +66880,7 @@ in sources."object.values-1.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.18.0" + sources."oo-ascii-tree-1.20.1" sources."open-7.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -66419,7 +66901,7 @@ in sources."regexp.prototype.flags-1.3.1" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-3.1.0" sources."rfdc-1.2.0" sources."safe-buffer-5.1.2" @@ -66460,7 +66942,7 @@ in sources."supports-color-7.2.0" sources."tar-stream-2.2.0" sources."type-fest-0.11.0" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."universalify-0.1.2" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" @@ -66500,16 +66982,16 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "4.3.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-4.3.0.tgz"; - sha512 = "8GHZfr+mG3zB/Lgqrr27qHBFsPSn0fyEI3f2rIZpxPxUbn2J6A8xyyeBRVTW8duDuXigN0s80vsXiXJOEFIO5Q=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.0.1.tgz"; + sha512 = "6Y+G8FmQu76rSWQjSBY5rVcdgatknjvzfEUU5xtx1uaYovClg7jap7ol3Xf3NP7vMd1fs38TtfhsyIS8Dq0Jvw=="; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."clean-css-4.2.3" - sources."commander-2.20.3" + sources."clean-css-5.0.1" + sources."commander-7.0.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.6" @@ -66560,6 +67042,7 @@ in sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" sources."fetch-everywhere-1.0.5" + sources."filter-obj-1.1.0" sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."has-flag-3.0.0" @@ -66582,7 +67065,7 @@ in sources."path-is-absolute-1.0.1" sources."prompt-1.1.0" sources."punycode-2.1.1" - sources."query-string-6.13.8" + sources."query-string-6.14.0" sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.7.1" @@ -66694,10 +67177,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.2.0.tgz"; - sha512 = "afm5SjyvQl21+4oGotX8mxjiwEBw8veRJun+sZQ5S4ZXMH6tQBZexE0Nyydcaoa5U0P1TBlI7Ywt+e/IZZxleA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.2.1.tgz"; + sha512 = "UlT5D++GU9vWlK/bANGHDxtThdPOWWiVRg9Fsist2ytrg6pjNPSDT/f6US1J7aBCRCB9p2463e/G7JSUT4WTow=="; }; buildInputs = globalBuildInputs; meta = { @@ -66760,7 +67243,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.1.3" + sources."typescript-4.1.5" ]; buildInputs = globalBuildInputs; meta = { @@ -66828,10 +67311,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.3.tgz"; - sha512 = "yMayIIMn/+JaSxHbAG2384sr1/1jvhDCuvRWXeWI+yLLVNCQ7pizGW8EeLC2bSkd01PORRWT4LBn7mNMs6dPRw=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.4.tgz"; + sha512 = "IK3JYMiJALMMhUlFgl4HxW2dvJdmUr86Hve+ngVATLpT2vWHG5V3sXjuHq7c7RlE7+oWS2CNoxIPf8oiuZesPQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -66931,7 +67414,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.2" - sources."fp-ts-2.9.3" + sources."fp-ts-2.9.5" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -66942,10 +67425,10 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."http-proxy-agent-4.0.1" @@ -67085,9 +67568,9 @@ in sha512 = "3p4AwJnsjtLJM53wLsMtcVUzWPMnnYI6pkwQraHH6Tp7/ZuXwIVhjUvDgMcAvhmIkVePyvJF5xZHN4ghLLP02A=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" @@ -67159,7 +67642,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -67256,7 +67739,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.663" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -67273,7 +67756,7 @@ in sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -67405,7 +67888,7 @@ in sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -67765,7 +68248,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -67948,7 +68431,7 @@ in sources."tsutils-3.20.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."unherit-1.1.3" sources."unified-6.2.0" sources."union-value-1.0.1" @@ -68097,10 +68580,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.31.0"; + version = "0.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.31.0.tgz"; - sha512 = "AvkJvFfQoZvC6xQi7GiSX3M8UaWuruNHfnE9fag/U8huhsTPe6UN52dEGIqkFPLvGqpSddsCx/Gvk9MptfXtFA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.32.0.tgz"; + sha512 = "AwUqoPFeetwDcCe6BpCRMsW+/VtPJ/I/wJA/3ycArSx2mYy+P2IBfBW62NERmw9RNopUbHQKjr6JBTXbl9T/uA=="; }; buildInputs = globalBuildInputs; meta = { @@ -68173,29 +68656,29 @@ in sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/core-7.12.16" + sources."@babel/generator-7.12.15" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/parser-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -68206,7 +68689,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.0.4" + sources."ajv-7.1.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -68221,7 +68704,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -68259,7 +68742,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.663" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -68329,7 +68812,7 @@ in sources."json-schema-traverse-1.0.0" sources."json5-2.2.0" sources."kind-of-6.0.3" - sources."known-css-properties-0.20.0" + sources."known-css-properties-0.21.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.20" @@ -68338,12 +68821,12 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.1.0" sources."mathml-tag-names-2.1.3" - sources."mdast-util-from-markdown-0.8.4" - sources."mdast-util-to-markdown-0.6.2" + sources."mdast-util-from-markdown-0.8.5" + sources."mdast-util-to-markdown-0.6.5" sources."mdast-util-to-string-2.0.0" sources."meow-9.0.0" sources."merge2-1.4.1" - sources."micromark-2.11.3" + sources."micromark-2.11.4" sources."micromatch-4.0.2" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -68398,6 +68881,7 @@ in sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" + sources."queue-microtask-1.2.2" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -68418,11 +68902,11 @@ in sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."signal-exit-3.0.3" @@ -68449,7 +68933,7 @@ in sources."strip-ansi-6.0.0" sources."strip-indent-3.0.0" sources."style-search-0.1.0" - sources."stylelint-13.9.0" + sources."stylelint-13.10.0" sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" @@ -68524,9 +69008,9 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" @@ -68556,14 +69040,14 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" sources."tslib-1.14.1" sources."tslint-5.20.1" sources."tsutils-2.29.0" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -68618,7 +69102,7 @@ in sha512 = "NVBl6AEbEax6GQdBlBy/SelJ5TXCkrnLN/dDqgDWwhIPX6UBFhFTFCLcqcHbfMjLM/MDvP/t85w+OYBGe2gXxg=="; }; dependencies = [ - sources."typescript-4.1.3" + sources."typescript-4.1.5" ]; buildInputs = globalBuildInputs; meta = { @@ -68639,9 +69123,9 @@ in sha512 = "2SHFFjxkw2kl0hADDNUYX85OR/PbjqYPxFnpNp6G83SbeZBoJN8KDUl7TrIJ7BZ4UCiIilXnKQCHpxREiVPAEg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -68695,7 +69179,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -68755,7 +69239,7 @@ in sources."punycode-2.1.1" sources."regexpp-3.1.0" sources."require-from-string-2.0.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.4" @@ -68775,7 +69259,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.0.4" + sources."ajv-7.1.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -68790,7 +69274,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."typescript-4.1.3" + sources."typescript-4.1.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.2.0" sources."vls-0.5.10" @@ -69089,20 +69573,36 @@ in sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" + sources."@npmcli/ci-detect-1.3.0" + sources."@npmcli/git-2.0.6" + sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/move-file-1.1.2" + sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/promise-spawn-1.3.2" + sources."@npmcli/run-script-1.8.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@tootallnate/once-1.1.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" + sources."agent-base-6.0.2" + sources."agentkeepalive-4.1.4" + sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ansi-0.3.1" (sources."ansi-align-3.0.0" // { dependencies = [ + sources."ansi-regex-4.1.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" sources."array-find-index-1.0.2" sources."array-flatten-1.1.1" sources."array-union-2.1.0" @@ -69120,6 +69620,10 @@ in (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" + sources."debug-2.6.9" + sources."iconv-lite-0.4.24" + sources."ms-2.0.0" + sources."qs-6.7.0" ]; }) (sources."boxen-4.2.0" // { @@ -69136,6 +69640,7 @@ in sources."braces-3.0.2" sources."builtins-1.0.3" sources."bytes-3.0.0" + sources."cacache-15.0.5" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."lowercase-keys-2.0.0" @@ -69146,20 +69651,29 @@ in sources."caseless-0.12.0" sources."chalk-3.0.0" sources."chardet-0.7.0" + sources."chownr-2.0.0" sources."ci-info-2.0.0" + sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."compressible-2.0.18" - sources."compression-1.7.4" + (sources."compression-1.7.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."concat-map-0.0.1" (sources."conf-1.4.0" // { dependencies = [ sources."dot-prop-4.2.1" + sources."env-paths-1.0.0" sources."is-obj-1.0.1" sources."make-dir-1.3.0" sources."pify-3.0.0" @@ -69167,6 +69681,7 @@ in ]; }) sources."configstore-5.0.1" + sources."console-control-strings-1.1.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."cookie-0.4.0" @@ -69174,7 +69689,7 @@ in sources."cordova-app-hello-world-5.0.0" sources."cordova-common-4.0.2" sources."cordova-create-3.0.0" - (sources."cordova-fetch-3.0.0" // { + (sources."cordova-fetch-3.0.1" // { dependencies = [ sources."pify-5.0.0" ]; @@ -69190,12 +69705,13 @@ in sources."crypto-random-string-2.0.0" sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" - sources."debug-2.6.9" + sources."debug-4.3.2" sources."decompress-response-3.3.0" sources."dedent-0.7.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" (sources."dep-graph-1.1.0" // { dependencies = [ sources."underscore-1.2.1" @@ -69214,18 +69730,27 @@ in sources."elementtree-0.1.7" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."endent-1.4.1" - sources."env-paths-1.0.0" + sources."env-paths-2.2.0" + sources."err-code-2.0.3" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-4.1.0" - sources."express-4.17.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.7.0" + ]; + }) sources."extend-3.0.2" (sources."external-editor-3.1.0" // { dependencies = [ + sources."iconv-lite-0.4.24" sources."tmp-0.0.33" ]; }) @@ -69237,15 +69762,22 @@ in sources."fastq-1.10.1" sources."figures-2.0.0" sources."fill-range-7.0.1" - sources."finalhandler-1.1.2" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."find-up-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-9.1.0" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."gauge-2.7.4" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -69257,11 +69789,12 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" @@ -69270,13 +69803,19 @@ in sources."inherits-2.0.3" ]; }) + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" + sources."https-proxy-agent-5.0.0" sources."human-signals-1.1.1" - sources."iconv-lite-0.4.24" + sources."humanize-ms-1.2.1" + sources."iconv-lite-0.6.2" sources."ignore-5.1.8" + sources."ignore-walk-3.0.3" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.7" @@ -69289,12 +69828,24 @@ in }) (sources."inquirer-6.5.2" // { dependencies = [ + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."has-flag-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."mute-stream-0.0.7" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."supports-color-5.5.0" ]; }) @@ -69306,17 +69857,20 @@ in sources."color-name-1.1.3" sources."has-flag-3.0.0" sources."supports-color-5.5.0" + sources."tough-cookie-3.0.1" ]; }) + sources."ip-1.1.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" + sources."is-lambda-1.0.1" sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" @@ -69325,6 +69879,7 @@ in sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" + sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-4.0.0" sources."isstream-0.1.2" @@ -69335,6 +69890,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" + sources."jsonparse-1.3.1" (sources."jsprim-1.4.1" // { dependencies = [ sources."extsprintf-1.3.0" @@ -69354,6 +69910,7 @@ in sources."semver-6.3.0" ]; }) + sources."make-fetch-happen-8.0.14" sources."md5-file-5.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -69368,10 +69925,24 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."ms-2.0.0" + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.3.3" + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."negotiator-0.6.2" sources."nice-try-1.0.5" + (sources."node-gyp-7.1.2" // { + dependencies = [ + sources."nopt-5.0.0" + ]; + }) sources."nopt-4.0.3" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -69380,10 +69951,18 @@ in ]; }) sources."normalize-url-4.5.0" + sources."npm-bundled-1.1.1" + sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.0" + sources."npm-packlist-2.1.4" + sources."npm-pick-manifest-6.1.0" + sources."npm-registry-fetch-9.0.0" sources."npm-run-path-4.0.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."objectorarray-1.0.4" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -69402,12 +69981,14 @@ in ]; }) sources."p-locate-2.0.0" + sources."p-map-4.0.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) + sources."pacote-11.2.6" sources."parent-module-1.0.1" sources."parseurl-1.3.3" sources."path-exists-3.0.0" @@ -69423,33 +70004,36 @@ in sources."pkg-up-2.0.0" sources."plist-3.0.1" sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."promise-retry-2.0.1" sources."promzard-0.3.0" sources."proxy-addr-2.0.6" sources."psl-1.8.0" + sources."puka-1.0.1" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" sources."q-1.5.1" - sources."qs-6.7.0" + sources."qs-6.5.2" + sources."queue-microtask-1.2.2" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ sources."bytes-3.1.0" + sources."iconv-lite-0.4.24" ]; }) sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" sources."read-package-json-2.1.2" + sources."read-package-json-fast-2.0.1" + sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.2" - sources."tough-cookie-2.5.0" - ]; - }) - sources."resolve-1.19.0" + sources."request-2.88.2" + sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."responselike-1.0.2" (sources."restore-cursor-2.0.0" // { @@ -69458,10 +70042,11 @@ in sources."onetime-2.0.1" ]; }) + sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -69474,45 +70059,49 @@ in }) (sources."send-0.17.1" // { dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."ms-2.1.1" ]; }) sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" + sources."smart-buffer-4.1.0" + sources."socks-2.5.1" + sources."socks-proxy-agent-5.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" + sources."ssri-8.0.1" sources."statuses-1.5.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" sources."stringify-package-1.0.1" - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."systeminformation-4.34.9" + sources."tar-6.1.0" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tough-cookie-3.0.1" + sources."tough-cookie-2.5.0" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -69520,12 +70109,15 @@ in sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."underscore-1.12.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" sources."unique-string-2.0.0" sources."universalify-2.0.0" sources."unpipe-1.0.0" sources."update-notifier-4.1.3" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."valid-identifier-0.0.2" @@ -69534,6 +70126,7 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."which-2.0.2" + sources."wide-align-1.1.3" (sources."widest-line-3.1.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -69584,15 +70177,15 @@ in sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -69709,7 +70302,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globby-9.2.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -69842,7 +70435,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-regex-1.1.0" @@ -69963,7 +70556,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -70006,7 +70599,7 @@ in sources."event-emitter-0.3.5" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -70107,10 +70700,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.1.tgz"; - sha512 = "ryEU58YUtn4gxaEQ/Zwt3Bbmkoc3MghLNbNKs1MUg8zDWyM+az1SvMmZ7QaXye9DNNwn5TS2/Ok+fpw2KKvZhA=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.2.tgz"; + sha512 = "B78UC1E8LwvbmvEjIPumKXvu9yeNTpaKrNVf0HpP5AJmGgq9fdipcYKtpqRNAwm06lvhpNhO3jvR9xeRQDsmog=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -70135,7 +70728,7 @@ in sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" sources."inflight-1.0.6" @@ -70205,10 +70798,10 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.2.tgz"; - sha512 = "qRsvaxOV0b/O+Tk1SznarDNbwqY83OhXCeQ9nb1VH4oUd1TrjB5NoFdJWWu9tOhzfV1M9NVgqd0hCoMOvICf5g=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.3.tgz"; + sha512 = "YJWlLKBx4tdOJ7NbUVqKATTAHB4IJTHSTJBAj0eBbdXdmpI4WGGS725MzoapgJPiBWUMtjgZcVcR5MHe3UHczQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -70489,7 +71082,7 @@ in sources."global-4.4.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -70951,7 +71544,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globby-11.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -70976,9 +71569,10 @@ in sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.2.2" + sources."queue-microtask-1.2.2" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."slash-3.0.0" sources."temp-dir-2.0.0" @@ -71043,7 +71637,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -71205,40 +71799,40 @@ in sha512 = "ohjlUXM2v39rDqGIrlyxdcn9ql+4b+X1u90CXNWjYw5wX6C3wTHRfqFfeV8jajYD6Xc+ufn2X1QeZZWhRBXTlA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/core-7.12.16" + sources."@babel/generator-7.12.15" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-syntax-jsx-7.12.1" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.12" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-react-jsx-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -71456,7 +72050,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-alpn-1.0.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" @@ -71515,7 +72109,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -71553,9 +72147,9 @@ in version = "1.7.5"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -71565,10 +72159,10 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.158.0" - sources."@fluentui/react-focus-7.17.1" + sources."@fluentui/react-7.160.0" + sources."@fluentui/react-focus-7.17.4" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.7.1" + sources."@fluentui/theme-1.7.3" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -71579,11 +72173,11 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.146" + sources."@microsoft/load-themed-styles-1.10.147" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - (sources."@npmcli/move-file-1.1.1" // { + (sources."@npmcli/move-file-1.1.2" // { dependencies = [ sources."rimraf-3.0.2" ]; @@ -71628,13 +72222,13 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.21" - sources."@uifabric/icons-7.5.18" + sources."@uifabric/foundation-7.9.24" + sources."@uifabric/icons-7.5.21" sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.9" + sources."@uifabric/react-hooks-7.13.11" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.19" - sources."@uifabric/utilities-7.33.2" + sources."@uifabric/styling-7.18.0" + sources."@uifabric/utilities-7.33.4" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -72011,9 +72605,10 @@ in sources."each-props-1.3.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" + sources."inherits-2.0.4" ]; }) sources."emojis-list-3.0.0" @@ -72088,7 +72683,7 @@ in sources."express-openapi-7.0.1" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -72179,7 +72774,7 @@ in ]; }) sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -72200,7 +72795,7 @@ in sources."globby-10.0.2" sources."glogg-1.0.2" sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gulp-4.0.2" (sources."gulp-clean-css-4.3.0" // { dependencies = [ @@ -72601,7 +73196,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.158.0" + sources."office-ui-fabric-react-7.160.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -72761,6 +73356,7 @@ in sources."qs-6.7.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" + sources."queue-microtask-1.2.2" sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" @@ -72809,7 +73405,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -72821,13 +73417,13 @@ in sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-queue-1.0.3" sources."rx-4.1.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.32.6" + sources."sass-1.32.7" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -73128,7 +73724,7 @@ in sources."anymatch-3.1.1" sources."binary-extensions-2.2.0" sources."chokidar-3.5.1" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."is-binary-path-2.1.0" sources."readdirp-3.5.0" ]; @@ -73188,7 +73784,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -73240,9 +73836,9 @@ in sha512 = "CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -73291,7 +73887,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -73363,7 +73959,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.0.4" + sources."ajv-7.1.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -73390,15 +73986,15 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "10.0.0"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.0.0.tgz"; - sha512 = "rMZDE3kiJ2JXv1qk3i3xa5lzelEVQuTNRF5nMHQNX2SDzHKucisbNQh9ExvXU3Wd+jNjeVOSmZ6Ir0gY3COf2w=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.0.2.tgz"; + sha512 = "owgGugHDhfzqe2tjbkz+Htv4stRwFfXJEG6lc+c9dKxwgAvuYNurldosLJ2gyC66Uv/cPf4IS70wuUTmNLTrOQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" sources."has-flag-3.0.0" @@ -73450,7 +74046,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -73523,7 +74119,7 @@ in sources."supports-color-8.1.1" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.0.4" + sources."ajv-7.1.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -73576,132 +74172,131 @@ in sha512 = "C6UvtUWCsJyFOah57CKNeSP+tZeJDfED7dyHIWDQ+cQx2EYzNQVt4GIOu63u1Hzf3WArehxMroTmMayHCdhTeA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.5" // { + sources."@babel/generator-7.12.15" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + (sources."@babel/helper-compilation-targets-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-default-from-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-default-from-7.12.13" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.12.1" + sources."@babel/plugin-syntax-export-default-from-7.12.13" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" + sources."@babel/plugin-syntax-flow-7.12.13" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.1" + sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-syntax-typescript-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.10" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-assign-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-react-display-name-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.12" - sources."@babel/plugin-transform-react-jsx-source-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - (sources."@babel/plugin-transform-runtime-7.12.10" // { + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-syntax-typescript-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-assign-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-react-display-name-7.12.13" + sources."@babel/plugin-transform-react-jsx-7.12.16" + sources."@babel/plugin-transform-react-jsx-source-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + (sources."@babel/plugin-transform-runtime-7.12.15" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-typescript-7.12.1" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.11" // { + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-typescript-7.12.16" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + (sources."@babel/preset-env-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.7" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/preset-typescript-7.12.16" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@expo/apple-utils-0.0.0-alpha.17" sources."@expo/babel-preset-cli-0.2.18" sources."@expo/bunyan-4.0.0" @@ -73838,22 +74433,22 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - (sources."@npmcli/git-2.0.4" // { + (sources."@npmcli/git-2.0.6" // { dependencies = [ sources."mkdirp-1.0.4" sources."which-2.0.2" ]; }) - sources."@npmcli/installed-package-contents-1.0.5" - (sources."@npmcli/move-file-1.1.1" // { + sources."@npmcli/installed-package-contents-1.0.7" + (sources."@npmcli/move-file-1.1.2" // { dependencies = [ sources."mkdirp-1.0.4" sources."rimraf-3.0.2" ]; }) - sources."@npmcli/node-gyp-1.0.1" + sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.1" + sources."@npmcli/run-script-1.8.3" sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" sources."@react-native-community/cli-debugger-ui-4.13.1" (sources."@react-native-community/cli-platform-ios-4.13.0" // { @@ -73914,7 +74509,7 @@ in sources."@types/tapable-1.0.6" sources."@types/text-table-0.2.1" sources."@types/tmp-0.0.33" - (sources."@types/uglify-js-3.11.1" // { + (sources."@types/uglify-js-3.12.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -73957,7 +74552,7 @@ in sources."acorn-6.4.2" sources."address-1.1.2" sources."agent-base-6.0.2" - sources."agentkeepalive-4.1.3" + sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" sources."ajv-5.5.2" sources."ajv-errors-1.0.1" @@ -74006,7 +74601,6 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-2.0.1" - sources."asap-2.0.6" sources."asn1-0.2.4" (sources."asn1.js-5.4.1" // { dependencies = [ @@ -74143,7 +74737,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -74239,7 +74833,7 @@ in ]; }) sources."connect-history-api-fallback-1.6.0" - sources."consola-2.15.1" + sources."consola-2.15.3" sources."console-browserify-1.2.0" sources."console-control-strings-1.1.0" sources."constants-browserify-1.0.0" @@ -74340,7 +74934,6 @@ in sources."dashdash-1.14.1" sources."dateformat-3.0.3" sources."debug-4.3.2" - sources."debuglog-1.0.1" sources."decache-4.4.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -74387,7 +74980,6 @@ in sources."sudo-prompt-8.2.5" ]; }) - sources."dezalgo-1.0.3" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -74424,8 +75016,8 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.650" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.663" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -74449,7 +75041,7 @@ in sources."env-paths-2.2.0" sources."envinfo-7.5.0" sources."eol-0.9.1" - sources."err-code-1.1.2" + sources."err-code-2.0.3" sources."errno-0.1.8" (sources."error-ex-1.3.2" // { dependencies = [ @@ -74591,7 +75183,7 @@ in }) sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ @@ -74603,7 +75195,7 @@ in }) sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-port-3.2.0" sources."get-stream-4.1.0" @@ -74638,7 +75230,7 @@ in sources."responselike-2.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphql-0.13.2" (sources."graphql-tools-3.0.0" // { dependencies = [ @@ -74904,7 +75496,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-8.0.13" // { + (sources."make-fetch-happen-8.0.14" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -75149,7 +75741,7 @@ in sources."semver-6.3.0" ]; }) - (sources."pacote-11.2.4" // { + (sources."pacote-11.2.6" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -75368,11 +75960,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" - (sources."promise-retry-1.1.1" // { - dependencies = [ - sources."retry-0.10.1" - ]; - }) + sources."promise-retry-2.0.1" sources."prompts-2.4.0" sources."proxy-addr-2.0.6" sources."prr-1.0.1" @@ -75396,6 +75984,7 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" + sources."queue-microtask-1.2.2" sources."quick-lru-5.1.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" @@ -75407,7 +75996,7 @@ in }) sources."raw-body-2.3.3" sources."rc-1.2.8" - (sources."react-dev-utils-11.0.1" // { + (sources."react-dev-utils-11.0.2" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."array-union-2.1.0" @@ -75435,18 +76024,17 @@ in sources."which-2.0.2" ]; }) - sources."react-error-overlay-6.0.8" + sources."react-error-overlay-6.0.9" sources."react-is-16.13.1" sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" - sources."read-package-json-fast-1.2.1" + sources."read-package-json-fast-2.0.1" (sources."readable-stream-2.3.7" // { dependencies = [ sources."isarray-1.0.0" ]; }) - sources."readdir-scoped-modules-1.1.0" sources."readdirp-3.5.0" sources."recursive-readdir-2.2.2" sources."regenerate-1.4.2" @@ -75503,7 +76091,7 @@ in ]; }) sources."requires-port-1.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-alpn-1.0.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ @@ -75526,7 +76114,7 @@ in }) sources."ripemd160-2.0.2" sources."router-ips-1.0.0" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" @@ -76197,7 +76785,7 @@ in sources."function-bind-1.1.1" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -76283,7 +76871,7 @@ in sources."repeating-2.0.1" sources."request-2.88.2" sources."request-progress-2.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -76349,14 +76937,17 @@ in sources."@nodelib/fs.walk-1.2.6" (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.1" + sources."@oclif/plugin-help-3.2.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."chalk-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."has-flag-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" + sources."supports-color-7.2.0" sources."wrap-ansi-4.0.0" ]; }) @@ -76543,7 +77134,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.10.1" - sources."faunadb-4.0.2" + sources."faunadb-4.0.3" sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" sources."for-in-1.0.2" @@ -76590,7 +77181,7 @@ in ]; }) sources."got-8.3.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -76731,7 +77322,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."query-string-5.1.1" - sources."querystringify-2.2.0" + sources."queue-microtask-1.2.2" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -76744,12 +77335,11 @@ in sources."request-2.88.2" sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" - sources."requires-port-1.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."ret-0.1.15" sources."reusify-1.0.4" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -76861,7 +77451,6 @@ in }) sources."uri-js-4.4.1" sources."urix-0.1.0" - sources."url-parse-1.4.7" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -76901,9 +77490,8 @@ in sources."@google-cloud/projectify-2.0.1" sources."@google-cloud/promisify-2.0.3" sources."@google-cloud/pubsub-2.8.0" - (sources."@grpc/grpc-js-1.2.5" // { + (sources."@grpc/grpc-js-1.2.6" // { dependencies = [ - sources."@types/node-12.19.15" sources."semver-6.3.0" ]; }) @@ -76934,7 +77522,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/duplexify-3.6.0" sources."@types/long-4.0.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -76995,7 +77583,7 @@ in sources."bignumber.js-9.0.1" sources."binary-0.3.0" sources."binary-extensions-2.2.0" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."blakejs-1.1.0" sources."bluebird-3.4.7" (sources."body-parser-1.19.0" // { @@ -77173,7 +77761,7 @@ in }) (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -77224,7 +77812,7 @@ in }) sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" (sources."fstream-1.0.12" // { dependencies = [ sources."rimraf-2.7.1" @@ -77263,7 +77851,7 @@ in sources."google-gax-2.10.2" sources."google-p12-pem-3.0.3" sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gtoken-5.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -77499,7 +78087,7 @@ in sources."promise-breaker-5.0.0" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.40" + sources."@types/node-13.13.41" ]; }) sources."proxy-addr-2.0.6" @@ -77717,7 +78305,7 @@ in sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xdg-basedir-4.0.0" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.31" @@ -77794,9 +78382,9 @@ in sha512 = "untVuHgEQjwTXQGiWcwMTi0Uks6ht9R5hb1mDT4AEQitZ/z8UrhvseQsGEC3kVEjfxQ6bdmCMaA/hKTZ5aQDrA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -77917,7 +78505,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" sources."rxjs-6.6.3" @@ -77967,44 +78555,11 @@ in flood = nodeEnv.buildNodePackage { name = "flood"; packageName = "flood"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/flood/-/flood-4.4.0.tgz"; - sha512 = "rLyGvvlEY0Vh2ExK0iB4GSLXYlsBvpT3vJQox4aPQV78j+jX5kLgdFqiwMBs5F7IhJ3JeC0CCyxYnta30sB2PQ=="; + url = "https://registry.npmjs.org/flood/-/flood-4.4.1.tgz"; + sha512 = "C15ULT/FBNrjhF4Qf6d235+Pnmyv9TO6fqy4t/dS41emoHAjJsFZe5opefo6OQXtZ7BBvUz0flgPclq4zM3mkg=="; }; - dependencies = [ - sources."async-2.6.3" - sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.11" - sources."buffer-crc32-0.2.13" - sources."colors-1.4.0" - sources."concat-map-0.0.1" - sources."fd-slicer-1.1.0" - sources."fs.realpath-1.0.0" - sources."geoip-country-4.0.53" - sources."glob-7.1.6" - sources."iconv-lite-0.5.2" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ip-address-6.4.0" - sources."jsbn-1.1.0" - sources."lazy-1.0.11" - sources."lodash-4.17.20" - sources."lodash.find-4.6.0" - sources."lodash.max-4.0.1" - sources."lodash.merge-4.6.2" - sources."lodash.padstart-4.6.1" - sources."lodash.repeat-4.1.0" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."pend-1.2.0" - sources."rimraf-2.7.1" - sources."safer-buffer-2.1.2" - sources."sprintf-js-1.1.2" - sources."wrappy-1.0.2" - sources."yauzl-2.10.0" - ]; buildInputs = globalBuildInputs; meta = { description = "A modern Web UI for various torrent clients with multi-user and multi-client support"; @@ -78153,7 +78708,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -78161,7 +78716,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."has-value-1.0.0" @@ -78706,9 +79261,9 @@ in sha512 = "2H4Y6kXvYRBdh42FUz8gaLkQ5AvtYYBXRgRElXjX/st4QhG+bgHdnCFGYoTbrVc2uA2vS63HtUS8AJ7SNE6Rew=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -78738,7 +79293,7 @@ in sources."arrify-1.0.1" sources."atomically-1.7.0" sources."base64-js-1.5.1" - sources."bl-4.0.3" + sources."bl-4.1.0" (sources."boxen-5.0.0" // { dependencies = [ sources."camelcase-6.2.0" @@ -78803,7 +79358,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -78926,7 +79481,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" @@ -78996,9 +79551,9 @@ in }; dependencies = [ sources."@ardatan/aggregate-error-0.0.6" - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -79020,7 +79575,7 @@ in }) ]; }) - (sources."@graphql-tools/delegate-7.0.9" // { + (sources."@graphql-tools/delegate-7.0.10" // { dependencies = [ sources."@graphql-tools/utils-7.2.5" sources."tslib-2.1.0" @@ -79053,13 +79608,10 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/schema-7.1.2" // { + (sources."@graphql-tools/schema-7.1.3" // { dependencies = [ - (sources."@graphql-tools/utils-7.2.5" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) + sources."@graphql-tools/utils-7.2.5" + sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/url-loader-6.8.0" // { @@ -79093,7 +79645,7 @@ in sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -79226,7 +79778,7 @@ in sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -79237,14 +79789,14 @@ in sources."p-cancelable-1.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphql-15.3.0" (sources."graphql-config-3.0.3" // { dependencies = [ sources."cosmiconfig-6.0.0" ]; }) - sources."graphql-subscriptions-1.1.0" + sources."graphql-subscriptions-1.2.0" sources."graphql-type-json-0.3.2" sources."graphql-upload-11.0.0" sources."graphql-ws-4.1.0" @@ -79448,6 +80000,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."querystringify-2.2.0" + sources."queue-microtask-1.2.2" sources."rc-1.2.8" sources."reftools-1.1.8" sources."regexp.prototype.flags-1.3.1" @@ -79463,7 +80016,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" (sources."rxjs-6.6.3" // { dependencies = [ sources."tslib-1.14.1" @@ -79733,7 +80286,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -79829,10 +80382,10 @@ in makam = nodeEnv.buildNodePackage { name = "makam"; packageName = "makam"; - version = "0.7.38"; + version = "0.7.39"; src = fetchurl { - url = "https://registry.npmjs.org/makam/-/makam-0.7.38.tgz"; - sha512 = "xRlCK3zKbEvQqDUH8C6dW6O+LdV6QDoxzbe2LSghO+ZrZq+iRbnXJvvNFvFRkGFW7fqciGvGq1P1dX5Rkul12w=="; + url = "https://registry.npmjs.org/makam/-/makam-0.7.39.tgz"; + sha512 = "6XvSBJfpz1Jr5UHajYsKKLDlFcdYuhVmOJu3IqKsD14BcYoi+oZ+wfta8CVbKvRJDT7mF7e9dzCei8+nlsA3kA=="; }; buildInputs = globalBuildInputs; meta = { @@ -80216,7 +80769,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -80252,7 +80805,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -80265,7 +80818,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" @@ -80402,7 +80955,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -80622,7 +81175,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -80652,12 +81205,12 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gulplog-1.0.0" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -80793,7 +81346,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -80931,7 +81484,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.12.6" + sources."uglify-js-3.12.7" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -81255,7 +81808,7 @@ in sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."base64-js-1.5.1" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -81411,7 +81964,7 @@ in sources."object-assign-3.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-ansi-2.0.0" @@ -81668,7 +82221,7 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."good-listener-1.2.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."historic-readline-1.0.8" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -81677,7 +82230,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.5.1" - sources."jquery.terminal-2.20.2" + sources."jquery.terminal-2.21.0" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -81819,7 +82372,7 @@ in sources."get-stream-4.1.0" sources."get-uri-3.0.2" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."http-errors-1.7.3" sources."http-proxy-agent-4.0.1" @@ -81998,7 +82551,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -82012,20 +82565,20 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "3.7.1"; + version = "4.5.0"; src = fetchurl { - name = "iosevka-3.7.1.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v3.7.1"; - sha256 = "ed7aee70af326ef22458f8f7603c599fd2f5164ae8062fbd6fb7d56864d98aca"; + name = "iosevka-4.5.0.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v4.5.0"; + sha256 = "f6dc0160e927241c7a63f5278d6e19b1da93f23defa02486b9a3ac7bdd3bde74"; }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-0.10.37" - sources."@ot-builder/bin-util-0.10.37" - (sources."@ot-builder/cli-help-shower-0.10.37" // { + sources."@ot-builder/bin-composite-types-1.0.1" + sources."@ot-builder/bin-util-1.0.1" + (sources."@ot-builder/cli-help-shower-1.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82035,7 +82588,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-0.10.37" // { + (sources."@ot-builder/cli-proc-1.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82045,7 +82598,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-0.10.37" // { + (sources."@ot-builder/cli-shared-1.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82055,87 +82608,65 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-0.10.37" - sources."@ot-builder/errors-0.10.37" - sources."@ot-builder/io-bin-cff-0.10.37" - sources."@ot-builder/io-bin-encoding-0.10.37" - sources."@ot-builder/io-bin-ext-private-0.10.37" - sources."@ot-builder/io-bin-font-0.10.37" - sources."@ot-builder/io-bin-glyph-store-0.10.37" - sources."@ot-builder/io-bin-layout-0.10.37" - sources."@ot-builder/io-bin-metadata-0.10.37" - sources."@ot-builder/io-bin-metric-0.10.37" - sources."@ot-builder/io-bin-name-0.10.37" - sources."@ot-builder/io-bin-sfnt-0.10.37" - sources."@ot-builder/io-bin-ttf-0.10.37" - sources."@ot-builder/ot-0.10.37" - sources."@ot-builder/ot-encoding-0.10.37" - sources."@ot-builder/ot-ext-private-0.10.37" - sources."@ot-builder/ot-glyphs-0.10.37" - sources."@ot-builder/ot-layout-0.10.37" - sources."@ot-builder/ot-metadata-0.10.37" - sources."@ot-builder/ot-name-0.10.37" - sources."@ot-builder/ot-sfnt-0.10.37" - sources."@ot-builder/ot-standard-glyph-namer-0.10.37" - sources."@ot-builder/prelude-0.10.37" - sources."@ot-builder/primitive-0.10.37" - sources."@ot-builder/rectify-0.10.37" - sources."@ot-builder/stat-glyphs-0.10.37" - sources."@ot-builder/trace-0.10.37" - sources."@ot-builder/var-store-0.10.37" - sources."@ot-builder/variance-0.10.37" + sources."@ot-builder/common-impl-1.0.1" + sources."@ot-builder/errors-1.0.1" + sources."@ot-builder/io-bin-cff-1.0.1" + sources."@ot-builder/io-bin-encoding-1.0.1" + sources."@ot-builder/io-bin-ext-private-1.0.1" + sources."@ot-builder/io-bin-font-1.0.1" + sources."@ot-builder/io-bin-glyph-store-1.0.1" + sources."@ot-builder/io-bin-layout-1.0.1" + sources."@ot-builder/io-bin-metadata-1.0.1" + sources."@ot-builder/io-bin-metric-1.0.1" + sources."@ot-builder/io-bin-name-1.0.1" + sources."@ot-builder/io-bin-sfnt-1.0.1" + sources."@ot-builder/io-bin-ttf-1.0.1" + sources."@ot-builder/ot-1.0.1" + sources."@ot-builder/ot-encoding-1.0.1" + sources."@ot-builder/ot-ext-private-1.0.1" + sources."@ot-builder/ot-glyphs-1.0.1" + sources."@ot-builder/ot-layout-1.0.1" + sources."@ot-builder/ot-metadata-1.0.1" + sources."@ot-builder/ot-name-1.0.1" + sources."@ot-builder/ot-sfnt-1.0.1" + sources."@ot-builder/ot-standard-glyph-namer-1.0.1" + sources."@ot-builder/prelude-1.0.1" + sources."@ot-builder/primitive-1.0.1" + sources."@ot-builder/rectify-1.0.1" + sources."@ot-builder/stat-glyphs-1.0.1" + sources."@ot-builder/trace-1.0.1" + sources."@ot-builder/var-store-1.0.1" + sources."@ot-builder/variance-1.0.1" sources."@unicode/unicode-13.0.0-1.0.3" - sources."abbrev-1.1.1" - sources."ajv-6.12.6" sources."amdefine-1.0.1" - sources."ansi-regex-2.1.1" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" sources."async-0.9.2" - sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."bufferstreams-2.0.1" - sources."camelcase-3.0.0" - sources."caseless-0.12.0" + sources."camelcase-5.3.1" sources."chainsaw-0.0.9" sources."chalk-2.4.2" - sources."chownr-1.1.4" sources."cldr-5.8.0" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" - sources."cliui-3.2.0" - sources."code-point-at-1.1.0" + sources."cliui-7.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" sources."css-2.2.4" sources."css-parse-2.0.0" - sources."dashdash-1.14.1" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."ejs-3.1.5" + sources."ejs-3.1.6" sources."emoji-regex-8.0.0" - sources."error-ex-1.3.2" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."escodegen-2.0.0" (sources."escope-1.0.3" // { @@ -82163,99 +82694,41 @@ in }) sources."estraverse-5.2.0" sources."esutils-2.0.3" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."file-uri-to-path-1.0.0" - sources."filelist-1.0.1" - sources."find-up-1.1.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."filelist-1.0.2" + sources."find-up-4.1.0" sources."fs-extra-9.1.0" - sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-2.7.4" - sources."get-caller-file-1.0.3" - sources."getpass-0.1.7" + sources."get-caller-file-2.0.5" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-unicode-2.0.1" sources."hashish-0.0.4" - sources."hosted-git-info-2.8.8" - sources."http-signature-1.2.0" sources."iconv-lite-0.6.2" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."invert-kv-1.0.0" - sources."is-arrayish-0.2.1" sources."is-core-module-2.2.0" - sources."is-fullwidth-code-point-1.0.0" - sources."is-typedarray-1.0.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."isstream-0.1.2" sources."jake-10.8.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" - sources."jsprim-1.4.1" - sources."lcid-1.0.0" sources."levn-0.3.0" - sources."load-json-file-1.1.0" sources."locate-path-5.0.0" sources."lru-cache-2.5.0" sources."memoizeasync-1.1.0" - sources."microbuffer-1.0.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) - sources."minizlib-1.3.3" sources."mkdirp-1.0.4" sources."ms-2.0.0" - sources."nan-2.14.2" - (sources."node-gyp-4.0.0" // { - dependencies = [ - sources."mkdirp-0.5.5" - sources."semver-5.3.0" - sources."which-1.3.1" - ]; - }) - sources."nopt-3.0.6" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."os-homedir-1.0.2" - sources."os-locale-1.4.0" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."ot-builder-0.10.37" - (sources."otb-ttc-bundle-0.10.37" // { + sources."ot-builder-1.0.1" + (sources."otb-ttc-bundle-1.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82268,38 +82741,21 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."pako-1.0.11" - sources."parse-json-2.2.0" sources."passerror-1.1.1" - sources."patel-0.33.1" - sources."path-exists-2.1.0" + sources."patel-0.34.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."path-type-1.1.0" sources."patrisika-0.22.2" sources."patrisika-scopes-0.11.1" sources."pegjs-0.10.0" - sources."performance-now-2.1.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" - sources."process-nextick-args-2.0.1" - sources."psl-1.8.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" - sources."request-2.88.2" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."require-main-filename-2.0.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" - sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semaphore-async-await-1.5.1" @@ -82314,10 +82770,6 @@ in sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" - sources."spdx-correct-3.1.1" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" (sources."spiro-2.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -82325,12 +82777,9 @@ in }) sources."split-1.0.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.1" sources."stack-trace-0.0.9" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" (sources."stylus-0.54.8" // { dependencies = [ sources."semver-6.3.0" @@ -82338,70 +82787,50 @@ in ]; }) sources."supports-color-5.5.0" - (sources."tar-4.4.13" // { - dependencies = [ - sources."mkdirp-0.5.5" - sources."yallist-3.1.1" - ]; - }) sources."through-2.3.8" sources."toposort-2.0.2" - sources."tough-cookie-2.5.0" sources."traverse-0.3.9" sources."ts-process-promises-1.0.2" sources."tslib-2.1.0" - sources."ttf2woff-2.0.2" - sources."ttf2woff2-3.0.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typo-geom-0.11.1" sources."unicoderegexp-0.4.1" sources."universalify-2.0.0" - sources."uri-js-4.4.1" sources."urix-0.1.0" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."validate-npm-package-license-3.0.4" (sources."verda-1.2.1" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."camelcase-5.3.1" sources."chalk-4.1.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."find-up-4.1.0" - sources."get-caller-file-2.0.5" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."path-exists-4.0.0" - sources."require-main-filename-2.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."y18n-4.0.1" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" ]; }) - sources."verror-1.10.0" + sources."wawoff2-1.0.2" sources."which-2.0.2" - sources."which-module-1.0.0" - sources."wide-align-1.1.3" + sources."which-module-2.0.0" sources."word-wrap-1.2.3" sources."wordwrap-0.0.3" - sources."wrap-ansi-2.1.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."wrappy-1.0.2" sources."xmldom-0.4.0" sources."xpath-0.0.32" - sources."y18n-3.2.2" + sources."y18n-5.0.5" sources."yallist-4.0.0" - sources."yargs-6.6.0" - sources."yargs-parser-4.2.1" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -82428,7 +82857,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."escape-string-regexp-1.0.5" - sources."filelist-1.0.1" + sources."filelist-1.0.2" sources."has-flag-3.0.0" sources."minimatch-3.0.4" sources."supports-color-5.5.0" @@ -82459,7 +82888,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."bufrw-1.3.0" - sources."chai-4.2.0" + sources."chai-4.3.0" sources."chai-as-promised-7.1.1" sources."chalk-2.4.2" sources."check-error-1.0.2" @@ -82540,8 +82969,8 @@ in dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.22" - sources."@joplin/fork-sax-1.2.26" + sources."@joplin/fork-htmlparser2-4.1.23" + sources."@joplin/fork-sax-1.2.27" sources."@joplin/lib-1.0.18" (sources."@joplin/renderer-1.0.26" // { dependencies = [ @@ -82550,8 +82979,8 @@ in sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - sources."@joplin/turndown-4.0.44" - sources."@joplin/turndown-plugin-gfm-1.0.26" + sources."@joplin/turndown-4.0.45" + sources."@joplin/turndown-plugin-gfm-1.0.27" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -82591,7 +83020,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.834.0" // { + (sources."aws-sdk-2.842.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -82607,7 +83036,7 @@ in sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."buffer-5.7.1" sources."readable-stream-3.6.0" @@ -82767,7 +83196,7 @@ in }) sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."fstream-1.0.12" (sources."gauge-2.7.4" // { dependencies = [ @@ -82780,7 +83209,7 @@ in sources."github-from-package-0.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -82789,7 +83218,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" - sources."highlight.js-10.5.0" + sources."highlight.js-10.6.0" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" @@ -82949,7 +83378,7 @@ in sources."debug-4.3.2" sources."html-minifier-4.0.0" sources."ms-2.1.2" - sources."uglify-js-3.12.6" + sources."uglify-js-3.12.7" ]; }) sources."minimatch-3.0.4" @@ -83172,7 +83601,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.45.9" + sources."terminal-kit-1.47.0" (sources."terser-4.8.0" // { dependencies = [ sources."commander-2.20.3" @@ -83245,7 +83674,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -83337,13 +83766,13 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.11" + sources."@babel/parser-7.12.16" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" sources."entities-2.0.3" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" @@ -83609,7 +84038,7 @@ in sources."get-stream-4.1.0" sources."global-dirs-3.0.0" sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -83794,16 +84223,16 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.0.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.0.4.tgz"; - sha512 = "Yk451MSSV82wwThwissGvTpaHYhKDOzzzcguj+XYMmLF9ZN6QDnUmOexzYPeDcne6g0eWEkP1QttzX0N9lQybw=="; + url = "https://registry.npmjs.org/karma/-/karma-6.1.0.tgz"; + sha512 = "QmRZ6HdKe6mHd89Az6yb85URRyDbXmn2IBo3lic7cwkkLjDWpjrMJxPAKlwNa5dFM1iHdT+kjtNJM0J5YAH90A=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -83854,11 +84283,11 @@ in sources."follow-redirects-1.13.2" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."http-errors-1.7.2" sources."http-proxy-1.18.1" sources."iconv-lite-0.4.24" @@ -83903,7 +84332,7 @@ in sources."rimraf-3.0.2" sources."safer-buffer-2.1.2" sources."setprototypeof-1.1.1" - (sources."socket.io-3.1.0" // { + (sources."socket.io-3.1.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -83939,7 +84368,7 @@ in sources."void-elements-2.0.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."y18n-5.0.5" sources."yargs-16.2.0" sources."yargs-parser-20.2.4" @@ -83983,11 +84412,11 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inflight-1.0.6" @@ -84317,9 +84746,9 @@ in sha512 = "vk1lfVRFm+UuEFA7wkLKeSF7Iz13W+N/vFd48aW2yuS7Kv0RbNm2/qcDPV863056LMfkRlsEe+QYOw3palj5Lg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" (sources."@evocateur/libnpmaccess-3.1.2" // { dependencies = [ sources."aproba-2.0.0" @@ -84421,7 +84850,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-3.4.1" + sources."@octokit/openapi-types-4.0.2" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ @@ -84447,11 +84876,11 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.7.1" + sources."@octokit/types-6.8.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -84712,6 +85141,7 @@ in sources."extend-shallow-2.0.1" ]; }) + sources."filter-obj-1.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" @@ -84732,7 +85162,7 @@ in }) sources."genfun-5.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" (sources."get-pkg-repo-1.4.0" // { dependencies = [ sources."camelcase-2.1.1" @@ -84803,7 +85233,7 @@ in sources."pify-4.0.1" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" (sources."handlebars-4.7.6" // { dependencies = [ sources."source-map-0.6.1" @@ -85094,7 +85524,7 @@ in sources."punycode-2.1.1" sources."q-1.5.1" sources."qs-6.5.2" - sources."query-string-6.13.8" + sources."query-string-6.14.0" sources."quick-lru-4.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.5" @@ -85128,7 +85558,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -85275,7 +85705,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.12.6" + sources."uglify-js-3.12.7" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -85363,10 +85793,10 @@ in sha512 = "w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw=="; }; dependencies = [ - sources."copy-anything-2.0.1" + sources."copy-anything-2.0.3" sources."debug-3.2.7" sources."errno-0.1.8" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."iconv-lite-0.4.24" sources."image-size-0.5.5" sources."is-what-3.12.0" @@ -85541,7 +85971,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -85889,7 +86319,7 @@ in sources."github-slugger-1.3.0" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { @@ -86231,7 +86661,7 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -86251,57 +86681,56 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.5" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + sources."@babel/core-7.12.16" + sources."@babel/generator-7.12.15" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + sources."@babel/helper-compilation-targets-7.12.16" + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" + sources."@babel/parser-7.12.16" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -86312,47 +86741,47 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.11" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-runtime-7.12.15" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/preset-env-7.12.16" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -86368,12 +86797,12 @@ in sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.11.0" sources."@types/estree-0.0.46" - sources."@types/graceful-fs-4.1.4" + sources."@types/graceful-fs-4.1.5" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -86494,7 +86923,7 @@ in sources."big.js-5.2.2" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."buffer-5.7.1" sources."readable-stream-3.6.0" @@ -86543,7 +86972,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -86666,8 +87095,8 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.650" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.663" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -86761,12 +87190,12 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-package-type-0.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -86786,7 +87215,7 @@ in }) sources."globals-11.12.0" sources."google-closure-compiler-js-20170910.0.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" (sources."gunzip-maybe-1.4.2" // { dependencies = [ sources."browserify-zlib-0.1.4" @@ -87083,7 +87512,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -87473,7 +87902,7 @@ in sources."link-check-4.5.4" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.2.8" + sources."marked-1.2.9" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."ms-2.1.3" @@ -87592,7 +88021,7 @@ in sources."eslint-3.19.0" sources."espree-3.5.4" sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -87608,7 +88037,7 @@ in sources."exit-hook-1.1.1" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.1.0" + sources."type-2.2.0" ]; }) sources."extend-3.0.2" @@ -87631,7 +88060,7 @@ in sources."glob-7.1.6" sources."globals-9.18.0" sources."glogg-1.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gulp-eslint-3.0.1" (sources."gulp-util-3.0.8" // { dependencies = [ @@ -87732,7 +88161,7 @@ in sources."replace-ext-0.0.1" sources."request-2.88.0" sources."require-uncached-1.0.3" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.3" @@ -87865,13 +88294,13 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" @@ -87993,12 +88422,12 @@ in sources."through-2.3.8" sources."try-catch-2.0.1" sources."try-to-catch-1.1.1" - sources."uglify-js-3.12.6" + sources."uglify-js-3.12.7" sources."unbzip2-stream-1.4.3" sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -88023,20 +88452,20 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.158.0" - sources."@fluentui/react-focus-7.17.1" + sources."@fluentui/react-7.160.0" + sources."@fluentui/react-focus-7.17.4" sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.7.1" - sources."@microsoft/load-themed-styles-1.10.146" + sources."@fluentui/theme-1.7.3" + sources."@microsoft/load-themed-styles-1.10.147" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.21" - sources."@uifabric/icons-7.5.18" + sources."@uifabric/foundation-7.9.24" + sources."@uifabric/icons-7.5.21" sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.9" + sources."@uifabric/react-hooks-7.13.11" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.19" - sources."@uifabric/utilities-7.33.2" + sources."@uifabric/styling-7.18.0" + sources."@uifabric/utilities-7.33.4" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -88163,7 +88592,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.158.0" + sources."office-ui-fabric-react-7.160.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -88254,7 +88683,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.41.1" + sources."swagger-ui-dist-3.43.0" sources."tail-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -88286,10 +88715,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.2.1"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; - sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz"; + sha512 = "TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -88297,36 +88726,45 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."balanced-match-1.0.0" sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."camelcase-5.3.1" - sources."chalk-4.1.0" - sources."chokidar-3.4.3" - (sources."cliui-5.0.0" // { + sources."camelcase-6.2.0" + (sources."chalk-4.1.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."supports-color-7.2.0" + ]; + }) + sources."chokidar-3.5.1" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."debug-4.2.0" - sources."decamelize-1.2.0" - sources."diff-4.0.2" - sources."emoji-regex-7.0.3" + (sources."debug-4.3.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."decamelize-4.0.0" + sources."diff-5.0.0" + sources."emoji-regex-8.0.0" + sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - sources."esprima-4.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-5.0.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -88342,68 +88780,52 @@ in sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" sources."isexe-2.0.0" - sources."js-yaml-3.14.0" + sources."js-yaml-4.0.0" sources."locate-path-6.0.0" sources."log-symbols-4.0.0" sources."minimatch-3.0.4" - sources."ms-2.1.2" - sources."nanoid-3.1.12" + sources."ms-2.1.3" + sources."nanoid-3.1.20" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" - sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" sources."randombytes-2.1.0" sources."readdirp-3.5.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."safe-buffer-5.2.1" sources."serialize-javascript-5.0.1" - sources."set-blocking-2.0.0" - sources."sprintf-js-1.0.3" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" sources."to-regex-range-5.0.1" sources."which-2.0.2" - sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."workerpool-6.0.2" - (sources."wrap-ansi-5.1.0" // { + sources."workerpool-6.1.0" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" - sources."y18n-4.0.1" - (sources."yargs-13.3.2" // { + sources."y18n-5.0.5" + (sources."yargs-16.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."yargs-parser-13.1.2" - (sources."yargs-unparser-2.0.0" // { - dependencies = [ - sources."camelcase-6.2.0" - sources."decamelize-4.0.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -88545,65 +88967,64 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.4.6"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.4.6.tgz"; - sha512 = "ZrD6so7tmmatQTWh4U7gApxKmBj1P27Fzo2cdDqhkPUenJY5Iw3AuUY1AvQUCPyxC5Cbco2d3SQdldKQYoL9Qw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.7.1.tgz"; + sha512 = "hqvtdK1A6COn6JDw9jJPs02RN9XJmI/ke1LsO8CmtsoDByvhUfjnOUmtX00lk5KHBCMEkmxKBNkG5AVZyhjZSw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.5" // { + sources."@babel/generator-7.12.15" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + (sources."@babel/helper-compilation-targets-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -88613,49 +89034,49 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.11" // { + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + (sources."@babel/preset-env-7.12.16" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@bugsnag/browser-7.6.0" sources."@bugsnag/core-7.6.0" sources."@bugsnag/cuid-3.0.0" @@ -88665,13 +89086,13 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-8.3.4" // { + (sources."@netlify/build-9.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."execa-3.4.0" sources."locate-path-5.0.0" - sources."resolve-2.0.0-next.2" + sources."resolve-2.0.0-next.3" ]; }) (sources."@netlify/cache-utils-1.0.6" // { @@ -88679,19 +89100,19 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/config-3.1.1" // { + (sources."@netlify/config-4.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."execa-3.4.0" ]; }) - (sources."@netlify/framework-info-2.1.1" // { + (sources."@netlify/framework-info-2.3.0" // { dependencies = [ sources."locate-path-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.9" + sources."@netlify/functions-utils-1.3.12" (sources."@netlify/git-utils-1.0.7" // { dependencies = [ sources."braces-3.0.2" @@ -88732,10 +89153,10 @@ in sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" - (sources."@netlify/zip-it-and-ship-it-2.1.3" // { + (sources."@netlify/zip-it-and-ship-it-2.3.0" // { dependencies = [ sources."locate-path-5.0.0" - sources."resolve-2.0.0-next.2" + sources."resolve-2.0.0-next.3" ]; }) (sources."@nodelib/fs.scandir-2.1.4" // { @@ -88765,15 +89186,20 @@ in }) (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.1" + sources."@oclif/plugin-help-3.2.2" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" - sources."wrap-ansi-4.0.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + ]; + }) ]; }) (sources."@oclif/config-1.17.0" // { @@ -88861,7 +89287,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-3.4.1" + sources."@octokit/openapi-types-4.0.2" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -88886,7 +89312,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.7.1" + sources."@octokit/types-6.8.3" sources."@rollup/plugin-babel-5.2.3" (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ @@ -88921,7 +89347,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/node-fetch-2.5.8" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" @@ -88935,7 +89361,7 @@ in sources."accepts-1.3.7" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-7.0.4" + sources."ajv-7.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -88979,7 +89405,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.834.0" // { + (sources."aws-sdk-2.842.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -88998,7 +89424,7 @@ in sources."base64-js-1.5.1" sources."before-after-hook-2.1.1" sources."binary-extensions-2.2.0" - sources."bl-4.0.3" + sources."bl-4.1.0" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -89040,7 +89466,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -89283,7 +89709,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.663" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" @@ -89293,6 +89719,7 @@ in sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" + sources."esbuild-0.8.44" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -89414,13 +89841,13 @@ in sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" sources."gensync-1.0.0-beta.2" sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-port-5.1.1" sources."get-proxy-2.1.0" sources."get-stream-5.2.0" @@ -89469,7 +89896,7 @@ in sources."to-readable-stream-1.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" (sources."has-ansi-0.1.0" // { dependencies = [ @@ -89757,13 +90184,13 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-6.1.6" // { + (sources."netlify-6.1.7" // { dependencies = [ sources."qs-6.9.6" ]; }) sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" - sources."netlify-redirect-parser-3.0.2" + sources."netlify-redirect-parser-3.0.3" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" @@ -89927,6 +90354,7 @@ in sources."qs-6.7.0" sources."query-string-5.1.1" sources."querystring-0.2.0" + sources."queue-microtask-1.2.2" sources."random-bytes-1.0.0" sources."random-item-3.1.0" sources."randombytes-2.1.0" @@ -89971,7 +90399,7 @@ in sources."require-main-filename-2.0.0" sources."require-package-name-2.0.1" sources."requires-port-1.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" (sources."restore-cursor-2.0.0" // { @@ -89983,7 +90411,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.38.4" + sources."rollup-2.38.5" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -89997,7 +90425,7 @@ in ]; }) sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-join-0.1.3" @@ -90207,7 +90635,7 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -90404,7 +90832,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-unicode-2.0.1" @@ -90586,7 +91014,7 @@ in ]; }) sources."glob-5.0.15" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-1.0.3" @@ -90690,7 +91118,7 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -90879,16 +91307,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.8.tgz"; - sha512 = "OBxxDA/Qn4W0H4J9oKGV64bT2F42eziZoR+lUZuZH0QfQqTl7ExWj2anu4CMuBtDcBhQN856idriwnhBxHqdDA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.9.tgz"; + sha512 = "1BXFaT7oDd5VM80O+1Lf72P9wCkYjg3CODROPRIPvcSEke6ubMo1M5GFsgh5EwGPLlTTlkuSgI+a4T3UhjAzbQ=="; }; dependencies = [ - sources."@babel/runtime-7.12.5" - sources."@node-red/editor-api-1.2.8" - sources."@node-red/editor-client-1.2.8" - (sources."@node-red/nodes-1.2.8" // { + sources."@babel/runtime-7.12.13" + sources."@node-red/editor-api-1.2.9" + sources."@node-red/editor-client-1.2.9" + (sources."@node-red/nodes-1.2.9" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -90902,9 +91330,9 @@ in }) ]; }) - sources."@node-red/registry-1.2.8" - sources."@node-red/runtime-1.2.8" - sources."@node-red/util-1.2.8" + sources."@node-red/registry-1.2.9" + sources."@node-red/runtime-1.2.9" + sources."@node-red/util-1.2.9" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -90960,7 +91388,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."inherits-2.0.4" sources."readable-stream-3.6.0" @@ -91085,7 +91513,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -91184,7 +91612,7 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; }) (sources."mqtt-packet-6.7.0" // { @@ -91446,7 +91874,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -91522,7 +91950,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" @@ -91634,12 +92062,12 @@ in sources."end-of-stream-1.4.4" sources."escape-goat-2.1.1" sources."fill-range-7.0.1" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."global-dirs-2.1.0" sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -91743,15 +92171,15 @@ in np = nodeEnv.buildNodePackage { name = "np"; packageName = "np"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/np/-/np-7.2.0.tgz"; - sha512 = "jfMFJXAJlGkCowMPGzA8Ywbmywk7I9hT96DsOcWjDsjq/zP5h6m3VZDcZ1AWYoCBPg4E/lFrJxROmiQH3OWnzA=="; + url = "https://registry.npmjs.org/np/-/np-7.3.0.tgz"; + sha512 = "rbKZ7YMtdyv7k2ViAfhkcmDUimQxTMDyGs8qH3Ex2tzoxei9ZSrQUm2LkTzZ7Uwtde9pIAyud/rwsyxS4w9lDg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -91776,7 +92204,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -91894,7 +92322,7 @@ in sources."type-fest-0.10.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."hard-rejection-2.1.0" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -92163,6 +92591,7 @@ in sources."escape-goat-2.1.1" ]; }) + sources."queue-microtask-1.2.2" sources."quick-lru-4.0.1" sources."rc-1.2.8" (sources."read-pkg-5.2.0" // { @@ -92181,7 +92610,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" (sources."resolve-cwd-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -92193,7 +92622,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."rxjs-6.6.3" sources."safer-buffer-2.1.2" sources."scoped-regex-2.1.0" @@ -92273,11 +92702,16 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.11"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.11.tgz"; - sha512 = "1Zh7LjuIoEhIyjkBflSSGzfjuPQwDlghNloppjruOH5bmj9midT9qcNT0tRUZRR04shU9ekrxNy9+UTBrqeBpQ=="; + url = "https://registry.npmjs.org/npm/-/npm-7.5.3.tgz"; + sha512 = "4MhBvHrQ82v5cvoWe7tX+IK8Z2xsbde9IS9sCP3SKpRo4JOHxe14tpZ/ZOTCy8xkp0DhBYqjxECmWv2EZK8BXg=="; }; + dependencies = [ + sources."@npmcli/installed-package-contents-1.0.7" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + ]; buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; @@ -92301,18 +92735,18 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.4" - sources."@npmcli/installed-package-contents-1.0.5" - sources."@npmcli/move-file-1.1.1" - sources."@npmcli/node-gyp-1.0.1" + sources."@npmcli/git-2.0.6" + sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/move-file-1.1.2" + sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.1" + sources."@npmcli/run-script-1.8.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.1.3" + sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-align-3.0.0" // { @@ -92330,7 +92764,6 @@ in sources."are-we-there-yet-1.1.5" sources."argparse-2.0.1" sources."array-union-2.1.0" - sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -92380,14 +92813,12 @@ in sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" sources."debug-4.3.2" - sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."dezalgo-1.0.3" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" @@ -92396,7 +92827,7 @@ in sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" - sources."err-code-1.1.2" + sources."err-code-2.0.3" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" @@ -92433,7 +92864,7 @@ in }) sources."globby-11.0.2" sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-4.0.0" @@ -92505,7 +92936,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.13" + sources."make-fetch-happen-8.0.14" sources."map-age-cleaner-0.1.3" sources."mem-8.0.0" sources."merge2-1.4.1" @@ -92552,7 +92983,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.2.4" + sources."pacote-11.2.6" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -92563,7 +92994,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" - sources."promise-retry-1.1.1" + sources."promise-retry-2.0.1" sources."prompts-2.4.0" sources."psl-1.8.0" sources."puka-1.0.1" @@ -92571,21 +93002,21 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."qs-6.5.2" + sources."queue-microtask-1.2.2" sources."rc-1.2.8" sources."rc-config-loader-4.0.0" - sources."read-package-json-fast-1.2.1" + sources."read-package-json-fast-2.0.1" sources."readable-stream-2.3.7" - sources."readdir-scoped-modules-1.1.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remote-git-tags-3.0.0" sources."request-2.88.2" sources."require-from-string-2.0.2" sources."responselike-1.0.2" - sources."retry-0.10.1" + sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-7.3.4" @@ -92879,112 +93310,111 @@ in sha512 = "G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.12.16" // { dependencies = [ sources."json5-2.2.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.11" // { + (sources."@babel/generator-7.12.15" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.5" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + sources."@babel/helper-compilation-targets-7.12.16" + sources."@babel/helper-create-class-features-plugin-7.12.16" + sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" + sources."@babel/plugin-syntax-flow-7.12.13" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.1" + sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.10" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.12" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.11" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-react-jsx-7.12.16" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/preset-env-7.12.16" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -93099,7 +93529,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -93234,8 +93664,8 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.650" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.663" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -93293,7 +93723,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-port-3.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -93305,7 +93735,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -93651,7 +94081,7 @@ in sources."request-2.88.2" sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -93951,10 +94381,10 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."handlebars-4.7.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -94095,7 +94525,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.12.6" + sources."uglify-js-3.12.7" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -94235,7 +94665,7 @@ in sources."fs.realpath-1.0.0" sources."get-value-2.0.6" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -94497,10 +94927,10 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -94613,6 +95043,7 @@ in sources."plist-1.2.0" sources."process-nextick-args-2.0.1" sources."pump-2.0.1" + sources."queue-microtask-1.2.2" sources."random-access-file-2.1.5" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -94626,12 +95057,12 @@ in sources."redent-1.0.0" sources."regexp.prototype.flags-1.3.1" sources."repeating-2.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-series-1.1.9" sources."rusha-0.8.13" sources."rxjs-5.5.12" @@ -94758,7 +95189,7 @@ in sources."ws-1.1.5" ]; }) - sources."bl-4.0.3" + sources."bl-4.1.0" sources."blob-0.0.5" sources."bn.js-4.11.9" sources."bncode-0.5.3" @@ -94845,7 +95276,7 @@ in sources."get-browser-rtc-1.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { @@ -94961,6 +95392,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" + sources."queue-microtask-1.2.2" sources."random-access-file-2.1.5" sources."random-access-storage-1.4.1" sources."random-bytes-1.0.0" @@ -94977,7 +95409,7 @@ in ]; }) sources."rimraf-2.7.1" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."run-series-1.1.9" sources."rusha-0.8.13" sources."safe-buffer-5.1.2" @@ -95062,7 +95494,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -95209,7 +95641,7 @@ in sources."fill-range-7.0.1" sources."follow-redirects-1.13.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" (sources."ftp-0.3.10" // { dependencies = [ sources."readable-stream-1.1.14" @@ -95261,7 +95693,7 @@ in sources."mkdirp-1.0.4" sources."module-details-from-path-1.0.3" sources."moment-2.29.1" - sources."moment-timezone-0.5.32" + sources."moment-timezone-0.5.33" sources."ms-2.1.3" sources."mute-stream-0.0.8" (sources."needle-2.4.0" // { @@ -95313,7 +95745,7 @@ in }) sources."readdirp-3.5.0" sources."require-in-the-middle-5.1.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."run-series-1.1.9" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -95375,10 +95807,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.16.0"; + version = "5.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.16.0.tgz"; - sha512 = "f7bNVvYGK24eiZ5gYX4wKOSohg6kIybEhrprHqUtFsP3TfttGSLqid1OTzLvVzwVp58QBj9ifOVwRQ+RiSmE0A=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.17.1.tgz"; + sha512 = "jSQZCzWyf3tZSANyWnA/errzlnomqrZQO11yvURLxkLDyJvzi5D1equahjJXyT/ubd7S2iJb8dlkHvqR5ORb3w=="; }; buildInputs = globalBuildInputs; meta = { @@ -95402,7 +95834,7 @@ in sources."commander-2.11.0" sources."file-or-stdin-1.0.2" sources."get-stdin-5.0.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."inspect-with-kind-1.0.5" sources."kind-of-6.0.3" sources."poor-mans-t-sql-formatter-1.6.10" @@ -95427,9 +95859,9 @@ in sha512 = "leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -95468,12 +95900,12 @@ in sources."fastq-1.10.1" sources."fill-range-7.0.1" sources."fs-extra-9.1.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."get-stdin-8.0.0" sources."glob-parent-5.1.1" sources."globby-11.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."ignore-5.1.8" sources."import-cwd-3.0.0" @@ -95506,15 +95938,16 @@ in sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" - sources."postcss-load-config-3.0.0" + sources."postcss-load-config-3.0.1" sources."postcss-reporter-7.0.2" sources."pretty-hrtime-1.0.3" + sources."queue-microtask-1.2.2" sources."read-cache-1.0.0" sources."readdirp-3.5.0" sources."require-directory-2.1.1" sources."resolve-from-4.0.0" sources."reusify-1.0.4" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."slash-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" @@ -95685,7 +96118,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -95700,7 +96133,7 @@ in sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.6" sources."globule-1.3.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" (sources."hash-base-3.1.0" // { dependencies = [ @@ -95792,7 +96225,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" @@ -95908,10 +96341,10 @@ in purty = nodeEnv.buildNodePackage { name = "purty"; packageName = "purty"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/purty/-/purty-6.3.0.tgz"; - sha512 = "l70uQyz+t5GvCPzOorUbIhRX3oQW9i8Kgwr0LvS6nUq+UM4rMJdYcHazuupcLVInvNsbd290EnpjaRgAITt0dw=="; + url = "https://registry.npmjs.org/purty/-/purty-6.3.1.tgz"; + sha512 = "KfOSejzz4PExqRwhRuLIJoggKY+cCVLGt+fB4csiyEv3ATX0IB93udl66UW4ZVj/zNJ4Ds+FK9nLfEXcNwBo5A=="; }; buildInputs = globalBuildInputs; meta = { @@ -95926,10 +96359,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.108"; + version = "1.1.109"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.108.tgz"; - sha512 = "LX6nLg1uu9DXSuvM4PeqSX2mVAzwoh8RfhTLK/W7zpEFYmdKVZXpJlgzwSfPVrRWjq/bEmj+hIYckkx0adBMjQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.109.tgz"; + sha512 = "CAaPMKMmeucbbaDLADjhtOdr/KEKknALovBlGh+VbFqAVta1rxrytiIzF2V6xKWx0QpKdkRixkItSa8rTWalnw=="; }; buildInputs = globalBuildInputs; meta = { @@ -96072,7 +96505,7 @@ in sources."reduce-flatten-1.0.1" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.7.1" @@ -96193,7 +96626,7 @@ in sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -96286,7 +96719,7 @@ in sources."esprima-3.1.3" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -96320,10 +96753,10 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "2.0.0-pre.5"; + version = "2.2.1-pre"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.0.0-pre.5.tgz"; - sha512 = "FCo6lqXhdj7sn7c2dzT+sp/DiQ9EsFnm+hVs5uzH2tP/qYahcwZN8vfKi+iJaoBfOgWgfnOH/1MM8IDj8lGGXg=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.2.1-pre.tgz"; + sha512 = "1f8y1ZeGRYskJyZZQzXVw5OlzQKs597JEr48wBzD6ZhmDhUbtqxswsFYROfCigWpkxywBsykesDy8ENKDOYQZg=="; }; dependencies = [ sources."@gardenapple/yargs-17.0.0-candidate.0" @@ -96448,7 +96881,7 @@ in sources."whatwg-url-8.4.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.5" @@ -96473,31 +96906,32 @@ in sha512 = "j4dwDetXrQT5sz1wl6/ZckQ0Ynl9Z+Q/De+e4Qz29dqAq0itimml55DcGRDMyIfEcyYkFgdzpusvWIAi1t/OUw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - (sources."@babel/generator-7.12.11" // { + sources."@babel/code-frame-7.12.13" + (sources."@babel/generator-7.12.15" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.16" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.40" + sources."@scarf/scarf-1.1.0" + sources."@types/node-13.13.41" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -96579,9 +97013,10 @@ in }) sources."domain-browser-1.2.0" sources."dompurify-2.2.6" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" + sources."inherits-2.0.4" ]; }) sources."emoji-regex-8.0.0" @@ -96599,7 +97034,7 @@ in sources."find-up-4.1.0" sources."foreach-2.0.5" sources."format-util-1.0.5" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-parent-5.1.1" sources."globals-11.12.0" @@ -96656,7 +97091,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.1.4" + sources."mobx-6.1.6" sources."mobx-react-7.1.0" sources."mobx-react-lite-3.2.0" sources."ms-2.1.2" @@ -96688,7 +97123,7 @@ in sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" - sources."polished-3.6.7" + sources."polished-3.7.0" sources."postcss-value-parser-4.1.0" sources."prismjs-1.23.0" sources."process-0.11.10" @@ -96707,7 +97142,7 @@ in sources."react-16.14.0" sources."react-dom-16.14.0" sources."react-is-16.13.1" - sources."react-tabs-3.1.2" + sources."react-tabs-3.2.0" (sources."readable-stream-2.3.7" // { dependencies = [ sources."inherits-2.0.4" @@ -96756,7 +97191,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.1.0" sources."tty-browserify-0.0.0" - sources."uglify-js-3.12.6" + sources."uglify-js-3.12.7" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -96826,13 +97261,13 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.38.4"; + version = "2.38.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz"; - sha512 = "B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.38.5.tgz"; + sha512 = "VoWt8DysFGDVRGWuHTqZzT02J0ASgjVq/hPs9QcBOGMd7B+jfTr/iqMVEyOi901rE3xq+Deq66GzIT1yt7sGwQ=="; }; dependencies = [ - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" ]; buildInputs = globalBuildInputs; meta = { @@ -96850,9 +97285,9 @@ in version = "0.4.0-dev"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -96881,14 +97316,14 @@ in sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.8" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.52.0" - sources."@typescript-eslint/eslint-plugin-4.14.2" - sources."@typescript-eslint/experimental-utils-4.14.2" - sources."@typescript-eslint/parser-4.14.2" - sources."@typescript-eslint/scope-manager-4.14.2" - sources."@typescript-eslint/types-4.14.2" - sources."@typescript-eslint/typescript-estree-4.14.2" - sources."@typescript-eslint/visitor-keys-4.14.2" + sources."@types/vscode-1.53.0" + sources."@typescript-eslint/eslint-plugin-4.15.0" + sources."@typescript-eslint/experimental-utils-4.15.0" + sources."@typescript-eslint/parser-4.15.0" + sources."@typescript-eslint/scope-manager-4.15.0" + sources."@typescript-eslint/types-4.15.0" + sources."@typescript-eslint/typescript-estree-4.15.0" + sources."@typescript-eslint/visitor-keys-4.15.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -96917,7 +97352,7 @@ in sources."buffers-0.1.1" sources."builtin-modules-3.2.0" sources."callsites-3.1.0" - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."chainsaw-0.1.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -96930,16 +97365,8 @@ in }) sources."cheerio-1.0.0-rc.5" sources."cheerio-select-tmp-0.1.1" - sources."chokidar-3.4.3" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."chokidar-3.5.1" + sources."cliui-7.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" @@ -96952,12 +97379,12 @@ in sources."css-select-3.1.2" sources."css-what-4.0.0" sources."debug-4.3.2" - sources."decamelize-1.2.0" + sources."decamelize-4.0.0" sources."deep-is-0.1.3" sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" sources."denodeify-1.2.1" - sources."diff-4.0.2" + sources."diff-5.0.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."dom-serializer-1.2.0" @@ -96975,6 +97402,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."entities-2.1.0" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" (sources."eslint-7.19.0" // { dependencies = [ @@ -96994,7 +97422,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -97021,7 +97449,7 @@ in sources."flatted-3.1.1" sources."form-data-3.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" (sources."fstream-1.0.12" // { dependencies = [ sources."rimraf-2.7.1" @@ -97034,7 +97462,7 @@ in sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."globby-11.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -97085,18 +97513,24 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.2.1" // { + (sources."mocha-8.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."argparse-2.0.1" + (sources."debug-4.3.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) sources."escape-string-regexp-4.0.0" sources."has-flag-4.0.0" - sources."js-yaml-3.14.0" - sources."supports-color-7.2.0" + sources."js-yaml-4.0.0" + sources."ms-2.1.3" + sources."supports-color-8.1.1" ]; }) sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanoid-3.1.12" + sources."nanoid-3.1.20" sources."natural-compare-1.4.0" sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" @@ -97109,7 +97543,6 @@ in sources."osenv-0.1.5" sources."p-limit-3.1.0" sources."p-locate-5.0.0" - sources."p-try-2.2.0" sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { dependencies = [ @@ -97130,6 +97563,7 @@ in sources."progress-2.0.3" sources."pseudomap-1.0.2" sources."punycode-2.1.1" + sources."queue-microtask-1.2.2" sources."randombytes-2.1.0" sources."read-1.0.7" (sources."readable-stream-2.3.7" // { @@ -97141,21 +97575,15 @@ in sources."regexpp-3.1.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - (sources."rollup-2.38.4" // { - dependencies = [ - sources."fsevents-2.3.1" - ]; - }) - sources."run-parallel-1.1.10" + sources."rollup-2.38.5" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.4" sources."serialize-javascript-5.0.1" - sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -97181,7 +97609,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.0.4" + sources."ajv-7.1.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -97199,7 +97627,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."typed-rest-client-1.2.0" - sources."typescript-4.1.3" + sources."typescript-4.1.5" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" @@ -97221,7 +97649,6 @@ in sources."vscode-languageserver-types-3.16.0" sources."vscode-test-1.5.0" sources."which-2.0.2" - sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -97231,40 +97658,20 @@ in ]; }) sources."word-wrap-1.2.3" - sources."workerpool-6.0.2" - (sources."wrap-ansi-5.1.0" // { + sources."workerpool-6.1.0" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."wrappy-1.0.2" - sources."y18n-4.0.1" + sources."y18n-5.0.5" sources."yallist-4.0.0" - (sources."yargs-13.3.2" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."find-up-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."yargs-parser-13.1.2" - (sources."yargs-unparser-2.0.0" // { - dependencies = [ - sources."camelcase-6.2.0" - sources."decamelize-4.0.0" - ]; - }) + sources."yargs-16.2.0" + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" sources."yocto-queue-0.1.0" @@ -97411,10 +97818,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.32.6"; + version = "1.32.7"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz"; - sha512 = "1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.7.tgz"; + sha512 = "C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A=="; }; dependencies = [ sources."anymatch-3.1.1" @@ -97422,7 +97829,7 @@ in sources."braces-3.0.2" sources."chokidar-3.5.1" sources."fill-range-7.0.1" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."glob-parent-5.1.1" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" @@ -97574,10 +97981,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.22.0"; + version = "2.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.22.0.tgz"; - sha512 = "uXKeoPZfOrTU6ZpHUng7cYZfKQd8aFHfDsX11JHeznPGhBuq1KfF/14o2VEOoFPeTHTHKmHzkWbIKYhJHHBxuw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.23.0.tgz"; + sha512 = "D5RN0ywVPxL4EFfIzREx9K7vgkHlXBQQn9zTfDzlfz2WHkmKX0kW3LG89J51UYNdeKlBN1YXPIphybzZH3ujOw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -97609,23 +98016,12 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.6.0" // { + (sources."@serverless/components-3.6.2" // { dependencies = [ - (sources."@serverless/utils-2.2.0" // { - dependencies = [ - sources."js-yaml-4.0.0" - ]; - }) sources."ansi-regex-5.0.0" - sources."argparse-2.0.1" - (sources."js-yaml-3.14.1" // { - dependencies = [ - sources."argparse-1.0.10" - ]; - }) + sources."js-yaml-3.14.1" sources."ramda-0.27.1" sources."strip-ansi-6.0.0" - sources."write-file-atomic-3.0.3" ]; }) (sources."@serverless/core-1.1.2" // { @@ -97635,13 +98031,13 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-4.4.2" // { + (sources."@serverless/enterprise-plugin-4.4.3" // { dependencies = [ sources."js-yaml-3.14.1" ]; }) sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-3.10.0" // { + (sources."@serverless/platform-client-3.11.0" // { dependencies = [ sources."js-yaml-3.14.1" ]; @@ -97681,7 +98077,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.168" sources."@types/long-4.0.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -97711,7 +98107,7 @@ in (sources."archiver-5.2.0" // { dependencies = [ sources."async-3.2.0" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."tar-stream-2.2.0" ]; }) @@ -97738,7 +98134,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.834.0" // { + (sources."aws-sdk-2.842.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -97853,7 +98249,7 @@ in sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" - sources."crc32-stream-4.0.1" + sources."crc32-stream-4.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -97997,7 +98393,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fs2-0.3.9" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" (sources."gauge-2.7.4" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -98027,7 +98423,7 @@ in sources."responselike-2.0.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -98110,7 +98506,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - (sources."jszip-3.5.0" // { + (sources."jszip-3.6.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -98251,7 +98647,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.40" + sources."@types/node-13.13.41" sources."long-4.0.0" ]; }) @@ -98262,6 +98658,7 @@ in sources."qs-6.5.2" sources."query-string-5.1.1" sources."querystring-0.2.0" + sources."queue-microtask-1.2.2" sources."quick-lru-5.1.1" sources."ramda-0.26.1" sources."rc-1.2.8" @@ -98286,8 +98683,8 @@ in sources."retry-0.10.1" sources."reusify-1.0.4" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" - sources."run-parallel-limit-1.0.6" + sources."run-parallel-1.2.0" + sources."run-parallel-limit-1.1.0" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -98302,7 +98699,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.31.0" // { + (sources."simple-git-2.34.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -98413,7 +98810,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-2.1.0" + sources."type-2.2.0" sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unbzip2-stream-1.4.3" @@ -98463,7 +98860,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.5.5" @@ -98816,7 +99213,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-value-2.0.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graceful-readlink-1.0.1" sources."has-flag-3.0.0" sources."has-value-1.0.0" @@ -99125,12 +99522,13 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.440.4"; + version = "1.452.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.440.4.tgz"; - sha512 = "ylKtCeG4VQ1aPn/yHYkP8Baokw1nnlBAy5D4T+eWFDyv6y86lqUat/DdbzORWy4rofj5ZS0sv36Hcxum3t1x3g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.452.0.tgz"; + sha512 = "afwZGN8ze1J1SMGtI5TbjYtESREWFD78oqum1azV6fuCOwS5j8aYcEFep358dqUcKnKEG5TIJ0J09+fW/AvSjw=="; }; dependencies = [ + sources."@open-policy-agent/opa-wasm-1.2.0" sources."@sindresorhus/is-2.1.1" sources."@snyk/cli-interface-2.11.0" (sources."@snyk/cocoapods-lockfile-parser-3.5.2" // { @@ -99167,9 +99565,8 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.6" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/responselike-1.0.0" - sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -99185,7 +99582,11 @@ in sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" sources."archy-1.0.0" - sources."argparse-1.0.10" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) sources."asap-2.0.6" sources."asn1-0.2.4" (sources."ast-types-0.14.2" // { @@ -99197,7 +99598,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -99273,7 +99674,7 @@ in sources."string_decoder-1.3.0" ]; }) - sources."dockerfile-ast-0.0.30" + sources."dockerfile-ast-0.1.0" sources."dot-prop-5.3.0" sources."dotnet-deps-parser-5.0.0" sources."duplexer3-0.1.4" @@ -99316,7 +99717,7 @@ in sources."glob-7.1.6" sources."global-dirs-2.1.0" sources."got-11.4.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."gunzip-maybe-1.4.2" sources."has-flag-3.0.0" @@ -99380,7 +99781,7 @@ in sources."isexe-2.0.0" sources."js-yaml-3.14.1" sources."json-buffer-3.0.1" - (sources."jszip-3.5.0" // { + (sources."jszip-3.6.0" // { dependencies = [ sources."pako-1.0.11" ]; @@ -99394,17 +99795,30 @@ in sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" + sources."lodash.constant-3.0.0" + sources."lodash.filter-4.6.0" sources."lodash.findkey-4.6.0" sources."lodash.flatmap-4.5.0" sources."lodash.flatten-4.4.0" + sources."lodash.foreach-4.5.0" sources."lodash.get-4.4.2" + sources."lodash.has-4.5.2" sources."lodash.invert-4.3.0" sources."lodash.isempty-4.4.0" sources."lodash.isequal-4.5.0" + sources."lodash.isfunction-3.0.9" + sources."lodash.isundefined-3.0.1" + sources."lodash.keys-4.2.0" + sources."lodash.map-4.6.0" sources."lodash.merge-4.6.2" + sources."lodash.reduce-4.6.0" sources."lodash.set-4.3.2" + sources."lodash.size-4.2.0" sources."lodash.topairs-4.3.0" + sources."lodash.transform-4.6.0" + sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" + sources."lodash.values-4.3.0" sources."lowercase-keys-2.0.0" sources."lru-cache-5.1.1" sources."macos-release-2.4.1" @@ -99520,7 +99934,7 @@ in sources."tslib-2.1.0" ]; }) - (sources."snyk-docker-plugin-4.13.1" // { + (sources."snyk-docker-plugin-4.16.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -99534,7 +99948,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.12.2" // { + (sources."snyk-gradle-plugin-3.12.3" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ @@ -99593,9 +100007,9 @@ in sources."tslib-1.11.1" ]; }) - (sources."snyk-poetry-lockfile-parser-1.1.2" // { + (sources."snyk-poetry-lockfile-parser-1.1.5" // { dependencies = [ - (sources."@snyk/dep-graph-1.23.0" // { + (sources."@snyk/dep-graph-1.23.1" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -99614,20 +100028,16 @@ in }) ]; }) - sources."snyk-python-plugin-1.19.2" + sources."snyk-python-plugin-1.19.4" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.2.7" ]; }) - (sources."snyk-resolve-deps-4.4.0" // { + (sources."snyk-resolve-deps-4.7.2" // { dependencies = [ - sources."@types/node-6.14.13" - sources."debug-3.2.7" - sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" sources."semver-5.7.1" - sources."snyk-module-1.9.1" sources."yallist-2.1.2" ]; }) @@ -99653,7 +100063,7 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."split-ca-1.0.1" - sources."sprintf-js-1.0.3" + sources."sprintf-js-1.1.2" sources."ssh2-0.8.9" sources."ssh2-streams-0.4.10" sources."statuses-1.5.0" @@ -99715,6 +100125,7 @@ in ]; }) sources."url-parse-lax-3.0.0" + sources."utf8-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vscode-languageserver-types-3.16.0" @@ -99753,16 +100164,16 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz"; - sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz"; + sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -99780,7 +100191,7 @@ in sources."socket.io-adapter-2.1.0" sources."socket.io-parser-4.0.4" sources."vary-1.1.2" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; buildInputs = globalBuildInputs; meta = { @@ -99847,7 +100258,7 @@ in sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" @@ -99916,7 +100327,7 @@ in sources."redent-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" sources."safe-buffer-5.2.1" @@ -99976,6 +100387,13 @@ in sha512 = "+KXfMBecoFFAo0C4FTfSsH2ZXtrL2aQDXgVlQ0NrYdNLHW2TEnibV0hG3yq3hOlAEUQmrwVHZATfVToO825gxA=="; }; dependencies = [ + (sources."@sammacbeth/random-access-idb-mutable-file-0.1.1" // { + dependencies = [ + sources."buffer-5.1.0" + sources."random-access-storage-1.3.0" + ]; + }) + sources."@types/minimatch-3.0.3" sources."abstract-leveldown-6.0.3" sources."aligned-block-file-1.2.2" sources."ansi-escapes-1.4.0" @@ -99986,17 +100404,25 @@ in sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-differ-3.0.0" sources."array-filter-1.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" + (sources."async-append-only-log-3.0.3" // { + dependencies = [ + sources."push-stream-11.0.0" + ]; + }) sources."async-each-1.0.3" sources."async-single-1.0.5" sources."async-write-2.1.0" sources."atob-2.1.2" sources."atomic-file-1.1.5" + sources."atomically-1.7.0" + sources."atomically-universal-0.1.1" sources."attach-ware-1.1.1" sources."available-typed-arrays-1.0.2" sources."bail-1.0.5" @@ -100012,12 +100438,17 @@ in sources."bash-color-0.0.4" sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" + sources."binary-search-bounds-2.0.5" sources."bindings-1.5.0" + sources."bipf-1.4.0" sources."blake2s-1.1.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."broadcast-stream-0.2.2" sources."buffer-5.7.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" (sources."cache-base-1.0.1" // { dependencies = [ @@ -100059,6 +100490,8 @@ in sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.6" sources."collection-visit-1.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."commander-2.20.3" sources."compare-at-paths-1.0.0" sources."component-emitter-1.3.0" @@ -100080,6 +100513,7 @@ in sources."continuable-series-1.2.0" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" + sources."cpu-percentage-1.0.3" sources."cross-spawn-6.0.5" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" @@ -100110,6 +100544,7 @@ in sources."abstract-leveldown-6.3.0" ]; }) + sources."end-of-stream-1.4.4" sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" (sources."es-abstract-1.18.0-next.2" // { @@ -100124,6 +100559,16 @@ in }) sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" + (sources."execa-4.1.0" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."onetime-5.1.2" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -100136,9 +100581,11 @@ in }) sources."extend.js-0.0.2" sources."extglob-0.3.2" + sources."fastintcompression-0.0.4" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" + sources."find-up-4.1.0" (sources."flumecodec-0.0.0" // { dependencies = [ sources."level-codec-6.2.0" @@ -100183,16 +100630,18 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" + sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."globby-4.1.0" sources."gossip-query-2.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-ansi-2.0.0" + sources."has-flag-4.0.0" sources."has-network-0.0.1" sources."has-symbols-1.0.1" (sources."has-value-1.0.0" // { @@ -100214,8 +100663,10 @@ in sources."he-0.5.0" sources."heap-0.2.6" sources."hoox-0.0.1" + sources."human-signals-1.1.1" sources."idb-kv-store-4.5.0" sources."ieee754-1.2.1" + sources."ignore-5.1.8" sources."immediate-3.2.3" sources."increment-buffer-1.0.1" sources."inflight-1.0.6" @@ -100261,6 +100712,7 @@ in sources."is-negative-zero-2.0.1" sources."is-number-2.1.0" sources."is-number-object-1.0.4" + sources."is-options-1.0.1" (sources."is-plain-object-2.0.4" // { dependencies = [ sources."isobject-3.0.1" @@ -100270,6 +100722,7 @@ in sources."is-primitive-2.0.0" sources."is-regex-1.1.2" sources."is-set-2.0.2" + sources."is-stream-2.0.0" sources."is-string-1.0.5" sources."is-symbol-1.0.3" sources."is-typed-array-1.1.4" @@ -100281,6 +100734,14 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" + (sources."jitdb-2.0.7" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."push-stream-11.0.0" + sources."typedarray-to-buffer-4.0.0" + ]; + }) + sources."jsesc-3.0.2" sources."json-buffer-2.0.11" sources."kind-of-3.2.2" sources."layered-graph-1.1.3" @@ -100307,6 +100768,8 @@ in sources."libnested-1.5.0" sources."libsodium-0.7.9" sources."libsodium-wrappers-0.7.9" + sources."locate-path-5.0.0" + sources."lodash.debounce-4.0.8" sources."lodash.get-4.4.2" sources."log-symbols-1.0.2" sources."log-update-1.0.2" @@ -100321,7 +100784,9 @@ in sources."markdown-table-0.4.0" sources."math-random-1.0.4" sources."mdmanifest-1.0.8" + sources."merge-stream-2.0.0" sources."micromatch-2.3.11" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -100330,12 +100795,20 @@ in ]; }) sources."mkdirp-0.5.5" + sources."mkdirp-classic-0.5.3" sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" + sources."mri-1.1.6" sources."ms-2.1.2" sources."multiblob-1.13.7" sources."multiblob-http-1.0.0" sources."multicb-1.2.2" + (sources."multimatch-4.0.0" // { + dependencies = [ + sources."array-union-2.1.0" + sources."arrify-2.0.1" + ]; + }) sources."multiserver-3.7.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" @@ -100360,12 +100833,18 @@ in sources."napi-macros-2.0.0" sources."ncp-2.0.0" sources."nearley-2.20.1" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" sources."npm-prefix-1.2.0" + (sources."npm-run-path-4.0.1" // { + dependencies = [ + sources."path-key-3.1.1" + ]; + }) sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -100408,11 +100887,16 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."p-defer-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."packet-stream-2.0.5" sources."packet-stream-codec-1.1.3" sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -100420,13 +100904,25 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."plur-2.1.2" + sources."polyraf-1.1.0" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" + sources."prettier-2.2.1" + (sources."pretty-quick-3.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-3.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."private-box-0.3.1" sources."process-nextick-args-2.0.1" + sources."promisify-4loc-1.0.0" sources."promisize-1.1.2" sources."prr-1.0.1" sources."pull-abortable-4.0.0" + sources."pull-async-1.0.0" + sources."pull-awaitable-1.0.0" sources."pull-box-stream-1.0.13" sources."pull-cat-1.1.11" sources."pull-catch-1.0.1" @@ -100464,6 +100960,7 @@ in sources."pull-sink-through-0.0.0" sources."pull-sort-1.0.2" sources."pull-stream-3.6.14" + sources."pull-thenable-1.0.0" (sources."pull-through-1.0.18" // { dependencies = [ sources."looper-3.0.0" @@ -100479,10 +100976,28 @@ in sources."pull-write-1.1.4" sources."pull-write-file-0.2.4" sources."pull-ws-3.3.2" + sources."pump-3.0.0" sources."push-stream-10.1.2" sources."push-stream-to-pull-stream-1.0.3" + sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" + sources."random-access-chrome-file-1.1.4" + sources."random-access-file-2.1.5" + (sources."random-access-idb-1.2.1" // { + dependencies = [ + sources."buffer-from-0.1.2" + ]; + }) + (sources."random-access-idb-mutable-file-0.3.0" // { + dependencies = [ + sources."buffer-5.1.0" + sources."random-access-storage-1.3.0" + ]; + }) + sources."random-access-memory-3.1.2" + sources."random-access-storage-1.4.1" + sources."random-access-web-2.0.3" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" @@ -100574,6 +101089,7 @@ in sources."rwlock-5.0.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."sanitize-filename-1.6.3" sources."secret-handshake-1.1.20" sources."secret-stack-6.3.2" sources."semver-5.7.1" @@ -100592,6 +101108,7 @@ in sources."object-inspect-1.9.0" ]; }) + sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -100640,8 +101157,30 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" + (sources."ssb-db2-1.11.2" // { + dependencies = [ + sources."abstract-leveldown-6.2.3" + sources."flumecodec-0.0.1" + sources."level-6.0.1" + sources."level-codec-6.2.0" + sources."level-js-5.0.2" + sources."mkdirp-1.0.4" + sources."push-stream-11.0.0" + (sources."ssb-keys-8.0.2" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) + sources."typedarray-to-buffer-4.0.0" + ]; + }) sources."ssb-ebt-5.6.7" - sources."ssb-friends-4.3.0" + (sources."ssb-friends-4.4.3" // { + dependencies = [ + sources."flumecodec-0.0.1" + sources."level-codec-6.2.0" + ]; + }) sources."ssb-gossip-1.1.1" (sources."ssb-invite-2.1.6" // { dependencies = [ @@ -100668,6 +101207,7 @@ in sources."ssb-query-2.4.5" sources."ssb-ref-2.14.3" sources."ssb-replicate-1.3.2" + sources."ssb-sort-1.1.3" sources."ssb-unix-socket-1.0.0" sources."ssb-validate-4.1.3" sources."ssb-ws-6.2.3" @@ -100702,6 +101242,7 @@ in sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" + sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" (sources."tape-4.13.3" // { @@ -100723,13 +101264,17 @@ in }) sources."to-space-case-1.0.0" sources."to-vfile-1.0.0" + sources."too-hot-1.0.0" + sources."traverse-0.6.6" sources."trim-0.0.1" sources."trim-lines-1.1.3" sources."trim-trailing-lines-1.1.4" + sources."truncate-utf8-bytes-1.0.2" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" + sources."typedfastbitset-0.2.1" sources."typewiselite-1.0.0" sources."uint48be-2.0.1" sources."ultron-1.0.2" @@ -100754,7 +101299,9 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."user-home-2.0.0" + sources."utf8-byte-length-1.0.4" sources."util-deprecate-1.0.2" + sources."varint-5.0.2" sources."vfile-1.4.0" sources."vfile-find-down-1.0.0" sources."vfile-find-up-1.0.0" @@ -100868,7 +101415,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.834.0" // { + (sources."aws-sdk-2.842.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -101007,14 +101554,14 @@ in dependencies = [ sources."cookie-0.4.1" sources."debug-4.1.1" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; }) (sources."engine.io-client-3.5.0" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; }) sources."engine.io-parser-2.2.1" @@ -101063,7 +101610,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -101076,7 +101623,7 @@ in sources."debug-3.2.7" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-2.0.6" @@ -101360,7 +101907,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."ret-0.2.2" sources."rethinkdb-2.4.2" sources."retry-0.9.0" @@ -101636,35 +102183,35 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "13.9.0"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz"; - sha512 = "VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.10.0.tgz"; + sha512 = "eDuLrL0wzPKbl5/TbNGZcbw0lTIGbDEr5W6lCODvb1gAg0ncbgCRt7oU0C2VFDvbrcY0A3MFZOwltwTRmc0XCw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/core-7.12.16" + sources."@babel/generator-7.12.15" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/parser-7.12.16" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -101675,7 +102222,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.0.4" + sources."ajv-7.1.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -101690,7 +102237,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -101728,7 +102275,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.663" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -101797,7 +102344,7 @@ in sources."json-schema-traverse-1.0.0" sources."json5-2.2.0" sources."kind-of-6.0.3" - sources."known-css-properties-0.20.0" + sources."known-css-properties-0.21.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.20" @@ -101806,12 +102353,12 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.1.0" sources."mathml-tag-names-2.1.3" - sources."mdast-util-from-markdown-0.8.4" - sources."mdast-util-to-markdown-0.6.2" + sources."mdast-util-from-markdown-0.8.5" + sources."mdast-util-to-markdown-0.6.5" sources."mdast-util-to-string-2.0.0" sources."meow-9.0.0" sources."merge2-1.4.1" - sources."micromark-2.11.3" + sources."micromark-2.11.4" sources."micromatch-4.0.2" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -101865,6 +102412,7 @@ in sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" + sources."queue-microtask-1.2.2" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -101885,11 +102433,11 @@ in sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."signal-exit-3.0.3" @@ -101955,6 +102503,100 @@ in bypassCache = true; reconstructLock = true; }; + svelte-language-server = nodeEnv.buildNodePackage { + name = "svelte-language-server"; + packageName = "svelte-language-server"; + version = "0.12.9"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.9.tgz"; + sha512 = "a1J4BTiP2uJ4LLk3/iuw4G9t2FbmTel0V8wyeuSVBPk+aZVAvt9sQ19Um0OFyUdwXWQVJn/jRTcrFYVXqE4Bgg=="; + }; + dependencies = [ + sources."@babel/code-frame-7.12.13" + sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/highlight-7.12.13" + sources."@emmetio/abbreviation-2.2.0" + sources."@emmetio/css-abbreviation-2.1.2" + sources."@emmetio/scanner-1.0.0" + sources."@types/node-14.14.26" + sources."@types/parse-json-4.0.0" + sources."@types/pug-2.0.4" + sources."@types/sass-1.16.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" + sources."binary-extensions-2.2.0" + sources."braces-3.0.2" + sources."callsites-3.1.0" + sources."chalk-2.4.2" + sources."chokidar-3.5.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."cosmiconfig-7.0.0" + sources."dedent-js-1.0.1" + sources."detect-indent-6.0.0" + sources."emmet-2.3.0" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."estree-walker-2.0.2" + sources."fill-range-7.0.1" + sources."fsevents-2.3.2" + sources."glob-parent-5.1.1" + sources."has-flag-3.0.0" + sources."import-fresh-3.3.0" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."jsonc-parser-2.3.1" + sources."lines-and-columns-1.1.6" + sources."lodash-4.17.20" + sources."lower-case-2.0.2" + sources."min-indent-1.0.1" + sources."no-case-3.0.4" + sources."normalize-path-3.0.0" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."pascal-case-3.1.2" + sources."path-type-4.0.0" + sources."picomatch-2.2.2" + sources."prettier-2.2.1" + sources."prettier-plugin-svelte-2.1.4" + sources."readdirp-3.5.0" + sources."resolve-from-4.0.0" + sources."source-map-0.7.3" + sources."strip-indent-3.0.0" + sources."supports-color-5.5.0" + sources."svelte-3.32.3" + sources."svelte-preprocess-4.6.8" + sources."svelte2tsx-0.1.169" + sources."to-regex-range-5.0.1" + sources."tslib-2.1.0" + sources."typescript-4.1.5" + sources."vscode-css-languageservice-5.0.0" + sources."vscode-emmet-helper-2.1.2" + sources."vscode-html-languageservice-4.0.0" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-7.0.0" + sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.16.0" + sources."vscode-nls-5.0.0" + sources."vscode-uri-2.1.2" + sources."yaml-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A language server for Svelte"; + homepage = "https://github.com/sveltejs/language-tools#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; @@ -101997,7 +102639,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -102246,7 +102888,7 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" (sources."graphlib-2.1.8" // { dependencies = [ sources."lodash-4.17.20" @@ -102613,7 +103255,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.12.6" + sources."uglify-js-3.12.7" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -102813,7 +103455,7 @@ in sources."errno-0.1.8" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -102845,29 +103487,29 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.8.1"; + version = "11.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.8.1.tgz"; - sha512 = "FlXzJrR008O/H/ynCTVQnsaW2kX2I1zb/rIxkn0HIAoNxU/A4au+P4QJkeDg7FRE6h8qdlZjrXHx79MfSTWzDw=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.8.2.tgz"; + sha512 = "YrTGagGzWKXYw6VjW4uhJ1y7LoW8zqWZIr8sWgeQVIFE84+G/cHPoZ8RhFlia+RZ4YryZPNOqevuF4vG+dbKNQ=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/ast-tester-2.3.1" - sources."@textlint/ast-traverse-2.3.1" - sources."@textlint/feature-flag-3.3.1" - sources."@textlint/fixer-formatter-3.3.1" - sources."@textlint/kernel-3.4.1" - sources."@textlint/linter-formatter-3.3.1" - sources."@textlint/markdown-to-ast-6.3.1" - sources."@textlint/module-interop-1.2.1" - sources."@textlint/source-code-fixer-3.4.1" - sources."@textlint/text-to-ast-3.3.1" - sources."@textlint/textlint-plugin-markdown-5.3.1" - sources."@textlint/textlint-plugin-text-4.3.1" - sources."@textlint/types-1.5.1" - sources."@textlint/utils-1.2.1" + sources."@textlint/ast-tester-2.3.2" + sources."@textlint/ast-traverse-2.3.2" + sources."@textlint/feature-flag-3.3.2" + sources."@textlint/fixer-formatter-3.3.2" + sources."@textlint/kernel-3.4.2" + sources."@textlint/linter-formatter-3.3.2" + sources."@textlint/markdown-to-ast-6.3.2" + sources."@textlint/module-interop-1.2.2" + sources."@textlint/source-code-fixer-3.4.2" + sources."@textlint/text-to-ast-3.3.2" + sources."@textlint/textlint-plugin-markdown-5.3.2" + sources."@textlint/textlint-plugin-text-4.3.2" + sources."@textlint/types-1.5.2" + sources."@textlint/utils-1.2.2" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -102913,10 +103555,10 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-symbols-1.0.1" @@ -102998,7 +103640,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.1" @@ -103103,7 +103745,7 @@ in sources."call-bind-1.0.2" sources."define-properties-1.1.3" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."match-index-1.0.3" @@ -103129,13 +103771,13 @@ in sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.1" + sources."@textlint/types-1.5.2" sources."@types/hast-2.3.1" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" @@ -103245,7 +103887,7 @@ in ]; }) sources."got-9.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -103392,7 +104034,7 @@ in sources."remark-retext-4.0.0" sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."retext-english-3.0.4" @@ -103482,7 +104124,7 @@ in sources."is-plain-obj-2.1.0" ]; }) - sources."unified-message-control-3.0.2" + sources."unified-message-control-3.0.3" sources."unique-string-2.0.0" sources."unist-util-inspect-5.0.1" sources."unist-util-is-4.0.4" @@ -103666,7 +104308,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.1" + sources."@textlint/types-1.5.2" sources."boundary-1.0.1" sources."buffer-from-1.1.1" sources."call-bind-1.0.2" @@ -103675,7 +104317,7 @@ in sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inherits-2.0.4" @@ -103731,7 +104373,7 @@ in sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.3" @@ -103764,7 +104406,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.1" + sources."@textlint/types-1.5.2" sources."boundary-1.0.1" sources."lodash-4.17.20" sources."split-lines-2.0.0" @@ -103794,7 +104436,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.1" + sources."@textlint/types-1.5.2" sources."boundary-1.0.1" sources."lodash-4.17.20" sources."strip-json-comments-3.1.1" @@ -103829,7 +104471,7 @@ in sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.3" @@ -103865,14 +104507,14 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.1" + sources."@textlint/types-1.5.2" sources."adverb-where-0.0.9" sources."boundary-1.0.1" sources."call-bind-1.0.2" sources."define-properties-1.1.3" sources."e-prime-0.10.4" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."no-cliches-0.1.1" @@ -103914,7 +104556,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -104067,7 +104709,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-11.5.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -104329,7 +104971,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -104428,7 +105070,7 @@ in sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-signature-1.2.0" @@ -104780,10 +105422,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.1.3"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; - sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz"; + sha512 = "6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA=="; }; buildInputs = globalBuildInputs; meta = { @@ -104808,7 +105450,7 @@ in sources."commander-2.20.3" sources."crypto-random-string-1.0.0" sources."fs-extra-7.0.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."jsonfile-4.0.0" sources."p-debounce-1.0.0" sources."temp-dir-1.0.0" @@ -104835,10 +105477,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.6"; + version = "3.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz"; - sha512 = "aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.7.tgz"; + sha512 = "SIZhkoh+U/wjW+BHGhVwE9nt8tWJspncloBcFapkpGRwNPqcH8pzX36BXe3TPBjzHWPMUZotpCigak/udWNr1Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -104884,7 +105526,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -105138,7 +105780,7 @@ in }) sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."y18n-5.0.5" sources."yallist-2.1.2" sources."yargs-16.2.0" @@ -105258,7 +105900,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."require-directory-2.1.1" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."rimraf-2.7.1" sources."rw-1.3.3" sources."safe-buffer-5.1.2" @@ -105564,13 +106206,13 @@ in "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; - version = "1.5.3"; + version = "1.6.1"; src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ sources."@types/json5-0.0.30" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.52.0" + sources."@types/vscode-1.53.0" sources."@types/yauzl-2.9.1" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -105760,7 +106402,7 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -105768,7 +106410,14 @@ in sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-4.5.0" + (sources."enhanced-resolve-4.5.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."memory-fs-0.5.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."entities-2.1.0" sources."errno-0.1.8" (sources."es-abstract-1.18.0-next.2" // { @@ -105829,18 +106478,7 @@ in sources."fill-range-7.0.1" sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" - (sources."findup-sync-3.0.0" // { - dependencies = [ - sources."braces-2.3.2" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."is-buffer-1.1.6" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" - ]; - }) + sources."findup-sync-3.0.0" sources."flat-4.1.1" (sources."flush-write-stream-1.1.1" // { dependencies = [ @@ -105863,7 +106501,7 @@ in sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-parent-5.1.1" @@ -105873,7 +106511,7 @@ in ]; }) sources."global-prefix-1.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -105936,16 +106574,12 @@ in sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json5-2.2.0" + sources."json5-1.0.1" sources."kind-of-6.0.3" sources."leven-3.1.0" sources."linkify-it-2.2.0" sources."loader-runner-2.4.0" - (sources."loader-utils-1.4.0" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) + sources."loader-utils-1.4.0" sources."locate-path-3.0.0" sources."lodash-4.17.20" sources."log-symbols-3.0.0" @@ -105960,7 +106594,7 @@ in }) sources."md5.js-1.3.5" sources."mdurl-1.0.1" - (sources."memory-fs-0.5.0" // { + (sources."memory-fs-0.4.1" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -105968,7 +106602,27 @@ in ]; }) sources."memory-streams-0.1.3" - sources."micromatch-4.0.2" + (sources."micromatch-3.1.10" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-range-2.1.1" + ]; + }) (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.11.9" @@ -106232,6 +106886,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-loader-6.2.2" // { dependencies = [ + sources."micromatch-4.0.2" sources."semver-6.3.0" ]; }) @@ -106240,7 +106895,7 @@ in sources."tunnel-0.0.4" sources."typed-rest-client-1.2.0" sources."typedarray-0.0.6" - sources."typescript-3.9.7" + sources."typescript-3.9.9" sources."uc.micro-1.0.6" sources."underscore-1.8.3" sources."union-value-1.0.1" @@ -106281,7 +106936,7 @@ in (sources."watchpack-1.7.5" // { dependencies = [ sources."chokidar-3.5.1" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."readdirp-3.5.0" ]; }) @@ -106301,7 +106956,6 @@ in sources."is-number-3.0.0" sources."isarray-1.0.0" sources."kind-of-3.2.2" - sources."micromatch-3.1.10" sources."normalize-path-2.1.1" sources."readable-stream-2.3.7" sources."readdirp-2.2.1" @@ -106309,32 +106963,7 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."webpack-4.46.0" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isarray-1.0.0" - sources."memory-fs-0.4.1" - sources."micromatch-3.1.10" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."to-regex-range-2.1.1" - ]; - }) + sources."webpack-4.46.0" (sources."webpack-cli-3.3.12" // { dependencies = [ sources."supports-color-6.1.0" @@ -106356,6 +106985,7 @@ in sources."xtend-4.0.2" sources."y18n-4.0.1" sources."yallist-3.1.1" + sources."yaml-1.10.0" (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -106483,7 +107113,7 @@ in sources."git-clone-0.1.0" sources."glob-7.1.6" sources."got-6.7.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gray-matter-2.1.1" sources."handlebars-4.7.6" sources."har-schema-2.0.0" @@ -106628,7 +107258,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.12.6" + sources."uglify-js-3.12.7" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -106669,9 +107299,9 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -106687,7 +107317,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -106895,7 +107525,7 @@ in sources."eslint-visitor-keys-1.3.0" sources."espree-5.0.1" sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -106962,7 +107592,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -106983,7 +107613,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -107292,7 +107922,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -107461,7 +108091,7 @@ in sources."type-check-0.3.2" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typescript-3.9.7" + sources."typescript-3.9.9" (sources."typescript-eslint-parser-16.0.1" // { dependencies = [ sources."semver-5.5.0" @@ -107604,9 +108234,9 @@ in sha512 = "f+NHiYwbTS0X6eSLkBDWoCYkkIJweVazGf4MD8S+kRX/5z40WsYsnRdVWG+p34Z6rCyNvlHHrnO2S1W8WWg7Tw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -107633,7 +108263,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/yauzl-2.9.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" @@ -107706,7 +108336,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" - sources."bl-4.0.3" + sources."bl-4.1.0" sources."bluebird-2.9.34" sources."boolbase-1.0.0" (sources."boxen-4.2.0" // { @@ -107736,7 +108366,7 @@ in sources."cheerio-1.0.0-rc.3" (sources."chokidar-3.5.1" // { dependencies = [ - sources."fsevents-2.3.1" + sources."fsevents-2.3.2" ]; }) (sources."chrome-launcher-0.13.4" // { @@ -107796,7 +108426,7 @@ in sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" - sources."crc32-stream-4.0.1" + sources."crc32-stream-4.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."css-select-1.2.0" @@ -107866,7 +108496,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -107965,7 +108595,7 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -107982,7 +108612,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."graceful-readlink-1.0.1" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -108339,7 +108969,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."sonic-boom-1.3.0" + sources."sonic-boom-1.3.2" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.19" @@ -108531,17 +109161,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.19.0"; + version = "5.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.19.0.tgz"; - sha512 = "egX19vAQ8fZ4cVYtA9Y941eqJtcZAK68mQq87MMv+GTXKZOc3TpKBBxdGX+HXUYlquPxiluNsJ1VHvwwklW7CQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.21.2.tgz"; + sha512 = "xHflCenx+AM4uWKX71SWHhxml5aMXdy2tu/vdi4lClm7PADKxlyDAFFN1rEFzNV0MAoPpHtBeJnl/+K6F4QBPg=="; }; dependencies = [ sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -108564,11 +109194,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.3" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001183" + sources."caniuse-lite-1.0.30001185" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.663" sources."enhanced-resolve-5.7.0" sources."es-module-lexer-0.3.26" sources."escalade-3.1.1" @@ -108582,24 +109212,19 @@ in sources."events-3.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."find-up-5.0.0" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."jest-worker-26.6.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" - sources."locate-path-6.0.0" sources."merge-stream-2.0.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."neo-async-2.6.2" sources."node-releases-1.1.70" sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - sources."pkg-dir-5.0.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" @@ -108618,7 +109243,7 @@ in sources."terser-webpack-plugin-5.1.1" sources."tslib-1.14.1" sources."uri-js-4.4.1" - sources."watchpack-2.1.0" + sources."watchpack-2.1.1" sources."webpack-sources-2.2.0" sources."yocto-queue-0.1.0" ]; @@ -108635,20 +109260,20 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.4.0.tgz"; - sha512 = "/Qh07CXfXEkMu5S8wEpjuaw2Zj/CC0hf/qbTDp6N8N7JjdGuaOjZ7kttz+zhuJO/J5m7alQEhNk9lsc4rC6xgQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.5.0.tgz"; + sha512 = "wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.2" - sources."@webpack-cli/configtest-1.0.0" - sources."@webpack-cli/info-1.2.1" - sources."@webpack-cli/serve-1.2.2" + sources."@webpack-cli/configtest-1.0.1" + sources."@webpack-cli/info-1.2.2" + sources."@webpack-cli/serve-1.3.0" sources."ansi-colors-4.1.1" sources."clone-deep-4.0.1" sources."colorette-1.2.1" - sources."commander-6.2.1" + sources."commander-7.0.0" sources."cross-spawn-7.0.3" sources."enquirer-2.3.6" sources."envinfo-7.7.4" @@ -108680,7 +109305,7 @@ in sources."path-parse-1.0.6" sources."pkg-dir-4.2.0" sources."rechoir-0.7.0" - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."shallow-clone-3.0.1" @@ -108714,7 +109339,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -108908,7 +109533,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -108922,7 +109547,7 @@ in sources."pify-2.3.0" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."handle-thing-2.0.1" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -109326,9 +109951,10 @@ in sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."punycode-2.1.1" + sources."queue-microtask-1.2.2" sources."randombytes-2.1.0" sources."reusify-1.0.4" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.0.0" sources."serialize-javascript-5.0.1" @@ -109367,7 +109993,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.40" + sources."@types/node-13.13.41" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -109389,13 +110015,13 @@ in ]; }) sources."bittorrent-peerid-1.3.3" - (sources."bittorrent-protocol-3.2.0" // { + (sources."bittorrent-protocol-3.3.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.16.0" // { + (sources."bittorrent-tracker-9.16.1" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -109405,7 +110031,7 @@ in ]; }) sources."blob-to-buffer-1.2.9" - sources."block-stream2-2.0.0" + sources."block-stream2-2.1.0" sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" @@ -109432,7 +110058,7 @@ in sources."mime-1.6.0" ]; }) - sources."chunk-store-stream-4.1.1" + sources."chunk-store-stream-4.2.0" sources."clivas-0.2.0" sources."common-tags-1.8.0" sources."compact2string-1.4.1" @@ -109445,7 +110071,7 @@ in ]; }) sources."core-util-is-1.0.2" - sources."create-torrent-4.4.3" + sources."create-torrent-4.5.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" (sources."dlnacasts-0.1.0" // { @@ -109458,13 +110084,13 @@ in sources."ecstatic-4.1.4" sources."ee-first-1.1.1" sources."elementtree-0.1.7" - sources."end-of-stream-1.4.1" + sources."end-of-stream-1.4.4" sources."err-code-2.0.3" sources."escape-html-1.0.3" sources."executable-4.1.1" sources."filestream-5.0.0" sources."freelist-1.0.3" - (sources."fs-chunk-store-2.0.2" // { + (sources."fs-chunk-store-2.0.3" // { dependencies = [ sources."thunky-1.1.0" ]; @@ -109490,7 +110116,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."junk-3.1.0" - sources."k-bucket-5.0.0" + sources."k-bucket-5.1.0" sources."k-rpc-5.1.0" sources."k-rpc-socket-1.11.1" sources."last-one-wins-1.0.4" @@ -109507,7 +110133,7 @@ in sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" sources."mediasource-2.4.0" - sources."memory-chunk-store-1.3.0" + sources."memory-chunk-store-1.3.2" sources."mime-2.5.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -109515,14 +110141,14 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."mp4-box-encoding-1.4.1" - sources."mp4-stream-3.1.0" + sources."mp4-stream-3.1.2" sources."ms-2.0.0" (sources."multicast-dns-6.2.3" // { dependencies = [ sources."thunky-1.1.0" ]; }) - sources."multistream-4.0.1" + sources."multistream-4.1.0" sources."napi-macros-2.0.0" sources."netmask-1.0.6" sources."network-address-1.1.2" @@ -109570,8 +110196,8 @@ in ]; }) sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" - sources."run-parallel-limit-1.0.6" + sources."run-parallel-1.2.0" + sources."run-parallel-limit-1.1.0" sources."run-series-1.1.9" sources."rusha-0.8.13" sources."safe-buffer-5.2.1" @@ -109635,7 +110261,7 @@ in sources."utp-native-2.3.0" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.112.3" // { + (sources."webtorrent-0.114.1" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -109643,13 +110269,13 @@ in sources."magnet-uri-6.1.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" - sources."parse-torrent-9.1.1" + sources."parse-torrent-9.1.3" sources."simple-get-4.0.0" ]; }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -109685,10 +110311,10 @@ in write-good = nodeEnv.buildNodePackage { name = "write-good"; packageName = "write-good"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-1.0.4.tgz"; - sha512 = "NA7P2MQ2yw4k+SYq9NQMB0GLchzoprbMRoJgMquLoWzucTozni8k/3hvXvldyDQbgPpPZObzOGvcB6UgqzggzQ=="; + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.6.tgz"; + sha512 = "7oWy7O3sGnc7ht7pL0ki5SDIt746vgthEdoKT5ldFYkTQ2J7xJn998qHRiiR1SEpFhNZYd0gZUwoRN3xM/GSkQ=="; }; dependencies = [ sources."adverb-where-0.2.1" @@ -109696,7 +110322,7 @@ in sources."e-prime-0.10.4" sources."no-cliches-0.2.2" sources."passive-voice-0.1.0" - sources."too-wordy-0.2.2" + sources."too-wordy-0.3.1" sources."weasel-words-0.1.1" ]; buildInputs = globalBuildInputs; @@ -109712,10 +110338,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.14.0.tgz"; - sha512 = "aMNzS7YoMrgG0QdCMonlrFS/fPiag4zVs9cJ7RB0ZzwiALB2446UFXwy6SaTmKfJq353rjGJ+d7j1HHKSX/IqA=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.15.0.tgz"; + sha512 = "idaCYstdGoV5Pi7PKxbUkGHt6jAI3l+nxNWrsVCetxrEgfH6T7qytfT0pF3n4NdfDNPHPHcqnl69FzCFDVfHnQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -109791,16 +110417,16 @@ in sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" - sources."@babel/runtime-7.12.5" + sources."@babel/highlight-7.12.13" + sources."@babel/runtime-7.12.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.26" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -110014,7 +110640,7 @@ in sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.1.0" sources."figures-2.0.0" - sources."filelist-1.0.1" + sources."filelist-1.0.2" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -110070,7 +110696,7 @@ in sources."p-cancelable-0.4.1" ]; }) - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."grouped-queue-1.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -110396,7 +111022,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.19.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -110695,7 +111321,7 @@ in sources."debug-4.3.2" sources."diff-4.0.2" sources."dir-glob-2.2.2" - sources."ejs-3.1.5" + sources."ejs-3.1.6" sources."find-up-3.0.0" sources."globby-9.2.0" sources."ignore-4.0.6" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix index 0d4229c03e..cd14d2a06a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "diet"; version = "0.4"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/ocaml-diet/releases/download/v${version}/diet-v${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix index 55dc9ca866..82818b3949 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin-watcher/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "irmin-watcher"; version = "0.4.1"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/irmin-watcher/releases/download/${version}/irmin-watcher-${version}.tbz"; sha256 = "00d4ph4jbsw6adp3zqdrwi099hfcf7p1xzi0685qr7bgcmandjfv"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix index 66055dca66..7636942033 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/kafka/default.nix @@ -1,26 +1,24 @@ -{ lib, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, - rdkafka, zlib }: +{ lib, fetchurl, buildDunePackage +, rdkafka, zlib }: buildDunePackage rec { pname = "kafka"; - version = "0.4"; + version = "0.5"; - src = fetchFromGitHub { - owner = "didier-wenzek"; - repo = "ocaml-kafka"; - rev = version; - sha256 = "0lb8x0wh7sf8v9mjwhq32azjz54kw49fsjfb7m76z4nhxfkjw5hy"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz"; + sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy"; }; - buildInputs = [ base cmdliner ocaml_lwt zlib ]; - propagatedBuildInputs = [ rdkafka zlib ]; meta = with lib; { homepage = "https://github.com/didier-wenzek/ocaml-kafka"; description = "OCaml bindings for Kafka"; license = licenses.mit; - maintainers = [ maintainers.rixed ]; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/kafka/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/kafka/lwt.nix new file mode 100644 index 0000000000..a6cef66b27 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/kafka/lwt.nix @@ -0,0 +1,19 @@ +{ buildDunePackage +, kafka +, lwt +, cmdliner +}: + +buildDunePackage rec { + pname = "kafka_lwt"; + + inherit (kafka) version useDune2 src; + + buildInputs = [ cmdliner ]; + + propagatedBuildInputs = [ kafka lwt ]; + + meta = kafka.meta // { + description = "OCaml bindings for Kafka, Lwt bindings"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix index 59e13330e5..28a6f5f43d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "lwt-dllist"; version = "1.0.0"; + useDune2 = true; + minimumOCamlVersion = "4.03"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix index 83146ef910..ee0c3b5b00 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,21 +1,25 @@ { lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml -, cppo, ocaml-migrate-parsetree, ocplib-endian, result +, cppo, dune-configurator, ocaml-migrate-parsetree, ocplib-endian, result , mmap, seq +, ocaml-syntax-shims }: let inherit (lib) optional versionAtLeast; in buildDunePackage rec { pname = "lwt"; - version = "5.3.0"; + version = "5.4.0"; + + useDune2 = true; src = fetchzip { url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2"; + sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cppo ocaml-migrate-parsetree ] + buildInputs = [ cppo dune-configurator ocaml-migrate-parsetree ] + ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix index 05a5a28dcd..9213e1af94 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "lwt_log"; version = "1.1.1"; + useDune2 = true; + minimumOCamlVersion = "4.02"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix index e74a743e6b..173094aacb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "1.1.3"; minimumOCamlVersion = "4.02"; + useDune2 = true; src = fetchzip { url = "https://github.com/aantron/${pname}/archive/${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix index 4418c50568..7051c51cc5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,20 +1,21 @@ { lib, fetchurl, buildDunePackage, opaline, ocaml , alcotest -, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, odoc, ocaml_lwt, pandoc, re }: +, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc, ocaml_lwt, re, result, csexp +, pandoc}: buildDunePackage rec { pname = "mdx"; - version = "1.8.0"; + version = "1.8.1"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "1p2ip73da271as0x1gfbajik3mf1bkc8l54276vgacn1ja3saj52"; + sha256 = "1szik1lyg2vs8jrisnvjdc29n0ifls8mghimff4jcz6f48haa3cv"; }; nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version odoc re ]; + propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc re ]; checkInputs = [ alcotest ocaml_lwt pandoc ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix index 9b9a1ae185..d34513afef 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "mirage-bootvar-unix"; version = "0.1.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${version}/mirage-bootvar-unix-${version}.tbz"; sha256 = "0r92s6y7nxg0ci330a7p0hii4if51iq0sixn20cnm5j4a2clprbf"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-device/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-device/default.nix index d86d133ded..d233277b7a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-device/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-device/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-device"; version = "2.0.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/mirage-device/releases/download/v${version}/mirage-device-v${version}.tbz"; sha256 = "18alxyi6wlxqvb4lajjlbdfkgcajsmklxi9xqmpcz07j51knqa04"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index faadaf214f..5d8d967bf4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -1,9 +1,11 @@ -{ lib, fetchFromGitHub, buildDunePackage, result, ppx_derivers }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, result, ppx_derivers }: buildDunePackage rec { pname = "ocaml-migrate-parsetree"; version = "1.8.0"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix index 22c1ecdf70..3106fe83fd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (opam) src version; + useDune2 = true; + nativeBuildInputs = [ unzip cppo ]; propagatedBuildInputs = [ ocamlgraph re ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix index 64cc7c0c6b..4bc409245e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { pname = "parse-argv"; version = "0.2.0"; + useDune2 = true; + minimumOCamlVersion = "4.03"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix index 7828f2172a..6f23af44b9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -1,28 +1,24 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo, ppx_tools, ppx_deriving -, ppxfind }: - -if lib.versionAtLeast ocaml.version "4.11" -then throw "ppx_deriving_protobuf is not available for OCaml ${ocaml.version}" -else +{ lib, fetchurl, buildDunePackage, cppo, ppx_deriving +, ppxlib +}: buildDunePackage rec { pname = "ppx_deriving_protobuf"; - version = "2.7"; + version = "3.0.0"; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = pname; - rev = "v${version}"; - sha256 = "0aq4f3gbkhhai0c8i5mcw2kpqy8l610f4dknwkrxh0nsizwbwryn"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/ocaml-ppx/ppx_deriving_protobuf/releases/download/v${version}/ppx_deriving_protobuf-v${version}.tbz"; + sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj"; }; - buildInputs = [ cppo ppx_tools ppxfind ppx_deriving ]; + buildInputs = [ cppo ppxlib ppx_deriving ]; meta = with lib; { homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; description = "A Protocol Buffers codec generator for OCaml"; license = licenses.mit; maintainers = [ maintainers.vyorkin ]; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix index 773fb76bcc..51407f6b49 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/resource-pooling/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { version = "1.1"; pname = "resource-pooling"; + useDune2 = true; + minimumOCamlVersion = "4.06"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix index 9a574a0457..1f4fd7b858 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,17 +1,20 @@ -{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl }: +{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl +, dune-configurator }: buildDunePackage rec { pname = "ssl"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ssl"; - rev = version; - sha256 = "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0"; + rev = "v${version}"; + sha256 = "1rszqiqayh67xlwd5411k8vib47x9kapdr037z1majd2c14z3kcb"; }; + useDune2 = true; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [openssl]; meta = { @@ -20,6 +23,7 @@ buildDunePackage rec { license = "LGPL+link exception"; maintainers = [ lib.maintainers.maggesi + lib.maintainers.anmonteiro ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix index 5d5e7dedd2..bf0e06507c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tyxml/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "tyxml"; version = "4.4.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz"; sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix index d454d24495..9779004085 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,9 +1,12 @@ -{ lib, fetchFromGitHub, buildDunePackage, czmq, stdint }: +{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, czmq, stdint }: buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "zmq"; version = "20180726"; + + useDune2 = true; + src = fetchFromGitHub { owner = "issuu"; repo = "ocaml-zmq"; @@ -11,7 +14,7 @@ buildDunePackage rec { sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; }; - buildInputs = [ czmq ]; + buildInputs = [ czmq dune-configurator ]; propagatedBuildInputs = [ stdint ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix index f8fc06791b..6717e787f1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "zmq-lwt"; - inherit (zmq) version src meta; + inherit (zmq) version src useDune2 meta; propagatedBuildInputs = [ zmq ocaml_lwt ]; } diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix index 94d83845e2..c89ec1619c 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix @@ -3,10 +3,10 @@ buildPerlPackage rec { pname = "po4a"; - version = "0.55"; + version = "0.62"; src = fetchurl { url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz"; - sha256 = "1qss4q5df3nsydsbggb7gg50bn0kdxq5wn8riqm9zwkiq6a4bifg"; + sha256 = "0eb510a66f59de68cf7a205342036cc9fc08b39334b91f1456421a5f3359e68b"; }; nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ]; propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index 74b44c21d0..f8124e43d7 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.70"; + version = "0.12.74"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-bQvLGrDUh66lipmML1VwrdNKkI6NezBckdlOqnDe7Qk="; + sha256 = "sha256-zEDqswyldyXha836ye+FmE4yYxH+7AzEvlKJYOje0xQ="; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix index a61ae1194f..fedc7a7ffd 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "redis"; - version = "5.3.2"; - sha256 = "1cfsbxf3q3im0cmalgk76jpz581zr92z03c1viy93jxb53k2vsgl"; + version = "5.3.3"; + sha256 = "sha256-N3iRYeFkzVIjmjDJojjaYf7FyDlc2sOFtu2PDFD9kvA="; internalDeps = with php.extensions; [ session diff --git a/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix new file mode 100644 index 0000000000..1aec97251e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib, pkgs }: +buildPecl { + pname = "smbclient"; + version = "1.0.4"; + sha256 = "07p72m5kbdyp3r1mfxhiayzdvymhc8afwcxa9s86m96sxbmlbbp8"; + + # TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66 + LIBSMBCLIENT_INCDIR = "${pkgs.samba.dev}/include/samba-4.0"; + + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.samba ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/GitPython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/GitPython/default.nix index dad4a3de38..0081051628 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/GitPython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/GitPython/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "GitPython"; - version = "3.1.12"; + version = "3.1.13"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "sha256-Qtvv2NniV2xJbtAFnzED3O9xJbnOFvnV+cg0rtRKHaw="; + sha256 = "sha256-hiGn53fidqXsg4tZKAulJy3RRKGBacNskD2LOLmfdQo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index e62e24d4ab..cc8ee94625 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "2.28.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "aa272605fd8a2ddcc6e5dd8151d628f76a9468c97ba7e4e315d6bc78b9bfb8f8"; + sha256 = "sha256-Wd8Qq/jE/C/zx1CRuKLt5Tz8VHY/4bwUa229aDcCFjk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix index 4f30eefbf9..b5fb2999c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.2.6"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "260225470b49429f5893a195a8b99c73a8d182be42bf90c37c93e7b20e44eaae"; + sha256 = "17cd8cfed1ee4b617198c9fabbabd70ebd8f01e54ac29cd6c3a92df14bd86656"; }; # For Python 3, locale has to be set to en_US.UTF-8 for diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix new file mode 100644 index 0000000000..e23db23d15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pyvex +}: + +buildPythonPackage rec { + pname = "ailment"; + version = "9.0.5739"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "1fjwksia6h7w7m5zhys65yr4zxvyfgp9hr1k5dn802p9kvz34bpc"; + }; + + propagatedBuildInputs = [ pyvex ]; + + # Tests depend on angr (possibly a circular dependency) + doCheck = false; + #pythonImportsCheck = [ "ailment" ]; + + meta = with lib; { + description = "The angr Intermediate Language"; + homepage = "https://github.com/angr/ailment"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix index 0b6c68de8b..3f2ee2fee3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix @@ -1,27 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, slixmpp, async-timeout, aiohttp }: +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +, isPy3k +, slixmpp +}: buildPythonPackage rec { pname = "aioharmony"; - version = "0.2.6"; + version = "0.2.7"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "90f4d1220d44b48b21a57e0273aa3c4a51599d0097af88e8be26df151e599344"; + sha256 = "sha256-aej8xC0Bsy6ip7IwO6onp55p6afkz8yZnz14cCExSPA="; }; - disabled = !isPy3k; + propagatedBuildInputs = [ + aiohttp + async-timeout + slixmpp + ]; - #aioharmony does not seem to include tests + # aioharmony does not seem to include tests doCheck = false; pythonImportsCheck = [ "aioharmony.harmonyapi" "aioharmony.harmonyclient" ]; - propagatedBuildInputs = [ slixmpp async-timeout aiohttp ]; - meta = with lib; { homepage = "https://github.com/ehendrix23/aioharmony"; - description = - "Asyncio Python library for connecting to and controlling the Logitech Harmony"; + description = "Python library for interacting the Logitech Harmony devices"; license = licenses.asl20; maintainers = with maintainers; [ oro ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix new file mode 100644 index 0000000000..c802633e57 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix @@ -0,0 +1,54 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, freezegun +, poetry-core +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiorecollect"; + version = "1.0.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "0dlz8zmqcn6g6000lfgcy5krpfafzdzrznmk6iwra65wcs7l9392"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + freezegun + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "aiorecollect" ]; + + meta = with lib; { + description = "Python library for the Recollect Waste API"; + longDescription = '' + aiorecollect is a Python asyncio-based library for the ReCollect + Waste API. It allows users to programmatically retrieve schedules + for waste removal in their area, including trash, recycling, compost + and more. + ''; + homepage = "https://github.com/bachya/aiorecollect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix index 1af39e970b..1d0aef1ee5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix @@ -1,11 +1,10 @@ { lib -, buildPythonPackage -, fetchPypi -, tox -, pytest , ansicolors +, buildPythonPackage , coverage -, pytestcov +, fetchPypi +, pytest-cov +, pytestCheckHook , textwrap3 }: @@ -20,20 +19,15 @@ buildPythonPackage rec { }; checkInputs = [ - tox - pytest ansicolors coverage - pytestcov + pytest-cov + pytestCheckHook ]; - propagatedBuildInputs = [ - textwrap3 - ]; + propagatedBuildInputs = [ textwrap3 ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "ansiwrap" ]; meta = with lib; { description = "Textwrap, but savvy to ANSI colors and styles"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix index f79bf23896..1c3c72a8e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "2.0.2"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "06nazfrm2sclp3lpgsn9wl8vmqxvx36s3gr2gnqz3zhjpf3glkxv"; + sha256 = "0k5c4a7xcbiyah8rgrfh2hwj3l3a9al7rh2lyz9ip4rr1hwnqvaf"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix index 0dea059f76..ac6eb09577 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.0.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "360e28e5e84a4d7023b16de2b897327fe3da63ddc8e01f9165b9113b7fe1c48a"; + sha256 = "fbbd069caa22c0270bc71a5330b46b5a4e1984d8345b9236ca02fbca23094647"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 8cd0f20a7f..79f21a2762 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.5610"; + version = "9.0.5739"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YlqCRLx8mqHXMKPCWqcGvHxRBGOxbwMZWPEDX/jEDdI="; + sha256 = "sha256-6qjX0r2vLYgJdrKBVKedplfa1yhWv9tBvTu5BsViXBc="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix new file mode 100644 index 0000000000..1d6c7b45d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, aspell, aspellDicts, python }: + +buildPythonPackage rec { + pname = "aspell-python"; + version = "1.15"; + disabled = isPy27; + + src = fetchPypi { + inherit version; + pname = "aspell-python-py3"; + extension = "tar.bz2"; + sha256 = "13dk3jrvqmfvf2w9b8afj37d8bh32kcx295lyn3z7r8qch792hi0"; + }; + + buildInputs = [ aspell ]; + + checkPhase = '' + export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell" + export HOME=$(mktemp -d) + ${python.interpreter} test/unittests.py + ''; + + pythonImportsCheck = [ "aspell" ]; + + meta = with lib; { + description = "Python wrapper for aspell (C extension and python version)"; + homepage = "https://github.com/WojciechMula/aspell-python"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix new file mode 100644 index 0000000000..0d4d41a547 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asteval"; + version = "0.9.22"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "newville"; + repo = pname; + rev = version; + sha256 = "sha256-93IBv6beYE/VTKJCWUbA1QTRdmQdn2kg35KBw6kmDis="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "asteval" ]; + + meta = with lib; { + description = "AST evaluator of Python expression using ast module"; + homepage = "https://github.com/newville/asteval"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix index 66c66535a1..b5028e4beb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.0.11"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "11ygrhkqm524i4qp2myjvpsmg1lsn32nsqxqla96sbj84qfnhv0q"; + sha256 = "sha256-NH53FaOJx79q5IIYeiz976H9Q8Vnw13qFw4zgRc2TTw="; }; # Upstream hasn't release the tests yet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index 8f832f827e..2a532beca4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.2.0"; + version = "21.2.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "1rzd0mcxdjnnzg35hvdvacwrr9brwmkw9bwlb5x6bcp24ry9yl0q"; + sha256 = "1yl09csypa64nhsw7dc6kj8iybm1wkhfzylyfyq8b7jpwdx7ql31"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 52298faa0c..1c067bcec2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.31.0"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "3a1d73d098161e60966b0d53bb310c98e4f66101688cce3d1697903643782d79"; + sha256 = "jL+sAlKbeXA1QeJVQbAcgIaPEbD/Ko+QMrI1Ew2dVq4="; }; # Tests are not included in the PyPI package @@ -26,10 +26,9 @@ buildPythonPackage rec { six ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ]; - meta = { + meta = with lib; { homepage = "https://github.com/awslabs/serverless-application-model"; description = "Python library to transform SAM templates into AWS CloudFormation templates"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.andreabedini ]; + license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index a89d94f3d7..ec1caa5c3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.15.0"; + version = "1.0.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5e98c360609a77b443b2fe431e0337e5cb705b4f02d0204791f9985f7ce68836"; + sha256 = "e2c0cecd634c0a106e389f39ad767bfd1d718d90692e4e3c9664b1fe9a792ade"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix index 1e1da32f6c..1437683941 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix @@ -1,19 +1,29 @@ -{ lib, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: +{ lib +, buildPythonPackage +, fetchPypi +, pyhamcrest +, pytest-benchmark +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "base58"; - version = "2.0.1"; - disabled = isPy27; # python 2 abandoned upstream + version = "2.1.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "365c9561d9babac1b5f18ee797508cd54937a724b6e419a130abad69cec5ca79"; + sha256 = "sha256-FxpUe0o8YeGuOAciSm967HXjZMQ5XnViZJ1zNXaAAaI="; }; - checkInputs = [ pytest pyhamcrest ]; - checkPhase = '' - pytest - ''; + checkInputs = [ + pyhamcrest + pytest-benchmark + pytestCheckHook + ]; + + pythonImportsCheck = [ "base58" ]; meta = with lib; { description = "Base58 and Base58Check implementation"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix index 599ad71b24..da6820ef6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "BespON"; src = fetchPypi { inherit pname version; - sha256 = "a75cd7e62746fb0fef9b98aa157a44f9ed2ef63e952f7ae4ec5b3c2892669187"; + sha256 = "2f2bda67fea8ee95c8aa7e885835ab88bdbfa392a94077ce1c9d29017420ce7a"; }; propagatedBuildInputs = [ ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Encodes and decodes data in the BespON format."; homepage = "https://github.com/gpoore/bespon_py"; - license = licenses.lgpl3; + license = licenses.bsd3; maintainers = with maintainers; [ synthetica ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 74d79bd677..b9120d412c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, stdenv , zlib , xz , ncompress @@ -20,22 +21,20 @@ , pyqtgraph , visualizationSupport ? false }: -let - version = "2.2.0"; -in -buildPythonPackage { +buildPythonPackage rec { pname = "binwalk"; - inherit version; + version = "2.2.0"; src = fetchFromGitHub { - owner = "devttys0"; + owner = "ReFirmLabs"; repo = "binwalk"; - rev = "be738a52e09b0da2a6e21470e0dbcd5beb42ed1b"; + rev = "v${version}"; sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ] - ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ]; + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools lzma pycrypto ] + ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ] + ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ]; # setup.py only installs version.py during install, not test postPatch = '' @@ -49,6 +48,8 @@ buildPythonPackage { checkInputs = [ nose ]; + pythonImportsCheck = [ "binwalk" ]; + meta = with lib; { homepage = "https://github.com/ReFirmLabs/binwalk"; description = "A tool for searching a given binary image for embedded files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix index 5e7cd42362..8e7dd0b11f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix @@ -1,30 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pyusb }: +{ lib +, buildPythonPackage +, fetchPypi +, pyusb +}: buildPythonPackage rec { pname = "BlinkStick"; - version = "1.1.8"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408"; + sha256 = "0rdk3i81s6byw23za0bxvkh7sj5l16qxxgc2c53qjg3klc24wcm9"; }; - patches = [ - (fetchpatch { - url = "https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch"; - sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f"; - }) - (fetchpatch { - url = "https://github.com/arvydas/blinkstick-python/pull/54.patch"; - sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl"; - }) - ]; + # Upstream fix https://github.com/arvydas/blinkstick-python/pull/54 + # https://github.com/arvydas/blinkstick-python/pull/54/commits/b9bee2cd72f799f1210e5d9e13207f93bbc2d244.patch + # has line ending issues after 1.2.0 + postPatch = '' + substituteInPlace setup.py --replace "pyusb==1.0.0" "pyusb>=1.0.0" + ''; propagatedBuildInputs = [ pyusb ]; + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "blinkstick" ]; + meta = with lib; { description = "Python package to control BlinkStick USB devices"; - homepage = "https://pypi.python.org/pypi/BlinkStick/"; + homepage = "https://github.com/arvydas/blinkstick-python"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 2bba1aa171..1d3e0cca67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.1"; # N.B: if you change this, change botocore too + version = "1.17.5"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-WKRA9MlqHy8HZXfHCFI3hUum20GnyR5KM/swBo+NRpI="; + sha256 = "sha256-1qr7gE/KK2fGXdp4rYtK/tkB4AQHEgi4TIBNNFrZ67o="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index e5179e6ace..05c333d939 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.1"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.5"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-lIi6NeLU0XN19nuP0wDfXsL4MXopJAMpAQCcmZ1WO1k="; + sha256 = "sha256-BKHfdZaB9fFxrMs1TYY7/tB3TWSk6O41/0mDV1VmCk4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix index 1c261d1730..3e86aac02f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "brother"; - version = "0.2.0"; + version = "0.2.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "0d984apw73kzd6bid65bqhp26gvvgqjni56nqr0gnb2sv7mknnm8"; + sha256 = "sha256-yOloGkOVhXcTt0PAjf3yWUItN1okO94DndRFsImiuz4="; }; # pytest-error-for-skips is not packaged diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix index 3d206c829e..e34b58907e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "btchip-python"; - version = "0.1.31"; + version = "0.1.32"; src = fetchPypi { inherit pname version; - sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c"; + sha256 = "34f5e0c161c08f65dc0d070ba2ff4c315ed21c4b7e0faa32a46862d0dc1b8f55"; }; propagatedBuildInputs = [ hidapi pyscard ecdsa ]; @@ -14,6 +14,8 @@ buildPythonPackage rec { # tests requires hardware doCheck = false; + pythonImportsCheck = [ "btchip.btchip" ]; + meta = with lib; { description = "Python communication library for Ledger Hardware Wallet products"; homepage = "https://github.com/LedgerHQ/btchip-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index 84476a2ca3..f4c5bfb162 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.10.0"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "06fgp5gpacyx1sqh1f6590r792d5lhzspwmjli592ajx69ckzzwf"; + sha256 = "0jmgpvgn36kfc1sa27a1l1g26dawhl99a1wl8gn4ajbcbcvc2pkh"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index 90c2f09919..f3dc0440ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1wr8fxa80c6vq55zv7k9rf61r805flrhd2v28qfl05jz1inghysb"; + sha256 = "0ymqkjz1zk4gs0hkxjh07napc4k24xxb8f3pganw27fca60xcii0"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index 92e78f940d..ed2f363901 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0bzn00qqx0xd9r4rrz01y9zmiwjlhcanrs13r1yzp2mycn9q5865"; + sha256 = "0x2k95lwx2gz2zj2ys646qiylhyqzlbiqf1k3q1l8w1wlggwv3xp"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0yh0dpg27gl3pk3nimj1yb6rw7kxvsv1bvzc6hbcfx3a9qdajicj"; + sha256 = "0fpam6x8x207la1xrr8m45yx35r646iizrs4gsaghlysmr95jb3i"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0b9fffr53wfq328csrqgdinafbs1v5s7yn4ky8faw6sqyd8l197v"; + sha256 = "0ari338hmi1bb1pln3mxv4k9aclbcby6z3km61wg3va511qhrrbq"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0pz1kmq731ap79l05l13f10r81lzgif5aydpsfz3k5fa9flvxjxs"; + sha256 = "0a5nrklyzfasaa119y4ivr7449rvsgifpkyravinacrl1g9phlls"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1jf72dzmgwrkqbr2f8s2dvf0zpvl3vbdq0qsf0g8xal272l7cmca"; + sha256 = "0rris2p7ic9p9ms3qcczia4nn5mb1yx2gv5mlnmg2yligjad2jaf"; }; buildInputs = [ buildbot-pkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index bf5e1e6ae9..02139d15e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "1s51ycgnvjbxc2y358vw6rnw8xsx9grj6pxzfxjrph784igy22r0"; + sha256 = "10ap7jlxs9vcmnyafr62mxlgsp709165nw55xmv9sw18r7m8wsm6"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 2587772127..7e26181cf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.16.1"; + version = "0.16.2"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1bjrg0ig40rjk5x65x7ac9xsl332r0ypqgrqjdivb5dvplifnw36"; + sha256 = "0jan4xikyi1p92rsir8camc6ify81wnd9l57v1pgmjf5fgb5r2w8"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix new file mode 100644 index 0000000000..1812ddff95 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, cachetools +, decorator +, fetchFromGitHub +, future +, nose +, pysmt +, pythonOlder +, pytestCheckHook +, z3 +}: + +buildPythonPackage rec { + pname = "claripy"; + version = "9.0.5739"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "1aym01f99zwb9w8qwy8gz631ka7g6akzdld0m4ykc5ip0rq70mki"; + }; + + # Use upstream z3 implementation + postPatch = '' + substituteInPlace setup.py --replace "z3-solver>=4.8.5.0" "" + ''; + + propagatedBuildInputs = [ + cachetools + decorator + future + pysmt + z3 + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "claripy" ]; + + meta = with lib; { + description = "Python abstraction layer for constraint solvers"; + homepage = "https://github.com/angr/claripy"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix index 9cbf86ab1c..ec5cbe8277 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: buildPythonPackage rec { pname = "cocotb"; @@ -25,9 +25,6 @@ buildPythonPackage rec { do substituteInPlace $f --replace 'shell which' 'shell command -v' done - - # This can perhaps be removed in the next update after 1.3.2? - substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" "" ''; checkInputs = [ swig verilog ]; @@ -36,8 +33,7 @@ buildPythonPackage rec { # test expected failures actually pass because of a fix in our icarus version # https://github.com/cocotb/cocotb/issues/1952 substituteInPlace tests/test_cases/test_discovery/test_discovery.py \ - --replace 'def access_single_bit' $'def foo(x): pass\ndef foo' \ - --replace 'def access_single_bit_assignment' $'def foo(x): pass\ndef foo' + --replace 'def access_single_bit' $'def foo(x): pass\ndef foo' export PATH=$out/bin:$PATH make test @@ -48,5 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; maintainers = with maintainers; [ matthuszagh ]; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix index 7efb08c2c6..e1aa8252d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix @@ -1,31 +1,31 @@ -{ lib, buildPythonApplication, fetchPypi, pytest, chardet }: +{ lib, buildPythonApplication, fetchFromGitHub, pytestCheckHook, pytest-cov, pytest-dependency, aspell-python, aspellDicts, chardet }: buildPythonApplication rec { pname = "codespell"; version = "2.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "dd9983e096b9f7ba89dd2d2466d1fc37231d060f19066331b9571341363c77b8"; + src = fetchFromGitHub { + owner = "codespell-project"; + repo = "codespell"; + rev = "v${version}"; + sha256 = "187g26s3wzjmvdx9vjabbnajpbg0s9klixyv6baymmgz9lrcv4ln"; }; - # no tests in pypi tarball - doCheck = false; - checkInputs = [ pytest chardet ]; - checkPhase = '' - # We don't want to be affected by the presence of these - rm -r codespell_lib setup.cfg - # test_command assumes too much about the execution environment - pytest --pyargs codespell_lib.tests -k "not test_command" + checkInputs = [ aspell-python chardet pytestCheckHook pytest-cov pytest-dependency ]; + + preCheck = '' + export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell" ''; + # tries to run not rully installed script + disabledTests = [ "test_command" ]; + pythonImportsCheck = [ "codespell_lib" ]; - meta = { + meta = with lib; { description = "Fix common misspellings in source code"; homepage = "https://github.com/codespell-project/codespell"; - license = with lib.licenses; [ gpl2 cc-by-sa-30 ]; - maintainers = with lib.maintainers; [ johnazoidberg ]; - platforms = lib.platforms.all; + license = with licenses; [ gpl2Only cc-by-sa-30 ]; + maintainers = with maintainers; [ johnazoidberg SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix index cd2ddf9da6..589753cd1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "9ac812006000887f76c95b8a33a9f0b65845bf072fbc54a42a1acffd34e41120"; + sha256 = "8a9caabdb02e87cd65c7f10f689ba3f1a15f8774de455e96fa5fc56eecfee63c"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix index 936db1081b..95f2effc04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix @@ -6,6 +6,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; + patchPhase = '' + substituteInPlace setup.py --replace 'version="0.1.11",' 'version="${version}",' + ''; + src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; @@ -21,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction layer for smart contract build systems"; homepage = "https://github.com/crytic/crytic-compile"; - license = licenses.agpl3; - maintainers = with maintainers; [ SuperSandro2000 ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 arturcygan ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix index 0e72ecaa82..4e862d2609 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix @@ -22,9 +22,8 @@ buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ toolz ]; - # Failing test https://github.com/pytoolz/cytoolz/issues/122 checkPhase = '' - NOSE_EXCLUDE=test_introspect_builtin_modules nosetests -v $out/${python.sitePackages} + nosetests -v $out/${python.sitePackages} ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix index 9d5e650207..2782342c1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.13.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "f92025b12931539cdda2173f2b4cd077119cbabbf3ddf62333f6302fd0d8a3ac"; + sha256 = "b61cb37322de91b4feb0d4d823694cbba8686f6459db774b53d553135350c71e"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix index 69eb4de2a2..3d29054467 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_html_components"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "2c662e640528c890aaa0fa23d48e51c4d13ce69a97841d856ddcaaf2c6a47be3"; + sha256 = "83eaa39667b7c3e6cbefa360743e6e536d913269ea15db14308ad022c78bc301"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix index 8977d49489..5c8f524e42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.8.3"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "f7ab2b922f4f0850bae0e9793cec99f8a1a241e5f7f5786e367ddd9e41d2b170"; + sha256 = "3c5519a781beb2261ee73b2d193bef6f212697636f204acd7d58cd986ba88e30"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix index c313aea6c0..8374d8694a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.11.0"; + version = "4.11.2"; src = fetchPypi { inherit pname version; - sha256 = "3170504a8626a9676b016c5ab456ab8c1fb1ea0206dcc2eddb8c4c6589216304"; + sha256 = "90fbdd12eaaf657aa80d429263de4bbeef982649eb5981ebeb2410d67c1d20eb"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix index f6f00553d9..89ff61f6c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.17.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60"; + sha256 = "067ipkp186h26j7whfid8hjf6cwjmw2b5jp6fvvg280j7q9bjsa9"; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest tests/unit/test_{configs,fingerprint,import,resources}.py \ + pytest tests/unit/test_{configs,fingerprint,resources}.py \ tests/unit/dash/ ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 4836fe35d1..737def7b9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.8.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "5f93e8560217ebbc5a2254eaf705e9cad8e1c82012567c658e26464a74fbab76"; + sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index 299fa82403..a97d9bc0c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "7.3.7"; + version = "7.3.8"; src = fetchPypi { inherit pname version; - sha256 = "35ead50a0550e65a7d6fd78e2c8e54095b53514fba85180768a2dbcdd3f2cf0b"; + sha256 = "0c0f036cf30e00fdc47c983875c72d16a3073ae9be9bcf39371514280f00a82d"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index c49e2e30b8..534cc816de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -76,11 +76,6 @@ buildPythonPackage rec { nbconvert ]; - postConfigure = '' - substituteInPlace setup.py \ - --replace "'numba >=0.37.0,<0.49'" "'numba'" - ''; - # dask doesn't do well with large core counts checkPhase = '' pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index 979d2811fe..5ed5a3eb15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "4.5.4"; + version = "4.10.3"; src = fetchPypi { inherit pname version; - sha256 = "99e65335cb84d543ebb47e76edadc695d062e5c25cc474698f50ed5e2aaa9002"; + sha256 = "93db83fac85bcb861469c0db1af11f4bc874aa2f9380151189a05d38c21afd60"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix index 6487e27623..dee64ebd6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix @@ -1,29 +1,29 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { - version = "3.1.2"; + version = "3.2.2"; pname = "django-cache-url"; - src = fetchPypi { - inherit pname version; - sha256 = "d0ee0d6c5daab92787bff47a4a6f5a6cf97c3c80d81a990820b2af16e12ad65a"; + src = fetchFromGitHub { + owner = "epicserve"; + repo = "django-cache-url"; + rev = "v${version}"; + sha256 = "0fxma2w6zl3cfl6wnynmlmp8snks67ffz4jcq4qmdc65xv1l204l"; }; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest tests + postPatch = '' + # disable coverage tests + sed -i '/--cov/d' setup.cfg ''; - # tests not included with pypi release - doCheck = false; + checkInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = "https://github.com/ghickman/django-cache-url"; + homepage = "https://github.com/epicserve/django-cache-url"; description = "Use Cache URLs in your Django application"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix index 313ae32f04..1bc9153d00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix @@ -1,22 +1,30 @@ -{ lib, - fetchPypi, - django, - buildPythonPackage +{ lib +, fetchFromGitHub +, buildPythonPackage +, django +, pytest-django +, pytestCheckHook }: buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.6.0"; + version = "3.7.0"; - src = fetchPypi { - inherit pname version; - sha256 = "5665fc1b1aabf1b678885cf6f8f8bd7da36ef0a978375e767d491b48d3055d8f"; + src = fetchFromGitHub { + owner = "adamchainz"; + repo = "django-cors-headers"; + rev = version; + sha256 = "1wc8cs1gpg9v98bq5qwnd4pcv043za50wd63gwkm86lbvjxyxynz"; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ + django + ]; - # pypi release does not include tests - doCheck = false; + checkInputs = [ + pytest-django + pytestCheckHook + ]; meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix index faad550d43..4ff2b7ba85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix @@ -1,30 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, - django, nose, pillow, sampledata, six, versiontools +{ lib +, buildPythonPackage +, fetchFromGitHub +, versiontools +, django +, sampledata +, nose +, pillow +, six }: buildPythonPackage rec { pname = "django-sampledatahelper"; version = "0.5"; + # no tests on PyPI + src = fetchFromGitHub { + owner = "kaleidos"; + repo = "django-sampledatahelper"; + rev = "8576f352ec26a3650f4386a6e1285b723f6aec23"; # no tag + sha256 = "1fx3ql4b9791594zkary19n20x5ra1m1n3pjaya9di1qy64csac4"; + }; + + nativeBuildInputs = [ versiontools ]; + + propagatedBuildInputs = [ django sampledata ]; + + checkInputs = [ nose pillow six ]; + + checkPhase = '' + DJANGO_SETTINGS_MODULE=tests.settings NOSE_EXCLUDE=test_calling_command nosetests -v + ''; + meta = { description = "Helper class for generate sample data for django apps development"; homepage = "https://github.com/kaleidos/django-sampledatahelper"; license = lib.licenses.bsd3; }; - - src = fetchPypi { - inherit pname version; - sha256 = "3fbc5533f1055f9d1944097f6271e8b18fcf4ed5cc582b518616445145300015"; - }; - - buildInputs = [ django nose pillow sampledata six versiontools ]; - propagatedBuildInputs = [ django sampledata ]; - - # HACK To prevent collision with pythonPackages.sampledata - preBuild = '' - rm tests/* - ''; - - # ERROR: test_image_from_directory (tests.tests.TestImageHelpers) - doCheck = false; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix index eac48593de..06ec880e32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.17"; + version = "2.2.18"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861"; + sha256 = "1d0b91343i9n0qz8xia1fbm4s3q8wi98nyc9a3acncm0w3sr9jf9"; }; patches = lib.optional withGdal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix index 2444146e83..7b447eb8d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7"; + sha256 = "c6c0462b8b361f8691171af1fb87eceb4442da28477e12200c40420176206ba7"; }; patches = lib.optional withGdal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix index e24a00564b..bae0acc1d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix @@ -29,9 +29,10 @@ buildPythonPackage rec { done ''; - meta = { + meta = with lib; { description = "Python Documentation Utilities"; homepage = "http://docutils.sourceforge.net/"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + license = with licenses; [ publicDomain bsd2 psfl gpl3Plus ]; + maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix new file mode 100644 index 0000000000..d265838526 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, django +, djangorestframework +, pytest +, pytest-cov +, pytest-django +, ipdb +, python +}: + +buildPythonPackage rec { + pname = "drf-nested-routers"; + version = "0.92.5"; + + src = fetchFromGitHub { + owner = "alanjds"; + repo = "drf-nested-routers"; + rev = "v${version}"; + sha256 = "1l1jza8xz6xcm3gwxh1k6pc8fs95cq3v751gxj497y1a83d26j8i"; + }; + + propagatedBuildInputs = [ django djangorestframework setuptools ]; + checkInputs = [ pytest pytest-cov pytest-django ipdb ]; + + checkPhase = '' + ${python.interpreter} runtests.py --nolint + ''; + + meta = with lib; { + homepage = "https://github.com/alanjds/drf-nested-routers"; + description = "Provides routers and fields to create nested resources in the Django Rest Framework"; + license = licenses.asl20; + maintainers = with maintainers; [ felschr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index 5d4ac94f7f..4cc3f34929 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, urllib3, certifi -, gevent, geventhttpclient, mock, fastimport -, git, glibcLocales }: +{ lib +, stdenv +, buildPythonPackage +, certifi +, fastimport +, fetchPypi +, gevent +, geventhttpclient +, git +, glibcLocales +, mock +, urllib3 +}: buildPythonPackage rec { - version = "0.20.15"; + version = "0.20.18"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "1248942fr12av2rkzpm2fq0qn6rajvv2lcgq65h8kby27qvp65zv"; + sha256 = "sha256-ATE4f5uZrsxprJhlWzkx8q1D2lPTpj4FD6Om1iYKxVQ="; }; LC_ALL = "en_US.UTF-8"; @@ -21,6 +30,8 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; + pythonImportsCheck = [ "dulwich" ]; + meta = with lib; { description = "Simple Python implementation of the Git file formats and protocols"; longDescription = '' @@ -29,7 +40,7 @@ buildPythonPackage rec { ''; homepage = "https://www.dulwich.io/"; changelog = "https://github.com/dulwich/dulwich/blob/dulwich-${version}/NEWS"; - license = with licenses; [ asl20 gpl2Plus]; + license = with licenses; [ asl20 gpl2Plus ]; maintainers = with maintainers; [ koral ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix index a953632f9f..845e27dcc4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix @@ -1,30 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, django , faker -, python -, ipaddress +, fetchPypi +, flask +, flask_sqlalchemy +, mongoengine +, pytestCheckHook +, sqlalchemy }: buildPythonPackage rec { pname = "factory_boy"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "ded73e49135c24bd4d3f45bf1eb168f8d290090f5cf4566b8df3698317dc9c08"; + sha256 = "0nsw2mdjk8sqds3qsix4cf19ws6i0fak79349pw2581ryc7w0720"; }; - propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; + propagatedBuildInputs = [ faker ]; - # tests not included with pypi release - doCheck = false; + checkInputs = [ + django + flask + flask_sqlalchemy + mongoengine + pytestCheckHook + sqlalchemy + ]; + + # Checks for MongoDB requires an a running DB + disabledTests = [ "MongoEngineTestCase" ]; + pythonImportsCheck = [ "factory" ]; meta = with lib; { - description = "A Python package to create factories for complex objects"; - homepage = "https://github.com/rbarrois/factory_boy"; - license = licenses.mit; + description = "Python package to create factories for complex objects"; + homepage = "https://github.com/rbarrois/factory_boy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix index 212e3a6fcc..214c89e1d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "60b2a696bf63d2bc1c90a5b1a861c280461732b88f079c267dc98021911a007b"; + sha256 = "31133c29c718aed95276425f7795d0a32b8d45a992ddd359c69600f22f869254"; }; propagatedBuildInputs = [ flask ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index cd91eb08be..75f4908b63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.18.2"; + version = "4.19.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0h750gvwpsp7fpmgfwkx93gkaf0m1s698g6r7n4xlaji563nlkiv"; + sha256 = "16jz3g4jzfdc43hs33b59vzd9m233qgflvy3ycdynifqk16lqsp2"; }; # all dependencies are optional, but diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 20d47dfe7e..0c2d74a90e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -1,35 +1,37 @@ { lib , buildPythonPackage -, flake8 -, nose2 -, mock +, fetchFromGitHub , requests , pyjwt -, fetchPypi +, pytestCheckHook +, responses }: buildPythonPackage rec { pname = "globus-sdk"; - version = "1.10.0"; + version = "2.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "b33021b58edacc16bf2ba8453efbb26a8b04242ee3f4d62dcdaa3c6e199f136f"; + src = fetchFromGitHub { + owner = "globus"; + repo = "globus-sdk-python"; + rev = version; + sha256 = "1kqnr50iwcq9nx40lblbqzf327cdcbkrir6vh70067hk33rq0gm9"; }; - checkPhase = '' - py.test tests - ''; + propagatedBuildInputs = [ + requests + pyjwt + ]; - # No tests in archive - doCheck = false; + checkInputs = [ + pytestCheckHook + responses + ]; - checkInputs = [ flake8 nose2 mock ]; - - propagatedBuildInputs = [ requests pyjwt ]; + pythonImportsCheck = [ "globus_sdk" ]; meta = with lib; { - description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; + description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix index ac511f8064..f9be06a827 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "08spn5g0s386x21dgwb46na8aknbwq5d1sn8bh6kayk9fjfbxwla"; + sha256 = "768ccd567b87bf0030f9458d796cc0a846c40825fa2896b77e9cc7a4af30ba2b"; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index d3846ad4f4..3bc5f185e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1rfdbkxbndi00wx9dx733ihp3hmcsk6k23pcjni0ki7m0c4acl5w"; + sha256 = "b19f0556c252b805a52c976e3317c53d91e36f56dc8d28192eea190627faf343"; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix index 301ffca034..bf7d08cdce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix @@ -5,6 +5,7 @@ , iso8601 , graphql-core , graphql-relay +, promise , pytestCheckHook , pytest-asyncio , pytest-benchmark @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; checkInputs = [ + promise pytestCheckHook pytest-asyncio pytest-benchmark @@ -39,6 +41,8 @@ buildPythonPackage rec { snapshottest ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + pythonImportsCheck = [ "graphene" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix index 9e48f66c13..5c29a1135a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix @@ -1,10 +1,11 @@ { buildPythonPackage , fetchFromGitHub , lib +, pythonOlder , coveralls , promise -, pytest +, pytestCheckHook , pytest-benchmark , pytest-mock , rx @@ -13,36 +14,21 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.2"; + version = "3.1.3"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "0kvbj9dwpx8mjfj86kqx54dbz9k72ki147ssyj0ca2syvb8jm3wb"; + sha256 = "0qy1i6vffwad74ymdsh1qjf5b6ph4z0vyxzkkc6yppwczhzmi1ps"; }; - propagatedBuildInputs = [ - promise - rx - six - ]; - checkInputs = [ - coveralls - pytest pytest-benchmark - pytest-mock + pytestCheckHook ]; - checkPhase = "pytest"; - - configurePhase = '' - substituteInPlace setup.py \ - --replace 'pytest-mock==1.2' 'pytest-mock==1.13.0' \ - --replace 'pytest-benchmark==3.0.0' 'pytest-benchmark==3.2.2' - ''; - meta = with lib; { description = "Port of graphql-js to Python"; homepage = "https://github.com/graphql-python/graphql-core"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix index b4048c922d..7859d2f4c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }: -buildPythonPackage { +buildPythonPackage rec { pname = "GreatFET"; version = "2019.5.1.dev0"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "greatfet"; - rev = "a927f21d59ccface00635146103a807c1d2b0ad8"; + rev = "v${version}"; sha256 = "054vkx4xkbhxhh5grjbs9kw3pjkv1zapp91ysrqr0c8mg1pc7zxv"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index 629c51071a..8ac1cd6f0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.34.1"; + version = "1.35.0"; src = fetchPypi { inherit pname version; - sha256 = "b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08"; + sha256 = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix index 0fc9d43dc2..f3e8162b71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "v${version}"; - sha256 = "1a984691kfin1n896p5l7y8ggjzx19ynih2cw040smfms0azhp4w"; + sha256 = "052l7gk1v0zckraavyba1bc2cqvmrbffwxxjsklgnslbdcg5h514"; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library and CLI tool to interface with Google Translate text-to-speech API"; homepage = "https://gtts.readthedocs.io"; + changelog = "https://gtts.readthedocs.io/en/latest/changelog.html"; license = licenses.mit; maintainers = with maintainers; [ unode ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix index 46b774a25c..e66a3f5e9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix @@ -1,35 +1,69 @@ -{ lib, stdenv +{ autoPatchelfHook , buildPythonPackage , cmake -, fetchPypi +, cython +, fetchFromGitHub , h3 -, python +, lib +, numpy +, pytestCheckHook +, scikit-build +, stdenv }: buildPythonPackage rec { pname = "h3"; - version = "3.7.0"; + version = "3.7.1"; - src = fetchPypi { - inherit pname version; - sha256 = "cd27fc8ecd9183f93934079b7c986401f499030ff2e2171eace9de462fab561d"; + # pypi version does not include tests + src = fetchFromGitHub { + owner = "uber"; + repo = "h3-py"; + rev = "v${version}"; + sha256 = "sha256-MIVV3kZGsIsaJ/ccJOK3+j1VwkUsZGHS5d1sGOBa1Ec="; }; - patches = [ - ./disable-custom-install.patch - ./hardcode-h3-path.patch + dontConfigure = true; + + checkInputs = [ pytestCheckHook ]; + + nativeBuildInputs = [ + scikit-build cmake cython + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # On Linux the .so files ends up referring to libh3.so instead of the full + # Nix store path. I'm not sure why this is happening! On Darwin it works + # fine. + autoPatchelfHook ]; - preBuild = '' - substituteInPlace h3/h3.py \ - --subst-var-by libh3_path ${h3}/lib/libh3${stdenv.hostPlatform.extensions.sharedLibrary} - ''; + # This is not needed per-se, it's only added for autoPatchelfHook to work + # correctly. See the note above ^^ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ h3 ]; + + propagatedBuildInputs = [ numpy ]; + + # The following prePatch replaces the h3lib compilation with using the h3 packaged in nixpkgs. + # + # - Remove the h3lib submodule. + # - Patch CMakeLists to avoid building h3lib, and use h3 instead. + prePatch = + let + cmakeCommands = '' + include_directories(${h3}/include/h3) + link_directories(${h3}/lib) + ''; + in '' + rm -r src/h3lib + substituteInPlace CMakeLists.txt --replace "add_subdirectory(src/h3lib)" "${cmakeCommands}" + ''; + + # Extra check to make sure we can import it from Python + pythonImportsCheck = [ "h3" ]; meta = with lib; { homepage = "https://github.com/uber/h3-py"; - description = "This library provides Python bindings for the H3 Core Library."; + description = "Hierarchical hexagonal geospatial indexing system"; license = licenses.asl20; - platforms = platforms.unix ++ platforms.darwin; maintainers = [ maintainers.kalbasit ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h3/disable-custom-install.patch b/third_party/nixpkgs/pkgs/development/python-modules/h3/disable-custom-install.patch deleted file mode 100644 index 981e3b6e2f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/h3/disable-custom-install.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/setup.py b/setup.py -index 8e1c220..45297b6 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,20 +25,6 @@ class CustomBuildExtCommand(build_ext): - install_h3(h3_version) - - --# Tested with wheel v0.29.0 --class BinaryDistribution(Distribution): -- def __init__(self, attrs=None): -- Distribution.__init__(self, attrs) -- # The values used for the name and sources in the Extension below are -- # not important, because we override the build_ext command above. -- # The normal C extension building logic is never invoked, and is -- # replaced with our own custom logic. However, ext_modules cannot be -- # empty, because this signals to other parts of distutils that our -- # package contains C extensions and thus needs to be built for -- # different platforms separately. -- self.ext_modules = [Extension('h3c', [])] -- -- - long_description = open('README.rst').read() - - setup( -@@ -52,14 +38,10 @@ setup( - url='https://github.com/uber/h3-py.git', - packages=find_packages(exclude=['tests', 'tests.*']), - install_requires=[], -- cmdclass={ -- 'build_ext': CustomBuildExtCommand, -- }, - package_data={ - 'h-py': - ['out/*.dylib' if platform.system() == 'Darwin' else ( - 'out/*.dll' if platform.system() == 'Windows' else - 'out/*.so.*')] - }, -- license='Apache License 2.0', -- distclass=BinaryDistribution) -+ license='Apache License 2.0') diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h3/hardcode-h3-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/h3/hardcode-h3-path.patch deleted file mode 100644 index 87549f298d..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/h3/hardcode-h3-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/h3/h3.py b/h3/h3.py -index 18cf168..2cc7812 100644 ---- a/h3/h3.py -+++ b/h3/h3.py -@@ -34,13 +34,7 @@ from ctypes import ( - POINTER, - ) - --_dirname = os.path.dirname(__file__) --libh3_path = ('{}/{}'.format(_dirname, 'out/libh3.1.dylib') -- if platform.system() == 'Darwin' else ( -- '{}/{}'.format(_dirname, 'out/h3.dll') if platform.system() == 'Windows' else -- '{}/{}'.format(_dirname, 'out/libh3.so.1'))) -- --libh3 = cdll.LoadLibrary(libh3_path) -+libh3 = cdll.LoadLibrary('@libh3_path@') - - # Type of an H3 index - H3Index = c_ulonglong diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix index 44665c1177..daa181a9cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-QOireN6uRIa7UBKsE63r6yT+mzfs8uOGzzDcNahELws="; + sha256 = "sha256-DuVpo+g5VS7bkj/DZi0vNOAPjPkzfIA5I2BD5KJ/rNQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/helper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/helper/default.nix index 8560364d4f..1697c72703 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/helper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/helper/default.nix @@ -1,19 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pyyaml, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyyaml +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "helper"; - version = "2.4.2"; + version = "2.5.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0p56dvjpaz9wnr0ik2wmvgqjf9ji180bhjky7q272l5dan94lgd6"; + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = version; + sha256 = "0zypjv8rncvrsgl200v7d3bn08gs48dwqvgamfqv71h07cj6zngp"; }; - checkInputs = [ mock ]; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ + pyyaml + ]; - # No tests in the pypi tarball - doCheck = false; + checkInputs = [ + pytestCheckHook + mock + ]; + + pythonImportsCheck = [ + "helper" + "helper.config" + ]; meta = with lib; { description = "Development library for quickly writing configurable applications and daemons"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix index 3f601eacc4..8d2afcf5e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "0f5cb598a7494b9703c6188246dc89e529d46cbb6700eca70cc895085f0b3cc3"; + sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01"; }; buildInputs = [ setuptools_scm cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index cc6003fa95..e6323c951e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "2.0.8"; + version = "2.0.10"; src = fetchPypi { inherit pname version; - sha256 = "9b7cabab87cd614e26b408653bc8937ec27b79ca2fde6b9457da55d2541f75fb"; + sha256 = "e561e3c5d4f39ab1f86e9f24bb0b2803ee6e312de61e90907f739aa638f35215"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix index dd23ad6c61..51b92c8a4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix @@ -1,5 +1,8 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { @@ -14,15 +17,13 @@ buildPythonPackage rec { sha256 = "1y924clp2hiqg3a9437z808p29mqcx537j5fmz71plx8qrcm5jf9"; }; - # python setup.py test is broken, use pytest - checkInputs = [ pytest ]; - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "html2text" ]; meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text"; homepage = "https://github.com/Alir3z4/html2text/"; - license = licenses.gpl3; + license = licenses.gpl3Only; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix index 9ce859c9b7..f7eb294841 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.6"; + version = "0.10.7"; src = fetchPypi { inherit pname version; - sha256 = "b0561dbdfecc6a6d7b0cc226d75a800ae9bbc93313a6ad526a1adc97be51eada"; + sha256 = "6ee2ba6002f11151472fa873b6637d902fc6045a2193aea08b39ae8147c230ba"; }; propagatedBuildInputs = [ requests six ]; @@ -14,6 +14,8 @@ buildPythonPackage rec { # Requires running a Vault server doCheck = false; + pythonImportsCheck = [ "hvac" ]; + meta = with lib; { description = "HashiCorp Vault API client"; homepage = "https://github.com/ianunruh/hvac"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix index b89df0bd2c..89f49d9cf6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "icmplib"; - version = "2.0.1"; + version = "2.0.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ValentinBELYN"; repo = pname; rev = "v${version}"; - sha256 = "0vps4iz87f8l0z3va92srsx5v19nnd65c22hvbgvhag3vhqsxg7h"; + sha256 = "0djsbksgml2h18w6509w59s88730w1xaxdxzws12alq4m5v4hirr"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index f5418b89e8..e0c2adb8e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 +, fetchpatch , pandas , pytestCheckHook , scikitlearn @@ -15,6 +16,16 @@ buildPythonPackage rec { sha256 = "da59de0d1c0fa66f62054dd9a0a295a182563aa1abbb3bf9224a3678fcfe8fa4"; }; + patches = [ + # Fix compatibility with scikit-learn 0.24. This patch will be included in releases of + # imbalanced-learn after 0.7.0 + (fetchpatch { + url = "https://github.com/scikit-learn-contrib/imbalanced-learn/commit/dc4051fe0011c68d900be05971b71016d4ad9e90.patch"; + sha256 = "1rv61k9wv4q37a0v943clr8fflcg9ly530smgndgkjlxkyzw6swh"; + excludes = ["doc/conf.py" "build_tools/*" "azure-pipelines.yml"]; + }) + ]; + propagatedBuildInputs = [ scikitlearn ]; checkInputs = [ pytestCheckHook pandas ]; preCheck = '' @@ -32,5 +43,6 @@ buildPythonPackage rec { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; license = licenses.mit; + maintainers = [ maintainers.rmcgibbo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index 7e9a6b5daa..eb8605c45d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -15,6 +15,9 @@ buildPythonPackage rec { pillow ]; + # no tests exectuted + doCheck = false; + meta = with lib; { description = "Convert images to PDF via direct JPEG inclusion"; homepage = "https://gitlab.mister-muffin.de/josch/img2pdf"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix index f402f913f3..53294680df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.5.3"; + version = "0.5.4"; pname = "imutils"; src = fetchPypi { inherit pname version; - sha256 = "857af6169d90e4a0a814130b9b107f5d611150ce440107e1c1233521c6fb1e2b"; + sha256 = "03827a9fca8b5c540305c0844a62591cf35a0caec199cb0f2f0a4a0fb15d8f24"; }; propagatedBuildInputs = [ opencv3 ]; @@ -18,6 +18,14 @@ buildPythonPackage rec { # no tests doCheck = false; + pythonImportsCheck = [ + "imutils" + "imutils.video" + "imutils.io" + "imutils.feature" + "imutils.face_utils" + ]; + meta = with lib; { homepage = "https://github.com/jrosebr1/imutils"; description = "A series of convenience functions to make basic image processing functions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/j2cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/j2cli/default.nix index d6efe84edf..c83b1c77e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/j2cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/j2cli/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { J2Cli is a command-line tool for templating in shell-scripts, leveraging the Jinja2 library. ''; - maintainers = with maintainers; [ rushmorem ]; + maintainers = with maintainers; [ rushmorem SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index b4590ed28d..e1318b51ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.14.1"; + version = "1.14.3"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "1vzzz7dlg6apxhcl0qkfdpp2v9d0q6jyafpfmklkcbjs31zvwcsw"; + sha256 = "sha256-6ofw74onFECJYYSuZlOVcNVAVuJaJKV4pkaJ4cTrvPk="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix index 8c1fe0a7d3..b6e6f47b64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix @@ -4,17 +4,24 @@ , setuptools , pyopenssl , cryptography +, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "josepy"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "502a36f86efe2a6d09bf7018bca9fd8f8f24d8090a966aa037dbc844459ff9c8"; + sha256 = "0aab1c3ceffe045e7fd5bcfe7685e27e9d2758518d9ba7116b5de34087e70bf5"; }; + postPatch = '' + # remove coverage flags + sed -i '/addopts/d' pytest.ini + ''; + propagatedBuildInputs = [ pyopenssl cryptography @@ -22,8 +29,10 @@ buildPythonPackage rec { setuptools ]; - # too many unpackaged check requirements - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; meta = with lib; { description = "JOSE protocol implementation in Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 5d8060d194..027ae2e40c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.11.0"; + version = "2021.1.0"; pname = "jupyter-repo2docker"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "7fc2edf0cda1e46f2e7553bfb84a47e6d141b8dac393268ef01ee3504ca6ad94"; + sha256 = "3e3e671407ef2a7f7695338dc6ce2ca9cc75683ffc7a543829cf119564aca802"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 71fba8a122..bd3e073a77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -28,6 +28,9 @@ buildPythonPackage rec { --replace "/bin/bash" "${bash}/bin/bash" ''; + # no tests + doCheck = false; + meta = with lib; { description = "JupyterHub Spawner using systemd for resource isolation"; homepage = "https://github.com/jupyterhub/systemdspawner"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libpurecool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libpurecool/default.nix new file mode 100644 index 0000000000..aa523d9a98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/libpurecool/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, netifaces +, paho-mqtt +, pycryptodome +, requests +, six +, zeroconf +}: + +buildPythonPackage rec { + pname = "libpurecool"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kwbinbg0i4fca1bpx6jwa1fiw71vg0xa89jhq4pmnl5cn9c8kqx"; + }; + + # Remove vendorized zeroconf, https://github.com/etheralm/libpurecool/issues/33 + postPatch = '' + rm libpurecool/zeroconf.py + substituteInPlace libpurecool/dyson_pure_cool_link.py \ + --replace "from .zeroconf import ServiceBrowser, Zeroconf" "from zeroconf import ServiceBrowser, Zeroconf" + ''; + + propagatedBuildInputs = [ + netifaces + paho-mqtt + pycryptodome + requests + six + zeroconf + ]; + + # Tests are only present in repo, https://github.com/etheralm/libpurecool/issues/36 + doCheck = false; + pythonImportsCheck = [ "libpurecool" ]; + + meta = with lib; { + description = "Python library for Dyson devices"; + homepage = "http://libpurecool.readthedocs.io"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix index bfc6b711ab..9cbd042c55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { nosetests ''; + passthru = { + inherit libvirt; + }; + meta = with lib; { homepage = "http://www.libvirt.org/"; description = "libvirt Python bindings"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index ff7ac9fb3f..86a505d444 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2020.12.05"; + version = "2021.01.15"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "c4310ea12d1ac39984a96c40a12fab92aefc3d77a615f89ef542b10497ae56fa"; + sha256 = "5d7109fc779c44070e3c57186eae59b133014835d5fe15b262fa9438d7599c81"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix index edc19f66f7..0c981a6789 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "mailmanclient"; - version = "3.3.1"; + version = "3.3.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0pjgzpvhdb6ql8asb20xr8d01m646zpghmcp9fmscks0n1k4di4g"; + sha256 = "4082ac0c66d7f7bee15751fe2564098b971177c0013e66d0c8ceee1ebdcb5592"; }; propagatedBuildInputs = [ six httplib2 requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manticore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manticore/default.nix index f9ca3afc4b..9e0938fb14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manticore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manticore/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { ] ++ lib.optionals (!stdenv.isLinux) [ "--ignore=tests/native" "--ignore=tests/other/test_locking.py" + "--ignore=tests/other/test_state_introspection.py" ]; disabledTests = [ # failing tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 4bf670082b..ba10c89e14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -1,23 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, - marshmallow, sqlalchemy +{ lib +, buildPythonPackage +, fetchPypi +, marshmallow +, sqlalchemy +, pytest-lazy-fixture +, pytestCheckHook }: buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.24.1"; - - meta = { - homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; - description = "SQLAlchemy integration with marshmallow "; - license = lib.licenses.mit; - }; + version = "0.24.2"; src = fetchPypi { inherit pname version; - sha256 = "d051cf013c075c43e1ee5c4b01f8fab6dd6b140dab6825be45875f674a0d289c"; + sha256 = "ee3ead3b83de6608c6850ff60515691b0dc556ca226680f8a82b9f785cdb71b1"; }; - propagatedBuildInputs = [ marshmallow sqlalchemy ]; + propagatedBuildInputs = [ + marshmallow + sqlalchemy + ]; + + checkInputs = [ + pytest-lazy-fixture + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; + description = "SQLAlchemy integration with marshmallow "; + license = licenses.mit; + }; - doCheck = false; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 8c77cffc4d..d46b505991 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.8.11"; + version = "0.8.12"; src = fetchPypi { inherit pname version; - sha256 = "d1958b9bd8c2631ccd6ebd4a54e35e5190dae2c0daeb786aec02f263b2c2e0b1"; + sha256 = "471684d40cbc2f7db345f2f809553b221a34d1c81e04bcdcb08a2832f140db1e"; }; propagatedBuildInputs = [ @@ -26,6 +26,8 @@ buildPythonPackage rec { # no tests available doCheck = false; + pythonImportsCheck = [ "mautrix" ]; + meta = with lib; { homepage = "https://github.com/tulir/mautrix-python"; description = "A Python 3 asyncio Matrix framework."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix index 51ee529e23..481f302d66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "16bbyihap2ygsi7xg58rwdn14ms1j0jy2kxbdljpg39s9q1rz6ps"; + sha256 = "sha256-woYs8EYUfALCtqHUCVfF5z1v1UIc9D8Iep9n4NrNIlg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix index ea2ae26c96..d068380a7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.24"; + version = "0.3.25"; src = fetchPypi { inherit pname version; - sha256 = "0q9bhw0lfw9iykjdsqz62ipy3ihfz6kprzw5sc7v1678l2pvs84j"; + sha256 = "b5ef61c4f05493cfe78b3f955878a3d0a71950eead5ebb484282f07456a47bea"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix index 4e443a377e..42d9ae3cf3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, nbconvert, pytest, requests, responses }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, nbconvert +, pytestCheckHook +, requests +, responses +}: buildPythonPackage rec { pname = "nbconflux"; @@ -14,11 +22,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ nbconvert requests ]; - checkInputs = [ pytest responses ]; + checkInputs = [ pytestCheckHook responses ]; - checkPhase = '' - pytest tests - ''; + JUPYTER_PATH="${nbconvert}/share/jupyter"; + disabledTests = [ + "test_post_to_confluence" + "test_optional_components" + ]; meta = with lib; { description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index fb5eb6cbf7..979b357607 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0"; + sha256 = "19lf036h0d9ryqasrh91myhn3dq5zcw4rik9jy6sayq7l6irmm94"; }; propagatedBuildInputs = [ @@ -29,9 +29,13 @@ buildPythonPackage rec { traitlets ]; - checkPhase = '' - ${python.interpreter} -m nbsphinx - ''; + # The package has not tests + doCheck = false; + + JUPYTER_PATH = "${nbconvert}/share/jupyter"; + pythonImportsCheck = [ + "nbsphinx" + ]; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 3826a74675..531232bf8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -15,8 +15,7 @@ in buildPythonPackage { }; buildInputs = [ precis-i18n ]; - checkInputs = [ gobject-introspection libsoup pygobject3 ]; - propagatedBuildInputs = [ idna pyopenssl ]; + propagatedBuildInputs = [ gobject-introspection idna libsoup pygobject3 pyopenssl ]; meta = with lib; { homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix index 55f70f74db..cb7d57f753 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "nmigen-boards"; - version = "unstable-2020-02-06"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.1.dev92+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev173+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen-boards"; - rev = "f37fe0295035db5f1bf82ed086b2eb349ab3a530"; - sha256 = "16112ahil100anfwggj64nyrj3pf7mngwrjyqyhf2ggxx9ir24cc"; + rev = "a35d870a994c2919116b2c06166dc127febb1512"; + sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -26,6 +26,9 @@ buildPythonPackage rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; + # no tests + doCheck = false; + meta = with lib; { description = "Board and connector definitions for nMigen"; homepage = "https://github.com/nmigen/nmigen-boards"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nmigen-soc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nmigen-soc/default.nix index 4c15e65e62..b987557d5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nmigen-soc/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "nmigen-soc"; - version = "unstable-2020-02-08"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.1.dev24+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev43+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen-soc"; - rev = "f1b009c7e075bca461d10ec963a7eaa3bf4dfc14"; - sha256 = "04kjaq9qp6ac3h0r1wlb4jyz56bb52l1rikmz1x7azvnr10xhrad"; + rev = "ecfad4d9abacf903a525f0a252c38844eda0d2dd"; + sha256 = "0afmnfs1ms7p1r4c1nc0sfvlcq36zjwaim7775v5i2vajcn3020c"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix index 4a2327bf92..1e38a087bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix @@ -6,6 +6,8 @@ , setuptools_scm , pyvcd , jinja2 +, importlib-resources +, importlib-metadata # for tests , pytestCheckHook @@ -16,21 +18,27 @@ buildPythonPackage rec { pname = "nmigen"; - version = "unstable-2020-04-02"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}"; + realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen"; - rev = "c79caead33fff14e2dec42b7e21d571a02526876"; - sha256 = "sha256-3+mxHyg0a92/BfyePtKT5Hsk+ra+fQzTjCJ2Ech44/s="; + rev = "f7c2b9419f9de450be76a0e9cf681931295df65f"; + sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1"; }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ setuptools pyvcd jinja2 ]; + propagatedBuildInputs = [ + setuptools + pyvcd + jinja2 + ] ++ + lib.optional (pythonOlder "3.9") importlib-resources ++ + lib.optional (pythonOlder "3.8") importlib-metadata; checkInputs = [ pytestCheckHook yosys symbiyosys yices ]; @@ -38,13 +46,6 @@ buildPythonPackage rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; - # Fail b/c can't find sby (symbiyosys) executable, which should be on path. - disabledTests = [ - "test_distance" - "test_reversible" - "FIFOFormalCase" - ]; - meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; homepage = "https://nmigen.info/nmigen"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix index ffa761f206..a9cb021a84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "bl1b0R3jP5PSJUXZ7SOguY+EDyzawNdJ0vqkYXrcd3I="; + sha256 = "86e2dae49e34de7c31b65b486c8f9aa58b66dc2e8ee9b34c390c6c58885c85a0"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index 8b2943ba36..63b5214b27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -1,13 +1,18 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, pydsdl }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pydsdl +}: buildPythonPackage rec { pname = "nunavut"; - version = "0.6.2"; + version = "1.0.1"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "48b6802722d78542ca5d7bbc0d6aa9b0a31e1be0070c47b41527f227eb6a1443"; + sha256 = "1gvs3fx2l15y5ffqsxxjfa4p1ydaqbq7qp5nsgb8jbz871358jxm"; }; propagatedBuildInputs = [ @@ -19,7 +24,10 @@ export HOME=$TMPDIR ''; - # repo doesn't contain tests, ensure imports aren't broken + # No tests in pypy package and no git tags yet for release versions, see + # https://github.com/UAVCAN/nunavut/issues/182 + doCheck = false; + pythonImportsCheck = [ "nunavut" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix index 71bec7e42d..1ae27b5ecf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.5.0"; + version = "4.5.4"; disabled = isPy27; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "getpelican"; repo = "pelican"; rev = version; - sha256 = "0p8p84fcpkr19d54dhxvldd8ijbg334wmrmkr99pnbrdl1gf64qi"; + sha256 = "08l8kk3c7ca1znxmgdmfgzn28dzjcziwflzq80fn9zigqj0y7fi8"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -27,6 +27,8 @@ buildPythonPackage rec { # Exclude custom locale test, which files were removed above to fix the source checksum checkPhase = '' nosetests -s \ + --exclude=test_basic_generation_works \ + --exclude=test_custom_generation_works \ --exclude=test_custom_locale_generation_works \ --exclude=test_log_filter \ pelican diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix index 2259fcd7ba..e68516fb07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix @@ -1,19 +1,26 @@ -{ lib, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, pyyaml +, matplotlib +, h5py +, spglib +, pytestCheckHook +}: buildPythonPackage rec { pname = "phonopy"; - version = "2.8.1"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "28864b04adb900597705f1367a100da869af835088bdd13f1693c4382259f128"; + sha256 = "1jaizhkb59ixknvc75nrhfq51bh75912q8ay36bxpf4g5hzyhw3a"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; checkInputs = [ pytestCheckHook ]; - # flakey due to floating point inaccuracy - disabledTests = [ "test_NaCl" ]; # prevent pytest from importing local directory preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 38efe0a49b..8ed27ea962 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -1,4 +1,5 @@ -{ attrs +{ lib +, attrs , buildPythonPackage , defusedxml , fetchPypi @@ -6,29 +7,28 @@ , isPy3k , lxml , pillow +, psutil , pybind11 -, pytestCheckHook +, pytest-cov , pytest-helpers-namespace , pytest-timeout -, pytest_xdist -, pytestrunner +, pytest-xdist +, pytestCheckHook , python-dateutil , python-xmp-toolkit -, python3 , qpdf +, setuptools-scm , setuptools-scm-git-archive -, setuptools_scm -, lib }: buildPythonPackage rec { pname = "pikepdf"; - version = "2.2.0"; + version = "2.5.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "74300a32c41b3d578772f6933f23a88b19f74484185e71e5225ce2f7ea5aea78"; + sha256 = "sha256-j8PpeyTa+9SxrAV8jxRMGEZ85V00KhqMQmiIkOrVjvM="; }; buildInputs = [ @@ -38,36 +38,34 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm-git-archive - setuptools_scm + setuptools-scm ]; checkInputs = [ attrs hypothesis - pillow - pytestCheckHook pytest-helpers-namespace pytest-timeout - pytest_xdist - pytestrunner + pytest-xdist + psutil + pytest-cov + pytestCheckHook python-dateutil python-xmp-toolkit ]; - propagatedBuildInputs = [ defusedxml lxml ]; - - postPatch = '' - sed -i \ - -e 's/^pytest .*/pytest/g' \ - -e 's/^attrs .*/attrs/g' \ - -e 's/^hypothesis .*/hypothesis/g' \ - requirements/test.txt - ''; + propagatedBuildInputs = [ + defusedxml + lxml + pillow + ]; preBuild = '' HOME=$TMPDIR ''; + pythonImportsCheck = [ "pikepdf" ]; + meta = with lib; { homepage = "https://github.com/pikepdf/pikepdf"; description = "Read and write PDFs with Python, powered by qpdf"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix new file mode 100644 index 0000000000..d7473a05bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchgit, poetry-core, pytestCheckHook, pytest-benchmark, pytest-mypy, pillow }: + +buildPythonPackage rec { + pname = "pixelmatch"; + version = "0.2.2"; + format = "pyproject"; + + # test fixtures are stored in LFS + src = fetchgit { + url = "https://github.com/whtsky/pixelmatch-py"; + rev = "v${version}"; + sha256 = "1dsix507dxqik9wvgzscvf2pifbg7gx74krrsalqbfcmm7d1i7xl"; + fetchLFS = true; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + pytest-benchmark + pytest-mypy + pillow + ]; + + pytestFlagsArray = [ + "--mypy" + "--benchmark-disable" + ]; + + meta = with lib; { + description = "A pixel-level image comparison library."; + homepage = "https://github.com/whtsky/pixelmatch-py"; + license = licenses.isc; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix new file mode 100644 index 0000000000..5dc77a2661 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pkce"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "RomeoDespres"; + repo = pname; + rev = version; + sha256 = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pkce" ]; + + meta = with lib; { + description = "Python module to work with PKCE"; + homepage = "https://github.com/RomeoDespres/pkce"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index b9a4fb34bf..5251ff1de0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -1,25 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests -, tqdm, websocket_client, pytest, pillow, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, tqdm +, websocket_client +, isPy27 +}: buildPythonPackage rec { pname = "PlexAPI"; - version = "4.1.2"; + version = "4.3.1"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1l955q1q6lljq3bmyiayr33gzxrlw16xdwgjdaflznvyg16fcjkk"; + sha256 = "sha256-gRXNOGd9YGcGysKbAtiNwi5NxPvv39F6PEXBjiYbVq4="; }; - propagatedBuildInputs = [ requests tqdm websocket_client ]; + propagatedBuildInputs = [ + requests + tqdm + websocket_client + ]; - checkInputs = [ pytest pillow ]; + # Tests require a running Plex instance + doCheck = false; + pythonImportsCheck = [ "plexapi" ]; meta = with lib; { - homepage = "https://github.com/pkkid/python-plexapi"; description = "Python bindings for the Plex API"; + homepage = "https://github.com/pkkid/python-plexapi"; license = licenses.bsd3; maintainers = with maintainers; [ colemickens ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix index 5834dd7603..1ad17d0459 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -8,6 +8,7 @@ , pygit2 , pyuv , i3ipc +, stdenv }: # TODO: bzr support is missing because nixpkgs switched to `breezy` @@ -29,8 +30,7 @@ buildPythonPackage rec { hglib pygit2 pyuv - i3ipc - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ i3ipc ]; # tests are travis-specific doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix index 8d4018d6d0..5ca1d3d83c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "7.1.2"; + version = "7.1.4"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aEx0swjfyBrSu1fgIiAwdwWmk9v5o7sbT5HTVp7L3R4="; + sha256 = "sha256-onxag3kmswqqSycbwW+orofrukry0pCaRSxVRq2u53A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix index 199a6804ea..3773a724e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix @@ -1,15 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k }: buildPythonPackage rec { pname = "precis-i18n"; - version = "1.0.0"; + version = "1.0.2"; disabled = !isPy3k; - src = fetchPypi { - pname = "precis_i18n"; - inherit version; - sha256 = "0gjhvwd8aifx94rl1ag08vlmndyx2q3fkyqb0c4i46x3p2bc2yi2"; + src = fetchFromGitHub { + owner = "byllyfish"; + repo = "precis_i18n"; + rev = "v${version}"; + hash = "sha256:1r9pah1kgik6valf15ac7ybw0szr92cq84kwjvm6mq3z46j1pmkr"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix new file mode 100644 index 0000000000..dc35aea6cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, prometheus_client +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prometheus-flask-exporter"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "rycus86"; + repo = "prometheus_flask_exporter"; + rev = version; + sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370"; + }; + + propagatedBuildInputs = [ flask prometheus_client ]; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests/" ]; + + meta = with lib; { + description = "Prometheus exporter for Flask applications"; + homepage = "https://github.com/rycus86/prometheus_flask_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ lbpdt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix new file mode 100644 index 0000000000..c41da62cf4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-runner +, pytestCheckHook +, pythonOlder +, morphys +, six +, varint +}: + +buildPythonPackage rec { + pname = "py-multicodec"; + version = "0.2.1"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "multiformats"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4="; + }; + + # Error when not substituting: + # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. + postPatch = '' + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + ''; + + nativeBuildInputs = [ + pytest-runner + ]; + + propagatedBuildInputs = [ + varint + six + morphys + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "multicodec" ]; + + meta = with lib; { + description = "Compact self-describing codecs"; + homepage = "https://github.com/multiformats/py-multicodec"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix index 1f8ecad001..73307c75b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix @@ -1,54 +1,48 @@ { base58 , buildPythonPackage , fetchFromGitHub -, isPy27 , lib , morphys -, pytest -, pytestcov -, pytestrunner +, pytest-runner +, pytestCheckHook +, pythonOlder , six -, variants , varint }: buildPythonPackage rec { pname = "py-multihash"; - version = "1.0.0"; + version = "2.0.1"; + disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "multiformats"; repo = pname; rev = "v${version}"; - sha256 = "07qglrbgcb8sr9msqw2v7dqj9s4rs6nyvhdnx02i5w6xx5ibzi3z"; + sha256 = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ base58 morphys six - variants varint ]; checkInputs = [ - pytest - pytestcov + pytestCheckHook ]; pythonImportsCheck = [ "multihash" ]; - disabled = isPy27; - meta = with lib; { description = "Self describing hashes - for future proofing"; homepage = "https://github.com/multiformats/py-multihash"; license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; - broken = true; # no longer compatible with base58, no updates in 5 years. Added 2020-11-05 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix new file mode 100644 index 0000000000..51497e8875 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, poetry +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyairnow"; + version = "1.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "asymworks"; + repo = pname; + rev = "v${version}"; + sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-aiohttp + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyairnow" ]; + + meta = with lib; { + description = "Python wrapper for EPA AirNow Air Quality API"; + homepage = "https://github.com/asymworks/pyairnow"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix index 2e9aa97f1f..882182a3a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix @@ -1,21 +1,21 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, poetry , aiohttp -, numpy -, pysmb , aresponses , asynctest +, buildPythonPackage +, fetchFromGitHub +, numpy +, poetry-core +, pysmb , pytest-aiohttp , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.5"; + version = "5.0.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,10 +24,10 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "0jjvng3py5g97gvx6rdbk5zxbn5rw8gq1ki4qi4vfsypchxbpz2q"; + sha256 = "sha256-7u8AwIr1Ah/7zCfXFwj/C/CaD/B3uLRkZ8Gf6d18Xp0="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix index 655adecd5c..08029d35df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix @@ -2,25 +2,24 @@ buildPythonPackage rec { pname = "pydsdl"; - version = "1.4.2"; + version = "1.9.4"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchFromGitHub { owner = "UAVCAN"; repo = pname; rev = version; - sha256 = "03kbpzdrjzj5vpgz5rhc110pm1axdn3ynv88b42zq6iyab4k8k1x"; + sha256 = "1hmmc4sg6dckbx2ghcjpi74yprapa6lkxxzy0h446mvyngp0kwfv"; }; - propagatedBuildInputs = [ - ]; - # allow for writable directory for darwin preBuild = '' export HOME=$TMPDIR ''; - # repo doesn't contain tests, ensure imports aren't broken + # repo doesn't contain tests + doCheck = false; + pythonImportsCheck = [ "pydsdl" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix index 6e808a0105..039d6259f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix @@ -1,40 +1,46 @@ { lib , buildPythonPackage -, fetchPypi -, requests +, fetchFromGitHub +, certifi +, click , keyring , keyrings-alt -, click +, pytz +, requests , six , tzlocal -, certifi -, bitstring -, unittest2 +, pytest-mock +, pytestCheckHook , future }: buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.7"; + version = "0.10.2"; - src = fetchPypi { - inherit pname version; - sha256 = "dcebb32e474bc28aa77b944a0a64949ef3b5b852cbef6256fbc95347a04e777c"; + src = fetchFromGitHub { + owner = "picklepete"; + repo = pname; + rev = version; + sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy"; }; propagatedBuildInputs = [ - requests + certifi + click + future keyring keyrings-alt - click + pytz + requests six tzlocal - certifi - bitstring - future ]; - checkInputs = [ unittest2 ]; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; postPatch = '' sed -i \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix index 2500909d53..e93d0b602b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix @@ -1,26 +1,26 @@ { lib -, aiodns , aiohttp -, async-timeout +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub +, pkce }: buildPythonPackage rec { pname = "pymyq"; - version = "2.0.14"; + version = "3.0.3"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "18825b9c6qk4zcvva79hpg6098z4zqxyapnqmjsli23npw0zh67w"; + sha256 = "1wrfnbz87ns2ginyvljna0axl35s0xfaiqwzapxm8ira40ax5wrl"; }; propagatedBuildInputs = [ - aiodns aiohttp - async-timeout + beautifulsoup4 + pkce ]; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynuki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynuki/default.nix new file mode 100644 index 0000000000..9c3dc394cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynuki/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, requests +}: + +buildPythonPackage rec { + pname = "pynuki"; + version = "1.4.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pschmitt"; + repo = pname; + rev = version; + sha256 = "1nymlrf0j430851plp355697p55asfxjmavdh2zr96b16d41dnn4"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pynuki" ]; + + meta = with lib; { + description = "Python bindings for nuki.io bridges"; + homepage = "https://github.com/pschmitt/pynuki"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix new file mode 100644 index 0000000000..a5414021b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyopenuv"; + version = "2.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1pzdcy65gndrlyhrwyc1rwsh8n4w79wla8n9fr13m00vac3cqkl0"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytest-aiohttp + pytest-cov + pytestCheckHook + ]; + + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "pyopenuv" ]; + + meta = with lib; { + description = "Python API to retrieve data from openuv.io"; + homepage = "https://github.com/bachya/pyopenuv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix index ed25a3ecbe..16916666a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.5.1"; + version = "2.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2a54d393aff3a244b566d78d597c9cb42e91b3b12f3169cec89d9dfff1c9c5bc"; + sha256 = "d28ddfd40e0c1b6a6b9da961c7d47a10261fb58f378cb00f05ce88b26df9c432"; }; pythonImportsCheck = [ "pyotp" ]; meta = with lib; { description = "Python One Time Password Library"; - homepage = "https://github.com/pyotp/pyotp"; + homepage = "https://github.com/pyauth/pyotp"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix new file mode 100644 index 0000000000..206e3671f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, py, lxml, pytestCheckHook, wireshark-cli }: + +buildPythonPackage rec { + pname = "pyshark"; + version = "0.4.2.11"; + + src = fetchFromGitHub { + owner = "KimiNewt"; + repo = pname; + rev = "v${version}"; + sha256 = "07dkhkf85cplcj1h3k8mmqzsn4zdkxzr0zg3gvf8yc8p5g5azx9q"; + }; + + propagatedBuildInputs = [ + py + lxml + ]; + + preConfigure = '' + cd src + ''; + + preCheck = '' + cd .. + ''; + + checkInputs = [ + pytestCheckHook + wireshark-cli + ]; + + meta = with lib; { + description = "Python wrapper for tshark, allowing python packet parsing using wireshark dissectors"; + homepage = "https://github.com/KimiNewt/pyshark/"; + license = licenses.mit; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix new file mode 100644 index 0000000000..f1005fe0b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, attrs +, buildPythonPackage +, fetchPypi +, jmespath +, async-timeout +}: + +buildPythonPackage rec { + pname = "pysma"; + version = "0.3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1awcsbk14i2aw01f7b7hrmpn9q6vr9v6la0i9n7ldv1h8rzq6j16"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + attrs + jmespath + ]; + + # pypi does not contain tests and GitHub archive not available + doCheck = false; + pythonImportsCheck = [ "pysma" ]; + + meta = with lib; { + description = "Python library for interacting with SMA Solar's WebConnect"; + homepage = "https://github.com/kellerza/pysma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix new file mode 100644 index 0000000000..ce5b6b8673 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "pysmt"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "051j36kpz11ik9bhvp5jgxzc3h7f18i1pf5ssdhjwyabr0n0zra3"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "pysmt" ]; + + meta = with lib; { + description = "Python library for SMT formulae manipulation and solving"; + homepage = "https://github.com/pysmt/pysmt"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix index e271373b73..0c23a907cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix @@ -1,40 +1,36 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , pytest , click -, pytestcov -, isPy27 -, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "pytest-click"; - version = "0.3"; + version = "1.0.2"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Stranger6667"; repo = "pytest-click"; - rev = version; - sha256 = "1cd15anw8d4rq6qs03j6ag38199rqw7vp0w0w0fm41mvdzr0lwvz"; + rev = "v${version}"; + sha256 = "197nvlqlyfrqpy5lrkmfh1ywpr6j9zipxl9d7syg2a2n7jz3a8rj"; }; - postConfigure = '' - substituteInPlace setup.py \ - --replace "mock==1.0.1" "mock" - ''; - propagatedBuildInputs = [ pytest click ]; - checkInputs = [ pytestcov ] ++ lib.optionals isPy27 [ mock ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "pytest plugin for click"; homepage = "https://github.com/Stranger6667/pytest-click"; + changelog = "https://github.com/Stranger6667/pytest-click/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix index 084c66e172..fe4d6ea7bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-snappy"; - version = "0.5.4"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2"; + sha256 = "06l9my361ig4x5ycyrmq33q83zcdib3y2zxfxv7k7dlpyp9ri2hn"; }; buildInputs = [ snappy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 3e6d728456..463ccb25b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -35,6 +35,9 @@ buildPythonPackage { --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; + # hangs on darwin + sandbox + doCheck = !stdenv.isDarwin; + meta = with lib; { homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit"; description = "Python XMP Toolkit for working with metadata"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix new file mode 100644 index 0000000000..393170cfb9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyvesync"; + version = "1.3.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "02fpbyg46mlpc2c1j4zylw9a1h6bacxvigrl3cndsf6fxlhfx15z"; + }; + + propagatedBuildInputs = [ requests ]; + + # Test are not available (not in PyPI tarball and there are no GitHub releases) + doCheck = false; + pythonImportsCheck = [ "pyvesync" ]; + + meta = with lib; { + description = "Python library to manage Etekcity Devices and Levoit Air Purifier"; + homepage = "https://github.com/webdjoe/pyvesync"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix new file mode 100644 index 0000000000..ddec4f0f23 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -0,0 +1,39 @@ +{ lib +, archinfo +, bitstring +, fetchPypi +, cffi +, buildPythonPackage +, future +, pycparser +}: + +buildPythonPackage rec { + pname = "pyvex"; + version = "9.0.5739"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jwxxw2kw7wkz7kh8m8vbavzw6m5k6xph7mazfn3k2qbsshh3lk3"; + }; + + propagatedBuildInputs = [ + archinfo + bitstring + cffi + future + pycparser + ]; + + # No tests are available on PyPI, GitHub release has tests + # Switch to GitHub release after all angr parts are present + doCheck = false; + pythonImportsCheck = [ "pyvex" ]; + + meta = with lib; { + description = "Python interface to libVEX and VEX IR"; + homepage = "https://github.com/angr/pyvex"; + license = with licenses; [ bsd2 gpl3Plus lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix index 32baa25e52..2d88460b49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix @@ -1,19 +1,21 @@ { lib -, buildPythonPackage -, fetchFromGitHub , asyncio-dgram +, buildPythonPackage , click +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { pname = "pywizlight"; - version = "0.4.1"; + version = "0.4.5"; src = fetchFromGitHub { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "0kyhyda28zbni9sjv6kvky6wlhqldl47niddgpbjsv5dlb9xvxns"; + sha256 = "sha256-E2rpkdj93LymlkST8HgZ+8VcJFOWwz8787NPfTCSXFY="; }; propagatedBuildInputs = [ @@ -21,13 +23,24 @@ buildPythonPackage rec { click ]; - # no tests are present - doCheck = false; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + # Tests requires network features (e. g., discovery testing) + disabledTests = [ + "test_Bulb_Discovery" + "test_timeout" + "test_timeout_PilotBuilder" + ]; + pythonImportsCheck = [ "pywizlight" ]; meta = with lib; { description = "Python connector for WiZ light bulbs"; homepage = "https://github.com/sbidy/pywizlight"; + changelog = "https://github.com/sbidy/pywizlight/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix new file mode 100644 index 0000000000..8040458bf7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix @@ -0,0 +1,53 @@ +{ lib +, asynctest +, bleak +, click +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-cov +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyzerproc"; + version = "0.4.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "emlove"; + repo = pname; + rev = version; + sha256 = "1qlxvvy9fyff56dvc46nsd5ngkxqhdi7s4gwfndj7dn76j81srpq"; + }; + + # Remove pytest-runner, https://github.com/emlove/pyzerproc/pull/1 + patchPhase = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + + propagatedBuildInputs = [ + bleak + click + ]; + + checkInputs = [ + asynctest + pytest-asyncio + pytest-cov + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyzerproc" ]; + + meta = with lib; { + description = "Python library to control Zerproc Bluetooth LED smart string lights"; + homepage = "https://github.com/emlove/pyzerproc"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix index 00808e744a..5fd9064020 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "rx"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; # There are no tests on the pypi source @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ReactiveX"; repo = "rxpy"; rev = "v${version}"; - sha256 = "0rcwa8001il9p7s096b9gc5yld8cyxvrsmwh1gpc9b87j172z6ax"; + sha256 = "0p0cs67l40npkvwgn5sb18l1b6df1b9fg6rzlqkwk2aa0v3cpvhf"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix index a690788095..d990295bff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix @@ -49,6 +49,8 @@ buildPythonPackage rec { responses ]; + pythonImportsCheck = [ "slack" ]; + meta = with lib; { description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API"; homepage = "https://github.com/slackapi/python-slackclient"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix index deb12817a7..0b320e7902 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,5 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder -, crytic-compile, prettytable, setuptools, solc +{ lib, stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder +, crytic-compile, prettytable, setuptools +# solc is currently broken on Darwin, default to false +, solc, withSolc ? !stdenv.isDarwin }: buildPythonPackage rec { @@ -19,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ crytic-compile prettytable setuptools ]; - postFixup = '' + postFixup = lib.optionalString withSolc '' wrapProgram $out/bin/slither \ --prefix PATH : "${lib.makeBinPath [ solc ]}" ''; @@ -32,7 +34,7 @@ buildPythonPackage rec { contract details, and provides an API to easily write custom analyses. ''; homepage = "https://github.com/trailofbits/slither"; - license = licenses.agpl3; - maintainers = [ maintainers.asymmetric ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ asymmetric arturcygan ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index 2bb700f675..1c49e1f4a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.3"; + version = "3.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1linla3za1gb3w0n0k6h3q8in62qhipizff259p14gzmyr95rjjv"; + sha256 = "sha256-LJuvUTbsL2anQENEuW1oaSUsMEiXnSgLEAhZ6EP5bNs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix index ab7dea9cf5..c6db32a15e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonOlder , cython +, catalogue , mock , numpy , pathlib @@ -12,17 +13,19 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.3.2"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f78eaef8d982e98921ce026d4205e652a9333137259f0b621f5c7b579e746e9d"; + sha256 = "e29730be53015970e4a59050e8e9f9be44d762108a617df56c9dfc981b515ab7"; }; nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ catalogue ]; + checkInputs = [ mock numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix index d802a23000..94513e5d62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -15,7 +15,6 @@ , databases , pytestCheckHook , pytest-asyncio -, pytestcov , typing-extensions , ApplicationServices }: @@ -46,12 +45,14 @@ buildPythonPackage rec { checkInputs = [ aiosqlite databases + pytest-asyncio pytestCheckHook typing-extensions ]; - pytestFlagsArray = [ "--ignore=tests/test_graphql.py" ]; - + disabledTestFiles = [ "tests/test_graphql.py" ]; + # https://github.com/encode/starlette/issues/1131 + disabledTests = [ "test_debug_html" ]; pythonImportsCheck = [ "starlette" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix index a49f6a4fdf..e7f1e442f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix @@ -1,33 +1,35 @@ { lib , fetchFromGitHub , buildPythonPackage +, poetry , isPy27 , docopt , easywatch , jinja2 , pytestCheckHook , pytest-check -, fetchPypi , markdown -, sphinx -, sphinx_rtd_theme }: buildPythonPackage rec { pname = "staticjinja"; - version = "1.0.3"; + version = "1.0.4"; + format = "pyproject"; disabled = isPy27; # 0.4.0 drops python2 support - # For some reason, in pypi the tests get disabled when using - # PY_IGNORE_IMPORTMISMATCH, so we just fetch from GitHub + # No tests in pypi src = fetchFromGitHub { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "12rpv5gv64i5j4w98wm1444xnnmarcn3pg783j3fkkzc58lk5wwj"; + sha256 = "1saz6f71s693gz9c2k3bq2di2mrkj65mgmfdg86jk0z0zzjk90y1"; }; + nativeBuildInputs = [ + poetry + ]; + propagatedBuildInputs = [ jinja2 docopt @@ -38,15 +40,10 @@ buildPythonPackage rec { pytestCheckHook pytest-check markdown - sphinx_rtd_theme - sphinx ]; + # The tests need to find and call the installed staticjinja executable preCheck = '' - # Import paths differ by a "build/lib" subdirectory, but the files are - # the same, so we ignore import mismatches. - export PY_IGNORE_IMPORTMISMATCH=1 - # The tests need to find and call the installed staticjinja executable export PATH="$PATH:$out/bin"; ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 08ef9975b2..46c8a2853b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -1,26 +1,37 @@ { lib , aiohttp , backoff +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , wrapt }: buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.11.0"; + version = "0.11.5"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yfaUa12doOvdFkbHHdOYcFcu86hYZtt2i0tya2ENjf4="; + sha256 = "sha256-s0IZ1UNldYddaR3zJoYS6ey8Kjxd1fr4fOwf0gNNbow="; }; + patches = [ + (fetchpatch { + name = "dont-use-dummpy-module-bs4.patch"; + url = "https://github.com/zabuldon/teslajsonpy/pull/138/commits/f5a788e47d8338c8ebb06d954f802ba1ec614db3.patch"; + sha256 = "0rws7fhxmca8d5w0bkygx8scvzah3yvb3yfhn05qmp73mn3pmcb3"; + }) + ]; + propagatedBuildInputs = [ aiohttp backoff + beautifulsoup4 wrapt ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix index 62749d3b02..23c68007cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix @@ -4,25 +4,13 @@ buildPythonPackage rec { pname = "todoist-python"; - version = "8.1.2"; + version = "8.1.3"; src = fetchPypi { inherit pname version; - sha256 = "750b2d2300e8590cd56414ab7bbbc8dfcaf8c27102b342398955812176499498"; + sha256 = "sha256-AFRKA5VRD6jyiguZYP7WOQOWqHq1GjUzbuez0f1070U="; }; - patches = [ - # From https://github.com/Doist/todoist-python/pull/80 - (fetchpatch { - url = "https://github.com/Doist/todoist-python/commit/605443c67a8e2f105071e0da001c9f6f2a89ef19.patch"; - sha256 = "0ah0s5by783kqlaimsbxz11idz0bhc2428aw9vdjpngmzb7ih1pa"; - }) - (fetchpatch { - url = "https://github.com/Doist/todoist-python/commit/f2f8e1e5b3ab1674ad9f0dff885702a25d1d18e9.patch"; - sha256 = "1kp63yk9kj87zvvgfl60m6lxdm5sx3dny4g0s67ap1jbz350wifn"; - }) - ]; - propagatedBuildInputs = [ requests ] ++ lib.optional (pythonOlder "3.5") typing; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 65c2af4449..6c04bacbd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.2.2"; + version = "4.3.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - hash = "sha256-sBMCzEgYX6HQbzoEIYnmMdpYecCCsQjTdl2mO1Veu9M="; + hash = "sha256-vv4wKf1PcuVR63ZQJd3oixdNvS7VcTmAaKkmL8I4COg="; }; propagatedBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - sed -ri 's/tokenizers==[^"]+/tokenizers/g' setup.py src/transformers/dependency_versions_table.py + sed -ri 's/tokenizers[=>]=[^"]+/tokenizers/g' setup.py src/transformers/dependency_versions_table.py ''; pythonImportsCheck = [ "transformers" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix index 39901a17f0..a9f3042fb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix @@ -15,10 +15,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; + # no tests + doCheck = false; + meta = with lib; { description = "Python implementation of the Transmission bittorent client RPC protocol"; homepage = "https://pypi.python.org/pypi/transmissionrpc/"; license = licenses.mit; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix index ff4bb845c8..56f3ba29dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -1,21 +1,33 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pyjwt, pysocks, pytz, requests, six, nose, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, nose +, pyjwt +, pysocks +, pytz +, requests +, six +}: buildPythonPackage rec { pname = "twilio"; - version = "6.43.0"; + version = "6.51.1"; + # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0p2chrzakqx5694g305j0klh9lxlclm5qp0qjm6wqicivyybggzg"; + sha256 = "sha256-OHtmUFm/9GkpIzz0DdSdlHyBFRIgu8GxQ4S4VMJik9o="; }; buildInputs = [ nose mock ]; propagatedBuildInputs = [ pyjwt pysocks pytz six requests ]; + pythonImportsCheck = [ "twilio" ]; + meta = with lib; { description = "Twilio API client and TwiML generator"; homepage = "https://github.com/twilio/twilio-python/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix new file mode 100644 index 0000000000..d4910cfdbe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, requests, rx, pytestCheckHook, responses, isPy3k }: + +buildPythonPackage rec { + pname = "twitch-python"; + version = "0.0.19"; + + src = fetchPypi { + inherit pname version; + sha256 = "b0b02abdd33458e4ffabc632aa6a6779f3599e188819632551353b6c5553f5c5"; + }; + + disabled = !isPy3k; + + postPatch = '' + substituteInPlace setup.py --replace "'pipenv'," "" + ''; + + propagatedBuildInputs = [ requests rx ]; + + checkInputs = [ pytestCheckHook responses ]; + + pythonImportsCheck = [ "twitch" ]; + + meta = with lib; { + description = "Twitch module for Python"; + homepage = "https://github.com/PetterKraabol/Twitch-Python"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix index e993363769..e93fd83656 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix @@ -30,7 +30,15 @@ buildPythonPackage rec { pytestcov ]; - disabledTests = [ "test_to_json_schema_complex_regular_expression" ]; + disabledTests = [ + # https://github.com/encode/typesystem/issues/102. cosmetic issue where python3.8 changed + # the default string formatting of regular expression flags which breaks test assertion + "test_to_json_schema_complex_regular_expression" + ]; + disabledTestFiles = [ + # for some reason jinja2 not picking up forms directory (1% of tests) + "tests/test_forms.py" + ]; meta = with lib; { description = "A type system library for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch deleted file mode 100644 index bd4e5e48b1..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/tests/test_pipes.py b/tests/test_pipes.py -index d883abf..2e74d7a 100644 ---- a/tests/test_pipes.py -+++ b/tests/test_pipes.py -@@ -2,6 +2,7 @@ import asyncio - import io - import os - import socket -+import unittest - - from uvloop import _testbase as tb - -@@ -96,6 +97,7 @@ class _BasePipeTest: - # extra info is available - self.assertIsNotNone(proto.transport.get_extra_info('pipe')) - -+ @unittest.skip("darwin sandbox") - def test_read_pty_output(self): - proto = MyReadPipeProto(loop=self.loop) - -@@ -198,6 +200,7 @@ class _BasePipeTest: - self.loop.run_until_complete(proto.done) - self.assertEqual('CLOSED', proto.state) - -+ @unittest.skip("darwin sandbox") - def test_write_pty(self): - master, slave = os.openpty() - os.set_blocking(master, False) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index a37e6a3675..27f7b68fe8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -1,69 +1,69 @@ { lib , stdenv , buildPythonPackage +, pythonOlder , fetchPypi -, pyopenssl , libuv -, psutil -, isPy27 -, pythonAtLeast , CoreServices , ApplicationServices # Check Inputs +, aiohttp +, psutil +, pyopenssl , pytestCheckHook -# , pytest-asyncio }: buildPythonPackage rec { pname = "uvloop"; - version = "0.14.0"; - disabled = isPy27; + version = "0.15.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "07j678z9gf41j98w72ysrnb5sa41pl5yxd7ib17lcwfxqz0cjfhj"; + sha256 = "0rfhr84km8k5gj0036b2pznwmc8macx56vkxc3aksvns95dksl0s"; }; - patches = lib.optional stdenv.isDarwin ./darwin_sandbox.patch; - buildInputs = [ libuv - ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; - - pythonImportsCheck = [ - "uvloop" - "uvloop.loop" + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ApplicationServices ]; dontUseSetuptoolsCheck = true; - checkInputs = [ pytestCheckHook pyopenssl psutil ]; + checkInputs = [ + aiohttp + pytestCheckHook + pyopenssl + psutil + ]; pytestFlagsArray = [ # from pytest.ini, these are NECESSARY to prevent failures "--capture=no" "--assert=plain" + "--strict" "--tb=native" # ignore code linting tests "--ignore=tests/test_sourcecode.py" ]; - disabledTests = [ - "test_sock_cancel_add_reader_race" # asyncio version of test is supposed to be skipped but skip doesn't happen. uvloop version runs fine - ] ++ lib.optionals (pythonAtLeast "3.8") [ "test_write_to_closed_transport" ]; # https://github.com/MagicStack/uvloop/issues/355 - # force using installed/compiled uvloop vs source by moving tests to temp dir preCheck = '' export TEST_DIR=$(mktemp -d) cp -r tests $TEST_DIR pushd $TEST_DIR - '' + lib.optionalString stdenv.isDarwin '' - # Some tests fail on Darwin - rm tests/test_[stu]*.py ''; + postCheck = '' popd ''; + pythonImportsCheck = [ + "uvloop" + "uvloop.loop" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; @@ -72,6 +72,5 @@ buildPythonPackage rec { homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; maintainers = with maintainers; [ costrouc ]; - broken = pythonAtLeast "3.9"; # see: https://github.com/MagicStack/uvloop/issues/365 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix index 578578a21b..40b1b328f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "vsure"; - version = "1.6.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "1lsr0wl1dwbzpn68ww348yk6v42bw89nrghz5gjsimrr428zw6qn"; + sha256 = "sha256-EFat1sewh0Y9PHs08Grlk2RparA47GqkUv/WJ3J2494="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix index ae9156099c..221076fae8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.16.2"; + version = "0.16.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "14cx54ia38ifz7c750i8jxcmnybzwh03ds6hinlwhx8hd2cx9knj"; + sha256 = "sha256-toB66woREkFUv3J14wwquRo+uAOgXKO+cwFgyw4Mma8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix index 83f9c7a998..1dde1405bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -3,36 +3,32 @@ , buildPythonPackage , fetchPypi , substituteAll -, pkgs , argcomplete , pyyaml , xmltodict -# Test inputs -, coverage -, flake8 , jq -, pytest -, toml +, pytestCheckHook }: buildPythonPackage rec { pname = "yq"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl"; + sha256 = "sha256-HSrUA1BNMGtSWLhsaY+YVtetWLe7F6K4dWkaanuMTCA="; }; patches = [ (substituteAll { src = ./jq-path.patch; - jq = "${lib.getBin pkgs.jq}/bin/jq"; + jq = "${lib.getBin jq}/bin/jq"; }) ]; postPatch = '' - substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" + substituteInPlace test/test.py \ + --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" ''; propagatedBuildInputs = [ @@ -41,16 +37,11 @@ buildPythonPackage rec { argcomplete ]; - doCheck = true; - checkInputs = [ - pytest - coverage - flake8 - toml + pytestCheckHook ]; - checkPhase = "pytest ./test/test.py"; + pytestFlagsArray = [ "test/test.py" ]; pythonImportsCheck = [ "yq" ]; @@ -59,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command-line YAML processor - jq wrapper for YAML documents"; homepage = "https://github.com/kislyuk/yq"; - license = [ licenses.asl20 ]; - maintainers = [ maintainers.womfoo ]; + license = licenses.asl20; + maintainers = with maintainers; [ womfoo SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 70cb7e3ca3..00c6fb7321 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -403,6 +403,10 @@ in ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + openssl = attrs: { + buildInputs = [ openssl ]; + }; + opus-ruby = attrs: { dontBuild = false; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 11f0297509..5578e03dc9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.143.1"; + version = "0.144.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-x7+hLbfccyJLc84246R8xay0FJlK/3JgNc6pqeowl9Q="; + sha256 = "sha256-Qr/fizCV+t6SbETEqns72Xv24ucLcqi1JRXF8SAtQRU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix index 51b363c6be..3455d78b23 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.8"; + version = "0.4.16"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "1anbanvaikj8g5jcmjd165krzvjdwj1cl8f3vm1nmy997x8vxihf"; + sha256 = "sha256-2PYHKJ141RWdUIDAKAFK6IzR4C41bHi/A8lDErSRLnU="; }; - cargoSha256 = "18xnqsrnf2gc9zny8ayzf1bah8mq1fy5k807cz039gqz36cvnma0"; + cargoSha256 = "sha256-x5wU0Ld4ssRoNqo9graJhjlpel+VdVdkKZMjHFqZsrE="; meta = with lib; { description = "SystemVerilog linter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index c4d22ecd89..14153b920e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.37.1"; + version = "0.38.1"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZYJqnyIFwyPODFqXAZp1ep0Ofl/JH2F07gqPx4WZ7mo="; + sha256 = "sha256-ezTmtKR6ng3fuVJzLP81o0aoaqu3XPUMF0BIKFCwXdw="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 8a48b43312..0859ed5132 100644 --- a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -4,75 +4,33 @@ , enableTelemetry ? false }: -let - py = python3.override { - packageOverrides = self: super: { - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "1.0.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0j6f4a9rpfh25k1gp7azqhnni4mb4fgy50jammgjgddw1l3w0w92"; - }; - }); - - aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { - version = "1.27.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ="; - }; - }); - - dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec { - version = "0.7.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y="; - }; - }); - - cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec { - version = "1.6.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk"; - }; - }); - }; - }; - -in - -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.6.2"; + version = "1.14.0"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0scnymhhiiqrs2j0jaypxgq2wg1qf1w8f55qfay0b3nf51y6mh8y"; + sha256 = "E+xIS0Z3M/ilBswH8XwXWnGb9gbDRuuKKE39qau9fFc="; }; # Tests are not included in the PyPI package doCheck = false; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ aws-lambda-builders aws-sam-translator chevron click cookiecutter dateparser + python-dateutil docker flask - idna jmespath - pathlib2 requests serverlessrepo - six tomlkit + watchdog ]; postFixup = if enableTelemetry then "echo aws-sam-cli TELEMETRY IS ENABLED" else '' @@ -83,19 +41,18 @@ buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ - --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \ - --replace "docker~=4.2.0" "docker~=4.3" \ - --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ + --replace "boto3~=1.14.23" "boto3~=1.14" \ + --replace "dateparser~=0.7" "dateparser>=0.7" \ + --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "requests==2.23.0" "requests~=2.24" \ - --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.7.0" + --replace "watchdog==0.10.3" "watchdog" ''; meta = with lib; { homepage = "https://github.com/awslabs/aws-sam-cli"; description = "CLI tool for local development and testing of Serverless applications"; license = licenses.asl20; - maintainers = with maintainers; [ andreabedini lo1tuma ]; + maintainers = with maintainers; [ lo1tuma ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/b4/default.nix b/third_party/nixpkgs/pkgs/development/tools/b4/default.nix new file mode 100644 index 0000000000..8210f7c409 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/b4/default.nix @@ -0,0 +1,36 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "b4"; + version = "0.6.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z"; + }; + + preConfigure = '' + substituteInPlace setup.py \ + --replace 'requests~=2.24' 'requests~=2.25' + ''; + + # tests make dns requests and fails + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ + requests + dnspython + dkimpy + + # These may be required in the future for other patch attestation features + #pycryptodomex~=3.9.9 + #PyNaCl + ]; + + meta = with lib; { + homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; + license = licenses.gpl2Only; + description = "A helper utility to work with patches made available via a public-inbox archive"; + maintainers = with maintainers; [ jb55 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix index 2cfde85f22..f9b4c3ea72 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "1mc1l2g2qrg9djpyyz203a6dpx5fxllisybmhrpmikyza15w935q"; + sha256 = "sha256-jXRTj/7GJO6rSueOmw8aNg69w43lxiDbSeZR802+kws="; }; - vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh"; + vendorSha256 = "sha256-fW7KHsxhBfz947Tg+O5bdtiH6xMeKmLRHX9FWQSyxVQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix new file mode 100644 index 0000000000..5482db67ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -0,0 +1,639 @@ +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles +, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +# this package (through the fixpoint glass) +, bazel_self +# needed only for the updater +, bazel_3 +, lr, xe, zip, unzip, bash, writeCBin, coreutils +, which, gawk, gnused, gnutar, gnugrep, gzip, findutils +# updater +, python27, python3, writeScript +# Apple dependencies +, cctools, libcxx, 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 = "4.0.0"; + sourceRoot = "."; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + sha256 = "1lfdx54dpzwrqysg5ngqhq7a0i01xk981crd4pdk4jb5f07ghl6k"; + }; + + # 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 = (builtins.fromJSON (builtins.readFile ./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-v10.5.zip" + else srcs."java_tools_javac11_linux-v10.5.zip") + srcs."coverage_output_generator-v2.5.zip" + srcs.build_bazel_rules_nodejs + srcs."android_tools_pkg-0.19.0rc3.tar.gz" + srcs.bazel_toolchains + srcs.com_github_grpc_grpc + srcs.upb + srcs.com_google_protobuf + srcs.rules_pkg + srcs.rules_cc + srcs.rules_java + srcs.rules_proto + srcs.com_google_absl + srcs.com_github_google_re2 + srcs.com_github_cares_cares + ]); + + 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 python27 python3 ]; + + # Java toolchain used for the build and tests + javaToolchain = "@bazel_tools//tools/jdk:toolchain_${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"; + arch = stdenv.hostPlatform.parsed.cpu.name; + + remote_java_tools = stdenv.mkDerivation { + name = "remote_java_tools_${system}"; + + src = srcDepsSet."java_tools_javac11_${system}-v10.5.zip"; + + nativeBuildInputs = [ autoPatchelfHook unzip ]; + buildInputs = [ gcc-unwrapped ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir $out; + ''; + + installPhase = '' + cp -Ra * $out/ + touch $out/WORKSPACE + ''; + }; + + bazelRC = writeTextFile { + name = "bazel-rc"; + text = '' + startup --server_javabase=${runJdk} + + # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054 + # Most commands inherit from 'build' anyway. + build --distdir=${distDir} + fetch --distdir=${distDir} + query --distdir=${distDir} + + build --override_repository=${remote_java_tools.name}=${remote_java_tools} + fetch --override_repository=${remote_java_tools.name}=${remote_java_tools} + query --override_repository=${remote_java_tools.name}=${remote_java_tools} + + # Provide a default java toolchain, this will be the same as ${runJdk} + build --host_javabase='@local_jdk//:jdk' + + # load default location for the system wide configuration + try-import /etc/bazel.bazelrc + ''; + }; + +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 = [ maintainers.mboes ]; + inherit platforms; + }; + + inherit src; + inherit 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 + + # On Darwin, using clang 6 to build fails because of a linker error (see #105573), + # but using clang 7 fails because libarclite_macosx.a cannot be found when linking + # the xcode_locator tool. + # This patch removes using the -fobjc-arc compiler option and makes the code + # compile without automatic reference counting. Caveat: this leaks memory, but + # we accept this fact because xcode_locator is only a short-lived process used during the build. + ./no-arc.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 = "4183fc709c26a00366665e2d60d70521dc0b405d"; + sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; + }; + + 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; + } + # dm-sonnet is only packaged for linux + // (lib.optionalAttrs stdenv.isLinux { + # TODO(timokau) dm-sonnet is broken currently + # dm-sonnet-linux = python3.pkgs.dm-sonnet; + })); + }; + + src_for_updater = stdenv.mkDerivation rec { + name = "updater-sources"; + inherit src; + buildInputs = [ unzip ]; + inherit sourceRoot; + installPhase = '' + cp -r . "$out" + ''; + }; + # update the list of workspace dependencies + passthru.updater = writeScript "update-bazel-deps.sh" '' + #!${runtimeShell} + (cd "${src_for_updater}" && + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ + "${bazel_3}"/bin/bazel \ + query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ + --loading_phase_threads=1 \ + --output build) \ + | "${python3}"/bin/python3 "${./update-srcDeps.py}" \ + "${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 ${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 + + substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' "" + + # 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 + + # replace initial value of pythonShebang variable in BazelPythonSemantics.java + substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \ + --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" + + # 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 = [ + installShellFiles + zip + python3 + unzip + makeWrapper + which + customBash + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx 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 + ''; + # Needed to build fish completion + propagatedBuildInputs = [ python3.pkgs.absl-py ]; + buildPhase = '' + # Increasing memory during compilation might be necessary. + # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + + # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md + # and `git rev-parse --short HEAD` which would result in + # "3.7.0- (@non-git)" due to non-git build and incomplete changelog. + # Actual bazel releases use scripts/release/common.sh which is based + # on branch/tag information which we don't have with tarball releases. + # Note that .bazelversion is always correct and is based on bazel-* + # executable name, version checks should work fine + export EMBED_LABEL="${version}- (@non-git)" + ${customBash}/bin/bash ./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 + ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.fish + ''; + + 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-{version}-{os_arch} + # The binary _must_ exist with this naming if your project contains a .bazelversion + # file. + cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + + # shell completion files + installShellCompletion --bash \ + --name bazel.bash \ + ./bazel_src/output/bazel-complete.bash + installShellCompletion --zsh \ + --name _bazel \ + ./bazel_src/scripts/zsh_completion/_bazel + installShellCompletion --fish \ + --name bazel.fish \ + ./bazel_src/output/bazel-complete.fish + ''; + + doInstallCheck = true; + 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-{version}-{os_arch} + 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/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch new file mode 100644 index 0000000000..012e613c2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch @@ -0,0 +1,34 @@ +--- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100 ++++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100 +@@ -21,10 +21,6 @@ + // 6,6.4,6.4.1 = 6.4.1 + // 6.3,6.3.0 = 6.3 + +-#if !defined(__has_feature) || !__has_feature(objc_arc) +-#error "This file requires ARC support." +-#endif +- + #import + #import + +--- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100 ++++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100 +@@ -123,7 +123,6 @@ + "macosx", + "clang", + "-mmacosx-version-min=10.9", +- "-fobjc-arc", + "-framework", + "CoreServices", + "-framework", +--- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100 ++++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100 +@@ -27,7 +27,7 @@ + ]) + + DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ +- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \ ++ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \ + -framework Foundation -o $@ $< + """ + diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json new file mode 100644 index 0000000000..43ad410031 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json @@ -0,0 +1,1498 @@ +{ + "1.25.0.zip": { + "name": "1.25.0.zip", + "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" + ] + }, + "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { + "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, + "382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz": { + "name": "382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", + "sha256": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", + "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" + ] + }, + "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { + "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.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" + ] + }, + "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": { + "name": "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" + ] + }, + "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { + "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", + "urls": [ + "https://mirror.bazel.build/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + ] + }, + "android_tools": { + "name": "android_tools", + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + }, + "android_tools_for_testing": { + "name": "android_tools_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + }, + "android_tools_pkg-0.19.0rc3.tar.gz": { + "name": "android_tools_pkg-0.19.0rc3.tar.gz", + "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "urls": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + ] + }, + "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { + "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + ] + }, + "bazel-skylib-1.0.3.tar.gz": { + "name": "bazel-skylib-1.0.3.tar.gz", + "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" + ] + }, + "bazel-toolchains-3.1.0.tar.gz": { + "name": "bazel-toolchains-3.1.0.tar.gz", + "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.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", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" + ] + }, + "bazel_toolchains": { + "name": "bazel_toolchains", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", + "strip_prefix": "bazel-toolchains-3.1.0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" + ] + }, + "bazel_website": { + "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n", + "name": "bazel_website", + "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4", + "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42", + "urls": [ + "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz" + ] + }, + "boringssl": { + "generator_function": "grpc_deps", + "generator_name": "boringssl", + "name": "boringssl", + "sha256": "81333e496d7b74a60aa6fa622c028ba382a0a6b9c815cc6ccb221042383b9a9b", + "strip_prefix": "boringssl-412844d75b14b9090b58423fd5f5ed8c2fd80212", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz", + "https://github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz" + ] + }, + "build_bazel_apple_support": { + "generator_function": "grpc_deps", + "generator_name": "build_bazel_apple_support", + "name": "build_bazel_apple_support", + "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz", + "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz" + ] + }, + "build_bazel_rules_apple": { + "generator_function": "grpc_deps", + "generator_name": "build_bazel_rules_apple", + "name": "build_bazel_rules_apple", + "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e", + "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz", + "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz" + ] + }, + "build_bazel_rules_nodejs": { + "name": "build_bazel_rules_nodejs", + "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz" + ] + }, + "com_github_cares_cares": { + "build_file": "@com_github_grpc_grpc//third_party:cares/cares.BUILD", + "generator_function": "grpc_deps", + "generator_name": "com_github_cares_cares", + "name": "com_github_cares_cares", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, + "com_github_gflags_gflags": { + "generator_function": "grpc_deps", + "generator_name": "com_github_gflags_gflags", + "name": "com_github_gflags_gflags", + "sha256": "63ae70ea3e05780f7547d03503a53de3a7d2d83ad1caaa443a31cb20aea28654", + "strip_prefix": "gflags-28f50e0fed19872e0fd50dd23ce2ee8cd759338e", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz", + "https://github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz" + ] + }, + "com_github_google_benchmark": { + "generator_function": "grpc_deps", + "generator_name": "com_github_google_benchmark", + "name": "com_github_google_benchmark", + "sha256": "f68aec93154d010324c05bcd8c5cc53468b87af88d87acb5ddcfaa1bba044837", + "strip_prefix": "benchmark-090faecb454fbd6e6e17a75ef8146acb037118d4", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz", + "https://github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz" + ] + }, + "com_github_google_re2": { + "generator_function": "grpc_deps", + "generator_name": "com_github_google_re2", + "name": "com_github_google_re2", + "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", + "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + ] + }, + "com_github_grpc_grpc": { + "name": "com_github_grpc_grpc", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/grpc:grpc_1.32.0.patch" + ], + "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", + "strip_prefix": "grpc-1.32.0", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + ] + }, + "com_google_absl": { + "generator_function": "grpc_deps", + "generator_name": "com_google_absl", + "name": "com_google_absl", + "sha256": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", + "strip_prefix": "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.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" + ] + }, + "com_google_protobuf": { + "name": "com_google_protobuf", + "patch_args": [ + "-p1" + ], + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "patches": [ + "//third_party/protobuf:3.13.0.patch" + ], + "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", + "strip_prefix": "protobuf-3.13.0", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" + ] + }, + "coverage_output_generator-v2.5.zip": { + "name": "coverage_output_generator-v2.5.zip", + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "cython": { + "build_file": "@com_github_grpc_grpc//third_party:cython.BUILD", + "generator_function": "grpc_deps", + "generator_name": "cython", + "name": "cython", + "sha256": "d68138a2381afbdd0876c3cb2a22389043fa01c4badede1228ee073032b07a27", + "strip_prefix": "cython-c2b80d87658a8525ce091cbe146cb7eaa29fed5c", + "urls": [ + "https://github.com/cython/cython/archive/c2b80d87658a8525ce091cbe146cb7eaa29fed5c.tar.gz" + ] + }, + "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" + ] + }, + "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz": { + "name": "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "sha256": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz" + ] + }, + "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" + ] + }, + "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { + "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "urls": [ + "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, + "enum34": { + "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD", + "generator_function": "grpc_deps", + "generator_name": "enum34", + "name": "enum34", + "sha256": "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1", + "strip_prefix": "enum34-1.1.6", + "urls": [ + "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz" + ] + }, + "envoy_api": { + "generator_function": "grpc_deps", + "generator_name": "envoy_api", + "name": "envoy_api", + "sha256": "9150f920abd3e710e0e58519cd769822f13d7a56988f2c34c2008815ec8d9c88", + "strip_prefix": "data-plane-api-8dcc476be69437b505af181a6e8b167fdb101d7e", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz" + ] + }, + "futures": { + "build_file": "@com_github_grpc_grpc//third_party:futures.BUILD", + "generator_function": "grpc_deps", + "generator_name": "futures", + "name": "futures", + "sha256": "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794", + "strip_prefix": "futures-3.3.0", + "urls": [ + "https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00/futures-3.3.0.tar.gz" + ] + }, + "io_bazel_rules_go": { + "generator_function": "grpc_deps", + "generator_name": "io_bazel_rules_go", + "name": "io_bazel_rules_go", + "sha256": "a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz" + ] + }, + "io_bazel_rules_python": { + "generator_function": "grpc_deps", + "generator_name": "io_bazel_rules_python", + "name": "io_bazel_rules_python", + "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161", + "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz" + }, + "io_bazel_rules_sass": { + "name": "io_bazel_rules_sass", + "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", + "strip_prefix": "rules_sass-1.25.0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" + ] + }, + "io_bazel_skydoc": { + "name": "io_bazel_skydoc", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, + "io_opencensus_cpp": { + "generator_function": "grpc_deps", + "generator_name": "io_opencensus_cpp", + "name": "io_opencensus_cpp", + "sha256": "90d6fafa8b1a2ea613bf662731d3086e1c2ed286f458a95c81744df2dbae41b1", + "strip_prefix": "opencensus-cpp-c9a4da319bc669a772928ffc55af4a61be1a1176", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz", + "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" + ] + }, + "java_tools_javac11_darwin-v10.5.zip": { + "name": "java_tools_javac11_darwin-v10.5.zip", + "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + ] + }, + "java_tools_javac11_linux-v10.5.zip": { + "name": "java_tools_javac11_linux-v10.5.zip", + "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + ] + }, + "java_tools_javac11_windows-v10.5.zip": { + "name": "java_tools_javac11_windows-v10.5.zip", + "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.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" + ] + }, + "jekyll_tree_0_17_1": { + "name": "jekyll_tree_0_17_1", + "sha256": "02256ddd20eeaf70cf8fcfe9b2cdddd7be87aedd5848d549474fb0358e0031d3", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.1.tar" + ] + }, + "jekyll_tree_0_17_2": { + "name": "jekyll_tree_0_17_2", + "sha256": "13b35dd309a0d52f0a2518a1193f42729c75255f5fae40cea68e4d4224bfaa2e", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.2.tar" + ] + }, + "jekyll_tree_0_18_1": { + "name": "jekyll_tree_0_18_1", + "sha256": "98b77f48e37a50fc6f83100bf53f661e10732bb3ddbc226e02d0225cb7a9a7d8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.18.1.tar" + ] + }, + "jekyll_tree_0_19_1": { + "name": "jekyll_tree_0_19_1", + "sha256": "ec892c59ba18bb8de1f9ae2bde937db144e45f28d6d1c32a2cee847ee81b134d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.1.tar" + ] + }, + "jekyll_tree_0_19_2": { + "name": "jekyll_tree_0_19_2", + "sha256": "3c2d9f21ec2fd1c0b8a310f6eb6043027c838810cdfc2457d4346a0e5cdcaa7a", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.2.tar" + ] + }, + "jekyll_tree_0_20_0": { + "name": "jekyll_tree_0_20_0", + "sha256": "bb79a63810bf1b0aa1f89bd3bbbeb4a547a30ab9af70c9be656cc6866f4b015b", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.20.0.tar" + ] + }, + "jekyll_tree_0_21_0": { + "name": "jekyll_tree_0_21_0", + "sha256": "23ec39c0138d358c544151e5c81586716d5d1c6124f10a742bead70516e6eb93", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.21.0.tar" + ] + }, + "jekyll_tree_0_22_0": { + "name": "jekyll_tree_0_22_0", + "sha256": "bec5cfaa5560e082e41e33bde276cf93f0f7bcfd2914a3e868f921df8b3ab725", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.22.0.tar" + ] + }, + "jekyll_tree_0_23_0": { + "name": "jekyll_tree_0_23_0", + "sha256": "56c80fcf49dc606fab8ed5e737a7409e9a486585b7b98673be69b5a4984dd774", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.23.0.tar" + ] + }, + "jekyll_tree_0_24_0": { + "name": "jekyll_tree_0_24_0", + "sha256": "988fa567906a73e50d3669909285187ef88c76ecd4aa277f4d1f355fc06a90c8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.24.0.tar" + ] + }, + "jekyll_tree_0_25_0": { + "name": "jekyll_tree_0_25_0", + "sha256": "e8ab61c047225e808982a564ecd692fd63bd243dccc88a8768ed069a5362a685", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.25.0.tar" + ] + }, + "jekyll_tree_0_26_0": { + "name": "jekyll_tree_0_26_0", + "sha256": "3907dfc6fb27d246e67877e553e8951fac239bb49f2dec7e06b6b09cb0b98b8d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.26.0.tar" + ] + }, + "jekyll_tree_0_27_0": { + "name": "jekyll_tree_0_27_0", + "sha256": "97e2633fefee389daade775da43907aa68699b32212f4e48cb095abe18aa7e65", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.27.0.tar" + ] + }, + "jekyll_tree_0_28_0": { + "name": "jekyll_tree_0_28_0", + "sha256": "64b3fc267fb1f4c56345d96f0ad9f07a2efe43bd15361f818368849cf941b3b7", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.28.0.tar" + ] + }, + "jekyll_tree_0_29_0": { + "name": "jekyll_tree_0_29_0", + "sha256": "99d7a6bf9ef0145c59c54b4319fb31cb855681782080a5490909c4a5463c7215", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.0.tar" + ] + }, + "jekyll_tree_0_29_1": { + "name": "jekyll_tree_0_29_1", + "sha256": "cf0a517f1660a7c4fd26a7ef6f3594bbefcf2b670bc0ed610bf3bb6ec3a9fdc3", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.1.tar" + ] + }, + "jekyll_tree_1_0_0": { + "name": "jekyll_tree_1_0_0", + "sha256": "61ef65c738a8cd65059f58f2ee5f7eef493136ac4d5e5c3464787d17043febdf", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.0.0.tar" + ] + }, + "jekyll_tree_1_1_0": { + "name": "jekyll_tree_1_1_0", + "sha256": "46d82c9249896903ee6be2295fc52a1346a9ee82f61f89b8a2181232c3bd999b", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.1.0.tar" + ] + }, + "jekyll_tree_1_2_0": { + "name": "jekyll_tree_1_2_0", + "sha256": "d402a8391ca2624673f124ff42ba8d0d40d4139e5d23111f3995dc6c5f70f63d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.2.0.tar" + ] + }, + "jekyll_tree_2_0_0": { + "name": "jekyll_tree_2_0_0", + "sha256": "7d7c424ede503856c61b645d8fdc2513ec6ea8600d76c5e87c45a9a45c16de3e", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.0.0.tar" + ] + }, + "jekyll_tree_2_1_0": { + "name": "jekyll_tree_2_1_0", + "sha256": "b0fd257b1d6b1b05705742d55a13b9a20d3e99f49c89334750c872d620e5b88f", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.1.0.tar" + ] + }, + "jekyll_tree_2_2_0": { + "name": "jekyll_tree_2_2_0", + "sha256": "4c1506786ab98df8039ec7354b82da7b586b2ae4ab7f7e7d08f3caf74ff28e3d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.2.0.tar" + ] + }, + "jekyll_tree_3_0_0": { + "name": "jekyll_tree_3_0_0", + "sha256": "bd1096ad609c253fa7b1473edf4a3aa51f36243e188dbb62c68d8ed4aca2419d", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.0.0.tar" + ] + }, + "jekyll_tree_3_1_0": { + "name": "jekyll_tree_3_1_0", + "sha256": "f9d2e22e24af426d6c9de163d91abe6d8af7eb1eabb1d7ff5e9cf4bededf465a", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.1.0-807b377.tar" + ] + }, + "jekyll_tree_3_2_0": { + "name": "jekyll_tree_3_2_0", + "sha256": "6cff8654e739a0c3062183a5a6cc82fcf9a77323051f8c007866d7f4101052a6", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.2.0.tar" + ] + }, + "jekyll_tree_3_3_0": { + "name": "jekyll_tree_3_3_0", + "sha256": "36b81e8ddf4f3caccf41acc82d9e49f000c1be9e92c9cc82793d60ff70636176", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.3.0.tar" + ] + }, + "jekyll_tree_3_4_0": { + "name": "jekyll_tree_3_4_0", + "sha256": "af82e775d911135bcff76e500bb003c4a9fccb949f8ddf4d93c58eca195bf5e8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.4.0.tar" + ] + }, + "jekyll_tree_3_5_0": { + "name": "jekyll_tree_3_5_0", + "sha256": "aa96cbad14cfab0b422d1d17eac3107a75eb05854d40ab4f1379a6fc87b2e1f8", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.0.tar" + ] + }, + "jekyll_tree_3_5_1": { + "name": "jekyll_tree_3_5_1", + "sha256": "1c949ba8da353c93c74a70638e5cb321ea1cd5582eda1b6ad88c6d2d0b569f2f", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.1.tar" + ] + }, + "jekyll_tree_3_6_0": { + "name": "jekyll_tree_3_6_0", + "sha256": "1b7a16a2098ca0c290c208a11db886e950d6c523b2cac2d0a0cba4a04aa832f3", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.6.0.tar" + ] + }, + "jekyll_tree_3_7_0": { + "name": "jekyll_tree_3_7_0", + "sha256": "a534d37ef3867c92fae8692852f92820a34f63a5f9092bbbec6505c0f69d8094", + "urls": [ + "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.7.0.tar" + ] + }, + "openjdk11_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_darwin_archive", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "openjdk11_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_linux_archive", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "openjdk11_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_windows_archive", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "openjdk14_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk14_darwin_archive", + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "openjdk14_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk14_linux_archive", + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "openjdk14_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk14_windows_archive", + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "openjdk15_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_darwin_archive", + "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz" + ] + }, + "openjdk15_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_linux_archive", + "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" + ] + }, + "openjdk15_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_windows_archive", + "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" + ] + }, + "openjdk_linux": { + "downloaded_file_path": "zulu-linux.tar.gz", + "name": "openjdk_linux", + "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz" + ] + }, + "openjdk_linux_aarch64": { + "downloaded_file_path": "zulu-linux-aarch64.tar.gz", + "name": "openjdk_linux_aarch64", + "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" + ] + }, + "openjdk_linux_aarch64_minimal": { + "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", + "name": "openjdk_linux_aarch64_minimal", + "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" + ] + }, + "openjdk_linux_aarch64_vanilla": { + "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", + "name": "openjdk_linux_aarch64_vanilla", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + }, + "openjdk_linux_minimal": { + "downloaded_file_path": "zulu-linux-minimal.tar.gz", + "name": "openjdk_linux_minimal", + "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz" + ] + }, + "openjdk_linux_ppc64le_vanilla": { + "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz", + "name": "openjdk_linux_ppc64le_vanilla", + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "openjdk_linux_s390x_vanilla": { + "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz", + "name": "openjdk_linux_s390x_vanilla", + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "openjdk_linux_vanilla": { + "downloaded_file_path": "zulu-linux-vanilla.tar.gz", + "name": "openjdk_linux_vanilla", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "openjdk_macos": { + "downloaded_file_path": "zulu-macos.tar.gz", + "name": "openjdk_macos", + "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz" + ] + }, + "openjdk_macos_minimal": { + "downloaded_file_path": "zulu-macos-minimal.tar.gz", + "name": "openjdk_macos_minimal", + "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz" + ] + }, + "openjdk_macos_vanilla": { + "downloaded_file_path": "zulu-macos-vanilla.tar.gz", + "name": "openjdk_macos_vanilla", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "openjdk_win": { + "downloaded_file_path": "zulu-win.zip", + "name": "openjdk_win", + "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" + ] + }, + "openjdk_win_minimal": { + "downloaded_file_path": "zulu-win-minimal.zip", + "name": "openjdk_win_minimal", + "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" + ] + }, + "openjdk_win_vanilla": { + "downloaded_file_path": "zulu-win-vanilla.zip", + "name": "openjdk_win_vanilla", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "platforms": { + "name": "platforms", + "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", + "strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" + ] + }, + "remote_coverage_tools": { + "name": "remote_coverage_tools", + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "remote_coverage_tools_for_testing": { + "name": "remote_coverage_tools_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "remote_java_tools_darwin": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_darwin", + "name": "remote_java_tools_darwin", + "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip" + ] + }, + "remote_java_tools_darwin_for_testing": { + "name": "remote_java_tools_darwin_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip" + ] + }, + "remote_java_tools_javac11_test_darwin": { + "name": "remote_java_tools_javac11_test_darwin", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + ] + }, + "remote_java_tools_javac11_test_linux": { + "name": "remote_java_tools_javac11_test_linux", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + ] + }, + "remote_java_tools_javac11_test_windows": { + "name": "remote_java_tools_javac11_test_windows", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + ] + }, + "remote_java_tools_linux": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_linux", + "name": "remote_java_tools_linux", + "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip" + ] + }, + "remote_java_tools_linux_for_testing": { + "name": "remote_java_tools_linux_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip" + ] + }, + "remote_java_tools_windows": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_windows", + "name": "remote_java_tools_windows", + "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip" + ] + }, + "remote_java_tools_windows_for_testing": { + "name": "remote_java_tools_windows_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip" + ] + }, + "remotejdk11_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux", + "name": "remotejdk11_linux", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "remotejdk11_linux_aarch64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_aarch64", + "name": "remotejdk11_linux_aarch64", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + }, + "remotejdk11_linux_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_aarch64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + }, + "remotejdk11_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "remotejdk11_linux_ppc64le": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_ppc64le", + "name": "remotejdk11_linux_ppc64le", + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_ppc64le_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_ppc64le_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_s390x": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_s390x", + "name": "remotejdk11_linux_s390x", + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_s390x_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_s390x_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_macos", + "name": "remotejdk11_macos", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "remotejdk11_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "remotejdk11_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_win", + "name": "remotejdk11_win", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "remotejdk11_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "remotejdk14_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_linux", + "name": "remotejdk14_linux", + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "remotejdk14_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "remotejdk14_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_macos", + "name": "remotejdk14_macos", + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "remotejdk14_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "remotejdk14_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_win", + "name": "remotejdk14_win", + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "remotejdk14_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk14_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "remotejdk15_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_linux_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" + ] + }, + "remotejdk15_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_macos_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz" + ] + }, + "remotejdk15_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_win_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" + ] + }, + "rules_cc": { + "name": "rules_cc", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + ] + }, + "rules_java": { + "name": "rules_java", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "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_nodejs-2.2.2.tar.gz": { + "name": "rules_nodejs-2.2.2.tar.gz", + "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz" + ] + }, + "rules_pkg": { + "name": "rules_pkg", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" + ] + }, + "rules_pkg-0.2.4.tar.gz": { + "name": "rules_pkg-0.2.4.tar.gz", + "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" + ] + }, + "rules_proto": { + "name": "rules_proto", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", + "strip_prefix": "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" + ] + }, + "six": { + "build_file": "@com_github_grpc_grpc//third_party:six.BUILD", + "generator_function": "grpc_deps", + "generator_name": "six", + "name": "six", + "sha256": "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", + "urls": [ + "https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-1.12.0.tar.gz" + ] + }, + "upb": { + "generator_function": "grpc_deps", + "generator_name": "upb", + "name": "upb", + "sha256": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", + "strip_prefix": "upb-382d5afc60e05470c23e8de19b19fc5ad231e732", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", + "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" + ] + }, + "v1.32.0.tar.gz": { + "name": "v1.32.0.tar.gz", + "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + ] + }, + "v3.13.0.tar.gz": { + "name": "v3.13.0.tar.gz", + "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" + ] + }, + "zlib": { + "build_file": "@com_github_grpc_grpc//third_party:zlib.BUILD", + "generator_function": "grpc_deps", + "generator_name": "zlib", + "name": "zlib", + "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45", + "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz", + "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz" + ] + }, + "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": { + "name": "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": { + "name": "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + ] + }, + "zulu11.37.17-ca-jdk11.0.6-win_x64.zip": { + "name": "zulu11.37.17-ca-jdk11.0.6-win_x64.zip", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": { + "name": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + ] + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py new file mode 100755 index 0000000000..9e998e0587 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python3 +import sys +import json + +if len(sys.argv) != 2: + print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr) + print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr) + print("Hail Eris.", file=sys.stderr) + sys.exit(1) + +http_archives = [] + +# just the kw args are the dict { name, sha256, urls … } +def http_archive(**kw): + http_archives.append(kw) +# like http_file +def http_file(**kw): + http_archives.append(kw) + +# this is inverted from http_archive/http_file and bundles multiple archives +def distdir_tar(**kw): + for archive_name in kw['archives']: + http_archives.append({ + "name": archive_name, + "sha256": kw['sha256'][archive_name], + "urls": kw['urls'][archive_name] + }) + +# TODO? +def git_repository(**kw): + print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr) + sys.exit(1) + +# execute the WORKSPACE like it was python code in this module, +# using all the function stubs from above. +exec(sys.stdin.read()) + +# transform to a dict with the names as keys +d = { el['name']: el for el in http_archives } + +def has_urls(el): + return ('url' in el and el['url']) or ('urls' in el and el['urls']) +def has_sha256(el): + return 'sha256' in el and el['sha256'] +bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values())) +if bad_archives: + print('Following bazel dependencies are missing url or sha256', file=sys.stderr) + print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr) + for el in bad_archives: + print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr) + sys.exit(1) + +with open(sys.argv[1], "w") as f: + print(json.dumps(d, sort_keys=True, indent=4), file=f) diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix index 30b957eb5e..11931a197c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -38,7 +38,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-cpp"; + name = "bazel-test-java"; inherit workspaceDir; bazelPkg = bazel; buildInputs = [ openjdk8 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index 0784de4cfd..3858a68165 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -17,15 +17,29 @@ let com_google_protobuf = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf"; - rev = "v3.7.0"; - sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh"; + rev = "v3.13.0"; + sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd"; }; bazel_skylib = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-skylib"; - rev = "f83cb8dd6f5658bc574ccd873e25197055265d1c"; - sha256 = "091fb0ky0956wgv8gghy9ay3yfx6497mb72qvibf0y9dllmxyn9l"; + rev = "2ec2e6d715e993d96ad6222770805b5bd25399ae"; + sha256 = "1z2r2vx6kj102zvp3j032djyv99ski1x1sl4i3p6mswnzrzna86s"; + }; + + rules_python = fetchFromGitHub { + owner = "bazelbuild"; + repo = "rules_python"; + rev = "c8c79aae9aa1b61d199ad03d5fe06338febd0774"; + sha256 = "1zn58wv5wcylpi0xj7riw34i1jjpqahanxx8y9srwrv0v93b6pqz"; + }; + + rules_proto = fetchFromGitHub { + owner = "bazelbuild"; + repo = "rules_proto"; + rev = "a0761ed101b939e19d83b2da5f59034bffc19c12"; + sha256 = "09lqfj5fxm1fywxr5w8pnpqd859gb6751jka9fhxjxjzs33glhqf"; }; net_zlib = fetchurl rec { @@ -40,7 +54,9 @@ let load("//:proto-support.bzl", "protobuf_deps") protobuf_deps() - ''; + load("@rules_proto//proto:repositories.bzl", "rules_proto_toolchains") + rules_proto_toolchains() + ''; protoSupport = writeText "proto-support.bzl" '' """Load dependencies needed to compile the protobuf library as a 3rd-party consumer.""" @@ -62,13 +78,17 @@ let name = "bazel_skylib", path = "${bazel_skylib}", ) - - native.bind( - name = "zlib", - actual = "@net_zlib//:zlib", + native.local_repository( + name = "rules_proto", + path = "${rules_proto}", ) + native.local_repository( + name = "rules_python", + path = "${rules_python}", + ) + http_archive( - name = "net_zlib", + name = "zlib", build_file = "@com_google_protobuf//:third_party/zlib.BUILD", sha256 = "${net_zlib.sha256}", strip_prefix = "zlib-1.2.11", @@ -89,6 +109,8 @@ let ''; personBUILD = writeText "BUILD" '' + load("@rules_proto//proto:defs.bzl", "proto_library") + proto_library( name = "person_proto", srcs = ["person.proto"], diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix index d3926beb32..30c55dbca3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; license = lib.licenses.asl20; + maintainers = lib.teams.beam.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index aa3af12c93..0c6450766b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ gleber tazjin ]; + maintainers = lib.teams.beam.members; license = lib.licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix index 4360a3f3a3..1fb4206d5c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "samurai"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "michaelforney"; repo = pname; rev = version; - sha256 = "0k0amxpi3v9v68a8vc69r4b86xs12vhzm0wxd7f11vap1pnqz2cz"; + sha256 = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI="; }; makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 18d41d6f74..68c1e94519 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-mHr+FuDMxLA5Y7BNbDN75mdHVP6Ah1/S5vXg6cC/dcE="; + sha256 = "0hyjyk3yw2yjb47j9kd6as5bsa2wkjricnx0803sg2p4qc8rb72f"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index ed1171458b..5ba6718a6b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -2,16 +2,16 @@ makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.26.0"; + version = "3.27.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "1z8hiamg3h1fnsmr8j5l9q6c8cd81lqmd00gcmz4spw73pqfxg3r"; + sha256 = "sha256-JfOCht+awc0I22vtRD5hgowgdVkcJR3qSxnxLoc3XZY="; }; - vendorSha256 = "1kxnpn4py8a2rz1gwg0y3yiwcwphj38pkp2k9z1p85ccm2wblljz"; + vendorSha256 = "sha256-4zKe8y+9fedvCt/XmPf0HxtyqLz+FP4Ylt6k9KBjaIw="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index 3fa1b7b95f..da92617415 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.7.4"; + version = "6.7.5"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-EFcgS+ZrmdrIwHAzwSuQFe7UgeWsTRjm2sDv5COdi/k="; + sha256 = "sha256-pL8h/hsaiVveZ32ee0bUepzcS7igJGVtGuHocrC21pY="; }; - vendorSha256 = "sha256-xeptlcJLj+R1BdC8Rdi3hsJVxdrmvfeTMsrhMNGrXi8="; + vendorSha256 = "sha256-IcIUYFmiVuRrZQisjWX5grOZPqovibgF5NmbG96FISI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index d9eef5e3c4..6f11ee9e87 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.263.3"; + version = "2.263.4"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0lyzmv378yjz4p4dlpm1nwdq4p781nycvspdik82xbxg4s6gamd3"; + sha256 = "1disj0a0qh7gzjqm6bjb7dx0v74k74hkyvxpg12ahdj2g04p8jhx"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 16e5fce1eb..eacd35ed76 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0k3vrz12dgfirz9p4ckgk2swr42w8fl50hdgg8pwc7yh2jsz8zl0"; + sha256 = "sha256-Zwh8baMD8jt+yfsK0jpsTEU32rT+IAQGwavVT3rpRsU="; }; buildInputs = [ jre makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix index 075cd5053b..930078b2dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix @@ -1,13 +1,13 @@ { lib, pythonPackages, fetchFromGitHub }: let - pgdbconn = pythonPackages.buildPythonPackage { + pgdbconn = pythonPackages.buildPythonPackage rec { pname = "pgdbconn"; version = "0.8.0"; src = fetchFromGitHub { owner = "perseas"; repo = "pgdbconn"; - rev = "26c1490e4f32e4b5b925e5b82014ad106ba5b057"; + rev = "v${version}"; sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z"; }; # The tests are impure (they try to access a PostgreSQL server) diff --git a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix new file mode 100644 index 0000000000..c20e2866dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -0,0 +1,43 @@ +{ lib, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, lvm2 }: + +buildGoModule rec { + pname = "dockle"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "goodwithtech"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Zc2ZlyeWdRvyuJLDDTONfh0/q+HKR4lNtSFMjgJWrRY="; + }; + + vendorSha256 = "sha256-4IJKXcnMXBqoEjsV4Xg2QYvKwxDDUjcZtrj9IRuT6i4="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ btrfs-progs lvm2 ]; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X main.version=${version}" + ]; + + preCheck = '' + # Remove tests that use networking + rm pkg/scanner/scan_test.go pkg/utils/fetch_test.go + ''; + + meta = with lib; { + homepage = "https://containers.goodwith.tech"; + changelog = "https://github.com/goodwithtech/dockle/releases/tag/v${version}"; + description = "Container Image Linter for Security"; + longDescription = '' + Container Image Linter for Security. + Helping build the Best-Practice Docker Image. + Easy to start. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index 2e60885111..e906936d2e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -76,30 +76,30 @@ rec { headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; }; - electron_9 = mkElectron "9.4.1" { - x86_64-linux = "36c6c33e2702f591c34a7e6ebd7d0828d554a4ce2eafb319a0cd16ffd4cc4b28"; - x86_64-darwin = "3e2f87d899be684eab226c572c566e89c05114059c9add1a33d2be63100b18fd"; - i686-linux = "be5f8d18f11ad7c0655faec4040a8af6239f29f1155210024a01826a30b0dbbe"; - armv7l-linux = "b710a0e3b80ef265760d49c9210f78a6410007521b0ed73c8b868b05d22a0a60"; - aarch64-linux = "e2fc73309780fc0e9b5abebcb8256b2bc389672f0bcc261269da5891a3df66dc"; - headers = "0sabqcjd6gcc6khyhiz3rk30p1y4bxsajy4rs9866bqyafq86j6q"; + electron_9 = mkElectron "9.4.3" { + x86_64-linux = "7744ec8af6512e569d600d7fd8e9105d3ca5ac7b6f54390dd553edbd7816289f"; + x86_64-darwin = "68c67a32f149618d629eb4a8a8044b98dc6ceedc16d46ff20782fcccad72fc44"; + i686-linux = "904955ee8365b95439fb4643844ac868b59525ed230a76c8e0395c0aa5719813"; + armv7l-linux = "5cfb3ae97a75d33d4b102d75944610dd56a566ee98186a030eb5bdbbd3d76323"; + aarch64-linux = "8afa647e4b5b1e290d5d852c7420e82916ba740e3e5576599076dc139cd1d556"; + headers = "0712160j1yvl9fmj2vm9lznkwnmji1hjzyicb4vis52lbrwx820l"; }; - electron_10 = mkElectron "10.3.0" { - x86_64-linux = "1a4afb659400c7acca0734df1b981b867e5dfdd15d4d3b73fd276d87b682f089"; - x86_64-darwin = "9c5cca484b28dc5cca89a7f1c77e65b3a04251f4eee740265c358efae351cb94"; - i686-linux = "fcb298bca0ab229e92b92c418d3e352885ff4291f735a35c7822b3ca17ae8a86"; - armv7l-linux = "48accf0fbef1f2d1a81e12c2e66b9280f871029b16947d0bebe036cf1fb71b1c"; - aarch64-linux = "2c99b4ec87ba657c33efb3a7e907e3f3e315e87347954231cb8bae393c1c96fd"; - headers = "1k97pfzxqrgw4y76js2chq13avgp9czin9q9mlh1zdf13bih96hj"; + electron_10 = mkElectron "10.3.2" { + x86_64-linux = "e28748c813ddc69c611a47961d68ae2dc3761f547c509d9ce2c56c2c6eadc9a2"; + x86_64-darwin = "3120ae3eab94d9102003f6fa2dc833a0629295c7ec0e154b35f61116d55a4954"; + i686-linux = "13f42ad6ea0fa41553b8f50323d0baaa29272220a2e81ca5293ad4439cda1d79"; + armv7l-linux = "0e571f63697b8985782175af07bdd7069886195d9ccd7fc5c04578b4144ea922"; + aarch64-linux = "173551fa6cd3ca1fb52fab3bd3e7f0ffd3e4758e78a5174e6d636a45a282ab8f"; + headers = "00x71b18prc55pv3sykbzpmkxf8yjzf2cdnlqif993jab8fbwmqn"; }; - electron_11 = mkElectron "11.2.1" { - x86_64-linux = "607d9d58c9a3b5c36461acc6bbe473bc604eee42a55c2c617ac46d095cf98abb"; - x86_64-darwin = "39d95668a3ea04bdc652ff9e2889c7a88f638534420e8e256679cbf4b7658a65"; - i686-linux = "59f226133d01fb6acf86fe98907964f79dcf2902054e5c4c9c4ff84a3ea88f4a"; - armv7l-linux = "85051d8eacf04aeec3dd74e46e7888d01bd4e6caf7ec2001122a1f3e11db44ee"; - aarch64-linux = "8aa9be5d6c139386390bad64f78b95756206a40fe4982fc9f199b67a7d06bec5"; - headers = "12sy8zzb0z654b85c5l1j8762nhwmkim1pbz1y3qzgbzvpbd5arq"; + electron_11 = mkElectron "11.2.3" { + x86_64-linux = "9249901fd7b85a7f952abe0df2ce83a566df612ef3ee15cce488cb1d751bc94d"; + x86_64-darwin = "e0b2784b25fd4a5ee4041d508d59bbb8386039c7ea7e9cea3e547c672f052b60"; + i686-linux = "78b2dd2d7b5e891e695cd31c28ac5fa1e99967ff538b944aa9d1ec224e82a964"; + armv7l-linux = "06178cd44792c7dceb72286460948cb7f575acba4e46cf72c154f243e93eaf65"; + aarch64-linux = "e23f2572a6a66779aff5d7cf25149fd343b0eef420fbfa3e8c3742284ce6e613"; + headers = "1yjc7zl7l5n3l2s2x3lbic2lc527alcd4mnwih7pjl5dhvdgmbm9"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index ed9205ee25..3fda533c52 100644 --- a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-d5B+SSUXtOD4x+dChQsUCkiHuHcW3lOrL4QhQekY7cA="; + sha256 = "sha256-l3Aftu1RkcDgzdzrKIAlziDgbjYfj5xLIbysS0a5JZw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix b/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix index 9ad85e840b..6b7b13437c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { name = "glpaper"; - version = "unstable-2020-03-30"; + version = "unstable-2020-10-11"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/glpaper"; - rev = "a95db77088dfb5636a87f3743fc9b5eca70c1ae2"; - sha256 = "04y12910wvhy4aqx2sa63dy9l6nbs7b77yqpdhc96x2b3mgzgjfs"; + rev = "9e7ec7cd270af330039c395345c7d23c04682267"; + sha256 = "sha256-yBHRg6eg+PK/ixuM0MBty3RJY9qcemr3Dt+8SAitqnk="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix index 3b73c52731..fc44efca82 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix @@ -1,22 +1,23 @@ { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "go-bindata"; - version = "unstable-2015-10-23"; + version = "3.22.0"; - goPackagePath = "github.com/jteeuwen/go-bindata"; + goPackagePath = "github.com/kevinburke/go-bindata"; src = fetchFromGitHub { - owner = "jteeuwen"; - repo = "go-bindata"; - rev = "a0ff2567cfb70903282db057e799fd826784d41d"; - sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v"; + owner = "kevinburke"; + repo = pname; + rev = "v${version}"; + sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; }; - excludedPackages = "testdata"; + subPackages = [ "go-bindata" ]; meta = with lib; { - homepage = "https://github.com/jteeuwen/go-bindata"; + homepage = "https://github.com/kevinburke/go-bindata"; + changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md"; description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; maintainers = with maintainers; [ cstrahan ]; license = licenses.cc0; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix index 1515dae339..94f9b6d8eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mBBjZRjaD1m6sIKR1/MRAKW25bGVNihxBwQMbw/lby4="; + sha256 = "sha256-gA7YpzroIP26u/kmbwlcYkWVfeJ8YDEAl0H9GGQrXA8="; }; - vendorSha256 = "sha256-Am0ypcViUcAcf96qv5qE7K3FvQuQs1XlpIqZf2upWyc="; + vendorSha256 = "sha256-eRcE6ai7076HqTWRJ8zKoV6/PJRgUpKvKF+0T7MgLQE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gron/default.nix b/third_party/nixpkgs/pkgs/development/tools/gron/default.nix index f486bc95bc..b8242cc3cd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gron/default.nix @@ -1,20 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gron"; - version = "0.6.0"; - - owner = "tomnomnom"; - repo = "gron"; - goPackagePath = "github.com/${owner}/${repo}"; + version = "0.6.1"; src = fetchFromGitHub { - inherit owner repo; + owner = "tomnomnom"; + repo = "gron"; rev = "v${version}"; - sha256 = "05f3w4zr15wd7xk75l12y5kip4gnv719a2x9w2hy23q3pnss9wk0"; + sha256 = "0qmzawkhg0qn9kxxrssbdjni2khvamhrcklv3yxc0ljmh77mh61m"; }; - goDeps = ./deps.nix; + patches = [ + (fetchpatch { + name = "fix-inconsistent-vendoring.patch"; + url = "https://github.com/tomnomnom/gron/pull/85/commits/d549a6cb68ed0e0ec7cc81d8275353acfe218725.patch"; + sha256 = "1461v4f7w6q75l3988br0g1ynfhzsh34z38pd2w8fp57vrgkcfi5"; + }) + ]; + + vendorSha256 = "0va88c3rjlc2nbpqx4ila36rwrx57wcdhig4jp9q58vv4zqc2yxy"; meta = with lib; { description = "Make JSON greppable!"; @@ -26,7 +31,7 @@ buildGoPackage rec { ''; homepage = "https://github.com/tomnomnom/gron"; license = licenses.mit; - maintainers = [ maintainers.fgaz ]; - platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ fgaz SuperSandro2000 ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gron/deps.nix b/third_party/nixpkgs/pkgs/development/tools/gron/deps.nix deleted file mode 100644 index effc255d87..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/gron/deps.nix +++ /dev/null @@ -1,57 +0,0 @@ -[ - rec { - owner = "fatih"; - repo = "color"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - rec { - owner = "nwidger"; - repo = "jsoncolor"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40"; - sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; - }; - } - rec { - owner = "pkg"; - repo = "errors"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - rec { - owner = "mattn"; - repo = "go-colorable"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - rec { - owner = "mattn"; - repo = "go-isatty"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix deleted file mode 100644 index 71b6355db5..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ mkDerivation, aeson, base, binary, blaze-markup, brittany -, bytestring, containers, data-default, deepseq, directory, extra -, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th -, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios -, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin -, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin -, hls-tactics-plugin, hslogger, hspec, hspec-core -, hspec-expectations, lens, lsp-test, mtl, optparse-applicative -, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions -, shake, lib, stm, stylish-haskell, tasty, tasty-ant-xml -, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun -, temporary, text, transformers, unordered-containers, with-utf8 -, yaml -}: -mkDerivation { - pname = "haskell-language-server"; - version = "0.8.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-default directory extra filepath ghc ghcide - gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative - optparse-simple process shake text unordered-containers - ]; - executableHaskellDepends = [ - aeson base binary brittany bytestring containers deepseq directory - extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide - gitrev hashable haskell-lsp hie-bios hls-class-plugin - hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin - hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens - mtl optparse-applicative optparse-simple ormolu process regex-tdfa - safe-exceptions shake stylish-haskell temporary text transformers - unordered-containers with-utf8 - ]; - testHaskellDepends = [ - aeson base blaze-markup bytestring containers data-default - directory extra filepath haskell-lsp hie-bios hls-plugin-api - hslogger hspec hspec-core hspec-expectations lens lsp-test process - stm tasty tasty-ant-xml tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun temporary text transformers - unordered-containers yaml - ]; - testToolDepends = [ ghcide ]; - homepage = "https://github.com/haskell/haskell-language-server#readme"; - description = "LSP server for GHC"; - license = lib.licenses.asl20; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix deleted file mode 100644 index b757dc8c9e..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ mkDerivation, aeson, base, containers, fetchgit, ghc -, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake -, lib, text, transformers, unordered-containers -}: -mkDerivation { - pname = "hls-class-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers ghc ghc-exactprint ghcide haskell-lsp - hls-plugin-api lens shake text transformers unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix deleted file mode 100644 index 2677b45a59..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, aeson, base, containers, deepseq, Diff, directory -, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide -, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api -, parser-combinators, pretty-simple, QuickCheck, safe-exceptions -, shake, lib, temporary, text, time, transformers -, unordered-containers -}: -mkDerivation { - pname = "hls-eval-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq Diff directory extra filepath ghc - ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types - hls-plugin-api parser-combinators pretty-simple QuickCheck - safe-exceptions shake temporary text time transformers - unordered-containers - ]; - description = "Eval plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix deleted file mode 100644 index 8207b5181b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc -, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, text -, unordered-containers -}: -mkDerivation { - pname = "hls-explicit-imports-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide haskell-lsp-types - hls-plugin-api shake text unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix deleted file mode 100644 index 02e314cba3..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ mkDerivation, aeson, apply-refact, base, binary, bytestring -, containers, data-default, deepseq, Diff, directory, extra -, fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide -, hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens -, regex-tdfa, shake, lib, temporary, text, transformers -, unordered-containers -}: -mkDerivation { - pname = "hls-hlint-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc ghc-lib ghc-lib-parser-ex - ghcide hashable haskell-lsp hlint hls-plugin-api hslogger lens - regex-tdfa shake temporary text transformers unordered-containers - ]; - description = "Hlint integration plugin with Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix deleted file mode 100644 index cca8acb881..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ mkDerivation, aeson, base, containers, deepseq, directory, extra -, fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types -, hls-plugin-api, retrie, safe-exceptions, shake, lib, text -, transformers, unordered-containers -}: -mkDerivation { - pname = "hls-retrie-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions - shake text transformers unordered-containers - ]; - description = "Retrie integration plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix deleted file mode 100644 index 369ce0e27b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, aeson, base, checkers, containers, deepseq -, directory, extra, fetchgit, filepath, fingertree, generic-lens -, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide -, haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover -, lens, mtl, QuickCheck, refinery, retrie, shake, lib, syb, text -, transformers -}: -mkDerivation { - pname = "hls-tactics-plugin"; - version = "0.5.1.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra filepath fingertree - generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide - haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text - transformers - ]; - testHaskellDepends = [ - base checkers containers ghc hie-bios hls-plugin-api hspec mtl - QuickCheck - ]; - testToolDepends = [ hspec-discover ]; - description = "Tactics plugin for Haskell Language Server"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh deleted file mode 100755 index aaccf8b9b9..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix jq curl -# -# This script will update the haskell-language-server derivation to the latest version using -# cabal2nix. -# -# Note that you should always try building haskell-language-server after updating it here, since -# some of the overrides in pkgs/development/haskell/configuration-nix.nix may -# need to be updated/changed. -# -# Remember to split out different updates into multiple commits - -set -eo pipefail - -# This is the directory of this update.sh script. -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" - -# =========================== -# HLS -# =========================== - -# hls derivation created with cabal2nix. -hls_derivation_file="${script_dir}/default.nix" - -# This is the current revision of hls in Nixpkgs. -hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")" - -# This is the latest release version of hls on GitHub. -# Get all tag names, filter to the hls ones (no prefix like 'hls-plugin-api-'), -# sort for the latest one and select just that -hls_latest_release=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/haskell/haskell-language-server/tags | - jq --raw-output 'map(.name) | .[]' | - grep '^[0-9]' | - sort --version-sort | - tail -n1) - -# Use this value instead for the very latest revision -# hls_head=(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output) - -hls_new_version=$hls_latest_release - -echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." -echo "Running cabal2nix and outputting to ${hls_derivation_file}..." -cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" -cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" -for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do - cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix" -done - -echo "Finished." diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 09cb60901e..4203564ae4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "865" "884" "8102" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "865" "884" "8103" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/third_party/nixpkgs/pkgs/development/tools/hover/default.nix b/third_party/nixpkgs/pkgs/development/tools/hover/default.nix index cb638af43d..81661dce8b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hover/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hover/default.nix @@ -18,7 +18,7 @@ let pname = "hover"; - version = "0.46.1"; + version = "0.46.2"; libs = with xorg; [ libX11.dev @@ -46,13 +46,13 @@ let subPackages = [ "." ]; - vendorSha256 = "1ixfmhp5g57hn23zyf85hy9jnyadayhdbalj4d0bx4q4p5c9qchi"; + vendorSha256 = "0hdh4vwzvwlarjzg6pv9dp665r9px9yplfjpgyyfjyy5b9sxl795"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-flutter-desktop"; repo = pname; - sha256 = "04f3dx2dcllfrw3ay1sbb72pj18ln7bxi9rrcaahqhsd7bn2ff9k"; + sha256 = "1gmsv7hmj7zzfwbz50az3kvgzqvj0jn8i2pv7sjyl9dx1bavi5g3"; }; nativeBuildInputs = [ addOpenGLRunpath makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix index 35ac0dbc6a..68841d48d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.150"; + version = "0.151"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "09lq21phnhr374wb8gj355jsqj8c4m5m818r3pbr8f8zpaamjxfj"; + sha256 = "sha256-MW6QFbmvKVP8/0/oa/O7pwXzLnzSW9blNcaY3ool6Dc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix index 6bbf086749..c41fb4c639 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.63.0"; + version = "0.65.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-g3ARa69FvCfs8a3vbQuse8JvRlPXT6ysfmvZAUYnnA4="; + sha256 = "sha256-Puddnem03RGORKkvcLy5o/eOzKzrOuRvqPk5FsjQ3Lw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index e96d8f38af..38439e6247 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,25 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "4B72VYQ+HBvhGQNl577DuZpvWNIvv/6fejRQtVKtFKY="; + sha256 = "sha256-K8jeX1/Wn6mbf48GIR2wRAwiwg1rxtbtCPjjH+4dPYw="; }; - cargoSha256 = "uOOpDRWPSoH49NTu82rDxxDR/2icoe4ECxVQb/J/45w="; + cargoSha256 = "sha256-a9SBeX3oesdoC5G+4dK2tbt+W7VA4jPqCM9tOAex4DI="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' installManPage man/just.1 - installShellCompletion --bash --name just.bash completions/just.bash - installShellCompletion --fish --name just.fish completions/just.fish - installShellCompletion --zsh --name _just completions/just.zsh + installShellCompletion --cmd just \ + --bash completions/just.bash \ + --fish completions/just.fish \ + --zsh completions/just.zsh ''; checkInputs = [ coreutils bash ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix index a089511fb6..6d66f141e9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z80e"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "KnightOS"; repo = "z80e"; rev = version; - sha256 = "0gdv17ynjd6zf3i4hkimd89xkrd8kxas3bf8d5sq54fdicapvkzc"; + sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc="; }; nativeBuildInputs = [ cmake knightos-scas ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix index 6ff123bb2b..f658995fe9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.9.2"; - # rev is the 3.9.2 commit, mainly for kustomize version command output - rev = "e98eada7365fc564c9aba392e954f306a9cbf1dd"; + version = "3.10.0"; + # rev is the 3.9.3 commit, mainly for kustomize version command output + rev = "602ad8aa98e2e17f6c9119e027a09757e63c8bec"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "0p1rxswfaj0g3y8nfw70qmxrlyv1pnzkapy1mxpzzyf04mmhg7wn"; + sha256 = "1qr0mi83df8d9qd2svyr1h26pg97qi67nnygrkydnp8an28k48hi"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "1pv8g0nnrpzbvd6dqgnrw2i27xkilbrr9npdz6pxr7mmbcg3w3w9"; + vendorSha256 = "0p2j8mm7jpladpm6v3451g38n5bax0g368dk5h5r5gmkr6srxdy4"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; @@ -34,6 +34,6 @@ buildGoModule rec { ''; homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; - maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man saschagrunert ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix index 4e5f394726..97aedfd8f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }: +{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.4.3"; + version = "2.5.3"; in stdenv.mkDerivation { pname = "minizinc"; @@ -12,28 +12,9 @@ stdenv.mkDerivation { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "0mahf621zwwywimly5nd6j39j7qr48k5p7zwpfqnjq4wn010mbf8"; + sha256 = "1kc65sxkc64pr560qaaznc44jnlvq7pbpzwijad410lpcnna5byg"; }; - patches = [ - # Fix build with newer Bison versions: - # https://github.com/MiniZinc/libminizinc/issues/389 - (fetchpatch { - url = "https://github.com/MiniZinc/libminizinc/commit/d3136f6f198d3081943c17ac6890dbe14a81d112.diff"; - sha256 = "1f4wxn9422ndgq6dd0vqdxm2313srm7gn9nh82aas2xijdxlmz2c"; - }) - (fetchpatch { - name = "bison-3.7-compat-1.patch"; - url = "https://github.com/MiniZinc/libminizinc/commit/8d4dcf302e78231f7c2665150e8178cacd06f91c.patch"; - sha256 = "1wgciyrqijv7b4wqha94is5skji8j7b9wq6fkdsnsimfd3xpxhqw"; - }) - (fetchpatch { - name = "bison-3.7-compat-2.patch"; - url = "https://github.com/MiniZinc/libminizinc/commit/952ffda0bd23dc21f83d3e3f080ea5b3a414e8e0.patch"; - sha256 = "0cnsfqw0hwm7rmazqnb99725rm2vdwab75vdpr5x5l3kjwsn76rj"; - }) - ]; - meta = with lib; { homepage = "https://www.minizinc.org/"; description = "A medium-level constraint modelling language"; diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix index 7709423e67..0683b9e126 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: +{ lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }: let - version = "2.4.3"; + version = "2.5.3"; in -stdenv.mkDerivation { +mkDerivation { pname = "minizinc-ide"; inherit version; - nativeBuildInputs = [ qmake makeWrapper ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtwebengine qtwebkit ]; src = fetchFromGitHub { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = version; - sha256 = "0dfqh73rnp00336pyr1hlgl1wb4m2kh28zvdkamjgml60gmg6wdr"; + sha256 = "1c80ilb1xbgzfadgal668h2zsaiv62il1jnljizrisgb7pszzyzw"; + fetchSubmodules = true; }; sourceRoot = "source/MiniZincIDE"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index 7bd25a6868..85ab64a230 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vlE0tN6m/PZtDZiIs/glTWYP+E4qzD0MAeQjX+OAcHY="; + sha256 = "sha256-HgFm58zdaycOH65jfu3QsfFemhXymp3OTekISih+8WA="; }; vendorSha256 = "sha256-9LEyxIBe4c938RQbLOQOsAb9MGNtjngm48P3P83BTNw="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 27e043a9ac..31c5d0d26e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.44.2"; + version = "1.46.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb"; + sha256 = "0cxgc18xpwyb5wp08km7aj8asn5biqnwq9fkgkk6wv1r1ihqlhf2"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 97b5f9ed82..780b2a8906 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -18,11 +18,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.46.4"; + version = "1.49.1"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "1p46zi1hh9calkcfgqz60c6rdi9i7i16ylj84iibi6k0pc690fjy"; + sha256 = "5Z6CUj/HfSj+pC9iDEmU/OKCYePSAazU9q9M3glnOZU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/default.nix new file mode 100644 index 0000000000..7ec9f3e140 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchzip, substituteAll, bash, jre }: + +stdenv.mkDerivation rec { + pname = "bonnmotion"; + version = "3.0.1"; + + src = fetchzip { + url = "https://sys.cs.uos.de/bonnmotion/src/bonnmotion-${version}.zip"; + sha256 = "16bjgr0hy6an892m5r3x9yq6rqrl11n91f9rambq5ik1cxjqarxw"; + }; + + patches = [ + # The software has a non-standard install bash script which kind of works. + # However, to make it fully functional, the automatically detection of the + # program paths must be substituted with full paths. + (substituteAll { + src = ./install.patch; + inherit bash jre; + }) + ]; + + installPhase = '' + runHook preInstall + + ./install + + mkdir -p $out/bin $out/share/bonnmotion + cp -r ./classes ./lib $out/share/bonnmotion/ + cp ./bin/bm $out/bin/ + + substituteInPlace $out/bin/bm \ + --replace /build/source $out/share/bonnmotion + + runHook postInstall + ''; + + meta = with lib; { + description = "A mobility scenario generation and analysis tool"; + longDescription = '' + BonnMotion is a Java software which creates and analyzes mobility + scenarios and is most commonly used as a tool for the investigation of + mobile ad hoc network characteristics. The scenarios can also be exported + for several network simulators, such as ns-2, ns-3, GloMoSim/QualNet, + COOJA, MiXiM, and ONE. + ''; + homepage = "https://sys.cs.uos.de/bonnmotion/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/install.patch b/third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/install.patch new file mode 100644 index 0000000000..86be99b3dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/install.patch @@ -0,0 +1,75 @@ +diff --git a/install b/install +index 95afa2c..70c5fca 100755 +--- a/install ++++ b/install +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!@bash@/bin/bash + + echo "BonnMotion - a mobility scenario generation and analysis tool" + echo "Copyright (C) 2002-2012 University of Bonn" +@@ -19,28 +19,11 @@ echo "along with this program; if not, write to the Free Software" + echo "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" + echo + +-OS=`uname -s | tr A-Z a-z | sed -e s/_.\*//` +- + PACKAGE=edu.bonn.cs.iv.bonnmotion +-JAVAPATH=`which java 2> /dev/null` +-if [ ! "$JAVAPATH" = "" ] +-then +- JAVAPATH=`dirname ${JAVAPATH}` +-fi +-echo -n Please enter your Java binary path \[$JAVAPATH\]:\ +-read KBDENTRY +-if [ ! "$KBDENTRY" = "" ] +-then +- JAVAPATH=$KBDENTRY +-fi ++JAVAPATH="@jre@/bin" + if [ -x "${JAVAPATH}/java" ] + then +- cd `dirname $0` +- BONNMOTION=`pwd` +- +- cd "${JAVAPATH}" +- JAVAPATH=`pwd` +- cd "${BONNMOTION}" ++ BONNMOTION="$(realpath .)" + + CLASSPATH="${BONNMOTION}/classes" + DOCPATH="${BONNMOTION}/javadoc" +@@ -52,14 +35,7 @@ then + then + mkdir "${DOCPATH}" + fi +- if [ $OS = "cygwin" ] +- then +- cd "${CLASSPATH}" +- CLASSPATH=`cmd.exe /c cd` +- cd "${DOCPATH}" +- DOCPATH=`cmd.exe /c cd` +- fi +- ++ + for l in $BONNMOTION/lib/*.jar + do + LIBRARYPATH=$LIBRARYPATH:$l +@@ -69,7 +45,7 @@ then + APPS=`ls` + cd "${BONNMOTION}/bin" + +- echo \#\!/bin/bash > .head ++ echo \#\!@bash@/bin/bash > .head + echo >> .head + echo BONNMOTION=\"$BONNMOTION\" >> .head + echo PACKAGE=\"$PACKAGE\" >> .head +@@ -103,8 +79,6 @@ then + fi + echo "done." + echo +- echo "$ ./bin/bm -h" +- ./bm + else + echo No executable \"$JAVAPATH/java\", aborting. + fi diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index a2d28bf7d0..d99649fd2a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.02.02-14.02.23"; + version = "2021.02.10-21.13.12"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; - sha256 = "sha256-NwaUIaGkSB+oVd/OArp+bs01ZDAFy5JJ4ic5sMDYg8s="; + sha256 = "sha256-kYetCpInY87l1NTaIhjzkNc2LQctMbSmcdQuI7zrFG4="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/edb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/edb/default.nix new file mode 100644 index 0000000000..ec65ca62fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/edb/default.nix @@ -0,0 +1,42 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, boost, capstone +, double-conversion, graphviz, qtxmlpatterns }: + +mkDerivation rec { + pname = "edb"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "eteran"; + repo = "edb-debugger"; + rev = "1.3.0"; + fetchSubmodules = true; + sha256 = "fFUau8XnsRFjC83HEsqyhrwCCBOfDmV6oACf3txm7O8="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ boost.dev capstone double-conversion graphviz qtxmlpatterns ]; + + postPatch = '' + # Remove CMAKE_INSTALL_PREFIX from DEFAULT_PLUGIN_PATH otherwise the nix store path will appear twice. + substituteInPlace ./src/CMakeLists.txt --replace \ + '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_PREFIX}/''${CMAKE_INSTALL_LIBDIR}/edb\"' \ + '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_LIBDIR}/edb\"' + + # The build script checks for the presence of .git to determine whether + # submodules were fetched and will throw an error if it's not there. + # Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic. + mkdir -p src/qhexview/.git + + # Change default optional terminal program path to one that is more likely to work on NixOS. + substituteInPlace ./src/Configuration.cpp --replace "/usr/bin/xterm" "xterm"; + ''; + + meta = with lib; { + description = "Cross platform AArch32/x86/x86-64 debugger"; + homepage = "https://github.com/eteran/edb-debugger"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lihop maxxk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix index 476179ac8e..201241fb83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix @@ -1,39 +1,38 @@ -{ lib, stdenv -, buildGoPackage +{ lib +, buildGoModule , fetchFromGitHub , makeWrapper , mercurial , git }: -buildGoPackage rec { - pname = "hound-unstable"; - version = "2018-11-02"; - rev = "74ec7448a234d8d09e800b92e52c92e378c07742"; +buildGoModule rec { + pname = "hound"; + version = "unstable-2021-01-26"; + + src = fetchFromGitHub { + owner = "hound-search"; + repo = "hound"; + rev = "b88fc1f79d668e6671a478ddf4fb3e73a63067b9"; + sha256 = "00xc3cj7d3klvhsh9hivvjwgzb6lycw3r3w7nch98nv2j8iljc44"; + }; + + vendorSha256 = "0x1nhhhvqmz3qssd2d44zaxbahj8lh9r4m5jxdvzqk6m3ly7y0b6"; nativeBuildInputs = [ makeWrapper ]; - goPackagePath = "github.com/etsy/hound"; + # requires network access + doCheck = false; - src = fetchFromGitHub { - inherit rev; - owner = "etsy"; - repo = "hound"; - sha256 = "0g6nvgqjabprcl9z5ci5frhbam1dzq978h1d6aanf8vvzslfgdpq"; - }; - - postInstall = with stdenv; let - binPath = lib.makeBinPath [ mercurial git ]; - in '' - wrapProgram $out/bin/houndd --prefix PATH : ${binPath} + postInstall = '' + wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git ]} ''; - meta = { + meta = with lib; { inherit (src.meta) homepage; - description = "Lightning fast code searching made easy"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ grahamc ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ grahamc SuperSandro2000 ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix index 6d58a39f70..acc8490b7c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,6 +1,6 @@ -{ lib, python37Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -with python37Packages; buildPythonApplication rec { +with python3Packages; buildPythonApplication rec { pname = "nrfutil"; version = "6.1"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix new file mode 100644 index 0000000000..94f92bfcf2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, libftdi1 +, libusb1 +, udev +}: + +stdenv.mkDerivation rec { + pname = "openfpgaloader"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "trabucayre"; + repo = "openFPGALoader"; + rev = "v${version}"; + sha256 = "0j87mlghbanh6c7lrxv0x3p6zgd0wrkcs9b8jf6ifh7b3ivcfg82"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + libftdi1 + libusb1 + udev + ]; + + meta = with lib; { + description = "Universal utility for programming FPGAs"; + homepage = "https://github.com/trabucayre/openFPGALoader"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ danderson ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index c68a1c1547..c41ab92fb9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -1,37 +1,26 @@ -{ stdenv -, lib -, fetchFromGitHub -, cargo -, rustc -, rustPlatform -, pkg-config -, glib -, openssl -, darwin -}: +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { - version = "0.2.14"; + version = "0.2.15"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; - rev = version; - sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind"; + rev = "v${version}"; + sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb"; }; - cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda"; + + cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj"; cargoBuildFlags = [ "--features=all" ]; - nativeBuildInputs = [ - pkg-config cargo rustc - ]; - buildInputs = [ - openssl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + # Tests fail because of client server setup which is not possible inside the pure environment, # see https://github.com/mozilla/sccache/issues/460 - checkPhase = null; + doCheck = false; meta = with lib; { description = "Ccache with Cloud Storage"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix index 0c1bb8ede1..0cfbd0680b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semver-tool"; - version = "2.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "fsaintjacques"; repo = pname; rev = version; - sha256 = "0lpwsa86qb5w6vbnsn892nb3qpxxx9ifxch8pw3ahzx2dqhdgnrr"; + sha256 = "sha256-coy/g4nEvSN+0/aqK2r3EEIaoUcnsZhzX66H1qsK9ac="; }; dontBuild = true; # otherwise we try to 'make' which fails. diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix index 9cae7b9016..c6915e294d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.1.18"; + version = "0.1.25"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "08n2sp0yj7ql5aagxw94dn8bx2jkigs9zlylf5zkg673bh54829x"; + sha256 = "sha256-+o15rElJZXQu2Hq1/79ms9wqYimINrViSdQltSJlGN8="; }; - cargoSha256 = "0k8x6kgxc2w7ldi456s4kg4v80b064drfa26zg5chcmcrr5zgmyv"; + cargoSha256 = "sha256-zLDUQcnvjyr+QJLVq6ADGPee0Fd7HeDhPAkb05hYLcE="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index 498508d091..9695c75a3c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "w9PLKLFjKehtub1LbVX9TbvKkj/S1t0MwZIZurF2x18="; + sha256 = "sha256-0WbUJYNRBKixRFl+YM1uSEltQneB6FYPFHNVVhmdseA="; }; - vendorSha256 = "J8ovcUeQsb58Bq/EM9mvYqtuDY1bXTEVCC9/AH+UttU="; + vendorSha256 = "sha256-WYTn2QoI1Z3L4Wxjrq0YT++X9vMA1Wm3zgl08CYiU1Y="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index 47966dcc13..557ff4fa96 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "tokei"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994="; buildInputs = lib.optionals stdenv.isDarwin [ - libiconv darwin.apple_sdk.frameworks.Security + libiconv Security ]; # enable all output formats diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix index a9b4218224..6c70b046ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -4,6 +4,8 @@ with ocamlPackages; buildDunePackage rec { pname = "ocaml-top"; version = "1.2.0-rc"; + useDune2 = true; + src = fetchzip { url = "https://github.com/OCamlPro/ocaml-top/archive/${version}.tar.gz"; sha256 = "1r290m9vvr25lgaanivz05h0kf4fd3h5j61wj4hpp669zffcyyb5"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index 9c888e284f..c03dbf7562 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "ocp-index"; version = "1.2.1"; + useDune2 = true; + src = fetchzip { url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index 4fe408fb77..b99880fe7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -11,8 +11,8 @@ let sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; }; cppo = fetchurl { - url = "https://github.com/mjambon/cppo/archive/v1.6.5.tar.gz"; - sha256 = "1dkm3d5h6h56y937gcdk2wixlpzl59vv5pmiafglr89p20kf7gqf"; + url = "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz"; + sha256 = "185q0x54id7pfc6rkbjscav8sjkrg78fz65rgfw7b4bqlyb2j9z7"; }; cudf = fetchurl { url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; @@ -27,8 +27,8 @@ let sha256 = "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz"; }; extlib = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; - sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; + url = "https://ygrek.org/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; + sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; mccs = fetchurl { url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz"; @@ -43,25 +43,25 @@ let sha256 = "0cjw69r7iilidi7b6arr92kjnjspchvwnmwr1b1gyaxqxpr2s98m"; }; re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz"; - sha256 = "0qkv42a4hpqpxvqa4kdkkcbhbg7aym9kv4mqgm3m51vxbd0pq0lv"; + url = "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz"; + sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj"; }; result = fetchurl { - url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz"; - sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk"; + url = "https://github.com/janestreet/result/archive/1.4.tar.gz"; + sha256 = "1cjlncnzkwc6zr4v8dgy8nin490blbyxzwwp0qh0cla7s3q2jw0n"; }; seq = fetchurl { url = "https://github.com/c-cube/seq/archive/0.1.tar.gz"; sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.7.zip"; - sha256 = "03yxj4hw9p5dh34b1yzl3xd0l1v2l2az0n7ix453yjrkn0wn0xic"; + url = "https://github.com/ocaml/opam/archive/2.0.8.zip"; + sha256 = "1h55jh4nnx1fcn7v7ss3fgxrn6ixkgnq7pvg5njz8c9xq4njwbc1"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.0.7"; + version = "2.0.8"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -69,7 +69,7 @@ in stdenv.mkDerivation { postUnpack = '' ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/cmdliner.tbz - ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz + ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tbz ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz ln -sv ${srcs.dune-local} $sourceRoot/src_ext/dune-local.tbz @@ -78,7 +78,7 @@ in stdenv.mkDerivation { ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz - ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz + ln -sv ${srcs.result} $sourceRoot/src_ext/result.tar.gz ln -sv ${srcs.seq} $sourceRoot/src_ext/seq.tar.gz ''; @@ -117,4 +117,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.7 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.0.8 -p opam-shebangs.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl index 1cbad6f5f4..b94aa7dd9a 100755 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -21,7 +21,7 @@ chomp $OPAM_RELEASE_SHA256; my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG"; my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`; -my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^available: ocaml-version >= "(.*)"$/m +my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" {>= "(.*)"}$/m or die "could not parse ocaml version bound\n"; print <<"EOF"; diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index c09331de59..34d6abb727 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4="; + sha256 = "sha256-KxYGXwK6wF5MDY+zrSdcQqBYkSdnxOCYudTh+TwTkm8="; }; - vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk="; + vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix index d5c6872cd7..26d7063c81 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "4.4"; + version = "5.0"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "1sqjw6q005lws7qhkd26jqyb1xqmpcklzw5hk8paxxi8mzyjn0jp"; + sha256 = "10ml3va6ip501ibaykbhq8282y1j6r8bc8azc1gqxskk5jvfz1jm"; }; outputs = [ "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index dbec90d8bf..47c3e26fa6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.15.2"; + version = "1.15.4"; /* Returns a package of editable sources whose changes will be available without needing to restart the nix-shell. diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index d400986d3d..9ee690815f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -39,7 +39,7 @@ self: super: ansible-lint = super.ansible-lint.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; preBuild = '' export HOME=$(mktemp -d) ''; @@ -48,42 +48,46 @@ self: super: astroid = super.astroid.overridePythonAttrs ( old: rec { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); av = super.av.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ffmpeg_4 ]; } ); bcrypt = super.bcrypt.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ]; } ); cairocffi = super.cairocffi.overridePythonAttrs ( old: { inherit (pkgs.python3.pkgs.cairocffi) patches; - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); cairosvg = super.cairosvg.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); + celery = super.celery.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + }); + cssselect2 = super.cssselect2.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -93,14 +97,14 @@ self: super: ( super.cffi.overridePythonAttrs ( old: { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ]; } ) ); cftime = super.cftime.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ]; } @@ -108,13 +112,13 @@ self: super: colour = super.colour.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.d2to1 ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ]; } ); configparser = super.configparser.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.toml ]; @@ -126,27 +130,40 @@ self: super: cryptography = super.cryptography.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs or [ ] + nativeBuildInputs = (old.nativeBuildInputs or [ ]) + ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; + } // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") { + CRYPTOGRAPHY_DONT_BUILD_RUST = "1"; } ); + daphne = super.daphne.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' "" + ''; + }); + datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: { postPatch = '' substituteInPlace setup.py --replace "setuptools==" "setuptools>=" ''; - buildInputs = old.buildInputs ++ [ self.setuptools ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; + }); + + dcli = super.dcli.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; }); ddtrace = super.ddtrace.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ + buildInputs = (old.buildInputs or [ ]) ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ]; }); dictdiffer = super.dictdiffer.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; } ); @@ -178,8 +195,8 @@ self: super: enableParallelBuilding = true; dontUseCmakeConfigure = true; - nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; - buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ pkgs.dlib.nativeBuildInputs; + buildInputs = (old.buildInputs or [ ]) ++ pkgs.dlib.buildInputs; } ); @@ -206,7 +223,7 @@ self: super: faker = super.faker.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); @@ -223,13 +240,13 @@ self: super: fastparquet = super.fastparquet.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); grandalf = super.grandalf.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); @@ -246,8 +263,8 @@ self: super: h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; configure_flags = "--hdf5=${pkgs.hdf5}"; postConfigure = '' ${self.python.executable} setup.py configure ${configure_flags} @@ -287,7 +304,7 @@ self: super: ''; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ # Commented out packages are declared required, but not actually # needed to build. They are not yet packaged for nixpkgs. # bitshuffle @@ -347,7 +364,7 @@ self: super: jira = super.jira.overridePythonAttrs ( old: { inherit (pkgs.python3Packages.jira) patches; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytestrunner self.cryptography self.pyjwt @@ -361,6 +378,11 @@ self: super: } ); + jsonslicer = super.jsonslicer.overridePythonAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.yajl ]; + }); + jupyter = super.jupyter.overridePythonAttrs ( old: rec { # jupyter is a meta-package. Everything relevant comes from the @@ -372,7 +394,7 @@ self: super: keyring = super.keyring.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.toml ]; postPatch = '' @@ -383,7 +405,7 @@ self: super: kiwisolver = super.kiwisolver.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cppy ]; } @@ -404,7 +426,7 @@ self: super: llvmlite = super.llvmlite.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.llvm ]; # Disable static linking # https://github.com/numba/llvmlite/issues/93 @@ -433,8 +455,8 @@ self: super: lxml = super.lxml.overridePythonAttrs ( old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ]; - buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; + nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ]; + buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ]; } ); @@ -459,11 +481,11 @@ self: super: XDG_RUNTIME_DIR = "/tmp"; - buildInputs = old.buildInputs + buildInputs = (old.buildInputs or [ ]) ++ lib.optional enableGhostscript pkgs.ghostscript ++ lib.optional stdenv.isDarwin [ Cocoa ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; @@ -494,16 +516,16 @@ self: super: mccabe = super.mccabe.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); mip = super.mip.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoPatchelfHook ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoPatchelfHook ]; - buildInputs = old.buildInputs ++ [ pkgs.zlib self.cppy ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.zlib self.cppy ]; } ); @@ -519,11 +541,11 @@ self: super: excludes = [ "pyproject.toml" ]; }) ]; - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; } )) else super.molecule.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; }); mongomock = super.mongomock.overridePythonAttrs (oa: { @@ -557,19 +579,19 @@ self: super: multiaddr = super.multiaddr.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); mysqlclient = super.mysqlclient.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.libmysqlclient ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; } ); netcdf4 = super.netcdf4.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ]; @@ -613,8 +635,8 @@ self: super: }; in { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - buildInputs = old.buildInputs ++ [ blas self.cython ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ]; + buildInputs = (old.buildInputs or [ ]) ++ [ blas self.cython ]; enableParallelBuilding = true; preBuild = '' ln -s ${cfg} site.cfg @@ -628,21 +650,21 @@ self: super: openexr = super.openexr.overridePythonAttrs ( old: rec { - buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openexr pkgs.ilmbase ]; NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; } ); osqp = super.osqp.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ]; dontUseCmakeConfigure = true; } ); parsel = super.parsel.overridePythonAttrs ( old: rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.pytest-runner ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -653,7 +675,7 @@ self: super: withMysql = old.passthru.withMysql or false; in { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.sqlite ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ]; propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; @@ -662,8 +684,8 @@ self: super: pillow = super.pillow.overridePythonAttrs ( old: { - nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs; - buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; + nativeBuildInputs = [ pkgs.pkg-config ] ++ (old.nativeBuildInputs or [ ]); + buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]); } ); @@ -714,17 +736,17 @@ self: super: psycopg2 = super.psycopg2.overridePythonAttrs ( old: { - buildInputs = old.buildInputs + buildInputs = (old.buildInputs or [ ]) ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; } ); psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( old: { - buildInputs = old.buildInputs + buildInputs = (old.buildInputs or [ ]) ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; } ); @@ -751,7 +773,7 @@ self: super: in if arrowCppVersion != pyArrowVersion then throw errorMessage else { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython pkgs.pkg-config pkgs.cmake @@ -764,7 +786,7 @@ self: super: PARQUET_HOME = _arrow-cpp; inherit ARROW_HOME; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.arrow-cpp ]; @@ -783,7 +805,7 @@ self: super: ) else super.pyarrow.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ]; } @@ -799,7 +821,7 @@ self: super: ).overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.meson pkgs.ninja pkgs.pkg-config @@ -818,7 +840,7 @@ self: super: pycocotools = super.pycocotools.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython self.numpy ]; @@ -869,27 +891,27 @@ self: super: pygobject = super.pygobject.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.glib pkgs.gobject-introspection ]; } ); pylint = super.pylint.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); pyopenssl = super.pyopenssl.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; } ); python-bugzilla = super.python-bugzilla.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.docutils ]; } @@ -897,7 +919,7 @@ self: super: python-ldap = super.python-ldap.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.openldap pkgs.cyrus_sasl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openldap pkgs.cyrus_sasl ]; } ); @@ -919,7 +941,7 @@ self: super: old: { format = "other"; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config pkgs.qt5.qmake pkgs.xorg.lndir @@ -936,7 +958,7 @@ self: super: ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets ; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.dbus pkgs.qt5.qtbase pkgs.qt5.qtsvg @@ -1071,13 +1093,13 @@ self: super: ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); python-prctl = super.python-prctl.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libcap ]; } @@ -1085,7 +1107,7 @@ self: super: pyzmq = super.pyzmq.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; } ); @@ -1108,13 +1130,13 @@ self: super: pandas = super.pandas.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ]; } ); panel = super.panel.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.nodejs ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.nodejs ]; } ); @@ -1138,11 +1160,11 @@ self: super: scipy = super.scipy.overridePythonAttrs ( old: if old.format != "wheel" then { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; enableParallelBuilding = true; - buildInputs = old.buildInputs ++ [ self.numpy.blas ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.numpy.blas ]; preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES @@ -1155,14 +1177,14 @@ self: super: scikit-learn = super.scikit-learn.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gfortran pkgs.glibcLocales ] ++ lib.optionals stdenv.cc.isClang [ pkgs.llvmPackages.openmp ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ]; @@ -1172,7 +1194,7 @@ self: super: shapely = super.shapely.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos self.cython ]; inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; } ); @@ -1190,8 +1212,8 @@ self: super: tables = super.tables.overridePythonAttrs ( old: { HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.hdf5 self.numpy self.numexpr ]; } ); @@ -1220,7 +1242,7 @@ self: super: tinycss2 = super.tinycss2.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -1241,13 +1263,14 @@ self: super: # is explicitly disabled with USE_CUDA=0. find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \; ''; - buildInputs = (old.buildInputs or [ ]) + buildInputs = + (old.buildInputs or [ ]) ++ [ self.typing-extensions ] ++ lib.optionals enableCuda [ - pkgs.linuxPackages.nvidia_x11 - pkgs.nccl.dev - pkgs.nccl.out - ]; + pkgs.linuxPackages.nvidia_x11 + pkgs.nccl.dev + pkgs.nccl.out + ]; propagatedBuildInputs = [ self.numpy self.future @@ -1285,7 +1308,7 @@ self: super: vispy = super.vispy.overrideAttrs ( old: { inherit (pkgs.python3.pkgs.vispy) patches; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython self.setuptools-scm-git-archive ]; @@ -1294,7 +1317,7 @@ self: super: uvloop = super.uvloop.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ + buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices pkgs.darwin.apple_sdk.frameworks.CoreServices ]; @@ -1312,7 +1335,7 @@ self: super: weasyprint = super.weasyprint.overridePythonAttrs ( old: { inherit (pkgs.python3.pkgs.weasyprint) patches; - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -1368,19 +1391,19 @@ self: super: credis = super.credis.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.cython ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ]; } ); hashids = super.hashids.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.flit-core ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ]; } ); packaging = super.packaging.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ + buildInputs = (old.buildInputs or [ ]) ++ # From 20.5 until 20.7, packaging used flit for packaging (heh) # See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367 lib.optional (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") [ self.flit-core ]; @@ -1407,13 +1430,13 @@ self: super: # is not translated correctly to a nix dependency. tqdm = super.tqdm.overrideAttrs ( old: { - buildInputs = [ super.toml ] ++ old.buildInputs; + buildInputs = [ super.toml ] ++ (old.buildInputs or [ ]); } ); watchdog = super.watchdog.overrideAttrs ( old: { - buildInputs = old.buildInputs or [ ] + buildInputs = (old.buildInputs or [ ]) ++ pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices; } ); diff --git a/third_party/nixpkgs/pkgs/development/tools/pup/default.nix b/third_party/nixpkgs/pkgs/development/tools/pup/default.nix index 13e8c233ec..018232b3f4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pup/default.nix @@ -1,21 +1,22 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "pup"; - version = "0.4.0"; - rev = "v${version}"; + version = "unstable-2019-09-19"; - goPackagePath = "github.com/ericchiang/pup"; - - src = fetchgit { - inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0mnhw0yph5fvcnrcmj1kfbyw1a4lcg3k9f6y28kf44ihlq8h1dfz"; + src = fetchFromGitHub { + owner = "ericchiang"; + repo = "pup"; + rev = "681d7bb639334bf485476f5872c5bdab10931f9a"; + sha256 = "1hx1k0qlc1bq6gg5d4yprn4d7kvqzagg6mi5mvb39zdq6c4y17vr"; }; + vendorSha256 = null; + meta = with lib; { - description = "Streaming HTML processor/selector"; + description = "Parsing HTML at the command line"; + homepage = "https://github.com/ericchiang/pup"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yegortimoshenko SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 40e3e42d84..dc5699ed37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -20,12 +20,12 @@ in mkDerivation rec { pname = "qtcreator"; - version = "4.11.0"; + version = "4.14.0"; baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version)); src = fetchurl { url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg"; + sha256 = "07i045mzwbfhwj2jlijhz9xs6ay03qs5dgcw2kzlcr79a69i0h6j"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ @@ -54,16 +54,14 @@ mkDerivation rec { preConfigure = '' substituteInPlace src/plugins/plugins.pro \ --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' + substituteInPlace src/libs/libs.pro \ + --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' '' + optionalString withClangPlugins '' # Fix paths for llvm/clang includes directories. substituteInPlace src/shared/clang/clang_defines.pri \ --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \ --replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin' - # Fix include path to find clang and clang-c include directories. - substituteInPlace src/plugins/clangtools/clangtools.pro \ - --replace 'INCLUDEPATH += $$LLVM_INCLUDEPATH' 'INCLUDEPATH += $$LLVM_INCLUDEPATH ${clang_qt_vendor}' - # Fix paths to libclang library. substituteInPlace src/shared/clang/clang_installation.pri \ --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang}/lib' \ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index 635f36ee83..e4eb2965fd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "0rq0anz0cawrgsinqyjh8wb3dgha09wx3ydrd3m9nfxs5dd3ij3k"; + sha256 = "sha256-RrDwq5VufMDsPlqRmBP3x2RUWU740L0L18noByO1IDY="; }; - cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld"; + cargoSha256 = "sha256-W6+RGzCYJF9f44QaFDOI414/vCfKIuIOXoH+GYY0GwY="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index d40145f163..b9c2e08ba1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -1,26 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config -, darwin }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, dbus +, Security +}: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { - name = "maturin-${version}"; +rustPlatform.buildRustPackage rec { + pname = "maturin"; version = "0.9.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; + hash = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; }; - cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; + cargoHash = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gmp openssl ] - ++ lib.optional stdenv.isDarwin Security - ++ lib.optional stdenv.isLinux dbus; + buildInputs = lib.optional stdenv.isLinux dbus + ++ lib.optional stdenv.isDarwin Security; # Requires network access, fails in sandbox. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 85cf35b356..3a4bd8f812 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-02-01"; + rev = "2021-02-08"; version = "unstable-${rev}"; - sha256 = "sha256-bPv51Jp6zJRdNJehuR8LVaBw/hubSeHbI5BeMwqEn4M="; - cargoSha256 = "sha256-5g9wFQ6qlkJgSHLSLS0pad00XT7KflyGAq8/BknF9/M="; + sha256 = "sha256-Idaaw6d0lvBUyZxpHKQ94aMtgM0zb0P8QRh+3pctX4k="; + cargoSha256 = "sha256-J6Hia83biutScZt/BMO4/qXYi35/Ec9MeaHeDG8Lqmc="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/third_party/nixpkgs/pkgs/development/tools/so/default.nix b/third_party/nixpkgs/pkgs/development/tools/so/default.nix index 99f9cdcd93..cd52f319bb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/so/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/so/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "so"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "samtay"; repo = pname; rev = "v${version}"; - sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck"; + sha256 = "sha256-WAUPB4hhvroE1/8nQcgLVWgGyXcFh7qxdFg6UtQzM9A="; }; - cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; + cargoSha256 = "sha256-wt6ClN9fpEAETk3kYeQRieTXnZQe4JEnQiA8CG4ZLog="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix index 1e88cfcdcc..e8f52fa833 100644 --- a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "0lvkrfszmn594n9qkf518c38c0fwzm32y997wlf28l3hpj6yqddq"; + sha256 = "sha256-OqJceRO1RFOLgNi3SbTKLw62tSfJSO7T2/u0RTX89AM="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; - cargoSha256 = "1aiyfsvmrqcmlw0z1944i9s5g3yxc39na5mf16pb9a4bhw8zcwjr"; + cargoSha256 = "sha256-jTZso61Lyt6jprBxBAhvchgOsgM9y1qBleTxUx1jCnE="; checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ]; cargoParallelTestThreads = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix b/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix index 6ce1ad9a38..8f9acd6c14 100644 --- a/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { srcs = [ (fetchFromGitHub { - owner = "SymbiFlow"; + owner = "YosysHQ"; repo = "prjtrellis"; rev = "60c05b3f4e71fd78d4fba5c31f9974694245199e"; sha256 = "1k37mxwxv9fpm6xnrxlqqap7zqh2dvgqncphj3asi2rz0kh07ppf"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) (fetchFromGitHub { - owner = "SymbiFlow"; + owner = "YosysHQ"; repo = "prjtrellis-db"; rev = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c"; sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g"; diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 505023f3fd..22ac7a8f2c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.0.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "14cl0rgkk2kw0qyanlm57nbcrnsnnx02ikd6b1mrsviamb6r1lz6"; + sha256 = "sha256-zt12LUKcsu/t2wNunIQhrNOqOABjyfL0MkSEPOQswFM="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/wire/default.nix b/third_party/nixpkgs/pkgs/development/tools/wire/default.nix index ff6d1e7ac5..a51252f566 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wire/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wire/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wire"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "google"; repo = "wire"; rev = "v${version}"; - sha256 = "0fYXo/LnxKV/qoaP59XCyEtLLAysZm/WhRdm3RnLdvw="; + sha256 = "sha256-9xjymiyPFMKbysgZULmcBEMI26naUrLMgTA+d7Q+DA0="; }; - vendorSha256 = "ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; + vendorSha256 = "sha256-ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; subPackages = [ "cmd/wire" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix index 67c8509fd7..1080498004 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l"; + sha256 = "sha256-GXnhI8nd4ciFd22989ypqGy5pozKJm+dzg8MaDDvuZg="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix index 5085346e3e..df343f3078 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "sha256-/DKDg2lJO6PikF7+kbwRX8ClS8rflH8KdrZNx7AR36g="; + sha256 = "sha256-bZWyAZrAYG45fqmEQYXsk8YLKurpppaahOkALAQXGhY="; }; # the integration tests will try to clone a remote repos diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v10.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v10.nix index cef9cd9287..495ac311b8 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v10.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v10.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.23.2"; - sha256 = "1iyvs56x5zvvqmpr6kkamgpfj70n2rj1fh7afc7q8hj3bq7f1985"; + version = "10.23.3"; + sha256 = "13za06bz17k71gcxyrx41l2j8al1kr3j627b8m7kqrf3l7rdfnsi"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix index 7afa3bfb6b..9c5975a6e4 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.20.1"; - sha256 = "0lqq6a2byw4qmig98j45gqnl0593xdhx1dr9k7x2nnvhblrfw3p0"; + version = "12.20.2"; + sha256 = "0g3dxip7b5j7fzkw4b82ln93fphxn1zpdizbj1ikjv3hy00dc6ln"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix index 410be6a249..ee8ea72c05 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.15.4"; - sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd"; + version = "14.15.5"; + sha256 = "0nv576mlmnf8pfs6yn7vsvwyg0a0xvs7m9pm4k131zjqx501v6z1"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/games/0verkill/default.nix b/third_party/nixpkgs/pkgs/games/0verkill/default.nix new file mode 100644 index 0000000000..69a371f09d --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/0verkill/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, xorgproto +, libX11 +, libXpm +}: + +stdenv.mkDerivation rec { + pname = "0verkill"; + version = "unstable-2011-01-13"; + + src = fetchFromGitHub { + owner = "hackndev"; + repo = pname; + rev = "522f11a3e40670bbf85e0fada285141448167968"; + sha256 = "WO7PN192HhcDl6iHIbVbH7MVMi1Tl2KyQbDa9DWRO6M="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 xorgproto libXpm ]; + + configureFlags = [ "--with-x" ]; + + preAutoreconf = '' + autoupdate + ''; + + hardeningDisable = [ "all" ]; # Someday the upstream will update the code... + + meta = with lib; { + homepage = "https://github.com/hackndev/0verkill"; + description = "ASCII-ART bloody 2D action deathmatch-like game"; + license = with licenses; gpl2Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/abuse/abuse.sh b/third_party/nixpkgs/pkgs/games/abuse/abuse.sh new file mode 100644 index 0000000000..de837d2718 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/abuse/abuse.sh @@ -0,0 +1,18 @@ +#! @shell@ + +if grep datadir ~/.abuse/abuserc &>/dev/null; then + if [ ! -d "$(grep datadir ~/.abuse/abuserc | cut -d= -f2)" ]; then + echo "Warning: ~/.abuse/abuserc references a datadir which is not existent." >&2 + echo "Try removing ~/.abuse/abuserc, else abuse will most likely not run." >&2 + echo >&2 + # This can happen if the build hash of abuse changes and the older version + # is garbage-collected. The correct path of the datadir is compiled into + # the binary, but unfortunately abuse writes out the path into abuserc on + # first start. This entry may later become stale. + fi +fi + +# The timidity bundled into SDL_mixer looks in . and in several global places +# like /etc for its configuration file. +cd @out@/etc +exec @out@/bin/.abuse-bin "$@" diff --git a/third_party/nixpkgs/pkgs/games/abuse/default.nix b/third_party/nixpkgs/pkgs/games/abuse/default.nix new file mode 100644 index 0000000000..2e863022a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/abuse/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, SDL_mixer, freepats }: + +stdenv.mkDerivation rec { + pname = "abuse"; + version = "0.8"; + + src = fetchurl { + url = "http://abuse.zoy.org/raw-attachment/wiki/download/${pname}-${version}.tar.gz"; + sha256 = "0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488"; + }; + + configureFlags = [ + "--with-x" + "--with-assetdir=$(out)/orig" + # The "--enable-debug" is to work around a segfault on start, see https://bugs.archlinux.org/task/52915. + "--enable-debug" + ]; + + desktopItems = [ (makeDesktopItem { + name = "abuse"; + exec = "abuse"; + icon = "abuse"; + desktopName = "Abuse"; + comment = "Side-scroller action game that pits you against ruthless alien killers"; + categories = "Game;ActionGame;"; + }) ]; + + postInstall = '' + mkdir $out/etc + echo -e "dir ${freepats}\nsource ${freepats}/freepats.cfg" > $out/etc/timidity.cfg + + mv $out/bin/abuse $out/bin/.abuse-bin + substituteAll "${./abuse.sh}" $out/bin/abuse + chmod +x $out/bin/abuse + + install -Dm644 doc/abuse.png $out/share/pixmaps/abuse.png + ''; + + nativeBuildInputs = [ copyDesktopItems ]; + buildInputs = [ SDL SDL_mixer freepats ]; + + meta = with lib; { + description = "Side-scroller action game that pits you against ruthless alien killers"; + homepage = "http://abuse.zoy.org/"; + license = with licenses; [ unfree ]; + # Most of abuse is free (public domain, GPL2+, WTFPL), however the creator + # of its sfx and music only gave Debian permission to redistribute the + # files. Our friends from Debian thought about it some more: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648272 + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/alephone/default.nix b/third_party/nixpkgs/pkgs/games/alephone/default.nix index efd26d1c4f..6562a60a5b 100644 --- a/third_party/nixpkgs/pkgs/games/alephone/default.nix +++ b/third_party/nixpkgs/pkgs/games/alephone/default.nix @@ -96,5 +96,5 @@ in self // { license = lib.licenses.free; hydraPlatforms = [ ]; } // meta; - }); + } // extraArgs); } diff --git a/third_party/nixpkgs/pkgs/games/crawl/default.nix b/third_party/nixpkgs/pkgs/games/crawl/default.nix index 8d16b2fe59..7b644aa714 100644 --- a/third_party/nixpkgs/pkgs/games/crawl/default.nix +++ b/third_party/nixpkgs/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi"; + sha256 = "sha256-lh0lCMZRH+c6jSHjLFDU3wjy6Oyp59ZcPaqg5PWVrkk="; }; # Patch hard-coded paths and remove force library builds diff --git a/third_party/nixpkgs/pkgs/games/factorio/default.nix b/third_party/nixpkgs/pkgs/games/factorio/default.nix index 9db8a95746..356cedd350 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/default.nix +++ b/third_party/nixpkgs/pkgs/games/factorio/default.nix @@ -42,7 +42,7 @@ let releaseType=alpha version=0.17.74 - nix-prefetch-url file://$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz + nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz Note the ultimate "_" is replaced with "-" in the --name arg! ''; diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index 4208df3acd..a8f49d5995 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.19.tar.xz", + "name": "factorio_alpha_x64-1.1.21.tar.xz", "needsAuth": true, - "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r", + "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/alpha/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", + "version": "1.1.21" }, "stable": { - "name": "factorio_alpha_x64-1.1.19.tar.xz", + "name": "factorio_alpha_x64-1.1.21.tar.xz", "needsAuth": true, - "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r", + "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/alpha/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", + "version": "1.1.21" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.19.tar.xz", + "name": "factorio_demo_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr", + "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/demo/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/demo/linux64", + "version": "1.1.21" }, "stable": { - "name": "factorio_demo_x64-1.1.19.tar.xz", + "name": "factorio_demo_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr", + "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/demo/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/demo/linux64", + "version": "1.1.21" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.19.tar.xz", + "name": "factorio_headless_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks", + "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/headless/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/headless/linux64", + "version": "1.1.21" }, "stable": { - "name": "factorio_headless_x64-1.1.19.tar.xz", + "name": "factorio_headless_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks", + "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/headless/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/headless/linux64", + "version": "1.1.21" } } } diff --git a/third_party/nixpkgs/pkgs/games/freeciv/default.nix b/third_party/nixpkgs/pkgs/games/freeciv/default.nix index f9938eaca3..647a87d571 100644 --- a/third_party/nixpkgs/pkgs/games/freeciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.2.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1nra6b6sk2gciaw1fpwx7qa20hky8cwcdwlshcl1zsikg577hyg5"; + sha256 = "sha256-tRjik2LONwKFZOcIuyFDoE1fD23UnZHMdNLo0DdYyOc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/games/frozen-bubble/default.nix b/third_party/nixpkgs/pkgs/games/frozen-bubble/default.nix index 6883acb601..f9dd3fd615 100644 --- a/third_party/nixpkgs/pkgs/games/frozen-bubble/default.nix +++ b/third_party/nixpkgs/pkgs/games/frozen-bubble/default.nix @@ -1,5 +1,6 @@ -{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib }: - +{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib +, copyDesktopItems, makeDesktopItem +}: perlPackages.buildPerlModule { pname = "frozen-bubble"; version = "2.212"; @@ -10,13 +11,24 @@ perlPackages.buildPerlModule { }; patches = [ ./fix-compilation.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ copyDesktopItems pkg-config ]; buildInputs = [ glib SDL SDL_mixer SDL_Pango perlPackages.SDL perlPackages.FileSlurp ]; propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 FileShareDir FileWhich IPCSystemSimple LocaleMaketextLexicon ]; perlPreHook = "export LD=$CC"; + desktopItems = [ + (makeDesktopItem { + name = "frozen-bubble"; + exec = "frozen-bubble"; + desktopName = "Frozen Bubble"; + genericName = "Frozen Bubble"; + comment = "Arcade/reflex colour matching game"; + categories = "Game;"; + }) + ]; + meta = { description = "Puzzle with Bubbles"; license = lib.licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/games/mindustry/default.nix b/third_party/nixpkgs/pkgs/games/mindustry/default.nix index ca4dc3b9a1..6f3cdab9ab 100644 --- a/third_party/nixpkgs/pkgs/games/mindustry/default.nix +++ b/third_party/nixpkgs/pkgs/games/mindustry/default.nix @@ -29,27 +29,27 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "123.1"; + version = "124.1"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "0qpgilb0v93zcik12idwzdd5b5lw74431iywq4d55gn5i6gb6bh1"; + sha256 = "1k4k559y8l6wmj9m4980f7xmaaxzx84x86rqc77j4nd3y3x53546"; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "146wvm0dahygnq327pspr62lq29irwrhc8ylgwdwwasrvlsscdp5"; + sha256 = "08v929sgxy1pclzc00p7l7fak2h9l306447w5k5db3719kacj059"; }; soloud = fetchFromGitHub { owner = "Anuken"; repo = "soloud"; # this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39 - rev = "73860909189c9c42924eb82e9b4a0eab2a4d5e1c"; - sha256 = "1gm3r16a539hm8jbc14mfxn7v88dv40vr7nzwmpifnz54qarkg3m"; + rev = "b33dfc5178fcb2613ee68136f4a4869cadc0b06a"; + sha256 = "1vf68i3pnsixch37285ib7afkwmlrc05v783395jsdjzj9i67lj3"; }; patches = [ @@ -114,7 +114,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "18r2gd1y79cy571f5hvlablfwrlz10cf7ssc9ckkvkk92i0323gk"; + outputHash = "18yfchv55f0fza6gdxd3f6gm0m4wy2a9jkw5wgl84id518jal6la"; }; in diff --git a/third_party/nixpkgs/pkgs/games/openmw/default.nix b/third_party/nixpkgs/pkgs/games/openmw/default.nix index 23572998d0..7c8f4990a6 100644 --- a/third_party/nixpkgs/pkgs/games/openmw/default.nix +++ b/third_party/nixpkgs/pkgs/games/openmw/default.nix @@ -6,6 +6,7 @@ let src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; + # commit does not exist on any branch on the target repository rev = "1556cd7966ebc1c80b6626988d2b25fb43a744cf"; sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; }; diff --git a/third_party/nixpkgs/pkgs/games/openra/mods.nix b/third_party/nixpkgs/pkgs/games/openra/mods.nix index 4a79125dc1..cf8cd433c2 100644 --- a/third_party/nixpkgs/pkgs/games/openra/mods.nix +++ b/third_party/nixpkgs/pkgs/games/openra/mods.nix @@ -123,6 +123,7 @@ in { src = fetchFromGitHub { owner = "IceReaper"; repo = "OpenRA" ; + # commit does not exist on any branch on the target repository rev = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; sha256 = "1yyqparf93x8yzy1f46gsymgkj5jls25v2yc7ighr3f7mi3igdvq"; name = "engine"; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 4ce123c78c..e3c22ae732 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.129.0"; + version = "2021.205.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "AVx842Zq3mq59VCPdF94mcx5uOr70SmkV/tMNkNyMSY="; + sha256 = "US8auytRXqtYGGNi+vxIzxCxpetWYeUkBRjgtJkPpMs="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 9e61cb9674..b670ce0c5e 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -1,9 +1,4 @@ { fetchNuGet }: [ - (fetchNuGet { - name = "Dapper"; - version = "2.0.78"; - sha256 = "13xgi8prsa3y67hx644yflamwakjv8vsk5m15v407clsl2r4g0bp"; - }) (fetchNuGet { name = "DeltaCompressionDotNet"; version = "2.0.0.0"; @@ -16,8 +11,8 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.169"; - sha256 = "0rs9fjr65432qckmzx4djlwsnc2yqwwwnjszqwnm3z2pv8dm7zrf"; + version = "1.0.175"; + sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; @@ -286,8 +281,13 @@ }) (fetchNuGet { name = "MessagePack"; - version = "1.7.3.7"; - sha256 = "1wyxl49i9crb247q3c84gnf4985gai8qxa8x3a22rcfxzzx29mjr"; + version = "2.2.85"; + sha256 = "1y0h8bd0drnlsqf1bvrdiv9j1892zqf1rmyclfjzs49klpf0xphk"; + }) + (fetchNuGet { + name = "MessagePack.Annotations"; + version = "2.2.85"; + sha256 = "00wajml6iy3wid8mixh3jmm6dapfjbccwq95m8qciika4pyd4lq9"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; @@ -296,79 +296,69 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "3.1.10"; - sha256 = "05drcgbpzq700kvxnfxha10w3jgfp2jp0r2h4hpczjxj6cywbbi6"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "3.1.11"; - sha256 = "04f37gxcd8hpkfmz5sssgwa20hfr3y5b093bqqz7yaxcqvdn54x4"; + version = "5.0.2"; + sha256 = "0qy4wamhcpxi9aqwq9kivhsj4rvhbch2wfwv11610psygb5457vk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; - version = "3.1.10"; - sha256 = "1sni7hjpylamxaf98insalx3jj2k8skb02mhkmamxxj2488r2p9j"; + version = "5.0.2"; + sha256 = "0295a87ilrdg43sil5wli74x7jy4apibqdk1fxam8kzj99whl5sk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; - version = "3.1.10"; - sha256 = "19mddj0dpy4j6fwh8b1q7aznnckjrkpvbqiyq4sq4z7lcgw6pbq6"; + version = "5.0.2"; + sha256 = "094zjf6h5dh87kznmmz7w4s1y37rw52vaz2h4jk4i4ik7hpijd0w"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; - version = "3.1.10"; - sha256 = "1y6zf2qgph6ga59272msywdv2xrycg56wz50bjm5pivmh6wv9240"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http.Features"; - version = "3.1.11"; - sha256 = "07mv432cgr1sclvrw5ah70wajxfgqlaxgnf99vca4r9a9a1i185a"; + version = "5.0.2"; + sha256 = "1rprpj1aw9z501rpb9415maqcqnk6pirbdl8yv5n9wpqgcnjizk8"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client"; - version = "3.1.10"; - sha256 = "1s352srycksfnvz5hhi7himpg2gn39iw2gizlc3g30w6pvy8p29c"; + version = "5.0.2"; + sha256 = "18pdw4h1j93wzcvlj87jy7n5sxkwlj69nnb7a2qxkc40jvm18ran"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client.Core"; - version = "3.1.10"; - sha256 = "1289624ilk45ca8rkyvirqdjsg9jsnqn8dzbjr6f83641fi73s69"; + version = "5.0.2"; + sha256 = "1rg3cpqr3yx5hn233c6cmmiry5v49fglfii7ryi1cf6rwqpdqn5l"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; - version = "3.1.10"; - sha256 = "0c6lim7my3alq43xxqkgykba068hjlzdcif6c956irailijc0smw"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Common"; - version = "3.1.11"; - sha256 = "0za69spf44df7xl0s82bk4spi80yjqxqncgfs5aqa15rjncg3d6l"; + version = "5.0.2"; + sha256 = "1sbwp00hq0ng891wdj6yhah8hr9hw34zvqr1xzs86g3gpmssgcj5"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; - version = "3.1.10"; - sha256 = "0qzdpblmgqm3bl5wr14igkqp35zwx4wdkwlh55xm4v3hzhq6l46m"; + version = "5.0.2"; + sha256 = "0p9kv2iayhz8y68r30mhzssv0m087v243ai7aax7jd44rqiv1w5i"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; - version = "3.1.11"; - sha256 = "15l2l5gmiwn90hl8d1w2lx2x5scx69rr7kph8liigs8vm3q95qx9"; + version = "5.0.2"; + sha256 = "1f0mjw0swiaxk4iqf7n598d51w40lwdbap4nlc0sv0vw3nklnlzp"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; - version = "3.1.10"; - sha256 = "114zrd732c452x3dy26ll7vhbsqkk9pdrb5f2jqn8nkhf2xg2bda"; + version = "5.0.2"; + sha256 = "01wi2q5sjazvax8d4gbcggsr7n801m4cx6jcqljv0r4cmz4y478a"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.0"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + version = "1.0.0"; + sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "5.0.0"; + sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; + }) (fetchNuGet { name = "Microsoft.Build.Framework"; version = "15.3.409"; @@ -509,31 +499,16 @@ version = "2.2.0"; sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.10"; - sha256 = "04xjhi2pmvycx4yam7i3j2l2yjzzbzvxn4i12f00r39j4kkfwqsn"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.10"; - sha256 = "1pj4n3c015ils13fwky2rfv5q8xza671ixb54vr479pc7an2fah3"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.10"; - sha256 = "004f9nshm5jg0g4n9f48phjx90pzmj88qbqyiimzgvwl0qkk870q"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; @@ -541,8 +516,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.10"; - sha256 = "0if1g8gj3ngvqf4ddkjhz30p4y2yax8m5vlbrjzgixq80g3apy6d"; + version = "5.0.1"; + sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; @@ -551,13 +526,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.10"; - sha256 = "0c9p32jd8fi5k02nbp7ilj0jmnl63kq2464acpsb6ajs4837c02q"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.11"; - sha256 = "097myz6cynk0y5xgashj9mkcliamdsljazg2hh3w407d197wzh6a"; + version = "5.0.0"; + sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; @@ -571,8 +541,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; - version = "3.1.10"; - sha256 = "1lf1hgpk0d5g9mv68f9b2cp6jhpnc4a6bflc1f2mn9x4dvmpv2wi"; + version = "5.0.0"; + sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; @@ -581,8 +551,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.10"; - sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; + version = "5.0.0"; + sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; @@ -596,13 +566,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Options"; - version = "3.1.10"; - sha256 = "0kmh12w0y4bf2jnmbbxk10mqnynjqa5qks5pa0zg4vsnfscj8i95"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "3.1.11"; - sha256 = "1k78gc5mwcixjc99h7hvx1qal6i5y67lrciwqqzdl1xk7rl6pjw4"; + version = "5.0.0"; + sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; @@ -611,13 +576,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; - version = "3.1.10"; - sha256 = "0a3f35427hpai0wq1wlqpn4m5aacfddkq25hp71nwlz5zm1dqfmk"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "3.1.11"; - sha256 = "1iy52c74jiki0i557qkjciywj7s6nnvbqx22i6p464fm925kwm4q"; + version = "5.0.0"; + sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.NetCore.Analyzers"; @@ -644,11 +604,6 @@ version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.1"; - sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; - }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; @@ -906,18 +861,8 @@ }) (fetchNuGet { name = "Sentry"; - version = "2.1.8"; - sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn"; - }) - (fetchNuGet { - name = "Sentry.PlatformAbstractions"; - version = "1.1.1"; - sha256 = "10mxyxmyjpr0y1ik2j55pp7ifn101sw319cbpf28i2xbfp0cvcaj"; - }) - (fetchNuGet { - name = "Sentry.Protocol"; - version = "2.1.8"; - sha256 = "04baw4yxc5lbcl83sfcdyjg5225719bf3sxpa3kjmhf58bjr143l"; + version = "3.0.1"; + sha256 = "1nmqwprp2xv9d8llfncyw94nfws9nwb7zj0sqrd6lv1mfgaxraql"; }) (fetchNuGet { name = "SharpCompress"; @@ -926,8 +871,8 @@ }) (fetchNuGet { name = "SharpCompress"; - version = "0.26.0"; - sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; + version = "0.27.1"; + sha256 = "1lhljszs94i1ssl831ik1a51n2pshf27nsjm78acnw1y1qnkm5pd"; }) (fetchNuGet { name = "SharpFNT"; @@ -1119,6 +1064,11 @@ version = "4.5.0"; sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "5.0.0"; + sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; + }) (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; @@ -1236,13 +1186,8 @@ }) (fetchNuGet { name = "System.IO.Pipelines"; - version = "4.7.3"; - sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; - }) - (fetchNuGet { - name = "System.IO.Pipelines"; - version = "4.7.4"; - sha256 = "09gv2nz35vmmcjrfj1ppxx32v772i0mb369v7lwqr8mz14zhh86r"; + version = "5.0.1"; + sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) (fetchNuGet { name = "System.Linq"; @@ -1274,11 +1219,6 @@ version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.2"; - sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld"; - }) (fetchNuGet { name = "System.Memory"; version = "4.5.3"; @@ -1359,6 +1299,11 @@ version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.6.0"; + sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; + }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; @@ -1381,8 +1326,8 @@ }) (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; - version = "4.7.0"; - sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; + version = "4.6.0"; + sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) (fetchNuGet { name = "System.Reflection.Extensions"; @@ -1464,6 +1409,11 @@ version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0"; + sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; + }) (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; @@ -1519,11 +1469,6 @@ version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.3.0"; - sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; - }) (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; @@ -1636,8 +1581,8 @@ }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; - version = "4.7.1"; - sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; + version = "5.0.0"; + sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; @@ -1651,13 +1596,18 @@ }) (fetchNuGet { name = "System.Text.Encodings.Web"; - version = "4.7.1"; - sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb"; + version = "5.0.0"; + sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; }) (fetchNuGet { name = "System.Text.Json"; - version = "4.7.2"; - sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + version = "5.0.0"; + sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "5.0.1"; + sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3"; }) (fetchNuGet { name = "System.Text.RegularExpressions"; @@ -1681,8 +1631,8 @@ }) (fetchNuGet { name = "System.Threading.Channels"; - version = "4.7.1"; - sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; + version = "5.0.0"; + sha256 = "11z28x3cawry60l5phkqrvavm0mshz84n4c79hrz0p65lq8jpxgs"; }) (fetchNuGet { name = "System.Threading.Tasks"; @@ -1704,6 +1654,11 @@ version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.4"; @@ -1724,11 +1679,6 @@ version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { - name = "System.ValueTuple"; - version = "4.3.0"; - sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; - }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; diff --git a/third_party/nixpkgs/pkgs/games/performous/default.nix b/third_party/nixpkgs/pkgs/games/performous/default.nix index b0fc948362..dce771faec 100644 --- a/third_party/nixpkgs/pkgs/games/performous/default.nix +++ b/third_party/nixpkgs/pkgs/games/performous/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext , glibmm, libxmlxx, pango, librsvg -, SDL2, glew, boost, libav, portaudio, epoxy +, SDL2, glew, boost, ffmpeg, portaudio, epoxy }: stdenv.mkDerivation rec { @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { buildInputs = [ glibmm libxmlxx pango librsvg - SDL2 glew boost libav portaudio epoxy + SDL2 glew boost ffmpeg portaudio epoxy ]; } diff --git a/third_party/nixpkgs/pkgs/games/pioneer/default.nix b/third_party/nixpkgs/pkgs/games/pioneer/default.nix index 0d348e3fa9..51eda72bde 100644 --- a/third_party/nixpkgs/pkgs/games/pioneer/default.nix +++ b/third_party/nixpkgs/pkgs/games/pioneer/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pioneer"; - version = "20200203"; + version = "20210203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8"; + sha256 = "sha256-51HXbX15uB1Xf9Re7Qi41BnJ9OW+GeXQhylJ+HwP0f8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/games/snipes/default.nix b/third_party/nixpkgs/pkgs/games/snipes/default.nix index 66188ba0ef..01b24ee434 100644 --- a/third_party/nixpkgs/pkgs/games/snipes/default.nix +++ b/third_party/nixpkgs/pkgs/games/snipes/default.nix @@ -13,13 +13,15 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "Davidebyzero"; repo = "Snipes"; - rev = "343e14104b7848eb1f882401888e685b7918ef9f"; - sha256 = "1rl70d5miak34warbwfv27z11vln4lvf7maqqc78z0gdc5zivdv2"; + rev = "594af45108e07aa4159c3babc9b5e53609c3fd6e"; + sha256 = "0gmh38swm74jmljy0bq27ipqzb4h8y9rzwc1j6harbd9qqz5knac"; }; postPatch = '' substitute config-sample.h config.h \ --replace SnipesConsole.ttf $out/share/snipes/SnipesConsole.ttf + substituteInPlace GNUmakefile \ + --replace 'CFLAGS=-Werror -Wall' 'CFLAGS=-Wall' ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 57326667cb..924714d802 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -171,7 +171,7 @@ in buildFHSUserEnv rec { SDL2 libusb1 dbus-glib - libav + ffmpeg atk # Only libraries are needed from those two libudev0-shim diff --git a/third_party/nixpkgs/pkgs/games/stockfish/default.nix b/third_party/nixpkgs/pkgs/games/stockfish/default.nix index 075db08a5c..71c482fe76 100644 --- a/third_party/nixpkgs/pkgs/games/stockfish/default.nix +++ b/third_party/nixpkgs/pkgs/games/stockfish/default.nix @@ -1,15 +1,22 @@ { lib, stdenv, fetchurl }: -let arch = if stdenv.isx86_64 then "x86-64" else +with lib; + +let + # The x86-64-modern may need to be refined further in the future + # but stdenv.hostPlatform CPU flags do not currently work on Darwin + # https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745 + archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "x86-64"; + arch = if stdenv.isDarwin then archDarwin else + if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else "unknown"; - version = "12"; nnueFile = "nn-82215d0fd0df.nnue"; nnue = fetchurl { name = nnueFile; - url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; + url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2"; }; in @@ -23,18 +30,24 @@ stdenv.mkDerivation { sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i"; }; + # This addresses a linker issue with Darwin + # https://github.com/NixOS/nixpkgs/issues/19098 + preBuild = optionalString stdenv.isDarwin '' + sed -i.orig '/^\#\#\# 3.*Link Time Optimization/,/^\#\#\# 3/d' Makefile + ''; + postUnpack = '' sourceRoot+=/src echo ${nnue} cp "${nnue}" "$sourceRoot/${nnueFile}" ''; - makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ]; + makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" "CXX=${stdenv.cc.targetPrefix}c++" ]; buildFlags = [ "build" ]; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://stockfishchess.org/"; description = "Strong open source chess engine"; longDescription = '' @@ -42,7 +55,7 @@ stdenv.mkDerivation { much stronger than the best human chess grandmasters. ''; maintainers = with maintainers; [ luispedro peti ]; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix b/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix index 1729e2fc28..961842e870 100644 --- a/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix +++ b/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix @@ -1,15 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkg-config, makeWrapper -, SDL2, glew, openal, libvorbis, libogg, curl, freetype, bluez, libjpeg, libpng, enet, harfbuzz -, mcpp, wiiuse, angelscript +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, fetchsvn +, cmake +, pkg-config +, makeWrapper +, SDL2 +, glew +, openal +, libvorbis +, libogg +, curl +, freetype +, bluez +, libjpeg +, libpng +, enet +, harfbuzz +, mcpp +, wiiuse +, angelscript }: - let dir = "stk-code"; assets = fetchsvn { - url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "18218"; + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "18218"; sha256 = "11iv3cqzvbjg33zz5i5gkl2syn6mlw9wqv0jc7h36vjnjqjv17xw"; - name = "stk-assets"; + name = "stk-assets"; }; # List of bundled libraries in stk-code/lib to keep @@ -36,19 +55,28 @@ let # Not packaged to this date "sheenbidi" ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "supertuxkart"; version = "1.2"; src = fetchFromGitHub { - owner = "supertuxkart"; - repo = "stk-code"; - rev = version; + owner = "supertuxkart"; + repo = "stk-code"; + rev = version; sha256 = "1f98whk0v45jgwcsbdsb1qfambvrnbbgwq0w28kjz4278hinwzq6"; - name = dir; + name = dir; }; + patches = [ + (fetchpatch { + # Fix build with SDL 2.0.14 + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch?id=288360dc7ce2f968a2f12099edeace3f3ed1a705"; + sha256 = "1jgab9393qan8qbqf5bf8cgw4mynlr5a6pggqhybzsmaczgnns3n"; + }) + ]; + # Deletes all bundled libs in stk-code/lib except those # That couldn't be replaced with system packages postPatch = '' @@ -58,12 +86,25 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ - SDL2 glew openal libvorbis libogg freetype curl bluez libjpeg libpng enet harfbuzz - mcpp wiiuse angelscript + SDL2 + glew + openal + libvorbis + libogg + freetype + curl + bluez + libjpeg + libpng + enet + harfbuzz + mcpp + wiiuse + angelscript ]; cmakeFlags = [ - "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs + "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 "-DCHECK_ASSETS=OFF" "-DUSE_SYSTEM_WIIUSE=ON" diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index 917cf328e7..0f04ebfe4d 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.12.8"; + version = "3.12.13-patch1"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "178lasa6ahwg2s2hamm13yysg42qm13v6a9pgs6nm66np93nskc7"; + sha256 = "sha256-OwS1rn5mfU6cA6pvpp7Q407Kw2wBGvpqWmqlajgHtCI="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/vitetris/default.nix b/third_party/nixpkgs/pkgs/games/vitetris/default.nix index 2b9c77cd46..99996ca5c3 100644 --- a/third_party/nixpkgs/pkgs/games/vitetris/default.nix +++ b/third_party/nixpkgs/pkgs/games/vitetris/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vitetris"; - version = "0.58.0"; + version = "0.59.1"; src = fetchFromGitHub { owner = "vicgeralds"; repo = "vitetris"; rev = "v${version}"; - sha256 = "1fvw9yqg1q25x6dlfi4bl3hrrcdgl6wwq29j89aycxwdfxrxs09w"; + sha256 = "sha256-Rbfa2hD67RGmInfWwYD4SthL8lm5bGSBi3oudV5hAao="; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/games/widelands/default.nix b/third_party/nixpkgs/pkgs/games/widelands/default.nix index ba7ce241b8..8b96dcc04e 100644 --- a/third_party/nixpkgs/pkgs/games/widelands/default.nix +++ b/third_party/nixpkgs/pkgs/games/widelands/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "widelands"; - version = "20"; + version = "21"; meta = with lib; { description = "RTS with multiple-goods economy"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}.tar.bz2"; - sha256 = "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q"; + url = "https://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}-source.tar.gz"; + sha256 = "sha256-YB4OTG+Rs/sOzizRuD7PsCNEobkZT7tw7z9w4GmU41c="; }; preConfigure = '' @@ -45,12 +45,8 @@ stdenv.mkDerivation rec { SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf ]; - prePatch = '' - substituteInPlace ./debian/org.widelands.widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/" - ''; - postInstall = '' mkdir -p "$out/share/applications/" - cp -v "../debian/org.widelands.widelands.desktop" "$out/share/applications/" + cp -v "../xdg/org.widelands.Widelands.desktop" "$out/share/applications/" ''; } diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix deleted file mode 100644 index 6503571eb6..0000000000 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, python2, python2Packages, file, makeWrapper, cups }: - -# Setup instructions can be found at https://github.com/simoncadman/CUPS-Cloud-Print#configuration -# So the nix version is something like: -# nix run nixpkgs.cups-googlecloudprint -c sudo setupcloudprint -# nix run nixpkgs.cups-googlecloudprint -c sudo listcloudprinters - -let pythonEnv = python2.buildEnv.override { - extraLibs = with python2Packages; [ - six - httplib2 - pycups - ]; -}; - -in stdenv.mkDerivation rec { - pname = "cups-googlecloudprint"; - version = "20160502"; - - src = fetchFromGitHub { - owner = "simoncadman"; - repo = "CUPS-Cloud-Print"; - rev = version; - sha256 = "0760i12w7jrhq7fsgyz3yqla5cvpjb45n6m2jz96wsy3p3xf6dzz"; - }; - - buildInputs = [ cups makeWrapper ]; - - cupsgroup = "nonexistantgroup"; - NOPERMS = 1; - - postConfigure = '' - substituteInPlace Makefile --replace "${cups}" "$out" - ''; - - postInstall = '' - pushd "$out" - for s in lib/cups/backend/gcp lib/cups/driver/cupscloudprint - do - echo "Wrapping $s..." - wrapProgram "$out/$s" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups" - done - - mkdir bin - - for s in share/cloudprint-cups/*.py - do - if [ -x "$s" ] # Only wrapping those Python scripts marked as executable - then - o="bin/$(echo $s | sed 's,share/cloudprint-cups/\(.*\).py,\1,')" - echo "Wrapping $o -> $s..." - makeWrapper "$out/$s" "$o" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups" - fi - done - popd - ''; - - meta = with lib; { - description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print"; - homepage = "http://ccp.niftiestsoftware.com"; - platforms = platforms.linux; - license = licenses.gpl3; - }; -} diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index f0289c2227..04cf6c3d96 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.24"; + version = "1.1.25"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" - "https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm" + "https://web.archive.org/web/20210212220538if_/https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm" ]; - sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co="; + sha256 = "sha256-8hgafO/1qOTVdfAdx7FpOOSLqfTl0sBFunuN/2q7KHw="; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix index 9112293db5..c2d73d3e7f 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix @@ -4,7 +4,7 @@ , pkg-config , cmake , bluez -, ffmpeg_3 +, ffmpeg , libao , gtk2 , glib @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez - ffmpeg_3 + ffmpeg libao libGLU libGL diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index 4a1fca0e7c..cec004e246 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake -, wrapQtAppsHook, qtbase, bluez, ffmpeg_3, libao, libGLU, libGL, pcre, gettext +, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ - curl ffmpeg_3 libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio + curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix index 87dacd46d5..a50bc3eb3e 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix @@ -16,14 +16,14 @@ mkDerivation rec { pname = "ppsspp"; - version = "1.10.3"; + version = "1.11"; src = fetchFromGitHub { owner = "hrydgard"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-W41Poq5S+opkasIGYo13SQZWQF1HjfFnH7u9DW5HNA0="; + sha256 = "19948jzqpclf8zfzp3k7s580xfjgqcyfwlcp7x7xj8h8lyypzymx"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix index c1b60ad63b..7d0ba259dc 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix @@ -925,8 +925,8 @@ in with lib.licenses; src = fetchFromGitHub { owner = "snes9xgit"; repo = core; - rev = "6db918cfe32b157239da44096091c212fdfb3b60"; - sha256 = "0y3jhy50qdhhfglybys9m0fgk9r24ksdcgv5iqpyxy5a4cjvhv8j"; + rev = "bd9246ddd75a5e9f78d6189c8c57754d843630f7"; + sha256 = "10fm7ah3aha9lf4k9hgw0dlhdvshzpig2d0ylcb12gf9zz0i22ns"; }; description = "Port of SNES9x git to libretro"; license = "Non-commercial"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path-stable.patch b/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path-stable.patch deleted file mode 100644 index da01a47781..0000000000 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path-stable.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c -index f795181..fb4926a 100644 ---- a/dlls/crypt32/rootstore.c -+++ b/dlls/crypt32/rootstore.c -@@ -18,6 +18,7 @@ - #include "config.h" - #include - #include -+#include /* getenv */ - #include - #ifdef HAVE_SYS_STAT_H - #include -@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) - - for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) - ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); -+ -+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); -+ if (nix_cert_file != NULL) -+ ret = import_certs_from_path(nix_cert_file, from, TRUE); -+ - check_and_store_certs(from, store); - } - CertCloseStore(from, 0); diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 3a5abe18d7..15e2f80aa4 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "5.0.3"; - url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8="; + version = "6.0"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-tJMGXy+D7kKcYuLsWGmKPPY+94ci4bIHZYIxUuhYLFY="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -38,15 +38,15 @@ in rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE - ./cert-path-stable.patch + ./cert-path.patch ]; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.0-rc4"; - url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU="; + version = "6.1"; + url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; + sha256 = "sha256-qSwkMIxIuFG13CKh01aWpXMRxEezHsn6VD7FsKpzoUk="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c="; + sha256 = "sha256-uu6wvWT54Zvp86KfUcKepGxjQ6JHRQ7Yuu4yeROdHeo="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/misc/lightspark/default.nix b/third_party/nixpkgs/pkgs/misc/lightspark/default.nix index fae02cdbcd..c45240982a 100644 --- a/third_party/nixpkgs/pkgs/misc/lightspark/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lightspark/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lightspark"; - version = "0.8.2"; + version = "0.8.4.1"; src = fetchFromGitHub { owner = "lightspark"; repo = "lightspark"; rev = version; - sha256 = "04wn6d6gmpf848x0yghw26m9syv0hm6q5dwqiw3fxhs155jjqfgv"; + sha256 = "sha256-pIiv5wEDLvTHjlYSicXUTTI6pVAsO6FC39Gie9Z/hZ4="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index ea68e147ba..74d9e3cffe 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, ffmpeg, lua5_1, curl , libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL , glee }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - wxGTK30 libav lua5_1 curl libpng xorg.libXrender + wxGTK30 ffmpeg lua5_1 curl libpng xorg.libXrender flam3 libgtop boost tinyxml freeglut libGLU libGL glee ]; diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 0d3a954b9b..ef20bbaf66 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -129,12 +129,12 @@ in rec { dracula = mkDerivation rec { pluginName = "dracula"; - version = "unstable-2020-12-28"; + version = "unstable-2021-02-09"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; - rev = "6757a5329948f00addd66b02ea94f61dd94456f5"; - sha256 = "0wwwzg3bwcrbr2nmf84prz7k4i79yq0960vs6zjp0x8nqn2fvziy"; + rev = "d1678a5834679d98ffac1dd7a0eaecff7868ab8e"; + sha256 = "rdy5NFkh5Yl2YOTnuMKZQGRqVb2Pk8Bpq3nbJp2rCtE="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index b491f01d09..c4448194a9 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-02-02"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "9b5c09047361f3ec2cf18afbb6d1e03047a59778"; - sha256 = "0bdqr1k3cllgqclshxsmcd16ba63bw0ig3sqj46an3mgpvd6v4xd"; + rev = "8cb9f5ef515f73eb3cf3188cc20ff57a51d9217b"; + sha256 = "1ml2j5l91n1zwp7zxdg2cny48bbj1gw0dfa223bf5iq472c1ggk2"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-01-28"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "16d201f8a789a5591ae980ac707a31241062ed52"; - sha256 = "18fbqqjb0cn89wkm4dfhwh3xzpf6gdnav78lrs59kzfggppkpn8l"; + rev = "4fbb34ccc09354ec09033719133c32d531111934"; + sha256 = "0blpw88d0b7arxnz18glppwwgs0gynq0l7yd2a2jm45wqvlfh8ld"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -207,6 +207,18 @@ let meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; + auto-session = buildVimPluginFrom2Nix { + pname = "auto-session"; + version = "2021-02-05"; + src = fetchFromGitHub { + owner = "rmagatti"; + repo = "auto-session"; + rev = "691155697a809af8797c1b935aa4e73187516d42"; + sha256 = "199rcp3wcqg40a6lsrk83lv2kxgmnbapd5zw16jcxg4svy30dhfg"; + }; + meta.homepage = "https://github.com/rmagatti/auto-session/"; + }; + autoload_cscope-vim = buildVimPluginFrom2Nix { pname = "autoload_cscope-vim"; version = "2011-01-28"; @@ -377,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-02-05"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "c592de172d6e9ed36c8ca38814b3bb2a8ffde901"; - sha256 = "1hs38ri6j6bfnl5ll8jcd3wcpv95h1rf19vd42x3h0i4npxba9hz"; + rev = "e3e679e077708ee8a4de6bdcdf4135ac1f1ebd9c"; + sha256 = "0i7wznlvamybbrz0qjvynkzk6alcxa327nrlw95la6qbw67vkbsl"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -473,12 +485,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-02-02"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "16fcaba5e3ee67b4149bf4ce6bd0c76991e982c2"; - sha256 = "0r23i855f01c3isfhv4j5r34xj777ffyqn420m44077dyr7r3m9k"; + rev = "8c839426885e290ff5f63d87778f6325339ecf1f"; + sha256 = "03ssv8b5pq44dnj9iplpc76js5mpwg0l77wg4zal5gx0ashgm39p"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -497,12 +509,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-02-03"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "14f4162f20e0d1dc7344e0620ffd11f3c811d4b2"; - sha256 = "01xqvksvs61vg8sc6wpiilp833g61sza455297vg0im0cz7i8wpc"; + rev = "9fd7f97b9696e53066a8e62f528f26b6bc1858b0"; + sha256 = "0lnkz1janblic4a15lr9fm6r62691wpgggdq8hyc5dz0m32jr0hn"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -604,6 +616,18 @@ let meta.homepage = "https://github.com/rhysd/committia.vim/"; }; + compe-tabnine = buildVimPluginFrom2Nix { + pname = "compe-tabnine"; + version = "2021-02-12"; + src = fetchFromGitHub { + owner = "tzachar"; + repo = "compe-tabnine"; + rev = "ea3e34dcbe09563c986bc60ec7d3c0db18ce9690"; + sha256 = "1gsi5ybkqxqv1q3yj2qdv5j2lhkwiabr3mrcj60ah5rb1qjvlmib"; + }; + meta.homepage = "https://github.com/tzachar/compe-tabnine/"; + }; + completion-buffers = buildVimPluginFrom2Nix { pname = "completion-buffers"; version = "2021-01-17"; @@ -666,12 +690,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-01-28"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0aa1e8f78e8e0746a6026260f4d9a64a0bdfbf7a"; - sha256 = "163hgvc64bjc18kf6biwy5slhkfg8rw7pvrjsq4kfmcszvkbhgap"; + rev = "88e7865b97737809d963b81b10737c41e90b4377"; + sha256 = "075rm1s1y1cklnsqf7845s3knfwyiqs1wd82d9rvbvc3gs12xlpf"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -702,12 +726,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-01-26"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "c4d5c58771dd854671bd26b94693ecc1ffa21e39"; - sha256 = "1r66h030f1952cl1bgynwb3r80zjh5imxwm87gnyjk6rg9kpjqnd"; + rev = "f1deefb084b28197eaf988bbebff70dd86a99e03"; + sha256 = "1461h9qlfvvcvig4zrbylm4j11xkxmbnha1nk5829xm50pjkmca2"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -846,12 +870,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-02-02"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "fe855a14eaf4ede5c040704770202fe954addbda"; - sha256 = "1f7gg77q8h227kbbf73d697v1x8w42szfckxmyskwb5wrvsxinpc"; + rev = "4d2353619262fe487a052288859f3eea64cd229c"; + sha256 = "1nxh1pqrnvzdw02fb8bncb8gswfr3p2n1h8yfnfjlljqiapkvhdq"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -894,24 +918,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-02-05"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "c56b0a7c0ff040f1de7e0bb48d76af56b4a4d2c1"; - sha256 = "1yg3qawbfpi7jjl8bkl8yif245c03lz3vm52w2z7c970n3y6v2pm"; + rev = "2ea80dfe51974a21a7ec695c23fe86be3a8b10ac"; + sha256 = "0ilqw2jfrjq1h0camgqzf3h0p78gz5k4v8sgsixfbijv0syim2y0"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-01-27"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "0c6e1653f0d0a904efa8da01e470ffe0bd1bf594"; - sha256 = "1jfwzvblcfx7yx0lhwps0smgsblrc0azncv1bzliyx27in3gn59s"; + rev = "907cf91cc491348bf383f3eb447c1be2a9330cb4"; + sha256 = "1xsri4chlzfr0zc93wl96fpy381maygc3dlvy58nz2yswdr0g103"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1040,12 +1064,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-12-26"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "760eb2f647a518144ca1dc1091cc449c0dbee71e"; - sha256 = "0dcq79xqfb5qnjinwni0bi3vn2sfsri8wmc75wgvw2114vyf2k9a"; + rev = "e526dbecda137e37c45492ce72fa92ea32314154"; + sha256 = "03dwis03zx88j4dan1y39b03rvf7f2q7hykhgqsfcx1zj8lp8s7n"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1112,12 +1136,12 @@ let deoplete-vim-lsp = buildVimPluginFrom2Nix { pname = "deoplete-vim-lsp"; - version = "2021-02-04"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = "deoplete-vim-lsp"; - rev = "4e369aee9c443f31b3974c945f807ad93d27cb5c"; - sha256 = "14vfa6zvxprrrdi82dwnayhr2wxmifd7h5w8cl0hfw5zyrs5qsr0"; + rev = "fd80985bfd9f140c8e38b303ab325ec86c05b976"; + sha256 = "1h9xprfqrfnfs50hgiah0c2y9lafhc2lldvmc7cl8xa5p9bslxj3"; }; meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; }; @@ -1136,12 +1160,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-01-25"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "2e3f5b5c24152d9aa4a0299ce6d1b7a6b76327eb"; - sha256 = "0yf35ak46pnknas6isvi4gpyc9n757a46kjvwwyh32pznfqpl41p"; + rev = "27af4ab2de157f80c8a8391aebb60061318814ea"; + sha256 = "12gjf3pcds7ms568pxmwrlnfijrm18h3pnb1x1a1gmf7bwj7xyfc"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1354,12 +1378,12 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-01-31"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "fa8a10607a39f41a16071561901b963836cd8706"; - sha256 = "0cg0ri14jmgx063j950m5kfvsy81qwzvxibar8fq9bkpk63xrip3"; + rev = "b71eaccd050f4f6422cf09594cd69067cacadd4c"; + sha256 = "0c8j6qd0aaa6cva1ca36rdybrv7zrvxip2k9w44f37gakrzgmh50"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1487,12 +1511,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-02-04"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "ee34f7fed7e2c8801a8c1a9101ab9392bc4e70a2"; - sha256 = "0lc94z24bpvfkyip76s4yprhfgprqhzviywhp2ds2dlm7xr6bwj5"; + rev = "e30c355aaf6d2ca9aaa3a246eb87c7ceb4c42855"; + sha256 = "09w6gvy9hg0cgrs6661g8kfyjd4waz0ajx983p5jqr6l9a96111k"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1511,24 +1535,24 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2020-12-16"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "4cc031a5d3384ee9cc3225ff038a633be6b7125f"; - sha256 = "0pdska6qkk734hplhyp2cw89xn2c897vgw72fgn2239pqryz5g4n"; + rev = "762f31ff620eb822ae4ca43c5dc2a62ca621f5fe"; + sha256 = "035nj257r2nkwriqq5l4qjn5z1a04l39k4i9s1yz0mgv902kmics"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-01-31"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "3f4a7cc9f50a179158cd8a9ea10ba56cae73514b"; - sha256 = "1afgq5kj98qhgsvpf556zs478s3776i0kjq3zr6zwxr36dp8455n"; + rev = "298c69898c11c2da574a6d2c32e195b0adc6f356"; + sha256 = "1999c3x2bpif0ppv1i452fcklgmjdxrvj510sy7dv8aym93vpmax"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1547,12 +1571,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-02-02"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "1a67c3426541c88e570096b1e6dc954eac0047fd"; - sha256 = "03gyic6qf59sl166sp9pw2rg73fxhghkm4cpfyyssm7npvlgckni"; + rev = "ae0c39167c83507c6c257cd13268c98b8066cb50"; + sha256 = "1xggg0h7phjjdjpzp884z7xqniyk3ca4yjc86lyh9vhbww87xa9c"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1571,12 +1595,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-02-02"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "fe58abc2d82328d489ac1678d2ac99c4ad94321e"; - sha256 = "03sm5a9pis0m2qbqzl6x6zf6limr0pbzcxmdf7hk83q8zg2y91wb"; + rev = "317750d66a572588eef9a23fefce4aff1cbcad94"; + sha256 = "0nc52f0hkb701scvnas6my9i92ys1i9c5y9h4h42yk00ph83k2k1"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2112,12 +2136,12 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2021-02-04"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "018f28d495f58ba99c952df75926481e1b5667f4"; - sha256 = "058f3rjdwfl8p63l5bf7csixl0714dy2dbrbzwig8if4bxn3dkp9"; + rev = "3223bccf0ee4168aae6753a5cf0c0aa32a60c586"; + sha256 = "1qka3hqm2376wz5pbr8x2c3rqycv392lv34spkqayq0d0fs4sqq0"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -2208,12 +2232,12 @@ let lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; - version = "2021-01-05"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "5215ea78a5949b42b86bf474d33608de6b7594a3"; - sha256 = "05h8n0ggi55g4ri9jsa4210knds0rxp8ym2knlq3njy40q0jjaxd"; + rev = "187c492c492f8b57c1a66b82904785141b01d5ac"; + sha256 = "0i8j37i2lkrsjlya9g5i8wr3gjlfkb9g9sqzq6a0132s6rpqdhmz"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; @@ -2230,26 +2254,38 @@ let meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; + lspkind-nvim = buildVimPluginFrom2Nix { + pname = "lspkind-nvim"; + version = "2021-02-06"; + src = fetchFromGitHub { + owner = "onsails"; + repo = "lspkind-nvim"; + rev = "953ca895203c095e13f97a8ece790bf546c82d1c"; + sha256 = "15rfzcmfwig7x8pbgc1maimqkqwqr4dbpf7498a0s16vng673bgk"; + }; + meta.homepage = "https://github.com/onsails/lspkind-nvim/"; + }; + lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-02-05"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "f50c266b285aec9a2645f9f48f55db2de0ccef94"; - sha256 = "149jwbwhzxvh6mvbkbhkkwh3y5gzfh2r2jc3p00y2arhxsx478fa"; + rev = "284b357137c3c57ff3716e07c865477788ab8e6d"; + sha256 = "1n737lqnkgvyjxnmxfg6hmbnjgdx0qyrqql0fxb85m1n06gsm2n7"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-02-05"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "66ab809e0ecdf38cc5eaaab56a3f3d2f1369e1ac"; - sha256 = "0lcvxlxlr0inl93k5kvpphmacg6iprx9ym5jivmqnkvqsfzzv860"; + rev = "8a4baa804b7b2906eb8b9c325546dceabffdfcfd"; + sha256 = "1fq5aa4yg5r1dr2g18xnywg7pyid6s9vzm71zy3anmdp4g24amgx"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2316,12 +2352,12 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-01-04"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "3e9ba8aae59441ed82b50b186f608e03aecb4f0e"; - sha256 = "1z264hr0vbsdc0ffaiflzq952xv4h1g55i08dnlifvpizhqbalv6"; + rev = "05a9ef7981ff6438e3de5e30323474092badccb8"; + sha256 = "1nr40222fcf1zfacwn2qdzzr074kvcp0p50ii8s6na99qp00nq78"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -2616,24 +2652,24 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-01-20"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "c1d63f047c2fc1dba638a80c24d9b9b44ceb9f50"; - sha256 = "1q92lxdy8mgiv3ffp2gxsf0acp98hk3yh3lkvsaj6crdwbrq1ss9"; + rev = "a75d96054618c47fbafef964d4d705525e8e37b9"; + sha256 = "0c7k1fhw1fjgby4h99r22sbzn639v76r12dl66fhdrnkvrk0709n"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-02-05"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "f3740d68852557b64da832969bc2302c10759eb7"; - sha256 = "1spgcvj25m5h6r4k6a41m233zl3wavj6yj84jpsjmg7xabw75c14"; + rev = "53f22813fb3e60a4175ee44de55732b93c2903de"; + sha256 = "0441hafqkqz11666cwkrgp90zmxgx7pjcl6n4bshyp82x3glw1nj"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2772,12 +2808,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-01-31"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "1b19089917cc3e0a81d3294fead2424c419d545c"; - sha256 = "0zm60spnz4nsn0g9zsdiapygr2nwnkrqcz0w2pr37sp9i91nxxvb"; + rev = "3a9d533f3de86a43b69f6c47d3394c0d866fdb08"; + sha256 = "032hn7p7kgvrj0qg4gmpvl072zz4p9s5n8mrbs3k8c3lln1n9wh6"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2880,12 +2916,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-02-05"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "b5e4239d19f6e5d69df724cb9a924a9b7cb1b739"; - sha256 = "1vn637x06ar3rnjgfwlsm7c59gfs4bia177x4gzj9kj4kl0aadcp"; + rev = "bef454eecc11fb13e5bc3f29f443f495904470ef"; + sha256 = "0plhhwip0nwc0fhgx5f1i6qhfl6msxf43vhgrv2xihmb30zjf2qr"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -2904,12 +2940,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-02-02"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c0245b577f09173d18a8931c36e7299f10eaf232"; - sha256 = "0gqa9kmb35vpididwv1ylk1ja8pcy4vxn30zfw1myc0jsxwknhlx"; + rev = "10a740b2364efc9acff78f4e7466902f153e584b"; + sha256 = "1w4dvdd9fmi8gmgdq4zkrhrwdii4k7ns782gv4abpkzss5v6s66h"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -2940,24 +2976,24 @@ let nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-02-04"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "daa245b13b77b478b5b9f62e2e0bb79e65dcf5e8"; - sha256 = "19qibdkwzcqxkzzdc0bi2s1nf8rbzikkygs0yf41an5ll35xl528"; + rev = "aa8e36bd4f34dd0157d725c74874dfa44841a5e7"; + sha256 = "1zrqd3ndlv3393xjmf1n3w6im24fyqmnpldqvph5ix9lfrrf5vzh"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-01-21"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "492c61ccef4562687d319bba48f824426b4613d6"; - sha256 = "1587mms2qr8n6igsln54vanpzhhm1s7mhrvr4iyszh47dlhjkvdi"; + rev = "90ac936055ba8432b532392835e0fbbd82e60836"; + sha256 = "1hfda95gwdglycs00a9rwvfar9w579234zn3sz4pngi5crdamr38"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -2988,24 +3024,24 @@ let nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-02-02"; + version = "2021-02-05"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "3437cc5696f6c6f1a46b1ad1445d9c917d3fa4bc"; - sha256 = "1i53c7wrbx52ybm9v1m6p8n8894gyb2hylv7iac063nkhnhl7v6h"; + rev = "9198402f3417b0dbf26e73cac8cb53e074c163f1"; + sha256 = "17gqdrskr744b1z26fjf01a9nvfasd4fhaa9dmmi4g4br8556cyj"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-02-04"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e0ee3364c02c5eb739ce7af5a13e8cc50aae8d3d"; - sha256 = "0kcdy6scrxb01rwajcimay7257n7xiwrl48pm24nlb3k2fzmsr9s"; + rev = "d3c178ac78f8930d4ca094685744f5c705b56b55"; + sha256 = "1mj761vxq3dd7m384ig6dhipg43qw1w3cpkkvq9aymnlsvfi5b1d"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3022,6 +3058,18 @@ let meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; + nvim-peekup = buildVimPluginFrom2Nix { + pname = "nvim-peekup"; + version = "2021-02-11"; + src = fetchFromGitHub { + owner = "gennaro-tedesco"; + repo = "nvim-peekup"; + rev = "d4276b9601c683ad802893fed0cfe12a8631e931"; + sha256 = "06sazbjcnv77c11b835b7n8p78vmzw9zl3lkqbfl6yarbbzniisi"; + }; + meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; + }; + nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; version = "2021-01-09"; @@ -3048,24 +3096,24 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-01-22"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "b2852578769b53430af678ae7a99482f2a4be0da"; - sha256 = "057w9nqn0xc207s7y7fcl84xi14251yhyjd6xsajv9hlh4zcgarv"; + rev = "c59831a5d11a35594dc4e379a89d276d5ac83cdf"; + sha256 = "0wf36dlg4hq2hfvyvm1i7z83ky1x4rr7vv249sk01clsy84nylql"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-02-04"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "93854135974cec0bba9a6026b28c1ec84fe70a00"; - sha256 = "0681d0d17c7lz2nqlsbn8n8j1gkfbhzahg3f0qw5sg0f5likrx57"; + rev = "e5facde11bc8a2577dbfd56e2a4063320b09bc0b"; + sha256 = "1i1dn4akszkly6cjf3z9s17y1fdgsgk0fr5i50hs4mlnxy7al01i"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3108,24 +3156,24 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-02-02"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "d3532beb184b64696095f101678e737277df8d1e"; - sha256 = "12wxajgrzs3qjdjig55c56pa7va6sqnklq9hzi26z4k5isghbc3z"; + rev = "3557b7baa9e773fff378235851cb3caac96fd4b9"; + sha256 = "14bz6xwwdypwxfxdxhmbwl0w04ys18l08s1dx40mm5l1627wh465"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2020-12-28"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "aaffb87b5a640d15a566d9af9e74baafcf9ec016"; - sha256 = "1qk2h8cwcb0v12lxayjdxka6wh5r1phn9cz5xkm5hvm1vcwrvlln"; + rev = "cadf0c30659acc8c60fec8100b81ea0fd92a8a9c"; + sha256 = "06d32z6rlz153vfbydcjvm6l2qrnjw0d6a60qxjpmbmby66nvcya"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -3168,12 +3216,12 @@ let oceanic-next = buildVimPluginFrom2Nix { pname = "oceanic-next"; - version = "2021-01-26"; + version = "2021-02-05"; src = fetchFromGitHub { owner = "mhartington"; repo = "oceanic-next"; - rev = "f47fa3d4f63f1ce60bba13af81d97ee98ec31ceb"; - sha256 = "064d2ip2fvkkqh0z8x0mykycbcwmdajflr5qz0pl4f5q0rlsnbb8"; + rev = "5ef31a34204f84714885ae9036f66a626036c3dc"; + sha256 = "1wazbyxaq71mlpyvyxrbrpyb9vgkcsj2y2zf1sba9gfjjszph482"; }; meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; @@ -3240,12 +3288,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-02-03"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "c5b7f23e0b406767c1918d6888962fdb97f951e8"; - sha256 = "01w01543af4mbaa5hy5gfvbyz14sibf391dal987rn7zzjlsby7f"; + rev = "75a254198770baffe11ed748338c82f4d2d71e9d"; + sha256 = "1vvkcpfvkkf14y7zxlp43ridx075y2hf14kc285mzwdhhb1ygcdi"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3336,12 +3384,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-02-03"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a022a1b11c3a74a18df383894ddab58169c5ace0"; - sha256 = "0k395lm8azlyyrnnkjgyyidhf7s33alm5n2rffcpmygbh5i4665d"; + rev = "b77fc46c5f35978c03277cd7261c07a36dafc8a4"; + sha256 = "0a38ma4kn6s75s286bdl5mhqlnbzzpir29gzjq7kxqi4y4zh9spc"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3360,12 +3408,12 @@ let popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2021-01-07"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "9ab0aa5f186a2a2429c55f1512e2fd8b536183f0"; - sha256 = "0ks9hxc506ybwrvk5qkl1qkj634ms5icy8cg0w3b1q5qzgz5k0wn"; + rev = "efcd82cbae750aa743619bfae7453fbec9366b87"; + sha256 = "0041c9xnnhw24ablwqw9p9vlcmbfrp9l9r6i4ayh8id666ylsln9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; @@ -3866,12 +3914,12 @@ let sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-02-02"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "9e0303c615445d6699a8c775f38e0e0fc457a5c3"; - sha256 = "0z1awkvz6vl5zci4qzibfb6nkk1c56rg5d4rqrhm5l1dh31pwjy3"; + rev = "96d000d9eff0165c7e0496f73787cc56d7c1581c"; + sha256 = "1n9j3wv5xifs7ppgjnnbvx9p4h4llshbzgrly5b7lx0nnb91yqg0"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -4046,12 +4094,12 @@ let telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-02-03"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "a5803b6755b3499aeabecb90f834aa060a2a8835"; - sha256 = "1fwcfxw9v6962pbf79s5hn75jcbfmsy6nig2z3s7s746pkfkjw9j"; + rev = "ffa2027102f75e28dd8d8c2a97f3b9163dd80b56"; + sha256 = "1ipxqkfaqc75qzpj7vg3gr44r8fcx979pyf84wibxic3kby9qp7y"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -4083,12 +4131,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-02-05"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "5f1d16acf6716261bd52466733e096a49b9eadad"; - sha256 = "1ybn9c6lxry5gs7rhnziv5i8gm45w4yrnkbvpzf898h5y6ifs5l5"; + rev = "3a7fa41857394cd2d90d00891413c12fada039c3"; + sha256 = "0bn7jvwwaxfhcqd4l3wi9bshabbrcd4aws7d564kh1js8bklwx1b"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4240,12 +4288,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-02-02"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "0e84f61b8184981012a32642f78ad88aafcf4258"; - sha256 = "183y7bzc9lix536wla1p6niyl1w17jpjm2ild6pc593pl194qjm5"; + rev = "66d81fc2c0bda30be69fffa46da0932ee8d5ddd5"; + sha256 = "0fzpl2fj5kig8kbcn65ph6y3h412ryx5mfa15822lnsf8cmkr5db"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -4276,12 +4324,12 @@ let unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2021-01-08"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "c455008595a15c7ccc2c9f2ea309ba2bf5d3fe63"; - sha256 = "054h0yrb2wffmirvqql2v34rfr5q0rx20p2y2wbrpx2w1vcwr2rc"; + rev = "b08814362624ded3b462addba4711647879ca308"; + sha256 = "0hk5xhn9zfas074hgv0y6lbc1jyj5kqjg4zdix8am3s97aqr96ms"; }; meta.homepage = "https://github.com/Shougo/unite.vim/"; }; @@ -4684,12 +4732,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-10-28"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "ff16950ba5e07353f25ee33732982a67af451eb2"; - sha256 = "12h6dznfwpifyr6ahk1b45pb59nlm6wkrfhgh65g1clnpzvchkiw"; + rev = "2a6f931987c1cc5e5bc0c4c44f21ac9bd4c72f3b"; + sha256 = "17w0cjzppx9zxrqxaa975xazcnps4v1b93bmy19dccvc7z1gipby"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -4730,6 +4778,18 @@ let meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; + vim-bbye = buildVimPluginFrom2Nix { + pname = "vim-bbye"; + version = "2018-03-03"; + src = fetchFromGitHub { + owner = "moll"; + repo = "vim-bbye"; + rev = "25ef93ac5a87526111f43e5110675032dbcacf56"; + sha256 = "0dlifpbd05fcgndpkgb31ww8p90pwdbizmgkkq00qkmvzm1ik4y4"; + }; + meta.homepage = "https://github.com/moll/vim-bbye/"; + }; + vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; version = "2020-08-06"; @@ -4852,12 +4912,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-02-01"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "01d0a16456a5a3daeb88a66b12e160d4b8aec8e8"; - sha256 = "1xmsp2rf5av9vfn8ynzm5kgxz0cv2wnnjmsmp4m2p5yjdwjxn669"; + rev = "2e8538beaf1cef636deab2d40edcb270044485d1"; + sha256 = "1ay90j72sknqhp1rdlgzdb5rxs98mwc5ad7q3rgqj8hpsr21x991"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5488,12 +5548,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-02-05"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "2a47359fe7eca7655747ad871530a66f7fdd22f8"; - sha256 = "1769lf2xgy11cmyg8n46xb7d4qn8c9b2ygiibj7skdyx9m88y4fw"; + rev = "bd76979d17c28db94430dbfa4007e5aef667441a"; + sha256 = "0ih17mimpjkk9w81cpmzks63rd4k5v32i5y1anykcgn9nmmbp8qm"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5536,12 +5596,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-01-26"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "8cf0cf5bfb2b858faecf4e0f6c1b8d0948805e5e"; - sha256 = "1ka4bbmzpdzaflnywl4pknd0xy1n6mqw3qk4krk92dd6bcya0b1d"; + rev = "5c821eb78d4018025a1a9f54a9ef2af2a5ddd365"; + sha256 = "0vzhc9dr166pn4xpznzxfyhfibas3m0an0z74gl3vih1qlg59h9y"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5608,12 +5668,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-01-26"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "ff9d134f0c69e25d391138036051b2c5e6bac864"; - sha256 = "1xpqhhvxf13nk4hd7jn0ydkkdk7r14w72h8hmpxzhhji1d0pcy43"; + rev = "2e3cd54ed696500bb3722226f2103d4b279272c0"; + sha256 = "1cv9lapq6xb0fq5i1mfbhv5qlab868mvby60yhwzafni5b2p9l37"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5656,12 +5716,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-01-22"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "007d9bc7786d703dc778de7b69895b8c1907dde7"; - sha256 = "1r7jv3cbawh9n2d6nd3iwga6bgj8z0nx94c3dhn5286si1s3857c"; + rev = "cb4c622c97a39652151748c4dec70a46e93a9117"; + sha256 = "0pfd6vizjrynz4azx3fkz5nwm7k08jjhvy6ypkjzhhw2ql37l7i9"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6150,12 +6210,12 @@ let vim-LanguageTool = buildVimPluginFrom2Nix { pname = "vim-LanguageTool"; - version = "2021-01-24"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "dpelle"; repo = "vim-LanguageTool"; - rev = "f92e2577ab937f437c06d91639100952b540365b"; - sha256 = "09jw26mmbyvjlz5fw1gj9q0dwmv0aqwbl288h4hcliyx56snijhl"; + rev = "0372ffae78aa3eac3bfa48ba3bf2f4015a86385a"; + sha256 = "00476l49lczj1rw5gb6vs7s9r0zi1khw0g1v6bsfwl5r32699l7r"; }; meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; @@ -6715,12 +6775,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-01-29"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "4980c987647523defbc20b3377993d34526f3911"; - sha256 = "089gp0abfqipz8rrh5jdcgrzg1a65cxchq1cadkxncmb8vcymh0r"; + rev = "fdbac11f36172d6e47e212385d2f4482e472f815"; + sha256 = "1mbs8v8k7698qnck5n38lqaz8sl07d1p31c84injb460l6jfv1s7"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -6847,12 +6907,12 @@ let vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2020-07-29"; + version = "2021-02-06"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-pencil"; - rev = "dad5a3626ab68039f2676c46e7a1635e0669cc63"; - sha256 = "1s1vxzqc5gvch2rfibn7ksmxj81gscfzg0bpvnq34jp430adzdc7"; + rev = "2135374d48a7cb89efd5e818c12bb0ff450dfbb4"; + sha256 = "17wgin33fj40brdb3zhm70qls2j2vssc4yrrv36y1qxwi7gdzn0f"; }; meta.homepage = "https://github.com/reedes/vim-pencil/"; }; @@ -6883,12 +6943,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-12-14"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "8b45742540f92ba902c97ad1d3d8862ba3305438"; - sha256 = "0ashl6qixnhgj5pnss9ri8w7fzixcsd0h4cmb2jpfrfma8s7xn3b"; + rev = "cffcfe150bda75177920530c5f1911b52f70a065"; + sha256 = "0sgfnxi1f5mnzcbklcmq6x17r1z1kz8s7h2h94girmd4aga3gcp0"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -7135,12 +7195,12 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2020-12-18"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "d865e427d067af57d85cf2b7d2bc1912eb84d0bf"; - sha256 = "1gcphxq52jx96fzf6xkq7mxvgyhjn6yzh7l5qc9h18lqmax9gqw2"; + rev = "964d48fd11db7c3a3246885993319d544c7c6fd5"; + sha256 = "09xpjd96xd0mkzfwyvinjhbza7xp6v66bdrxwkb0j0n1kgfgkx4l"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -7289,6 +7349,18 @@ let meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; + vim-shellcheck = buildVimPluginFrom2Nix { + pname = "vim-shellcheck"; + version = "2019-07-25"; + src = fetchFromGitHub { + owner = "itspriddle"; + repo = "vim-shellcheck"; + rev = "4346419ac57ef341a15aa39c827c0848f17c6faf"; + sha256 = "0j28nqmfjxzhwylp2r1mp5v39fws5jvn7k9maam97mi3j66a9jz5"; + }; + meta.homepage = "https://github.com/itspriddle/vim-shellcheck/"; + }; + vim-signature = buildVimPluginFrom2Nix { pname = "vim-signature"; version = "2018-07-06"; @@ -7363,12 +7435,12 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2021-01-17"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "f83a157552a3bf393a7c034df1d21e3555123a4c"; - sha256 = "090rl4mfww5rmv04v25f58jfv3yx23bwi0pijkwxr442yhbg3rg2"; + rev = "10fd0aa57d176718bc2c570f121ab523c4429a25"; + sha256 = "18zn29mkgdiddn3il393xzg7hpa0x25yvais1l29jq2711sg4rdc"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -7411,12 +7483,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-01-30"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "adff0bf675e17d5b94ec7d10b5cd8a0dd74a61b0"; - sha256 = "0yvk6d147rvp8gwsbls39dp3qblmkk0wz5prrx3k5j3dlh5l7fcp"; + rev = "8426857c1b8d1c00bbe0faa6dfff99acb1521042"; + sha256 = "16lvwd22813k38dbkfx4w46gmvbkfla4a0zyklpz7qa658phfprw"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7892,12 +7964,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-01-29"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "4ca5978e327a8bc021ffd28fd2328ca8ce353305"; - sha256 = "1a2p5ij2gpkcn5jjwg6bna9gxmrdpg49ch6c52grzwzyw2lz2fjw"; + rev = "88f934f572efdbc73c7b4b23a9b96f710524a94d"; + sha256 = "0pk0vqns7269gi9jd8bdcg1qxlgdm55w9mf3nsrzc9z3d3j3vpw0"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7916,12 +7988,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-02-02"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "cacfe408e58f9b2cbc6ecd0f1135ff4810e42889"; - sha256 = "0cfhrkmss1bzjgr30bn43wa1h4z1ylkh2ixxsdjbchhpqjmzfq1c"; + rev = "d840e1af9e680b384e8a28e62b46ad5148907fdd"; + sha256 = "0d6gmw38829ln6mvn5j3gyy6by3ks5g62qiyzapz3vw67zyblyjz"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7976,12 +8048,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-12-21"; + version = "2021-02-09"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "c5322b2f67bc627d467e527a530ff6695ccd3dbd"; - sha256 = "0j3pnbg0a2rcjfp691v7wzcp9bqan24qvdl4fxzljipl2lyim0qb"; + rev = "68bd1775277ad5677ebf5cdc774ca3ba4755d457"; + sha256 = "1pg179iz0xvd6r7xks7qrn1c7vh7zmp39s9axhdgp7jisqbhaaqx"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -8180,12 +8252,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-01-10"; + version = "2021-02-10"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "52eff3265181bbbe5338818dc5bc196e234cea45"; - sha256 = "1j4f3762zpw4qvqiyrq1ym4lk78w3r93ya70id7g6w4pviaqcv1j"; + rev = "e99ac0d65867f4d97e7b891ac21cd341de1ff53f"; + sha256 = "1jxl33svlymcwc3dsalabpy7px91rgfpalpb2bhxkqd4vgxwcjql"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8193,12 +8265,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-02-02"; + version = "2021-02-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7a25a6b7f8c51eabe5d4d47951c73fde7d2ece72"; - sha256 = "0vqpj2jg0nmjra0icm90p2dwf6jx87qjvch6hmvxj0m3g8kjs1cl"; + rev = "1319bca15f1e25cf8f0ca64818719c860d2d83ac"; + sha256 = "043x5x4pxhni2isjxh6x4klldyanhpks3pljc246ybiz9q372bsi"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8207,12 +8279,12 @@ let pname = "vimux"; version = "2017-10-24"; src = fetchFromGitHub { - owner = "benmills"; + owner = "ostera"; repo = "vimux"; rev = "37f41195e6369ac602a08ec61364906600b771f1"; sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra"; }; - meta.homepage = "https://github.com/benmills/vimux/"; + meta.homepage = "https://github.com/ostera/vimux/"; }; vimwiki = buildVimPluginFrom2Nix { @@ -8241,12 +8313,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-02-05"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "d5b19ed3db6fd3e9598b399d8a9977ff926ad24e"; - sha256 = "0idd04aj76f3in8h5ljgxqkf9rpv29cbg58j8wbm874hfy72mm2i"; + rev = "05d1fb2e333caa2bf2717d4e8ff5ae8c2a1f971d"; + sha256 = "0zyq4fgi6i4gdn25ykpxsy7bpyzysny5qkg40r3493yqnp3rvnfw"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -8374,12 +8446,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-12-31"; + version = "2021-02-07"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "2434b104065be4590f07ad950d0943b7194f01e6"; - sha256 = "0hhwqb5w84bi28h27wmisx4mb91xc6jbdh004d5994bl2098yrf8"; + rev = "dbf67638cb7084883c7463b0d6226be9d9159b9a"; + sha256 = "1qxwgjfhzz7ymkbbnjm3xrp368rmcphdaj4lxrkkbp9d2pn9g8s7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -8423,12 +8495,12 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-01-13"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "bc1a7584b435b9921e245c3621ab7524be370b2d"; - sha256 = "0fvgky7i6m5n4h4l73xdisxhpcc8cv9pq8jrvz571gmyjsh1rrrv"; + rev = "e3646fc3124e33da4909e30caaad1167523e0c53"; + sha256 = "0a200497js325343prx638rkzg6544lxrrr3ij5g0i6dvazzwg21"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index c7aff3c97a..9b1aa6cd05 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -658,7 +658,7 @@ self: super: { }); lf-vim = super.lf-vim.overrideAttrs (old: { - dependencies = with super; [ bclose-vim ]; + dependencies = with super; [ vim-bbye ]; }); vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { @@ -741,6 +741,15 @@ self: super: { meta.platforms = lib.platforms.all; }); + compe-tabnine = super.compe-tabnine.overrideAttrs (old: { + buildInputs = [ tabnine ]; + + postFixup = '' + mkdir $target/binaries + ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) + ''; + }); + completion-tabnine = super.completion-tabnine.overrideAttrs (old: { buildInputs = [ tabnine ]; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index cded72abf2..416dc7fc72 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -27,7 +27,6 @@ bakpakin/fennel.vim bazelbuild/vim-bazel bbchung/clighter8 benizi/vim-automkdir -benmills/vimux bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion @@ -129,6 +128,7 @@ fruit-in/vim-nong-theme fsharp/vim-fsharp fszymanski/deoplete-emoji garbas/vim-snipmate +gennaro-tedesco/nvim-peekup gentoo/gentoo-syntax GEverding/vim-hocon gfanto/fzf-lsp.nvim@main @@ -187,6 +187,7 @@ itchyny/lightline.vim itchyny/thumbnail.vim itchyny/vim-cursorword itchyny/vim-gitbranch +itspriddle/vim-shellcheck ivanov/vim-ipython jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim @@ -357,6 +358,7 @@ milkypostman/vim-togglelist mindriot101/vim-yapf mk12/vim-lean mkasa/lushtags +moll/vim-bbye mopp/sky-color-clock.vim morhetz/gruvbox motus/pig.vim @@ -429,7 +431,9 @@ octol/vim-cpp-enhanced-highlight ojroques/vim-oscyank@main Olical/aniseed Olical/conjure +onsails/lspkind-nvim OrangeT/vim-csharp +ostera/vimux osyo-manga/shabadou.vim osyo-manga/vim-anzu osyo-manga/vim-over @@ -481,6 +485,7 @@ rhysd/vim-grammarous rhysd/vim-operator-surround RishabhRD/nvim-lsputils RishabhRD/popfix +rmagatti/auto-session@main rodjek/vim-puppet romainl/vim-cool romainl/vim-qf @@ -618,6 +623,7 @@ Twinside/vim-hoogle tyru/caw.vim tyru/open-browser-github.vim tyru/open-browser.vim +tzachar/compe-tabnine@main uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 604a47e1ed..8c32ac2f5d 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }: +{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8 }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -128,6 +128,18 @@ let }; }; + dbaeumer.vscode-eslint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-eslint"; + publisher = "dbaeumer"; + version = "2.1.14"; + sha256 = "sha256-bVGmp871yu1Llr3uJ+CCosDsrxJtD4b1+CR+omMUfIQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-markdownlint"; @@ -689,9 +701,7 @@ let }; }; - vadimcn.vscode-lldb = callPackage ./vscode-lldb { - lldb = llvmPackages_latest.lldb; - }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { }; vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index 6e73ee446d..188fa67ede 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,24 +1,24 @@ { - "name": "vscode-lldb", - "version": "1.5.3", - "dependencies": { - "@types/json5": "^0.0.30", - "@types/mocha": "^7.0.1", - "@types/node": "^8.10.50", - "@types/vscode": "^1.31.0", - "@types/yauzl": "^2.9.0", - "json5": "^2.1.0", - "memory-streams": "^0.1.3", - "mocha": "^7.0.1", - "source-map-support": "^0.5.12", - "string-argv": "^0.3.1", - "ts-loader": "^6.2.1", - "typescript": "^3.7.0", - "vsce": "^1.73.0", - "vscode-debugadapter-testsupport": "^1.35.0", - "vscode-debugprotocol": "^1.35.0", - "webpack": "^4.39.1", - "webpack-cli": "^3.3.7", - "yauzl": "^2.10.0" - } + "name": "vscode-lldb", + "version": "1.6.1", + "dependencies": { + "string-argv": "^0.3.1", + "yaml": "^1.10.0", + "yauzl": "^2.10.0", + "@types/vscode": "^1.31.0", + "@types/node": "^8.10.50", + "@types/mocha": "^7.0.1", + "@types/yauzl": "^2.9.0", + "@types/json5": "^0.0.30", + "typescript": "^3.7.0", + "mocha": "^7.0.1", + "source-map-support": "^0.5.12", + "memory-streams": "^0.1.3", + "vscode-debugprotocol": "^1.35.0", + "vscode-debugadapter-testsupport": "^1.35.0", + "vsce": "^1.73.0", + "webpack": "^4.39.1", + "webpack-cli": "^3.3.7", + "ts-loader": "^6.2.1" + } } diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch index db62552b91..30ab3f9b21 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch @@ -1,35 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 890abd4..157a8a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -9,13 +9,6 @@ include(cmake/CopyFiles.cmake) - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_INSTALL_PREFIX $ENV{HOME}/.vscode/extensions/vscode-lldb CACHE PATH "Install location") - --set(LLDB_ROOT $ENV{LLDB_ROOT} CACHE PATH "Root of LLDB build directory") --if (LLDB_ROOT) -- message("Using LLDB from ${LLDB_ROOT}") +@@ -16,13 +16,6 @@ endif() + set(VERSION "${VERSION}${VERSION_SUFFIX}") + message("Version ${VERSION}") + +-set(LLDB_PACKAGE $ENV{LLDB_PACKAGE} CACHE PATH "Zip archive containing LLDB files") +-if (LLDB_PACKAGE) +- message("Using LLDB_PACKAGE=${LLDB_PACKAGE}") -else() -- message(FATAL_ERROR "LLDB_ROOT not set." ) +- message(FATAL_ERROR "LLDB_PACKAGE not set." ) -endif() - + set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]") + # General OS-specific definitions - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(DylibPrefix lib) -@@ -64,8 +57,9 @@ set(UpdateFile ${CMAKE_COMMAND} -E copy_if_different) - - # Adapter - --add_subdirectory(adapter) --add_subdirectory(lldb) -+add_custom_target(adapter) -+add_custom_target(lldb) -+add_custom_target(codelldb) - - # Extension package content - -@@ -74,16 +68,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) +@@ -87,16 +80,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) - + -# Run 'npm install' -execute_process( - COMMAND ${NPM} install @@ -42,4 +32,3 @@ - # Copy it back, so we can commit the lock file. file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) - \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index f22c9df36a..c4d2282810 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -1,100 +1,94 @@ -{ lib, stdenv, vscode-utils, fetchFromGitHub, rustPlatform, makeWrapper, jq -, nodePackages, cmake, nodejs, unzip, python3, lldb, breakpointHook -, setDefaultLldbPath ? true +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, jq, callPackage +, nodePackages, cmake, nodejs, unzip, python3 }: assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; - name = "vscode-lldb"; - version = "1.5.3"; - - dylibExt = stdenv.hostPlatform.extensions.sharedLibrary; + pname = "vscode-lldb"; + version = "1.6.1"; src = fetchFromGitHub { owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "1139945j3z0fxc3nlyvd81k0ypymqsj051idrbgbibwshpi86y93"; + sha256 = "sha256-mi+AeHg9zO0vjF0OZCufPkliInqxTvDGV350wqAwe90="; fetchSubmodules = true; }; - adapter = rustPlatform.buildRustPackage { - pname = "${name}-adapter"; - inherit version src; + lldb = callPackage ./lldb.nix {}; - cargoSha256 = "0jl4msf2jcjxddwqkx8fr0c35wg4vwvg5c19mihri1v34i09zc5r"; + adapter = rustPlatform.buildRustPackage { + pname = "${pname}-adapter"; + inherit version src; # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; + cargoSha256 = "sha256-HPVbqYsst/iFrHn5wvmWtqeVHOHR7JT8lu+/xZq1lK0="; + nativeBuildInputs = [ makeWrapper ]; buildAndTestSubdir = "adapter"; - # Hack: Need a nightly compiler. - RUSTC_BOOTSTRAP = 1; + cargoFlags = [ + "--lib" + "--bin=codelldb" + "--features=weak-linkage" + ]; - # `adapter` expects a special hierarchy to resolve everything well. - postInstall = '' - mkdir -p $out/adapter - mv -t $out/adapter \ - $out/bin/* \ - $out/lib/* \ - ./adapter/*.py \ - ./formatters/*.py - rmdir $out/{bin,lib} - ''; - - postFixup = '' - wrapProgram $out/adapter/codelldb \ - --prefix PATH : "${python3}/bin" \ - --prefix LD_LIBRARY_PATH : "${python3}/lib" - ''; + # Tests are linked to liblldb but it is not available here. + doCheck = false; }; - build-deps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; - vsix = stdenv.mkDerivation { - name = "${name}-${version}-vsix"; - inherit src; +in stdenv.mkDerivation rec { + name = "vscode-extension-${pname}"; + inherit src; + vscodeExtUniqueId = "${publisher}.${pname}"; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; - # Only build the extension. We handle `adapter` and `lldb` with nix. - patches = [ ./cmake-build-extension-only.patch ]; + nativeBuildInputs = [ cmake nodejs unzip makeWrapper ]; - nativeBuildInputs = [ cmake nodejs unzip breakpointHook ]; + patches = [ ./cmake-build-extension-only.patch ]; - postConfigure = '' - cp -r ${build-deps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . - ''; - - makeFlags = [ "vsix_bootstrap" ]; - - installPhase = '' - unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted - mv vsix-extracted/extension $out - - ln -s ${adapter}/adapter $out - # Mark that adapter and lldb are installed. - touch $out/platform.ok - ''; - - dontStrip = true; - dontPatchELF = true; - }; - -in vscode-utils.buildVscodeExtension { - inherit name; - src = vsix; - - nativeBuildInputs = lib.optional setDefaultLldbPath jq; - postUnpack = lib.optionalString setDefaultLldbPath '' - jq '.contributes.configuration.properties."lldb.library".default = $s' \ - --arg s "${lldb}/lib/liblldb.so" \ - $sourceRoot/package.json >$sourceRoot/package.json.new - mv $sourceRoot/package.json.new $sourceRoot/package.json + postConfigure = '' + cp -r ${nodeDeps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . ''; - vscodeExtUniqueId = "${publisher}.${name}"; + cmakeFlags = [ + # Do not append timestamp to version. + "-DVERSION_SUFFIX=" + ]; + makeFlags = [ "vsix_bootstrap" ]; + + installPhase = '' + ext=$out/$installPrefix + runHook preInstall + + unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted + + mkdir -p $ext/{adapter,formatters} + mv -t $ext vsix-extracted/extension/* + cp -t $ext/adapter ${adapter}/{bin,lib}/* ../adapter/*.py + cp -t $ext/formatters ../formatters/*.py + ln -s ${lldb} $ext/lldb + # Mark that all components are installed. + touch $ext/platform.ok + + runHook postInstall + ''; + + # `adapter` will find python binary and libraries at runtime. + fixupPhase = '' + wrapProgram $out/$installPrefix/adapter/codelldb \ + --prefix PATH : "${python3}/bin" \ + --prefix LD_LIBRARY_PATH : "${python3}/lib" + ''; + + passthru = { + inherit lldb adapter; + }; meta = with lib; { description = "A native debugger extension for VSCode based on LLDB"; @@ -102,5 +96,6 @@ in vscode-utils.buildVscodeExtension { license = with licenses; [ mit ]; maintainers = with maintainers; [ oxalica ]; platforms = platforms.all; + broken = stdenv.isDarwin; # Build failed on x86_64-darwin currently. }; } diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix new file mode 100644 index 0000000000..2ec90b1931 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix @@ -0,0 +1,23 @@ +# Patched lldb for Rust language support. +{ lldb_11, fetchFromGitHub }: +let + llvmSrc = fetchFromGitHub { + owner = "vadimcn"; + repo = "llvm-project"; + rev = "dd7efd9ea2d38e3227bc2e83a99772aceeb44242"; + sha256 = "sha256-XY8J8Ie1cWb6ok72Gju/KUxZ4fIFQVitYVnuCezGRKQ="; + }; +in lldb_11.overrideAttrs (oldAttrs: { + src = "${llvmSrc}/lldb"; + + passthru = (oldAttrs.passthru or {}) // { + inherit llvmSrc; + }; + + doInstallCheck = true; + postInstallCheck = (oldAttrs.postInstallCheck or "") + '' + versionOutput="$($out/bin/lldb --version)" + echo "'lldb --version' returns: $versionOutput" + echo "$versionOutput" | grep -q 'rust-enabled' + ''; +}) diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh new file mode 100755 index 0000000000..0f3e407ddd --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix-prefetch +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" +if [[ $# -ne 1 ]]; then + echo "Usage: ./update.sh " + exit 1 +fi + +echo " +FIXME: This script doesn't update patched lldb. Please manually check branches +of https://github.com/vadimcn/llvm-project and update lldb with correct version of LLVM. +" + +nixpkgs=../../../.. +nixFile=./default.nix +owner=vadimcn +repo=vscode-lldb +version="$1" + +sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile" +srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version" --fetchSubmodules) +sed -E 's/\bsha256 = ".*?"/sha256 = "'$srcHash'"/' --in-place "$nixFile" +cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") +sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile" + +src="$(nix-build $nixpkgs -A vscode-extensions.vadimcn.vscode-lldb.src --no-out-link)" +jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) }' \ + --arg version "$version" \ + "$src/package.json" \ + > build-deps/package.json + +# Regenerate nodePackages. +cd "$nixpkgs/pkgs/development/node-packages" +exec ./generate.sh diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix index b65547ff32..c729ee6010 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "goku"; - version = "0.1.11"; + version = "0.3.6"; src = fetchurl { url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz"; - sha256 = "49562342be114c2656726c5c697131acd286965ab3903a1a1e157cc689e20b15"; + sha256 = "1pss1k2slbqzpfynik50pdk4jsaiag4abhmr6kadmaaj18mfz7ai"; }; sourceRoot = "."; installPhase = '' + chmod +x goku + chmod +x gokuw mkdir -p $out/bin cp goku $out/bin cp gokuw $out/bin diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix index 87535b92e4..b79f0bd84f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nix-community"; repo = "acpi_call"; - rev = "3d7c9fe5ed3fc5ed5bafd39d54b1fdc7a09ce710"; - sha256 = "09kp8zl392h99wjwzqrdw2xcfnsc944hzmfwi8n1y7m2slpdybv3"; + rev = "fe4cd0124099b88b61f83006023bc0d95e742e75"; + sha256 = "1rksbg78i7y2wzam9p6kbhx8rmkaiq0kqg8nj7k0j6d25m79289s"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix new file mode 100644 index 0000000000..015419ee07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, alsaLib, glib, json-glib }: + +stdenv.mkDerivation { + pname = "aseq2json"; + version = "unstable-2018-04-28"; + src = fetchFromGitHub { + owner = "google"; + repo = "midi-dump-tools"; + rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a"; + sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA="; + }; + sourceRoot = "source/aseq2json"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib glib json-glib ]; + + installPhase = '' + install -D --target-directory "$out/bin" aseq2json + ''; + + meta = with lib; { + description = "Listens for MIDI events on the Alsa sequencer and outputs as JSON to stdout"; + homepage = "https://github.com/google/midi-dump-tools"; + license = licenses.asl20; + maintainers = [ maintainers.queezle ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix index b1c6f5a8f9..f835b9a9ec 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "compsize"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "kilobyte"; repo = pname; rev = "v${version}"; - sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126"; + sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8="; }; buildInputs = [ btrfs-progs ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "btrfs: Find compression type/ratio on a file or set of files"; homepage = "https://github.com/kilobyte/compsize"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ CrazedProgrammer ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/eudev/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/eudev/default.nix index 3d26fc3b00..c8562cc5f3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/eudev/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.9"; + version = "3.2.10"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "1z6lfhhbjs6j7pbp6ybn17ywjsdl87ql6g1p3m2y26aa10cqcqc9"; + sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix index 979f55cc35..95998c694f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "firejail"; - version = "0.9.64.2"; + version = "0.9.64.4"; src = fetchFromGitHub { owner = "netblue30"; repo = "firejail"; rev = version; - sha256 = "1adizsb7pxr101bvvd359hxympnv36rnikp78npdr5dcvwddv3dv"; + sha256 = "sha256-q/XL8cznHlUXdubUEptEAVma1jRUqFb5XcLAV0RVCzs="; }; buildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 4fd1cf7ef1..6801256c7d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2020-12-18"; + version = "2021-02-08"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = lib.replaceStrings ["-"] [""] version; - sha256 = "1rb5b3fzxk5bi6kfqp76q1qszivi0v1kdz1cwj2llp5sd9ns03b5"; + sha256 = "0c85cd659312isfz1r87qswsgfhy0rljagcwspnvjljqrh9bsgzq"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1p7vn2hfwca6w69jhw5zq70w44ji8mdnibm1z959aalax6ndy146"; + outputHash = "0l4xsgxdvjffad7a98n42nyqy3ihs6m6hy3qsfkqin9z10413x5n"; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index c4649557b1..f7f0203780 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,13 +1,13 @@ { rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "firmware-manager"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw"; + sha256 = "sha256-aKatdjHa/k7j48upkR1O6PFxCUfJYE3KhhzZ9Ohe0Jc="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { installPhase = "make prefix='$(out)' install"; - cargoSha256 = "0byc0pqa1w2qnfrx3psrzdq1c8qjslbmzxg872b9v6fr5d4c9cvg"; + cargoSha256 = "sha256-TISYaSOu8c+74ie4QHLqflXfLWwcLHEOch/hAx3iu60="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix index 9c14fde319..44bcbba205 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "flashbench"; - version = "2012-06-06"; + pname = "flashbench-unstable"; + version = "2020-01-23"; - src = fetchgit { - url = "https://github.com/bradfa/flashbench.git"; - rev = "2e30b1968a66147412f21002ea844122a0d5e2f0"; - sha256 = "037rhd2alwfip9qk78cy8fwwnc2kdyzccsyc7v2zpmvl4vvpvnhg"; + src = fetchFromGitHub { + owner = "bradfa"; + repo = "flashbench"; + rev = "d783b1bd2443812c6deadc31b081f043e43e4c1a"; + sha256 = "045j1kpay6x2ikz8x54ph862ymfy1nzpbmmqpf3nkapiv32fjqw5"; }; installPhase = '' + runHook preInstall + install -d -m755 $out/bin $out/share/doc/flashbench install -v -m755 flashbench $out/bin install -v -m755 erase $out/bin/flashbench-erase install -v -m644 README $out/share/doc/flashbench + + runHook postInstall ''; meta = with lib; { description = "Testing tool for flash based memory devices"; homepage = "https://github.com/bradfa/flashbench"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.rycee ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix index ae89cd43f2..bd1b414f4c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -# Don't use this for anything important yet! - stdenv.mkDerivation rec { pname = "fscryptctl"; - version = "0.1.0"; + version = "1.0.0"; goPackagePath = "github.com/google/fscrypt"; @@ -12,10 +10,10 @@ stdenv.mkDerivation rec { owner = "google"; repo = "fscryptctl"; rev = "v${version}"; - sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb"; + sha256 = "1hwj726mm0yhlcf6523n07h0yq1rvkv4km64h3ydpjcrcxklhw6l"; }; - makeFlags = [ "DESTDIR=$(out)/bin" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { description = "Small C tool for Linux filesystem encryption"; @@ -34,6 +32,7 @@ stdenv.mkDerivation rec { documentation for filesystem encryption before using fscryptctl. ''; inherit (src.meta) homepage; + changelog = "https://github.com/google/fscryptctl/releases/tag/v{version}"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fscryptctl/legacy.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fscryptctl/legacy.nix new file mode 100644 index 0000000000..64a409fb58 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fscryptctl/legacy.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub }: + +# Don't use this for anything important! +# TODO: Drop fscryptctl-experimental after the NixOS 21.03/21.05 release. + +stdenv.mkDerivation rec { + pname = "fscryptctl"; + version = "0.1.0"; + + goPackagePath = "github.com/google/fscrypt"; + + src = fetchFromGitHub { + owner = "google"; + repo = "fscryptctl"; + rev = "v${version}"; + sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb"; + }; + + makeFlags = [ "DESTDIR=$(out)/bin" ]; + + meta = with lib; { + description = "Small C tool for Linux filesystem encryption"; + longDescription = '' + fscryptctl is a low-level tool written in C that handles raw keys and + manages policies for Linux filesystem encryption, specifically the + "fscrypt" kernel interface which is supported by the ext4, f2fs, and + UBIFS filesystems. + fscryptctl is mainly intended for embedded systems which can't use the + full-featured fscrypt tool, or for testing or experimenting with the + kernel interface to Linux filesystem encryption. fscryptctl does not + handle key generation, key stretching, key wrapping, or PAM integration. + Most users should use the fscrypt tool instead, which supports these + features and generally is much easier to use. + As fscryptctl is intended for advanced users, you should read the kernel + documentation for filesystem encryption before using fscryptctl. + ''; + inherit (src.meta) homepage; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + knownVulnerabilities = [ '' + fscryptctl version 1.0.0 was released and now uses v2 encryption + policies. fscryptctl-experimental will remain at version 0.1.0 which + still supports the v1 encryption policies. Please try to switch from the + "fscryptctl-experimental" package to "fscryptctl". The v1 encryption + policies can be insecure, are hard to use correctly, and have different + semantics from v2 policies (which is why they are no longer supported in + fscryptctl 1.0.0+). + '' ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/default.nix index 0ed6f54a1d..02c46b9ba7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.10.1"; - sha256Hash = "0bb22mac8m0z6qp0s6g4r0x4aj6gc19pfyqr6sdy4hkpwxicgmaf"; + version = "3.10.2"; + sha256Hash = "0m44hhk6jxkgkvk2jsjcwa3pqgzzqnpm606n3n8wn1ldypkvpsps"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hal-flash/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hal-flash/default.nix deleted file mode 100644 index 70dab152c7..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hal-flash/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkg-config, udisks2 }: - -stdenv.mkDerivation { - name = "hal-flash-0.3.3"; - - src = fetchurl { - url = "https://github.com/cshorler/hal-flash/archive/v0.3.3.tar.gz"; - sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake dbus glib libtool udisks2 ]; - - preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; - - meta = with lib; { - homepage = "https://github.com/cshorler/hal-flash"; - description = "libhal stub library to satisfy the Flash Player DRM requirements"; - longDescription = - '' - Stub library based loosely upon libhal.[ch] from the hal-0.5.14 - package. Provides the minimum necessary functionality to enable - libflashplayer.so/libadobecp.so to play back DRM content. - ''; - license = with licenses; [ afl21 gpl2 ]; - maintainers = with maintainers; [ malyn ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 9c0f261d0c..aed631bee1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,26 +1,26 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.219-hardened1.patch", - "sha256": "0pgpb7phjgil01xbpwqdwyk8k3pv5qlikw4721cmy10aj97plpqw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.219-hardened1/linux-hardened-4.14.219-hardened1.patch" + "name": "linux-hardened-4.14.221-hardened1.patch", + "sha256": "167pazgz6xa0xmvkqdk0a9z1gp9ria0mm2wmq6g41wzhcy20zrfz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.221-hardened1/linux-hardened-4.14.221-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.173-hardened1.patch", - "sha256": "19ikdwvp3mjh6cl2anhlpzmk1ha4lw1lf9rmvls7pzc7d1bmlwi0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.173-hardened1/linux-hardened-4.19.173-hardened1.patch" + "name": "linux-hardened-4.19.175-hardened1.patch", + "sha256": "04pflpzb8fs2wlx2sm46r1lxn4vcmhsygzk088m8rg3jjygany3i", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.175-hardened1/linux-hardened-4.19.175-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.13-hardened1.patch", - "sha256": "1pn6ddkpairsij8p5130h8iwqq65v6ngn0c3pf6rlavy4az1sw82", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.13-hardened1/linux-hardened-5.10.13-hardened1.patch" + "name": "linux-hardened-5.10.15-hardened1.patch", + "sha256": "1xd0qr58lz38swivhrbhjf1jz3y8y4i9ba1qcij7bydw125qvz14", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.15-hardened1/linux-hardened-5.10.15-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.95-hardened1.patch", - "sha256": "04c54xk75gb4p4yfrmjam25jafqz47cqapr38jw2v1plwc98ng4m", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.95-hardened1/linux-hardened-5.4.95-hardened1.patch" + "name": "linux-hardened-5.4.97-hardened1.patch", + "sha256": "1610lgvxxx6rmbi38q3pcaf9kcw8fqxspwmg2irgmvvzniv5p42x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.97-hardened1/linux-hardened-5.4.97-hardened1.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index d387e2fd03..787bc5accc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.219"; + version = "4.14.221"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1p81p2g1dax225mbc704g1yl96i93nq19j9fpkrzr4f066kwmvkm"; + sha256 = "1sf7sagy88p20310klbxdacyalg3q6zg870c709nz17lbw3m88nf"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index f0d84e36fa..390724b8a8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.173"; + version = "4.19.175"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pqr8k0kfnaklb31y29xvqdmgn0pak4qd9pl77lsh6pkwqvd5zfj"; + sha256 = "099b3dw9rj2z147dpjppd57g24paxw8x4fq1ir1ss5ibzy24pvnc"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 3b8cea54f3..eba19be1c2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.255"; + version = "4.4.257"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0l45csywd30qrs8gwzjjijr5hwpd5s05rbyrxb37vck78znk0f1g"; + sha256 = "0njb4gf77vix2xgnyhmrzf67czpqfng9np644l9j18dn4mb7q1iy"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4591018ee9..f53d39b20b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.255"; + version = "4.9.257"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "066101fzq5lr1pznw1hwlvsdgqpv8n7b2yi09qpv3xi0r41jvpxg"; + sha256 = "0kynyqk62hkfmamhvfp98i9kyr395chnwghslcbq5pl1zkzq1rwm"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 719f9ee40f..0d37a8b435 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.13"; + version = "5.10.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1wp1vy9y50ncwlx5yqgya5gy0vdqgzn0icffg6dzmvjwwc68qs86"; + sha256 = "00bf1v8zn4qngxhj6sca0lhv71xlnajw02iq6854s76my6y8flnq"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index b556481543..2e11688910 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.95"; + version = "5.4.97"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0jfl2jwq9z6iymn6sfrdcf9w63nijdzf3ncxc77a5gs6yd2fa2h3"; + sha256 = "0gs856v3q3m0q245mf8b9ivds8dizqrgjw27s9kbq3v31886da3i"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index a84828aa0c..25c8ee3a65 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17812"; - sha256 = "150rh6qakyfzr6afzchf7c05z0dvc39gj0rpfb4ggr7xqpzhxrcc"; + rev = "17873"; + sha256 = "1r1c8wagbq3cgxys7ylvsg6bnxiky66xgx9l0282zsmnn3gh83l7"; } , ... }: @@ -35,6 +35,8 @@ in linux.override { ''; }; + extraMeta.broken = true; + passthru.updateScript = ./update-libre.sh; maintainers = [ lib.maintainers.qyliss ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index b1874bf382..619bf48b73 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -7,6 +7,7 @@ buildLinux (args // { src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs"; + # commit does not exist on any branch on the target repository rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc"; sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix index d7255ac458..11a6f2755d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix @@ -30,6 +30,16 @@ stdenv.mkDerivation rec { "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf" ]; + # The following turns the 'clobbered' error into a warning + # which should fix the following error: + # + # semanage_store.c: In function 'semanage_exec_prog': + # semanage_store.c:1278:6: error: variable 'i' might be clobbered by 'longjmp' or 'vfork' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wclobbered-Werror=clobbered8;;] + # 1278 | int i; + # | ^ + # cc1: all warnings being treated as errors + NIX_CFLAGS_COMPILE = [ "-Wno-error=clobbered" ]; + installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; meta = removeAttrs libsepol.meta ["outputsToInstall"] // { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index cc72e2e42b..38b5e3241c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -145,7 +145,7 @@ buildHostCmd() { if [ -z "$buildHost" ]; then "$@" elif [ -n "$remoteNix" ]; then - ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "${maybeSudo[@]}" "$@" + ssh $SSHOPTS "$buildHost" env PATH="$remoteNix":'$PATH' "${maybeSudo[@]}" "$@" else ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@" fi diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix index 407f43eaf0..a697bb17a4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4, gettext +{ lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext , nixosTests }: @@ -11,17 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; }; - patches = lib.optionals (stdenv.hostPlatform.libc == "musl") [ - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; - sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; - }) - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; - sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81"; - }) - ]; - outputs = [ "out" "doc" "man" /* "modules" */ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix new file mode 100644 index 0000000000..c477e6f367 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, pkg-config +, meson +, ninja +, fetchFromGitLab +, libgudev +, glib +, gobject-introspection +, gettext +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_412 +, libxml2 +, libxslt +, upower +, systemd +}: + +stdenv.mkDerivation rec { + pname = "power-profiles-daemon"; + version = "0.1"; + + outputs = [ "out" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "hadess"; + repo = "power-profiles-daemon"; + rev = version; + sha256 = "012w3aryw5d43dr9jj5i6wy2a0n21jidr4ggs9ix7d4z9byr175w"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 + libxml2 # for xmllint for stripping GResources + libxslt # for xsltproc for building docs + gobject-introspection + ]; + + buildInputs = [ + libgudev + systemd + upower + glib + ]; + + mesonFlags = [ + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "-Dgtk_doc=true" + ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon"; + description = "Makes user-selected power profiles handling available over D-Bus"; + platforms = platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mvnetbiz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix index 0902ce3d61..4cf3e1f7dd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "psmisc"; - version = "23.3"; + version = "23.4"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1132xvrldv0dar2mf221mv5kvajq0v6yrq8k3nl0wslnh5baa0r0"; + sha256 = "sha256-s7omgtsNooYqhr4JUTZ6WCtPaZVC1ujJGz6KxUBWIs8="; }; nativeBuildInputs = [ autoconf automake gettext ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix index ef71cd8254..12f87f4095 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -12,6 +12,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rtlwifi-linux"; repo = "rtlwifi_new"; + # commit does not exist on any branch on the target repository rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348"; sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix index 41ab1a0f53..3622356257 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20201221"; + version = "1.0.20210124"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-8RPJEk+6NaJP3LNZYEncLlkdrw2jHxNekKwEr+YpHeQ="; + sha256 = "sha256-ZiHnKDYziiNvNV1/HjEluC83600RYCvgbUuPiRATRYE="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index a66520b6fa..202dc9091f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -8,8 +8,8 @@ , libtirpc , nfs-utils , gawk, gnugrep, gnused, systemd -, smartmontools, sysstat, sudo -, pkg-config +, smartmontools, enableMail ? false +, sysstat, sudo, pkg-config # Kernel dependencies , kernel ? null @@ -18,6 +18,8 @@ with lib; let + smartmon = smartmontools.override { inherit enableMail; }; + buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; @@ -148,7 +150,7 @@ let ''; postFixup = let - path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmontools sysstat ]}:$PATH"; + path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmon sysstat ]}:$PATH"; in '' for i in $out/libexec/zfs/zpool.d/*; do sed -i '2i${path}' $i @@ -157,12 +159,17 @@ let outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; - passthru.tests = if isUnstable then - [ nixosTests.zfs.unstable ] - else [ - nixosTests.zfs.installer - nixosTests.zfs.stable - ]; + passthru = { + inherit enableMail; + + tests = + if isUnstable then [ + nixosTests.zfs.unstable + ] else [ + nixosTests.zfs.installer + nixosTests.zfs.stable + ]; + }; meta = { description = "ZFS Filesystem Linux Kernel module"; diff --git a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix index 19d1aa3b5e..baba0ecdf0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }: -let version = "0.6.7"; +let version = "0.6.8"; in stdenv.mkDerivation { pname = "solo5"; inherit version; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - sha256 = "05k9adg3440zk5baa6ry8z5dj8d8r8hvzafh2469pdgcnr6h45gr"; + sha256 = "sha256-zrxNCXJIuEbtE3YNRK8Bxu2koHsQkcF+xItoIyhj9Uc="; }; hardeningEnable = [ "pie" ]; diff --git a/third_party/nixpkgs/pkgs/servers/adminer/default.nix b/third_party/nixpkgs/pkgs/servers/adminer/default.nix index 2774c8d1f2..779f7312ca 100644 --- a/third_party/nixpkgs/pkgs/servers/adminer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adminer/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, php }: stdenv.mkDerivation rec { - version = "4.7.8"; + version = "4.8.0"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "0k794agvd8pa3mwl0076i7753fzxd41lhr23aih4l2lbdgnzi68z"; + sha256 = "sha256-T2LEUoIbFrMta+wP7PNci0QkFYrJZmWP3RP/JzgqUoc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/dict/dictd-db.nix b/third_party/nixpkgs/pkgs/servers/dict/dictd-db.nix index 584c35bf7f..da73a94c2a 100644 --- a/third_party/nixpkgs/pkgs/servers/dict/dictd-db.nix +++ b/third_party/nixpkgs/pkgs/servers/dict/dictd-db.nix @@ -91,5 +91,5 @@ in rec { locale = "en_UK"; }; wordnet = callPackage ./dictd-wordnet.nix {}; - wiktionary = callPackage ./dictd-wiktionary.nix {}; + wiktionary = callPackage ./wiktionary {}; } diff --git a/third_party/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix b/third_party/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix deleted file mode 100644 index f591064a3c..0000000000 --- a/third_party/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix +++ /dev/null @@ -1,31 +0,0 @@ -{lib, stdenv, fetchurl, python, dict, glibcLocales, writeScript}: - -stdenv.mkDerivation rec { - version = "20161001"; - pname = "dict-db-wiktionary"; - data = fetchurl { - url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m"; - }; - - convert = ./wiktionary2dict.py; - buildInputs = [python dict glibcLocales]; - - builder = writeScript "wiktionary-builder.sh" '' - source $stdenv/setup - - mkdir -p $out/share/dictd/ - cd $out/share/dictd - - python -O ${convert} ${data} - dictzip wiktionary-en.dict - echo en_US.UTF-8 > locale - ''; - - meta = { - description = "DICT version of English Wiktionary"; - homepage = "http://en.wiktionary.org/"; - maintainers = [ ]; - platforms = lib.platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/dict/wiktionary/builder.sh b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/builder.sh new file mode 100644 index 0000000000..65652ad4bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/builder.sh @@ -0,0 +1,8 @@ +source $stdenv/setup + +mkdir -p $out/share/dictd/ +cd $out/share/dictd + +python -O "$convert" "$src" +dictzip wiktionary-en.dict +echo en_US.UTF-8 > locale diff --git a/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix new file mode 100644 index 0000000000..cd0c9c6c24 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, python, dict, glibcLocales }: + +stdenv.mkDerivation rec { + version = "20210201"; + pname = "dict-db-wiktionary"; + + src = fetchurl { + url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; + sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs"; + }; + + convert = ./wiktionary2dict.py; + buildInputs = [ python dict glibcLocales ]; + builder = ./builder.sh; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "DICT version of English Wiktionary"; + homepage = "http://en.wiktionary.org/"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.all; + license = with licenses; [ cc-by-sa-30 fdl11Plus ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/dict/wiktionary/latest_version.py b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/latest_version.py new file mode 100644 index 0000000000..2833a1e05b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/latest_version.py @@ -0,0 +1,42 @@ +import subprocess + +from html.parser import HTMLParser +from os.path import abspath, dirname +from urllib.request import urlopen + +class WiktionaryLatestVersionParser(HTMLParser): + def __init__(self, current_version, *args, **kwargs): + self.latest_version = current_version + super().__init__(*args, **kwargs) + + + def handle_starttag(self, tag, attrs): + if tag != 'a': + return + + href = dict(attrs)['href'][0:-1] + if href == 'latest': + return + + self.latest_version = max(self.latest_version, href) + + +def nix_prefetch_url(url, algo='sha256'): + """Prefetches the content of the given URL.""" + print(f'nix-prefetch-url {url}') + out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) + return out.decode('utf-8').rstrip() + + +current_version = subprocess.check_output([ + 'nix', 'eval', '--raw', + '-f', dirname(abspath(__file__)) + '/../../../..', + 'dictdDBs.wiktionary.version', +]).decode('utf-8') + +parser = WiktionaryLatestVersionParser(current_version) + +with urlopen('https://dumps.wikimedia.org/enwiktionary/') as resp: + parser.feed(resp.read().decode('utf-8')) + +print(parser.latest_version) diff --git a/third_party/nixpkgs/pkgs/servers/dict/wiktionary/update.sh b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/update.sh new file mode 100755 index 0000000000..ff5e0fc355 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/update.sh @@ -0,0 +1,7 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p common-updater-scripts python3 + +set -ueo pipefail + +version="$(python "$(dirname "${BASH_SOURCE[0]}")"/latest_version.py)" +update-source-version dictdDBs.wiktionary "$version" diff --git a/third_party/nixpkgs/pkgs/servers/dict/wiktionary2dict.py b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/wiktionary2dict.py similarity index 100% rename from third_party/nixpkgs/pkgs/servers/dict/wiktionary2dict.py rename to third_party/nixpkgs/pkgs/servers/dict/wiktionary/wiktionary2dict.py diff --git a/third_party/nixpkgs/pkgs/servers/etebase/default.nix b/third_party/nixpkgs/pkgs/servers/etebase/default.nix new file mode 100644 index 0000000000..d16c6f0113 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/etebase/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, python3, fetchFromGitHub }: + +let + py = python3.override { + packageOverrides = self: super: { + django = super.django_3; + }; + }; +in + with py.pkgs; + +buildPythonPackage rec { + pname = "etebase-server"; + version = "0.7.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "etesync"; + repo = "server"; + rev = "v${version}"; + sha256 = "1r2a7ki9w2h3l6rwqa3fzxjlqfj2lbgfrm8lynjhvcdv02s5abbi"; + }; + + patches = [ ./secret.patch ]; + + propagatedBuildInputs = with pythonPackages; [ + asgiref + cffi + django + django-cors-headers + djangorestframework + drf-nested-routers + msgpack + psycopg2 + pycparser + pynacl + pytz + six + sqlparse + ]; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -r . $out/lib/etebase-server + ln -s $out/lib/etebase-server/manage.py $out/bin/etebase-server + wrapProgram $out/bin/etebase-server --prefix PYTHONPATH : "$PYTHONPATH" + chmod +x $out/bin/etebase-server + ''; + + meta = with lib; { + homepage = "https://github.com/etesync/server"; + description = "An Etebase (EteSync 2.0) server so you can run your own."; + license = licenses.agpl3Only; + maintainers = with maintainers; [ felschr ]; + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/etebase/secret.patch b/third_party/nixpkgs/pkgs/servers/etebase/secret.patch new file mode 100644 index 0000000000..182d325924 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/etebase/secret.patch @@ -0,0 +1,26 @@ +diff --git a/etebase_server/settings.py b/etebase_server/settings.py +index 9baf8d3..501d9f6 100644 +--- a/etebase_server/settings.py ++++ b/etebase_server/settings.py +@@ -23,11 +22,6 @@ + # Quick-start development settings - unsuitable for production + # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ + +-# SECURITY WARNING: keep the secret key used in production secret! +-# See secret.py for how this is generated; uses a file 'secret.txt' in the root +-# directory +-SECRET_FILE = os.path.join(BASE_DIR, "secret.txt") +- + # SECURITY WARNING: don't run with debug turned on in production! + DEBUG = True + +@@ -143,7 +137,7 @@ + + section = config["global"] + +- SECRET_FILE = section.get("secret_file", SECRET_FILE) ++ SECRET_FILE = section.get("secret_file", None) + STATIC_ROOT = section.get("static_root", STATIC_ROOT) + STATIC_URL = section.get("static_url", STATIC_URL) + MEDIA_ROOT = section.get("media_root", MEDIA_ROOT) + diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix index 2aa46b7d82..508068bd2d 100644 --- a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix +++ b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "niklasf"; repo = pname; rev = "v${version}"; - sha256 = "159fwjy70n6lvnhdwv65azgi03r5qcc2m2zpzgz0k3r6cy06faxj"; + sha256 = "19dh69b6mqx16195w9d20fah4jl8hhbxm84xq4zwsgl4khmw7zqz"; }; - cargoSha256 = "1bfs8dy08799r6d63sb33zwcxas3gzp7jvcxv3w8n64gffan8f2n"; + cargoSha256 = "0zl2fnmqncyjd52wkn6dddx9lm9ywpw7swy895yq299z2bbbkv3h"; preBuild = '' rmdir ./assets diff --git a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix new file mode 100644 index 0000000000..be3012740f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: + +rustPlatform.buildRustPackage rec { + pname = "agate"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "mbrubeck"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mnatEvojma1+cOVllTAzDVxl5luRGleLE6GNPnQUNWQ="; + }; + + cargoSha256 = "sha256-B07itUftDj3yVMDc/2VetwYs74fZBa1tmeELbbQ39P0="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; + changelog = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; + description = "Very simple server for the Gemini hypertext protocol"; + longDescription = '' + Agate is a server for the Gemini network protocol, built with the Rust + programming language. Agate has very few features, and can only serve + static files. It uses async I/O, and should be quite efficient even when + running on low-end hardware and serving many concurrent requests. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix index f81cc6600f..7736ed1a01 100644 --- a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix @@ -2,18 +2,17 @@ , cmake, pkg-config # required , libupnp, libuuid, pugixml, libiconv, sqlite, zlib, spdlog, fmt -, pkgs # options -, enableDuktape ? true -, enableCurl ? true -, enableTaglib ? true -, enableLibmagic ? true -, enableLibmatroska ? true -, enableAvcodec ? false -, enableLibexif ? true -, enableExiv2 ? false -, enableFFmpegThumbnailer ? false -, enableInotifyTools ? true +, enableDuktape ? true, duktape +, enableCurl ? true, curl +, enableTaglib ? true, taglib +, enableLibmagic ? true, file +, enableLibmatroska ? true, libmatroska, libebml +, enableAvcodec ? false, ffmpeg +, enableLibexif ? true, libexif +, enableExiv2 ? false, exiv2 +, enableFFmpegThumbnailer ? false, ffmpegthumbnailer +, enableInotifyTools ? true, inotify-tools }: with lib; @@ -51,16 +50,16 @@ in stdenv.mkDerivation rec { libupnp libuuid pugixml libiconv sqlite zlib fmt.dev spdlog ] - ++ optionals enableDuktape [ pkgs.duktape ] - ++ optionals enableCurl [ pkgs.curl ] - ++ optionals enableTaglib [ pkgs.taglib ] - ++ optionals enableLibmagic [ pkgs.file ] - ++ optionals enableLibmatroska [ pkgs.libmatroska pkgs.libebml ] - ++ optionals enableAvcodec [ pkgs.libav.dev ] - ++ optionals enableLibexif [ pkgs.libexif ] - ++ optionals enableExiv2 [ pkgs.exiv2 ] - ++ optionals enableInotifyTools [ pkgs.inotify-tools ] - ++ optionals enableFFmpegThumbnailer [ pkgs.ffmpegthumbnailer ]; + ++ optionals enableDuktape [ duktape ] + ++ optionals enableCurl [ curl ] + ++ optionals enableTaglib [ taglib ] + ++ optionals enableLibmagic [ file ] + ++ optionals enableLibmatroska [ libmatroska libebml ] + ++ optionals enableAvcodec [ ffmpeg.dev ] + ++ optionals enableLibexif [ libexif ] + ++ optionals enableExiv2 [ exiv2 ] + ++ optionals enableInotifyTools [ inotify-tools ] + ++ optionals enableFFmpegThumbnailer [ ffmpegthumbnailer ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index b6c3a281f2..40779f4bc1 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.2.0"; + version = "2021.2.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -16,7 +16,7 @@ "agent_dvr" = ps: with ps; [ agent-py ]; "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ airly ]; - "airnow" = ps: with ps; [ ]; # missing inputs: pyairnow + "airnow" = ps: with ps; [ pyairnow ]; "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; @@ -195,7 +195,7 @@ "dwd_weather_warnings" = ps: with ps; [ ]; # missing inputs: dwdwfsapi "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool + "dyson" = ps: with ps; [ aiohttp-cors libpurecool zeroconf ]; "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy @@ -561,7 +561,7 @@ "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo - "nuki" = ps: with ps; [ ]; # missing inputs: pynuki + "nuki" = ps: with ps; [ pynuki ]; "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "number" = ps: with ps; [ ]; "nut" = ps: with ps; [ ]; # missing inputs: pynut2 @@ -592,7 +592,7 @@ "opensensemap" = ps: with ps; [ opensensemap-api ]; "opensky" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw - "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv + "openuv" = ps: with ps; [ pyopenuv ]; "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ pyopnsense ]; "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio @@ -666,7 +666,7 @@ "random" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client - "recollect_waste" = ps: with ps; [ ]; # missing inputs: aiorecollect + "recollect_waste" = ps: with ps; [ aiorecollect ]; "recorder" = ps: with ps; [ sqlalchemy ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch "reddit" = ps: with ps; [ praw ]; @@ -744,7 +744,7 @@ "slack" = ps: with ps; [ ]; # missing inputs: slackclient "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api - "sma" = ps: with ps; [ ]; # missing inputs: pysma + "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee "smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab @@ -901,7 +901,7 @@ "verisure" = ps: with ps; [ jsonpath vsure ]; "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense "version" = ps: with ps; [ pyhaversion ]; - "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync + "vesync" = ps: with ps; [ pyvesync ]; "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client @@ -965,7 +965,7 @@ "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; - "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc + "zerproc" = ps: with ps; [ pyzerproc ]; "zestimate" = ps: with ps; [ xmltodict ]; "zha" = ps: with ps; [ bellows pyserial-asyncio pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 1c24f6dd4f..fae857fda5 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixosTests, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 +{ stdenv, nixosTests, lib, fetchFromGitHub, python3 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -57,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.2.0"; + hassVersion = "2021.2.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "116aq683wy7sxdbxr43li90irpfbsz0dv8w0r1fghcjpwlj7ihwa"; + sha256 = "0s1jcd94wwvmvzq86w8s9dwfvnmjs9l661z9pc6kwgagggjjgd8c"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -101,6 +101,7 @@ in with py.pkgs; buildPythonApplication rec { astral async-timeout attrs + awesomeversion bcrypt certifi ciso8601 @@ -180,31 +181,25 @@ in with py.pkgs; buildPythonApplication rec { ]; pytestFlagsArray = [ - "-n auto" + # limit amout of runners to reduce race conditions + "-n 2" + # assign tests grouped by file to workers + "--dist loadfile" # don't bulk test all components "--ignore tests/components" - # prone to race conditions due to parallel file access - "--ignore tests/test_config.py" # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0 "--ignore tests/auth/mfa_modules/test_notify.py" "tests" ] ++ map (component: "tests/components/" + component) componentTests; disabledTests = [ - # AssertionError: assert 'unknown' == 'not_home' - "test_device_tracker_not_home" + # AssertionError: assert 1 == 0 + "test_merge" + # ModuleNotFoundError: No module named 'pyqwikswitch' + "test_merge_id_schema" # keyring.errors.NoKeyringError: No recommended backend was available. "test_secrets_from_unrelated_fails" "test_secrets_credstash" - # AssertionError: Expected 'start' to have been called once. Called 0 times. - "test_setup_and_stop" - # AssertionError: assert {} == {'test': } - "test_get_custom_components_internal" - # assert 0 == 1 where 0 = len([]) - "test_error_posted_as_event" - # RuntimeError: Event loop is closed - "test_config_path" - "test_info_endpoint_register_callback_timeout" ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix index de3f58fc06..72c6286af3 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; + sha256 = "sha256-/4jA5acNpHpdQ9kb/1A9thtoUCqsYFxSCr4JLmFYdt4="; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix index afc7c5c745..be631dd341 100644 --- a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.58"; + name = "lighttpd-1.4.59"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "sha256-Jn/v/aE6GQ69znsVFy2L4W2pgAhFfzD93s1ygy0SbQ4="; + sha256 = "sha256-+5U9snPa7wjttuICVWyuij0H7tYIHJa9mQPblX0QhNU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix index 71bc969bbe..0725b674a3 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -22,6 +22,17 @@ in fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth"; + akamai-token-validate = { + src = fetchFromGitHub { + name = "akamai-token-validate"; + owner = "kaltura"; + repo = "nginx-akamai-token-validate-module"; + rev = "34fd0c94d2c43c642f323491c4f4a226cd83b962"; + sha256 = "0yf34s11vgkcl03wbl6gjngm3p9hs8vvm7hkjkwhjh39vkk2a7cy"; + }; + inputs = [ pkgs.openssl ]; + }; + aws-auth = { src = fetchFromGitHub { name = "aws-auth"; @@ -320,6 +331,17 @@ in }; }; + secure-token = { + src = fetchFromGitHub { + name = "secure-token"; + owner = "kaltura"; + repo = "nginx-secure-token-module"; + rev = "95bdc0d1aca06ea7fe42555f71e65910bd74914d"; + sha256 = "19wzck1xzq4kz7nyabcwzlank1k7wi7w2wn2c1mwz374c79g8ggp"; + }; + inputs = [ pkgs.openssl ]; + }; + set-misc = { src = fetchFromGitHub { name = "set-misc"; @@ -370,6 +392,16 @@ in }; }; + spnego-http-auth = { + src = fetchFromGitHub { + name = "spnego-http-auth"; + owner = "stnoonan"; + repo = "spnego-http-auth-nginx-module"; + rev = "72c8ee04c81f929ec84d5a6d126f789b77781a8c"; + sha256 = "05rw3a7cv651951li995r5l1yzz6kwkm2xpbd59jsfzd74bw941i"; + }; + }; + statsd = { src = fetchFromGitHub { name = "statsd"; @@ -462,6 +494,17 @@ in inputs = [ pkgs.ffmpeg_3 ]; }; + vod = { + src = fetchFromGitHub { + name = "vod"; + owner = "kaltura"; + repo = "nginx-vod-module"; + rev = "e46079f51282d5a378e6911714b5f3a533bb7700"; + sha256 = "0pzzq4xcq7jg8mxwnz7srj1nczg9ajd1b8q58qlm03lny8nd2hr5"; + }; + inputs = [ pkgs.ffmpeg_3 pkgs.fdk_aac pkgs.openssl pkgs.libxml2 pkgs.libiconv ]; + }; + vts = { src = fetchFromGitHub { name = "vts"; diff --git a/third_party/nixpkgs/pkgs/servers/irc/ngircd/default.nix b/third_party/nixpkgs/pkgs/servers/irc/ngircd/default.nix index b89837e594..870a7836fe 100644 --- a/third_party/nixpkgs/pkgs/servers/irc/ngircd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irc/ngircd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ngircd"; - version = "26"; + version = "26.1"; src = fetchurl { url = "https://ngircd.barton.de/pub/ngircd/${pname}-${version}.tar.xz"; - sha256 = "1ijmv18fa648y7apxb9vp4j9iq6fxq850kz5v36rysaq614cdp2n"; + sha256 = "sha256-VcFv0mAJ9vxqAH3076yHoC4SL2gGEs2hzibhehjYYlQ="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/isso/default.nix b/third_party/nixpkgs/pkgs/servers/isso/default.nix index b9bce56d9f..4db8ac1f40 100644 --- a/third_party/nixpkgs/pkgs/servers/isso/default.nix +++ b/third_party/nixpkgs/pkgs/servers/isso/default.nix @@ -3,16 +3,14 @@ with python3Packages; buildPythonApplication rec { pname = "isso"; - # Can not use 0.12.2 because of: - # https://github.com/posativ/isso/issues/617 - version = "unstable-2020-09-14"; + version = "0.12.4"; # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; - rev = "f4d2705d4f1b51f444d0629355a6fcbcec8d57b5"; - sha256 = "02jgfzq3svd54zj09jj7lm2r7ypqqjynzxa9dgnnm0pqvq728wzr"; + rev = version; + sha256 = "16wjpz8r74fzjvzhl6by3sjc2g1riz8lh59ccgp14bns1yhsh2yi"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix new file mode 100644 index 0000000000..8508fbe8f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix @@ -0,0 +1,112 @@ +{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv +, yarn, callPackage, imagemagick, ffmpeg, file, ruby_2_7 + + # Allow building a fork or custom version of Mastodon: +, pname ? "mastodon" +, version ? import ./version.nix +, srcOverride ? null +, dependenciesDir ? ./. # Should contain gemset.nix, yarn.nix and package.json. +}: + +stdenv.mkDerivation rec { + inherit pname version; + + # Using overrideAttrs on src does not build the gems and modules with the overridden src. + # Putting the callPackage up in the arguments list also does not work. + src = if srcOverride != null then srcOverride else callPackage ./source.nix {}; + + mastodon-gems = bundlerEnv { + name = "${pname}-gems-${version}"; + inherit version; + ruby = ruby_2_7; + gemdir = src; + gemset = dependenciesDir + "/gemset.nix"; + # This fix (copied from https://github.com/NixOS/nixpkgs/pull/76765) replaces the gem + # symlinks with directories, resolving this error when running rake: + # /nix/store/451rhxkggw53h7253izpbq55nrhs7iv0-mastodon-gems-3.0.1/lib/ruby/gems/2.6.0/gems/bundler-1.17.3/lib/bundler/settings.rb:6:in `': uninitialized constant Bundler::Settings (NameError) + postBuild = '' + for gem in "$out"/lib/ruby/gems/*/gems/*; do + cp -a "$gem/" "$gem.new" + rm "$gem" + # needed on macOS, otherwise the mv yields permission denied + chmod +w "$gem.new" + mv "$gem.new" "$gem" + done + ''; + }; + + mastodon-js-modules = mkYarnPackage { + pname = "${pname}-modules"; + yarnNix = dependenciesDir + "/yarn.nix"; + packageJSON = dependenciesDir + "/package.json"; + inherit src version; + }; + + mastodon-assets = stdenv.mkDerivation { + pname = "${pname}-assets"; + inherit src version; + + buildInputs = [ + mastodon-gems nodejs-slim yarn + ]; + + # FIXME: "production" would require OTP_SECRET to be set, so we use + # development here. + RAILS_ENV = "development"; + + buildPhase = '' + # Support Mastodon forks which don't call themselves 'mastodon' or which + # omit the organization name from package.json. + if [ "$(ls ${mastodon-js-modules}/libexec/* | grep node_modules)" ]; then + cp -r ${mastodon-js-modules}/libexec/*/node_modules node_modules + else + cp -r ${mastodon-js-modules}/libexec/*/*/node_modules node_modules + fi + chmod -R u+w node_modules + rake webpacker:compile + ''; + + installPhase = '' + mkdir -p $out/public + cp -r public/assets $out/public + cp -r public/packs $out/public + ''; + }; + + passthru.updateScript = callPackage ./update.nix {}; + + buildPhase = '' + if [ "$(ls ${mastodon-js-modules}/libexec/* | grep node_modules)" ]; then + ln -s ${mastodon-js-modules}/libexec/*/node_modules node_modules + else + ln -s ${mastodon-js-modules}/libexec/*/*/node_modules node_modules + fi + ln -s ${mastodon-assets}/public/assets public/assets + ln -s ${mastodon-assets}/public/packs public/packs + + patchShebangs bin/ + for b in $(ls ${mastodon-gems}/bin/) + do + if [ ! -f bin/$b ]; then + ln -s ${mastodon-gems}/bin/$b bin/$b + fi + done + + rm -rf log + ln -s /var/log/mastodon log + ln -s /tmp tmp + ''; + propagatedBuildInputs = [ imagemagick ffmpeg file mastodon-gems.wrappedRuby ]; + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; + + meta = with lib; { + description = "Self-hosted, globally interconnected microblogging software based on ActivityPub"; + homepage = "https://joinmastodon.org"; + license = licenses.agpl3Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ petabyteboy happy-river erictapen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix new file mode 100644 index 0000000000..07aeb0bc9c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix @@ -0,0 +1,3006 @@ +{ + actioncable = { + dependencies = ["actionpack" "nio4r" "websocket-driver"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yvrnxvdzx3yvgkxwzffhkr8m4w19h97lyyj030g1q4xjii5a1kr"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + actionmailer = { + dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nhslq95il78h7qv7w7h7i9fx3znc5hxmqbnws0sl9w7am7zkl8x"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d8gxymshjhva5fyv33iy2hzp4jm3i44asdbma9pv9wzpl5fwhn0"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + actionview = { + dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k8dgkplqj76i3q1f8897m8svj2xggd1knhy3bcwfl4nh7998kw6"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + active_model_serializers = { + dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p8rhy2bw86d0l3d0l97zj179yqzl338v7r5pvl8mdagcrp2fw9i"; + type = "gem"; + }; + version = "0.10.10"; + }; + active_record_query_trace = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19888wjdpqvr2kaci6v6jyjw9pjf682zb1iyx2lz12mpdmy3500n"; + type = "gem"; + }; + version = "1.8"; + }; + activejob = { + dependencies = ["activesupport" "globalid"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w32z0s111cr95mwpdb3fnlzaf1vdz0ag3l2gah9m95kfa2pb2kv"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + activemodel = { + dependencies = ["activesupport"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g79l7v0ddpxcj5r2s9kii6h4r4nbpy5bksbqi5lxvivrb3pkz1m"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport" "arel"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05b9l85a31cq6g7v4b4ifrj798q49rlidcvvfasmb3bk412wlp03"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + activestorage = { + dependencies = ["actionpack" "activerecord" "marcel"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yzig9p9qb2wx91y0d0vs7bz23hli6djwwf4cawxh6b93bycbcci"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; + }; + airbrussh = { + dependencies = ["sshkit"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16lmd6173gvhcpzj1blracx6hhlqjmmmmi4rh5y4lz6c87vg51lp"; + type = "gem"; + }; + version = "1.4.0"; + }; + android_key_attestation = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02spc1sh7zsljl02v9d5rdb717b628vw2k7jkkplifyjk4db0zj6"; + type = "gem"; + }; + version = "0.3.0"; + }; + annotate = { + dependencies = ["activerecord" "rake"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dxrfppwfg13vqmambbs56xjj8qsdgcy58r2yc44vvy3z1g5yflw"; + type = "gem"; + }; + version = "3.1.1"; + }; + arel = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; + type = "gem"; + }; + version = "9.0.0"; + }; + ast = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; + type = "gem"; + }; + version = "2.4.1"; + }; + attr_encrypted = { + dependencies = ["encryptor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; + type = "gem"; + }; + version = "3.1.0"; + }; + av = { + dependencies = ["cocaine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1swakpybf6g0nzfdn6q4s9c97ysc3i4ffk84dw8v2321fpvc8gqq"; + type = "gem"; + }; + version = "0.9.0"; + }; + awrence = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zwdli370jfsj6jypv7vrqf4vv4ac4784faw7ar5v88fk4q9rcv"; + type = "gem"; + }; + version = "1.1.1"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pqgnc4pcwdvvxlclmyjwcaf0vmlciy0l9y1yab5f1f0fjn969fs"; + type = "gem"; + }; + version = "1.397.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8w8qqrmx91ngw9b8dr1zx2h2g071kjd1973w9fk2486gs0n44f"; + type = "gem"; + }; + version = "3.109.3"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a"; + type = "gem"; + }; + version = "1.39.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ak4kz8x7l0qfadx4p09iky1gbf6ka3wa66rnvc7rn3sf1k80zjm"; + type = "gem"; + }; + version = "1.85.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; + type = "gem"; + }; + version = "1.2.2"; + }; + bcrypt = { + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; + type = "gem"; + }; + version = "3.1.16"; + }; + better_errors = { + dependencies = ["coderay" "erubi" "rack"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11220lfzhsyf5fcril3qd689kgg46qlpiiaj00hc9mh4mcbc3vrr"; + type = "gem"; + }; + version = "2.9.1"; + }; + bindata = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic"; + type = "gem"; + }; + version = "2.4.8"; + }; + binding_of_caller = { + dependencies = ["debug_inspector"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; + type = "gem"; + }; + version = "0.8.0"; + }; + blurhash = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04halkacf3pd030s3bqfjd59vbj47lchrhp9zvwsn4c6sdrfjdd4"; + type = "gem"; + }; + version = "0.1.4"; + }; + bootsnap = { + dependencies = ["msgpack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qx1f729bgh391agsqb4ngzn22wdn4cc6mkp0cipf0d5hsg9cpaq"; + type = "gem"; + }; + version = "1.5.1"; + }; + brakeman = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pbr3drisii8j8wdvxhvd7kmpqwcgzayl99kzkjnpl1p27vpvvvv"; + type = "gem"; + }; + version = "4.10.0"; + }; + browser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q1yzvbqp0mykswipq3w00ljw9fgkhjfrij3hkwi7cx85r14n6gw"; + type = "gem"; + }; + version = "4.2.0"; + }; + builder = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + bullet = { + dependencies = ["activesupport" "uniform_notifier"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18ifwnvn13755qkfigapyj5bflpby3phxzbb7x5336d0kzv5k7d9"; + type = "gem"; + }; + version = "6.1.0"; + }; + bundler-audit = { + dependencies = ["thor"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j"; + type = "gem"; + }; + version = "0.7.0.1"; + }; + byebug = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; + type = "gem"; + }; + version = "11.1.3"; + }; + capistrano = { + dependencies = ["airbrussh" "i18n" "rake" "sshkit"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13k2k29y8idcacr0r4ycixpb7mvv2v88dilwzdmaw9r08wc8y9bl"; + type = "gem"; + }; + version = "3.14.1"; + }; + capistrano-bundler = { + dependencies = ["capistrano"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "168kyi0gv2s84jm533m8rg0dii50flr06n6s2ci6kzsib3n9n8dr"; + type = "gem"; + }; + version = "2.0.1"; + }; + capistrano-rails = { + dependencies = ["capistrano" "capistrano-bundler"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13fnicx9fkilgvlapjmdglcs3yjll0brx3bp4mbi3sixxcm6vy9r"; + type = "gem"; + }; + version = "1.6.1"; + }; + capistrano-rbenv = { + dependencies = ["capistrano" "sshkit"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x9m1i5zd0wx122zw3m40zprlmxk9d47bd6w61k81wr4qsvkk3rw"; + type = "gem"; + }; + version = "2.2.0"; + }; + capistrano-yarn = { + dependencies = ["capistrano"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zdg2s061vl5b8114n909mrjb2hc1qx0i4wqx9nacsrcjgyp07l9"; + type = "gem"; + }; + version = "2.0.2"; + }; + capybara = { + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ji9kyb01dpnjbvpyb0c481cpnisd6wx6div6rywi9fihk66627w"; + type = "gem"; + }; + version = "3.33.0"; + }; + case_transform = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fzyws6spn5arqf6q604dh9mrj84a36k5hsc8z7jgcpfvhc49bg2"; + type = "gem"; + }; + version = "0.2"; + }; + cbor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3"; + type = "gem"; + }; + version = "0.5.9.6"; + }; + charlock_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + type = "gem"; + }; + version = "0.7.7"; + }; + chewy = { + dependencies = ["activesupport" "elasticsearch" "elasticsearch-dsl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dczmxh09s0s8d2l111zdb49s0c6wa1s09dslh8prqms6r4n544f"; + type = "gem"; + }; + version = "5.1.0"; + }; + chunky_png = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0av5km25hxz21zkbnvac1g8hjskwhr1gvb3rhlcnjvhqq8cvz2lj"; + type = "gem"; + }; + version = "1.3.12"; + }; + cld3 = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04hwr44m7x7vv55lc4vk5zcd6zq98c2asvzl3dh2adg1fhpk29nr"; + type = "gem"; + }; + version = "3.3.0"; + }; + climate_control = { + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q11v0iabvr6rif0d025xh078ili5frrihlj0m04zfg7lgvagxji"; + type = "gem"; + }; + version = "0.2.0"; + }; + cocaine = { + dependencies = ["climate_control"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01kk5xd7lspbkdvn6nyj0y51zhvia3z6r4nalbdcqw5fbsywwi7d"; + type = "gem"; + }; + version = "0.5.8"; + }; + coderay = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; + type = "gem"; + }; + version = "1.1.3"; + }; + color_diff = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01dpvqlzybpb3pkcwd9ik5sbjw283618ywvdphxslhiy8ps3kp4r"; + type = "gem"; + }; + version = "0.1"; + }; + concurrent-ruby = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + type = "gem"; + }; + version = "1.1.7"; + }; + connection_pool = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qikl4av1z8kqnk5ba18136dpqzw8wjawc2w9b4zb5psdd5z8nwf"; + type = "gem"; + }; + version = "2.2.3"; + }; + cose = { + dependencies = ["cbor" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h1vcirk1vpr992xmnwf5z77fpizjwn4xzq2vrrjhvdmjynvl3jj"; + type = "gem"; + }; + version = "1.0.0"; + }; + crack = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1awi8jy4jn0f7vxpdvz3xvn1zzjbjh33n28lfkijh77dla5zb7lc"; + type = "gem"; + }; + version = "0.4.4"; + }; + crass = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; + type = "gem"; + }; + version = "1.0.6"; + }; + css_parser = { + dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; + type = "gem"; + }; + version = "1.7.1"; + }; + debug_inspector = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; + type = "gem"; + }; + version = "0.0.3"; + }; + devise = { + dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"]; + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0syqkh0q9mcdgj68m2cf1innpxb8fv6xsayk1kgsdmq539rkv3ic"; + type = "gem"; + }; + version = "4.7.3"; + }; + devise-two-factor = { + dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzk7phrryxlq4k3jrcxm8faifmbqrbfxq7jx089ncsixwd69bn4"; + type = "gem"; + }; + version = "3.1.0"; + }; + devise_pam_authenticatable2 = { + dependencies = ["devise" "rpam2"]; + groups = ["pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13ipl52pkhc6vxp8ca31viwv01237bi2bfk3b1fixq1x46nf87p2"; + type = "gem"; + }; + version = "9.2.0"; + }; + diff-lcs = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; + type = "gem"; + }; + version = "1.4.4"; + }; + discard = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zq7wjmknz8fd1pw169xpwf6js4280gnphy6mw8m3xiz1715bcig"; + type = "gem"; + }; + version = "1.2.0"; + }; + docile = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + type = "gem"; + }; + version = "1.3.2"; + }; + domain_name = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + doorkeeper = { + dependencies = ["railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "105yr9gy60z0pyh85pbc6gazanm6jmb5c6agd7p1mzrc21hmrzrk"; + type = "gem"; + }; + version = "5.4.0"; + }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + type = "gem"; + }; + version = "2.7.6"; + }; + dotenv-rails = { + dependencies = ["dotenv" "railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1my2jdmgmpf32rfxffkb9cyxh7ayis4q5ygpwjqj4vpp25y3a70c"; + type = "gem"; + }; + version = "2.7.6"; + }; + e2mmap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5"; + type = "gem"; + }; + version = "0.1.0"; + }; + ed25519 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; + type = "gem"; + }; + version = "1.2.4"; + }; + elasticsearch = { + dependencies = ["elasticsearch-api" "elasticsearch-transport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qkabj3hd0f9yf6l42xls78vzsbihziqw3zqrmjj91l0w1d1abkk"; + type = "gem"; + }; + version = "7.9.0"; + }; + elasticsearch-api = { + dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nsk9p816x3rck1xklmzbbhfp18w0i32qb0qaxvrx8jlgwvd3y7z"; + type = "gem"; + }; + version = "7.9.0"; + }; + elasticsearch-dsl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d2qr5hvqcr5r78djzrw5fjkaggvw080sdixnnq8cf8yriwhsvnf"; + type = "gem"; + }; + version = "0.1.9"; + }; + elasticsearch-transport = { + dependencies = ["faraday" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ic87n4772an00nq6z2znd8wmyhpgdcmjbvrzfqj51xi4q627x0a"; + type = "gem"; + }; + version = "7.9.0"; + }; + encryptor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb"; + type = "gem"; + }; + version = "3.0.0"; + }; + erubi = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + type = "gem"; + }; + version = "1.9.0"; + }; + et-orbi = { + dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xr8i8ql4xzx17d12590i3j299hj6vc0ja2j29dy12i5nlchxrvp"; + type = "gem"; + }; + version = "1.2.4"; + }; + excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05is0kb650j8wrdi4rgkdls662chnhdg2p64pgq3zkd3d7l2a9zw"; + type = "gem"; + }; + version = "0.76.0"; + }; + fabrication = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pdrl55xf76pbc5kjzp7diawxxvgbk2cm38532in6df823431n6z"; + type = "gem"; + }; + version = "2.21.1"; + }; + faker = { + dependencies = ["i18n"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6"; + type = "gem"; + }; + version = "2.14.0"; + }; + faraday = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; + type = "gem"; + }; + version = "1.0.1"; + }; + fast_blank = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56"; + type = "gem"; + }; + version = "1.0.0"; + }; + fastimage = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11ny2pj0j6pljszrf1w3iqdv2pcl2iwwghjbgcjlizy424zbh0hb"; + type = "gem"; + }; + version = "2.2.0"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + type = "gem"; + }; + version = "1.10.0"; + }; + ffi-compiler = { + dependencies = ["ffi" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + type = "gem"; + }; + version = "1.0.1"; + }; + fog-core = { + dependencies = ["builder" "excon" "formatador" "mime-types"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; + type = "gem"; + }; + version = "2.1.0"; + }; + fog-json = { + dependencies = ["fog-core" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; + type = "gem"; + }; + version = "1.2.0"; + }; + fog-openstack = { + dependencies = ["fog-core" "fog-json" "ipaddress"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11j18h61d3p0pcp9k5346lbj1lahab1dqybkrx9338932lmjn7ap"; + type = "gem"; + }; + version = "0.3.10"; + }; + formatador = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + type = "gem"; + }; + version = "0.2.5"; + }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vmzjmwq5968ni9wzdp957iizddj85v69qi0hz5rk8148lz1bccm"; + type = "gem"; + }; + version = "1.3.9"; + }; + fuubar = { + dependencies = ["rspec-core" "ruby-progressbar"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "090sx0ck194am6v3hwfld2ijvldd0mjwplqz8r36p34l4p8z9d79"; + type = "gem"; + }; + version = "2.5.0"; + }; + globalid = { + dependencies = ["activesupport"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; + type = "gem"; + }; + version = "0.4.2"; + }; + hamlit = { + dependencies = ["temple" "thor" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06imnwpzvpagwn0b9a8kwv7hncii32flmafz20z95hd77hhr6ab7"; + type = "gem"; + }; + version = "2.13.0"; + }; + hamlit-rails = { + dependencies = ["actionpack" "activesupport" "hamlit" "railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v75yd6x0nwky83smd9hw5ym9h0pi32jrzbnvq55pzj0rc95gg2p"; + type = "gem"; + }; + version = "0.2.3"; + }; + hamster = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1lsh96vnyc1pnzyd30f9prcsclmvmkdb3nm5aahnyizyiy6lar"; + type = "gem"; + }; + version = "3.0.0"; + }; + hashdiff = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; + type = "gem"; + }; + version = "1.0.1"; + }; + hashie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; + type = "gem"; + }; + version = "4.1.0"; + }; + health_check = { + dependencies = ["rails"]; + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "0b799ead604f900ed50685e9b2d469cd2befba5b"; + sha256 = "0yz4axwkynsnng8xswrg2ysxlkjwfw0v4padvqwm4xal7nri172d"; + type = "git"; + url = "https://github.com/ianheggie/health_check"; + }; + version = "4.0.0.pre"; + }; + highline = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + type = "gem"; + }; + version = "2.0.3"; + }; + hiredis = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04jj8k7lxqxw24sp0jiravigdkgsyrpprxpxm71ba93x1wr2w1bz"; + type = "gem"; + }; + version = "0.6.3"; + }; + hkdf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04fixg0a51n4vy0j6c1hvisa2yl33m3jrrpxpb5sq6j511vjriil"; + type = "gem"; + }; + version = "0.3.0"; + }; + htmlentities = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + http = { + dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; + type = "gem"; + }; + version = "4.4.1"; + }; + http-cookie = { + dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + http-form_data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc"; + type = "gem"; + }; + version = "2.3.0"; + }; + http-parser = { + dependencies = ["ffi-compiler"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10wz818i7dq5zkcll0yf7pbjz1zqvs7mgh3xg3x6www2f2ccwxqj"; + type = "gem"; + }; + version = "1.2.1"; + }; + http_accept_language = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d0nlfz9vm4jr1l6q0chx4rp2hrnrfbx3gadc1dz930lbbaz0hq0"; + type = "gem"; + }; + version = "2.1.1"; + }; + httplog = { + dependencies = ["rack" "rainbow"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mq67if5lq388raxa5rh43z6g5zlqh9yixcja4s81p9dzrsj4i3x"; + type = "gem"; + }; + version = "1.4.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + type = "gem"; + }; + version = "1.8.5"; + }; + i18n-tasks = { + dependencies = ["activesupport" "ast" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04am9452ihm8fcq2si44bba0msz0014wfg50ksxs5dpb2l065abg"; + type = "gem"; + }; + version = "0.9.31"; + }; + idn-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr"; + type = "gem"; + }; + version = "0.1.0"; + }; + ipaddress = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; + type = "gem"; + }; + version = "0.8.3"; + }; + iso-639 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k1r8wgk6syvpsl3j5qfh5az5w4zdvk0pvpjl7qspznfdbp2mn71"; + type = "gem"; + }; + version = "0.3.5"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + type = "gem"; + }; + version = "1.4.0"; + }; + json = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + type = "gem"; + }; + version = "2.3.1"; + }; + json-canonicalization = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "014lc8am17m2amfkzdfc9ksaafnwpb7zzr8l7382r60zkkgpkljg"; + type = "gem"; + }; + version = "0.2.0"; + }; + json-ld = { + dependencies = ["htmlentities" "json-canonicalization" "link_header" "multi_json" "rack" "rdf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q9sg8a719sai53gjpznf9r78l035xry0pk1yrag34pb50k2l05l"; + type = "gem"; + }; + version = "3.1.5"; + }; + json-ld-preloaded = { + dependencies = ["json-ld" "rdf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f8vham63wy689d4jp2j9rani0n10h40dpymgishf3na8cjj0lix"; + type = "gem"; + }; + version = "3.1.3"; + }; + jsonapi-renderer = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ys4drd0k9rw5ixf8n8fx8v0pjh792w4myh0cpdspd317l1lpi5m"; + type = "gem"; + }; + version = "0.2.2"; + }; + jwt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; + type = "gem"; + }; + version = "2.2.2"; + }; + kaminari = { + dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vxkqciny5v4jgmjxl8qrgbmig2cij2iskqbwh4bfcmpxf467ch3"; + type = "gem"; + }; + version = "1.2.1"; + }; + kaminari-actionview = { + dependencies = ["actionview" "kaminari-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w0p1hyv6lgf6h036cmn2kbkdv4x7g0g9q9kc5gzkpz7amlxr8ri"; + type = "gem"; + }; + version = "1.2.1"; + }; + kaminari-activerecord = { + dependencies = ["activerecord" "kaminari-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02n5xxv6ilh39q2m6vcz7qrdai7ghk3s178dw6f0b3lavwyq49w3"; + type = "gem"; + }; + version = "1.2.1"; + }; + kaminari-core = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h04cr4y1jfn81gxy439vmczifghc2cvsyw47aa32is5bbxg1wlz"; + type = "gem"; + }; + version = "1.2.1"; + }; + launchy = { + dependencies = ["addressable"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xdyvr5j0gjj7b10kgvh8ylxnwk3wx19my42wqn9h82r4p246hlm"; + type = "gem"; + }; + version = "2.5.0"; + }; + letter_opener = { + dependencies = ["launchy"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9"; + type = "gem"; + }; + version = "1.7.0"; + }; + letter_opener_web = { + dependencies = ["actionmailer" "letter_opener" "railties"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pianlrbf9n7jrqxpyxgsfk1j1d312d57d6gq7yxni6ax2q0293q"; + type = "gem"; + }; + version = "1.4.0"; + }; + link_header = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yamrdq4rywmnpdhbygnkkl9fdy249fg5r851nrkkxr97gj5rihm"; + type = "gem"; + }; + version = "0.0.8"; + }; + lograge = { + dependencies = ["actionpack" "activesupport" "railties" "request_store"]; + groups = ["production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac"; + type = "gem"; + }; + version = "0.11.2"; + }; + loofah = { + dependencies = ["crass" "nokogiri"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + type = "gem"; + }; + version = "2.7.0"; + }; + mail = { + dependencies = ["mini_mime"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + type = "gem"; + }; + version = "2.7.1"; + }; + makara = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01n90s1jcc05dc9a70k3c3aa4gc9j49k9iv56n2k4jm949dacms6"; + type = "gem"; + }; + version = "0.4.1"; + }; + marcel = { + dependencies = ["mimemagic"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + type = "gem"; + }; + version = "0.3.3"; + }; + mario-redis-lock = { + dependencies = ["redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v9wdjcjqzpns2migxp4a5b4w82mipi0fwihbqz3q2qj2qm7wc17"; + type = "gem"; + }; + version = "1.2.1"; + }; + memory_profiler = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04ivhv1bilwqm33jv28gar2vwzsichb5nipaq395d3axabv8qmfy"; + type = "gem"; + }; + version = "0.9.14"; + }; + method_source = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + type = "gem"; + }; + version = "1.0.0"; + }; + microformats = { + dependencies = ["json" "nokogiri"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wdyxr22qzw9ri5gzng3a4wqj6a25vq4dhbhd9synk2hjg5pfgvq"; + type = "gem"; + }; + version = "4.2.1"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + type = "gem"; + }; + version = "3.2020.0512"; + }; + mimemagic = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf"; + type = "gem"; + }; + version = "0.3.5"; + }; + mini_mime = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + type = "gem"; + }; + version = "1.0.2"; + }; + mini_portile2 = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + type = "gem"; + }; + version = "2.4.0"; + }; + minitest = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + type = "gem"; + }; + version = "5.14.2"; + }; + msgpack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; + type = "gem"; + }; + version = "1.3.3"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; + net-ldap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; + type = "gem"; + }; + version = "0.16.3"; + }; + net-scp = { + dependencies = ["net-ssh"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b4h3ip8d1gkrc0znnw54hbxillk73mdnaf5pz330lmrcl1wiilg"; + type = "gem"; + }; + version = "3.0.0"; + }; + net-ssh = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; + type = "gem"; + }; + version = "6.1.0"; + }; + nilsimsa = { + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "fd184883048b922b176939f851338d0a4971a532"; + sha256 = "0fds01pr220kg6g3g0rphrkg1fc6py1pnf546pnsb76wd9c0c5il"; + type = "git"; + url = "https://github.com/witgo/nilsimsa"; + }; + version = "1.1.2"; + }; + nio4r = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + type = "gem"; + }; + version = "2.5.4"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + type = "gem"; + }; + version = "1.10.10"; + }; + nokogumbo = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s"; + type = "gem"; + }; + version = "2.0.2"; + }; + nsa = { + dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i1bhmvs49yv70pgl41lx1lr8x6whg52szb8ic1jb6wmmxr2ylcz"; + type = "gem"; + }; + version = "0.2.7"; + }; + oj = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqmzqldi9a0wpilwx87yh61xd7647gg8ffammg4ava0bsx375g2"; + type = "gem"; + }; + version = "3.10.16"; + }; + omniauth = { + dependencies = ["hashie" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + type = "gem"; + }; + version = "1.9.1"; + }; + omniauth-cas = { + dependencies = ["addressable" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kzlh1nac4yz70917cdcsk0r23gy5h7i0x5kbmkvkpbgk6gvrb0z"; + type = "gem"; + }; + version = "2.0.0"; + }; + omniauth-rails_csrf_protection = { + dependencies = ["actionpack" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xgkxwg17w39q3yjqcj0fm6hdkw37qm1l82dvm9zxn6q2pbzm2zv"; + type = "gem"; + }; + version = "0.1.2"; + }; + omniauth-saml = { + dependencies = ["omniauth" "ruby-saml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gxl14lbksnjkl8dfn23lsjkk63md77icm5racrh6fsp5n4ni9d4"; + type = "gem"; + }; + version = "1.10.3"; + }; + openssl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03wbynzkhay7l1x76srjkg91q48mxl575vrxb3blfxlpqwsvvp0w"; + type = "gem"; + }; + version = "2.2.0"; + }; + openssl-signature_algorithm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14d95jr5z6dgvpwf52p7ckjf3w3cihin2k6g9599711pfxdj4fp5"; + type = "gem"; + }; + version = "0.4.0"; + }; + orm_adapter = { + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda"; + type = "gem"; + }; + version = "0.5.0"; + }; + ox = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nd301vsf3k4pl0aa6gkng12yxfdf5s490v65ky2vz8lainaw16q"; + type = "gem"; + }; + version = "2.13.4"; + }; + paperclip = { + dependencies = ["activemodel" "activesupport" "mime-types" "mimemagic" "terrapin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04mlw7aqj20ry0fy92gxnxg99hy5xczff7rhywfzz4mqlhc2wgg7"; + type = "gem"; + }; + version = "6.0.0"; + }; + paperclip-av-transcoder = { + dependencies = ["av" "paperclip"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gcnp3fpdb5lqilcij4yqga6397nb7zyyf9lzxnqpbp7cvc18lhf"; + type = "gem"; + }; + version = "0.6.4"; + }; + parallel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + type = "gem"; + }; + version = "1.20.1"; + }; + parallel_tests = { + dependencies = ["parallel"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mvdk8vgzqjv2pvadxwc8w2vf8dmiw145rjf47c36nn6l5hh02j6"; + type = "gem"; + }; + version = "3.4.0"; + }; + parser = { + dependencies = ["ast"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; + type = "gem"; + }; + version = "2.7.2.0"; + }; + parslet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01pnw6ymz6nynklqvqxs4bcai25kcvnd5x4id9z3vd1rbmlk0lfl"; + type = "gem"; + }; + version = "2.0.0"; + }; + pastel = { + dependencies = ["tty-color"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; + type = "gem"; + }; + version = "0.8.0"; + }; + pg = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + type = "gem"; + }; + version = "1.2.3"; + }; + pghero = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lb858gpz8919in51pgxbk9v5m4qppd136gpag2plzs24rv5hg3s"; + type = "gem"; + }; + version = "2.7.2"; + }; + pkg-config = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "068sf963n2zk47kqcckj624g5pxmk68mm76h02piphfyh9x4zmi3"; + type = "gem"; + }; + version = "1.4.4"; + }; + pluck_each = { + dependencies = ["activerecord" "activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b7g0ggjsbca81qwvpayj1c5qy65p5zq19lb7fiy1v0yb48pzvhp"; + type = "gem"; + }; + version = "0.1.3"; + }; + posix-spawn = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cmb0svalqcxfzlzc5fvrci12b79x7bakasr8gkl3q5rz6di1q52"; + type = "gem"; + }; + version = "0.3.15"; + }; + premailer = { + dependencies = ["addressable" "css_parser" "htmlentities"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f0zz3vwv1kyr43chvrpvhb8wm9qgcaz8ckc1lj2jxfp6xsss971"; + type = "gem"; + }; + version = "1.14.2"; + }; + premailer-rails = { + dependencies = ["actionmailer" "premailer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q23clzqgzxcg1jld7hn5jy2yqxvana3iw66vmjgzz7y4ylf97b6"; + type = "gem"; + }; + version = "1.11.1"; + }; + private_address_check = { + groups = ["production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05phz0vscfh9chv90yc9091pifw3cpwkh76flnhrmvja1q3na4cy"; + type = "gem"; + }; + version = "0.5.0"; + }; + pry = { + dependencies = ["coderay" "method_source"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; + type = "gem"; + }; + version = "0.13.1"; + }; + pry-byebug = { + dependencies = ["byebug" "pry"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; + type = "gem"; + }; + version = "3.9.0"; + }; + pry-rails = { + dependencies = ["pry"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; + type = "gem"; + }; + version = "0.3.9"; + }; + public_suffix = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + puma = { + dependencies = ["nio4r"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mkmfbf4qyiknwi9bb5432cpbbz06r855gknxb8grn24gmgs4d9i"; + type = "gem"; + }; + version = "5.0.4"; + }; + pundit = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18kwm5rkazb89yf792y3fxqihcxw2vdy7k1w542s4hg82ibfpyx3"; + type = "gem"; + }; + version = "2.1.0"; + }; + raabro = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1idqvx5cpmyj1a5nwb1b19szx4lilyr6qpp6drkn744mzq2hppgr"; + type = "gem"; + }; + version = "1.3.3"; + }; + rack = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rack-attack = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zzyiiif9w67v43rv0hg7nxbwp1ish1f02x61kx0rmz8sy1j7wnn"; + type = "gem"; + }; + version = "6.3.1"; + }; + rack-cors = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; + type = "gem"; + }; + version = "1.1.1"; + }; + rack-proxy = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v40xd3xhzhbdqfynd03gn88j1pga2zhrv58xs9fl4hzrlbp096s"; + type = "gem"; + }; + version = "0.6.5"; + }; + rack-test = { + dependencies = ["rack"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + type = "gem"; + }; + version = "1.1.0"; + }; + rails = { + dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b5g3h5sbbncks44w8vjnx0zp145ygphrsspy4ay7xsls92xynq0"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + rails-controller-testing = { + dependencies = ["actionpack" "actionview" "activesupport"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "151f303jcvs8s149mhx2g5mn67487x0blrf9dzl76q1nb7dlh53l"; + type = "gem"; + }; + version = "1.0.5"; + }; + rails-dom-testing = { + dependencies = ["activesupport" "nokogiri"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + type = "gem"; + }; + version = "2.0.3"; + }; + rails-html-sanitizer = { + dependencies = ["loofah"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; + type = "gem"; + }; + version = "1.3.0"; + }; + rails-i18n = { + dependencies = ["i18n" "railties"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02kdlm7jgwvwnnc1amy8md2vl0f2jkfr6rr36vybclr9qm4fb80f"; + type = "gem"; + }; + version = "5.1.3"; + }; + rails-settings-cached = { + dependencies = ["rails"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wyhyls0aqb1iw7mnaldg39w3mnbi3anmpbvb52rjwkpj2mchhnc"; + type = "gem"; + }; + version = "0.6.6"; + }; + railties = { + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "089kiwmv8fxyfk0zp57q74nyd5i6d5x5ihlrzbzwl041v94s2zx9"; + type = "gem"; + }; + version = "5.2.4.4"; + }; + rainbow = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; + }; + rake = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + type = "gem"; + }; + version = "13.0.1"; + }; + rdf = { + dependencies = ["hamster" "link_header"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "109c355wj2a74v2yrwgqpzhgnxchkm5dakcacqx9fk2i98f7m7d8"; + type = "gem"; + }; + version = "3.1.7"; + }; + rdf-normalize = { + dependencies = ["rdf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kfhh5n57im80i1ak00qz9f5hx8k10ldn0r5l1gw1qaa1lydmydg"; + type = "gem"; + }; + version = "0.4.0"; + }; + redis = { + groups = ["default" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48"; + type = "gem"; + }; + version = "4.2.5"; + }; + redis-actionpack = { + dependencies = ["actionpack" "redis-rack" "redis-store"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2276zzc0044zh37a8frx1v7hnra7z7k126154ps7njbqngfdv3"; + type = "gem"; + }; + version = "5.2.0"; + }; + redis-activesupport = { + dependencies = ["activesupport" "redis-store"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14a3z8810j02ysvg53f3mvcfb4rw34m91yfd19zy9y5lb3yv2g59"; + type = "gem"; + }; + version = "5.2.0"; + }; + redis-namespace = { + dependencies = ["redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i6s898z5w31z385cba1683pgg5nnmj4m686cbravg7j4pgbcgv"; + type = "gem"; + }; + version = "1.8.0"; + }; + redis-rack = { + dependencies = ["rack" "redis-store"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nblbxg1f051dn83jp92lz3lc1wxm18nviglrabv2l0vz6rd0pkb"; + type = "gem"; + }; + version = "2.1.3"; + }; + redis-rails = { + dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; + groups = ["production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40"; + type = "gem"; + }; + version = "5.0.2"; + }; + redis-store = { + dependencies = ["redis"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cpzbf2svnk4j5awb24ncl0mih45zkbdrd7q23jdg1r8k3q7mdg6"; + type = "gem"; + }; + version = "1.9.0"; + }; + regexp_parser = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; + type = "gem"; + }; + version = "1.8.2"; + }; + request_store = { + dependencies = ["rack"]; + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; + type = "gem"; + }; + version = "1.5.0"; + }; + responders = { + dependencies = ["actionpack" "railties"]; + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14kjykc6rpdh24sshg9savqdajya2dislc1jmbzg91w9967f4gv1"; + type = "gem"; + }; + version = "3.0.1"; + }; + rexml = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; + rotp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d"; + type = "gem"; + }; + version = "2.1.2"; + }; + rpam2 = { + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zvli3s4z1hf2l7gyfickm5i3afjrnycc3ihbiax6ji6arpbyf33"; + type = "gem"; + }; + version = "4.0.2"; + }; + rqrcode = { + dependencies = ["chunky_png" "rqrcode_core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06lw8b6wfshxd61xw98xyp1a0zsz6av4nls2c9fwb7q59wb05sci"; + type = "gem"; + }; + version = "1.1.2"; + }; + rqrcode_core = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "071jqmhk3hf0grsvi0jx5sl449pf82p40ls5b3likbq4q516zc0j"; + type = "gem"; + }; + version = "0.1.2"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b8891149l4rdlaz58k1dprc09rhpvq98bblk4qpd3dvcvqklkvh"; + type = "gem"; + }; + version = "3.9.3"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + type = "gem"; + }; + version = "3.9.1"; + }; + rspec-rails = { + dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lzik01ziaskgpdpy8knffpw0fsy9151f5lfigyhb89wq4q45hfs"; + type = "gem"; + }; + version = "4.0.1"; + }; + rspec-sidekiq = { + dependencies = ["rspec-core" "sidekiq"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1spzw3sc2p0n9qfb89y1v8igd60y7c5z9w2hjqqbbgbyjvy0agp8"; + type = "gem"; + }; + version = "3.1.0"; + }; + rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir"; + type = "gem"; + }; + version = "3.9.3"; + }; + rspec_junit_formatter = { + dependencies = ["rspec-core"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p"; + type = "gem"; + }; + version = "0.4.1"; + }; + rubocop = { + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cganc8j8zq7x81bmkav39dhbqydxhqyfs98z2g4g7ld6scywm20"; + type = "gem"; + }; + version = "1.3.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15jxn0aqxgalpl9zlrqyk2kk41qcp4sn1yys55qif5f787b3nrij"; + type = "gem"; + }; + version = "1.1.1"; + }; + rubocop-rails = { + dependencies = ["activesupport" "rack" "rubocop"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14g703lv0cbqw504cdjsv0yydrsnm61rwg0n0mql4zl5hw1n7lfh"; + type = "gem"; + }; + version = "2.8.1"; + }; + ruby-progressbar = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + type = "gem"; + }; + version = "1.10.1"; + }; + ruby-saml = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ps79g3f39iy6dpc9z4z5wwxdkbaciqjfbi0pfl7dbkz1d8q14qi"; + type = "gem"; + }; + version = "1.11.0"; + }; + rufus-scheduler = { + dependencies = ["fugit"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bcr8y9nq0anw0gkkpl0zvzgzhhsamw2swp9jwwffd33n8fxg76c"; + type = "gem"; + }; + version = "3.6.0"; + }; + safety_net_attestation = { + dependencies = ["jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln"; + type = "gem"; + }; + version = "0.4.0"; + }; + sanitize = { + dependencies = ["crass" "nokogiri" "nokogumbo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18m3zcf207gcrmghx288w3n2kpphc22lbmbc1wdx1nzcn8g2yddh"; + type = "gem"; + }; + version = "5.2.1"; + }; + scenic = { + dependencies = ["activerecord" "railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11inxsg0qd6kdj8cdwbh7syvr9wzv93jpp5nhlhjwp4v9ngrm9xk"; + type = "gem"; + }; + version = "1.5.4"; + }; + securecompare = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ay65wba4i7bvfqyvf5i4r48q6g70s5m724diz9gdvdavscna36b"; + type = "gem"; + }; + version = "1.0.0"; + }; + semantic_range = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "150wq0y749rags4pm0g3zljd575vk17nwdzp0m0q04s62977rd24"; + type = "gem"; + }; + version = "2.3.0"; + }; + sidekiq = { + dependencies = ["connection_pool" "rack" "redis"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mjxrxppv08a1hwqi8gpg6n168cxqhp7c2r2jwc4rbz9j5k41vcw"; + type = "gem"; + }; + version = "6.1.2"; + }; + sidekiq-bulk = { + dependencies = ["sidekiq"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08nyxzmgf742irafy3l4fj09d4s5pyvsh0dzlh8y4hl51rgkh4xv"; + type = "gem"; + }; + version = "0.2.0"; + }; + sidekiq-scheduler = { + dependencies = ["e2mmap" "redis" "rufus-scheduler" "sidekiq" "thwait" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ycwmpf17mdd762l5q9w01b4ms5fqrr6hb7s4ndi3nwz8pcngw91"; + type = "gem"; + }; + version = "3.0.1"; + }; + sidekiq-unique-jobs = { + dependencies = ["concurrent-ruby" "sidekiq" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lw2hgq28wd97kkp2897gy1yf0fx0yz6l23gdgjl8i2pas7d5wxd"; + type = "gem"; + }; + version = "6.0.25"; + }; + simple-navigation = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pkj5z48k90v9v53gckl1b0jsix08kpl6qkgsd4pkc7cva8dbqid"; + type = "gem"; + }; + version = "4.1.0"; + }; + simple_form = { + dependencies = ["actionpack" "activemodel"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jj4fcs2r5sm3gjsmygcs2fi2ai18az5ynq1cqp1w0j3aajdian7"; + type = "gem"; + }; + version = "5.0.3"; + }; + simplecov = { + dependencies = ["docile" "simplecov-html"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00xwb0mizvbm9s04a6h5ycwn2zpdxjb3wxaawq6ypjjbvxszihcq"; + type = "gem"; + }; + version = "0.19.1"; + }; + simplecov-html = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; + type = "gem"; + }; + version = "0.12.3"; + }; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-rails = { + dependencies = ["actionpack" "activesupport" "sprockets"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; + type = "gem"; + }; + version = "3.2.2"; + }; + sshkit = { + dependencies = ["net-scp" "net-ssh"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gfglybqjw6g6hccqvh2yjfqlvdy4hwad8mcjdc7zjm5swncfxwz"; + type = "gem"; + }; + version = "1.21.0"; + }; + stackprof = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "147rb66p3n062vc433afqhkd99iazvkrqnghxgh871r62yhha93f"; + type = "gem"; + }; + version = "0.2.16"; + }; + statsd-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0djig5dnqjgww6wrw3f1mvnnjllznahlchvk4lvs4wx9qjsqpysr"; + type = "gem"; + }; + version = "1.4.0"; + }; + stoplight = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ixpwp14hrygif8c1wn05gh4d4nq1940p3grh95r4dqmpjdqn0sr"; + type = "gem"; + }; + version = "2.2.1"; + }; + streamio-ffmpeg = { + dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nnxizc0371vwh0k6gqjj1b7fjszydpqfz549n6qn2q1pza3894z"; + type = "gem"; + }; + version = "3.0.2"; + }; + strong_migrations = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sdijc2nc9lx6kga216rg4yfmyv4g7slbpcrlfjx20psbn54d7jd"; + type = "gem"; + }; + version = "0.7.2"; + }; + temple = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; + type = "gem"; + }; + version = "0.8.2"; + }; + terminal-table = { + dependencies = ["unicode-display_width"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; + terrapin = { + dependencies = ["climate_control"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p18f05r0c5s70571gqig3z2ym74wx79s6rd45sprp207bqskzn9"; + type = "gem"; + }; + version = "0.6.0"; + }; + thor = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + type = "gem"; + }; + version = "1.0.1"; + }; + thread_safe = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + thwait = { + dependencies = ["e2mmap"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q0fqlh0668j66z0g3s5yhqs39368az2ycxyphsx4c5nib5r4kak"; + type = "gem"; + }; + version = "0.2.0"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + version = "2.0.10"; + }; + tpm-key_attestation = { + dependencies = ["bindata" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kdqyanz211wmxjzfiz2wg17gj6p4431qvjr0i6sp3d6268sssg4"; + type = "gem"; + }; + version = "0.9.0"; + }; + tty-color = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12vcxmn3lj405rs0fxcki7jwpkrx8y55x8jwjf9v6yvnx2y5kga3"; + type = "gem"; + }; + version = "0.5.2"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-prompt = { + dependencies = ["pastel" "tty-reader"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "170y0imsmzav5xgaav6xhzlz879fq2zv25ryk8y3qc2kqaz7x657"; + type = "gem"; + }; + version = "0.22.0"; + }; + tty-reader = { + dependencies = ["tty-cursor" "tty-screen" "wisper"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "078rlqbdw72jjgp597yn5psasgf4508qdw9g3prxgbcgpcdcsd0r"; + type = "gem"; + }; + version = "0.8.0"; + }; + tty-screen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + type = "gem"; + }; + version = "0.8.1"; + }; + twitter-text = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg"; + type = "gem"; + }; + version = "1.14.7"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; + tzinfo-data = { + dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a"; + type = "gem"; + }; + version = "1.2020.4"; + }; + unf = { + dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + type = "gem"; + }; + version = "0.0.7.7"; + }; + unicode-display_width = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + type = "gem"; + }; + version = "1.7.0"; + }; + uniform_notifier = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vm4aix8jmv42s1x58m3lj3xwkbxyn9qn6lzhhig0d1j8fv6j30c"; + type = "gem"; + }; + version = "1.13.0"; + }; + warden = { + dependencies = ["rack"]; + groups = ["default" "pam_authentication"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l7gl7vms023w4clg02pm4ky9j12la2vzsixi2xrv9imbn44ys26"; + type = "gem"; + }; + version = "1.2.9"; + }; + webauthn = { + dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jpr8b2lzhvfxv47yjvw0h8sqa9aah5bnharh686xqzyjz9a823q"; + type = "gem"; + }; + version = "3.0.0.alpha1"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wbdjagk2qpr76k3zw2gmkfp5aqlrc1a4qrpjv7sq1q39qbn8xax"; + type = "gem"; + }; + version = "3.10.0"; + }; + webpacker = { + dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xgyv5ppljw3yq71nbrw2hj6hq9y8qbdavjrn53nsccpy7801wdx"; + type = "gem"; + }; + version = "5.2.1"; + }; + webpush = { + dependencies = ["hkdf" "jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gi7aircw2bizk08pihr9srncjy9x9iy0ymp1qgchni639k1k05s"; + type = "gem"; + }; + version = "0.3.8"; + }; + websocket-driver = { + dependencies = ["websocket-extensions"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; + type = "gem"; + }; + version = "0.7.3"; + }; + websocket-extensions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; + type = "gem"; + }; + version = "0.1.5"; + }; + wisper = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf"; + type = "gem"; + }; + version = "2.0.1"; + }; + xorcist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q7hr3qyn1hczv9fglqc2cbaax0fb37gjjr0y24x19mmp817csdn"; + type = "gem"; + }; + version = "1.1.2"; + }; + xpath = { + dependencies = ["nokogiri"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/package.json b/third_party/nixpkgs/pkgs/servers/mastodon/package.json new file mode 100644 index 0000000000..498d4b6372 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/package.json @@ -0,0 +1,193 @@ +{ + "version": "3.3.0", + "name": "@tootsuite/mastodon", + "license": "AGPL-3.0-or-later", + "engines": { + "node": ">=10.13" + }, + "scripts": { + "postversion": "git push --tags", + "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack", + "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack", + "manage:translations": "node ./config/webpack/translationRunner.js", + "start": "node ./streaming/index.js", + "test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest", + "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass", + "test:lint:js": "eslint --ext=js . --cache", + "test:lint:sass": "sass-lint -v", + "test:jest": "cross-env NODE_ENV=test jest --coverage" + }, + "repository": { + "type": "git", + "url": "https://github.com/tootsuite/mastodon.git" + }, + "browserslist": [ + "last 2 versions", + "IE >= 11", + "iOS >= 9", + "not dead" + ], + "jest": { + "projects": [ + "/app/javascript/mastodon" + ], + "testPathIgnorePatterns": [ + "/node_modules/", + "/vendor/", + "/config/", + "/log/", + "/public/", + "/tmp/" + ], + "setupFiles": [ + "raf/polyfill" + ], + "setupFilesAfterEnv": [ + "/app/javascript/mastodon/test_setup.js" + ], + "collectCoverageFrom": [ + "app/javascript/mastodon/**/*.js", + "!app/javascript/mastodon/features/emoji/emoji_compressed.js", + "!app/javascript/mastodon/locales/locale-data/*.js", + "!app/javascript/mastodon/service_worker/entry.js", + "!app/javascript/mastodon/test_setup.js" + ], + "coverageDirectory": "/coverage", + "moduleDirectories": [ + "/node_modules", + "/app/javascript" + ] + }, + "private": true, + "dependencies": { + "@babel/core": "^7.12.7", + "@babel/plugin-proposal-class-properties": "^7.8.3", + "@babel/plugin-proposal-decorators": "^7.12.1", + "@babel/plugin-transform-react-inline-elements": "^7.12.1", + "@babel/plugin-transform-runtime": "^7.12.1", + "@babel/preset-env": "^7.12.7", + "@babel/preset-react": "^7.12.7", + "@babel/runtime": "^7.12.5", + "@clusterws/cws": "^3.0.0", + "@gamestdio/websocket": "^0.3.2", + "@github/webauthn-json": "^0.5.7", + "@rails/ujs": "^6.0.3", + "array-includes": "^3.1.1", + "arrow-key-navigation": "^1.2.0", + "autoprefixer": "^9.8.6", + "axios": "^0.21.0", + "babel-loader": "^8.2.1", + "babel-plugin-lodash": "^3.3.4", + "babel-plugin-preval": "^5.0.0", + "babel-plugin-react-intl": "^6.2.0", + "babel-plugin-transform-react-remove-prop-types": "^0.4.24", + "babel-runtime": "^6.26.0", + "blurhash": "^1.1.3", + "classnames": "^2.2.5", + "color-blend": "^3.0.0", + "compression-webpack-plugin": "^6.1.1", + "cross-env": "^7.0.2", + "css-loader": "^5.0.1", + "cssnano": "^4.1.10", + "detect-passive-events": "^2.0.1", + "dotenv": "^8.2.0", + "emoji-mart": "Gargron/emoji-mart#build", + "es6-symbol": "^3.1.3", + "escape-html": "^1.0.3", + "exif-js": "^2.3.0", + "express": "^4.17.1", + "file-loader": "^6.2.0", + "font-awesome": "^4.7.0", + "glob": "^7.1.6", + "history": "^4.10.1", + "http-link-header": "^1.0.3", + "immutable": "^3.8.2", + "imports-loader": "^1.2.0", + "intersection-observer": "^0.11.0", + "intl": "^1.2.5", + "intl-messageformat": "^2.2.0", + "intl-relativeformat": "^6.4.3", + "is-nan": "^1.3.0", + "js-yaml": "^3.13.1", + "lodash": "^4.17.19", + "mark-loader": "^0.1.6", + "marky": "^1.2.1", + "mini-css-extract-plugin": "^1.3.1", + "mkdirp": "^1.0.4", + "npmlog": "^4.1.2", + "object-assign": "^4.1.1", + "object-fit-images": "^3.2.3", + "object.values": "^1.1.1", + "offline-plugin": "^5.0.7", + "path-complete-extname": "^1.0.0", + "pg": "^6.4.0", + "postcss-loader": "^3.0.0", + "postcss-object-fit-images": "^1.1.2", + "promise.prototype.finally": "^3.1.2", + "prop-types": "^15.5.10", + "punycode": "^2.1.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hotkeys": "^1.1.4", + "react-immutable-proptypes": "^2.2.0", + "react-immutable-pure-component": "^2.2.2", + "react-intl": "^2.9.0", + "react-masonry-infinite": "^1.2.2", + "react-motion": "^0.5.2", + "react-notification": "^6.8.5", + "react-overlays": "^0.9.2", + "react-redux": "^7.2.2", + "react-redux-loading-bar": "^4.0.8", + "react-router-dom": "^4.1.1", + "react-router-scroll-4": "^1.0.0-beta.1", + "react-select": "^3.1.0", + "react-sparklines": "^1.7.0", + "react-swipeable-views": "^0.13.9", + "react-textarea-autosize": "^8.3.0", + "react-toggle": "^4.1.1", + "redis": "^3.0.2", + "redux": "^4.0.5", + "redux-immutable": "^4.0.0", + "redux-thunk": "^2.2.0", + "regenerator-runtime": "^0.13.7", + "rellax": "^1.12.1", + "requestidlecallback": "^0.3.0", + "reselect": "^4.0.0", + "rimraf": "^3.0.2", + "sass": "^1.29.0", + "sass-loader": "^10.1.0", + "stacktrace-js": "^2.0.2", + "stringz": "^2.1.0", + "substring-trie": "^1.0.2", + "terser-webpack-plugin": "^4.2.3", + "tesseract.js": "^2.1.1", + "throng": "^4.0.0", + "tiny-queue": "^0.2.1", + "uuid": "^8.3.1", + "webpack": "^4.44.2", + "webpack-assets-manifest": "^3.1.1", + "webpack-bundle-analyzer": "^4.1.0", + "webpack-cli": "^3.3.12", + "webpack-merge": "^5.4.0", + "wicg-inert": "^3.1.0", + "kind-of": "^6.0.3" + }, + "devDependencies": { + "@testing-library/jest-dom": "^5.11.6", + "@testing-library/react": "^11.2.2", + "babel-eslint": "^10.1.0", + "babel-jest": "^26.6.3", + "eslint": "^7.14.0", + "eslint-plugin-import": "~2.22.1", + "eslint-plugin-jsx-a11y": "~6.4.1", + "eslint-plugin-promise": "~4.2.1", + "eslint-plugin-react": "~7.21.5", + "jest": "^26.6.3", + "raf": "^3.4.1", + "react-intl-translations-manager": "^5.0.3", + "react-test-renderer": "^16.14.0", + "sass-lint": "^1.13.1", + "webpack-dev-server": "^3.11.0", + "yargs": "^16.1.1" + } +} diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/resolutions.patch b/third_party/nixpkgs/pkgs/servers/mastodon/resolutions.patch new file mode 100644 index 0000000000..4cde0ba8df --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/resolutions.patch @@ -0,0 +1,67 @@ +diff --git a/package.json b/package.json +index 7b8f49dd8..24cdd3498 100644 +--- a/package.json ++++ b/package.json +@@ -168,7 +168,8 @@ + "webpack-bundle-analyzer": "^4.1.0", + "webpack-cli": "^3.3.12", + "webpack-merge": "^5.4.0", +- "wicg-inert": "^3.1.0" ++ "wicg-inert": "^3.1.0", ++ "kind-of": "^6.0.3" + }, + "devDependencies": { + "@testing-library/jest-dom": "^5.11.6", +@@ -187,8 +188,5 @@ + "sass-lint": "^1.13.1", + "webpack-dev-server": "^3.11.0", + "yargs": "^16.1.1" +- }, +- "resolutions": { +- "kind-of": "^6.0.3" + } + } +diff --git a/yarn.lock b/yarn.lock +index 4aa8f6380..68d2fd8b5 100644 +--- a/yarn.lock ++++ b/yarn.lock +@@ -5689,6 +5689,11 @@ is-binary-path@~2.1.0: + dependencies: + binary-extensions "^2.0.0" + ++is-buffer@^1.1.5: ++ version "1.1.6" ++ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" ++ integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== ++ + is-callable@^1.1.4, is-callable@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" +@@ -6639,7 +6644,26 @@ killable@^1.0.1: + resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" + integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== + +-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: ++kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: ++ version "3.2.2" ++ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" ++ integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= ++ dependencies: ++ is-buffer "^1.1.5" ++ ++kind-of@^4.0.0: ++ version "4.0.0" ++ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" ++ integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= ++ dependencies: ++ is-buffer "^1.1.5" ++ ++kind-of@^5.0.0: ++ version "5.1.0" ++ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" ++ integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== ++ ++kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix new file mode 100644 index 0000000000..57eff626ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix @@ -0,0 +1,11 @@ +# This file was generated by pkgs.mastodon.updateScript. +{ fetchgit, applyPatches }: let + src = fetchgit { + url = "https://github.com/tootsuite/mastodon.git"; + rev = "v3.3.0"; + sha256 = "17wvggvy5mmyf3f1i5v1hgvh6wjdhg9hb3wiyfaydx0slsg03qba"; + }; +in applyPatches { + inherit src; + patches = [./resolutions.patch ./version.patch ]; +} diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/update.nix b/third_party/nixpkgs/pkgs/servers/mastodon/update.nix new file mode 100644 index 0000000000..28c0ff235e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/update.nix @@ -0,0 +1,21 @@ +{ pkgs, stdenv, lib, makeWrapper, yarn2nix, bundix, coreutils, + diffutils, nix-prefetch-github, gnused, jq }: +stdenv.mkDerivation rec { + name = "mastodon-update-script"; + installPhase = '' + mkdir -p $out/bin + cp ${./update.sh} $out/bin/update.sh + patchShebangs $out/bin/update.sh + wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + phases = [ "installPhase" ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ]; + + meta = { + maintainers = with lib.maintainers; [ happy-river ]; + description = "Utility to generate Nix expressions for Mastodon's dependencies"; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/update.sh b/third_party/nixpkgs/pkgs/servers/mastodon/update.sh new file mode 100755 index 0000000000..be06f52207 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/update.sh @@ -0,0 +1,121 @@ +#!/usr/bin/env bash +set -e + +URL=https://github.com/tootsuite/mastodon.git + +POSITIONAL=() +while [[ $# -gt 0 ]]; do + key="$1" + + case $key in + --url) + URL="$2" + shift # past argument + shift # past value + ;; + --ver) + VERSION="$2" + shift # past argument + shift # past value + ;; + --rev) + REVISION="$2" + shift # past argument + shift # past value + ;; + --patches) + PATCHES="$2" + shift # past argument + shift # past value + ;; + *) # unknown option + POSITIONAL+=("$1") + shift # past argument + ;; + esac +done + +if [[ -z "$VERSION" || -n "$POSITIONAL" ]]; then + echo "Usage: update.sh [--url URL] --ver VERSION [--rev REVISION] [--patches PATCHES]" + echo "URL may be any path acceptable to 'git clone' and VERSION the" + echo "semantic version number. If VERSION is not a revision acceptable to" + echo "'git checkout', you must provide one in REVISION. If URL is not" + echo "provided, it defaults to https://github.com/tootsuite/mastodon.git." + echo "PATCHES, if provided, should be one or more Nix expressions" + echo "separated by spaces." + exit 1 +fi + +if [[ -z "$REVISION" ]]; then + REVISION="$VERSION" +fi + +rm -f gemset.nix yarn.nix version.nix version.patch source.nix package.json +TARGET_DIR="$PWD" + + +WORK_DIR=$(mktemp -d) + +# Check that working directory was created. +if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then + echo "Could not create temporary directory" + exit 1 +fi + +# Delete the working directory on exit. +function cleanup { + # Report errors, if any, from nix-prefetch-git + grep "fatal" $WORK_DIR/nix-prefetch-git.out >/dev/stderr || true + rm -rf "$WORK_DIR" +} +trap cleanup EXIT + +echo "Fetching source code $REVISION from $URL" +JSON=$(nix-prefetch-git --url "$URL" --rev "$REVISION" 2> $WORK_DIR/nix-prefetch-git.out) +SHA=$(echo $JSON | jq -r .sha256) +FETCHED_SOURCE_DIR=$(grep '^path is' $WORK_DIR/nix-prefetch-git.out | sed 's/^path is //') + +echo "Creating version.nix" +echo \"$VERSION\" | sed 's/^"v/"/' > version.nix + +echo "Creating source.nix" +# yarn2nix and mkYarnPackage want the version to be present in +# package.json. Mastodon itself does not include the version in +# package.json but at least one fork (Soapbox) does. +if [ $(jq .version $FETCHED_SOURCE_DIR/package.json) == "null" ]; then + mkdir $WORK_DIR/a $WORK_DIR/b + cp $FETCHED_SOURCE_DIR/package.json $WORK_DIR/a + cd $WORK_DIR + jq "{version:$(cat $TARGET_DIR/version.nix)} + ." a/package.json > b/package.json + diff -Naur --label a/package.json --label b/package.json a b > $TARGET_DIR/version.patch || true + rm -rf a b tmp + cd $TARGET_DIR + PATCHES="$PATCHES ./version.patch " +fi + +cat > source.nix << EOF +# This file was generated by pkgs.mastodon.updateScript. +{ fetchgit, applyPatches }: let + src = fetchgit { + url = "$URL"; + rev = "$REVISION"; + sha256 = "$SHA"; + }; +in applyPatches { + inherit src; + patches = [$PATCHES]; +} +EOF +SOURCE_DIR="$(nix-build --no-out-link -E '(import {}).callPackage ./source.nix {}')" + +echo "Creating gemset.nix" +bundix --lockfile="$SOURCE_DIR/Gemfile.lock" --gemfile="$SOURCE_DIR/Gemfile" +echo "" >> $TARGET_DIR/gemset.nix # Create trailing newline to please EditorConfig checks + +echo "Creating yarn.nix" +cp -r $SOURCE_DIR/* $WORK_DIR +chmod -R u+w $WORK_DIR +cd $WORK_DIR +yarn2nix > $TARGET_DIR/yarn.nix +sed "s/https___.*_//g" -i $TARGET_DIR/yarn.nix +cp $WORK_DIR/package.json $TARGET_DIR diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/version.nix b/third_party/nixpkgs/pkgs/servers/mastodon/version.nix new file mode 100644 index 0000000000..b577fbf196 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/version.nix @@ -0,0 +1 @@ +"3.3.0" diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/version.patch b/third_party/nixpkgs/pkgs/servers/mastodon/version.patch new file mode 100644 index 0000000000..c1449e4132 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/version.patch @@ -0,0 +1,9 @@ +diff -Naur --label a/package.json --label b/package.json a/package.json b/package.json +--- a/package.json ++++ b/package.json +@@ -1,4 +1,5 @@ + { ++ "version": "3.3.0", + "name": "@tootsuite/mastodon", + "license": "AGPL-3.0-or-later", + "engines": { diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix b/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix new file mode 100644 index 0000000000..9c3b844bcc --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix @@ -0,0 +1,12181 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + }; + } + { + name = "_babel_compat_data___compat_data_7.12.7.tgz"; + path = fetchurl { + name = "_babel_compat_data___compat_data_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz"; + sha1 = "9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"; + }; + } + { + name = "_babel_core___core_7.12.7.tgz"; + path = fetchurl { + name = "_babel_core___core_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.7.tgz"; + sha1 = "bf55363c08c8352a37691f7216ec30090bf7e3bf"; + }; + } + { + name = "_babel_generator___generator_7.12.5.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz"; + sha1 = "a2c50de5c8b6d708ab95be5e6053936c1884a4de"; + }; + } + { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.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.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; + sha1 = "bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"; + }; + } + { + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; + path = fetchurl { + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz"; + sha1 = "55fc1ead5242caa0ca2875dcb8eed6d311e50f48"; + }; + } + { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"; + sha1 = "8095cddbff858e6fa9c326daee54a2f2732c1d5d"; + }; + } + { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; + sha1 = "cb470c76198db6a24e9dbc8987275631e5d29831"; + }; + } + { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; + sha1 = "3c45998f431edd4a9214c5f1d3ad1448a6137f6e"; + }; + } + { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz"; + sha1 = "18b1302d4677f9dc4740fe8c9ed96680e29d37e8"; + }; + } + { + name = "_babel_helper_define_map___helper_define_map_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_define_map___helper_define_map_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz"; + sha1 = "f037ad794264f729eda1889f4ee210b870999092"; + }; + } + { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz"; + sha1 = "40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.10.4.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_get_function_arity___helper_get_function_arity_7.10.4.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_hoist_variables___helper_hoist_variables_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; + sha1 = "d49b001d1d5a68ca5e6604dda01a6297f7c9381e"; + }; + } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; + sha1 = "fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha1 = "1bfc0229f794988f76ed0a4d4e90860850b54dfb"; + }; + } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; + sha1 = "7954fec71f5b32c48e4b303b437c34453fd7247c"; + }; + } + { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.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_plugin_utils___helper_plugin_utils_7.10.4.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_helper_regex___helper_regex_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_regex___helper_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.4.tgz"; + sha1 = "59b373daaf3458e5747dece71bbaf45f9676af6d"; + }; + } + { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; + sha1 = "8c4dbbf916314f6047dc05e6a2217074238347fd"; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz"; + sha1 = "f15c9cc897439281891e11d5ce12562ac0cf3fa9"; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; + sha1 = "32427e5aa61547d38eb1e6eaf5fd1426fdad9136"; + }; + } + { + 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.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; + sha1 = "2c70576eaa3b5609b24cb99db2888cc3fc4251d1"; + }; + } + { + 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_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_option___helper_validator_option_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; + sha1 = "175567380c3e77d60ff98a54bb015fe78f2178d9"; + }; + } + { + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; + sha1 = "8a6f701eab0ff39f765b5a1cfef409990e624b87"; + }; + } + { + name = "_babel_helpers___helpers_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz"; + sha1 = "1a1ba4a768d9b58310eda516c449913fe647116e"; + }; + } + { + 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_parser___parser_7.12.7.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz"; + sha1 = "fee7b39fe809d0e73e5b25eecaf5780ef3d73056"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; + sha1 = "dc6c1170e27d8aca99ff65f4925bd06b1c90550e"; + }; + } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; + sha1 = "a082ff541f2a29a4821065b8add9346c0c16e5de"; + }; + } + { + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz"; + sha1 = "59271439fed4145456c41067450543aee332d15f"; + }; + } + { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; + sha1 = "43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"; + }; + } + { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; + sha1 = "8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; + sha1 = "d45423b517714eedd5621a9dfdc03fa9f4eb241c"; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; + sha1 = "f2c490d36e1b3c9659241034a5d2cd50263a2751"; + }; + } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; + sha1 = "3ed4fff31c015e7f3f1467f190dbe545cd7b046c"; + }; + } + { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz"; + sha1 = "8bf253de8139099fea193b297d23a9d406ef056b"; + }; + } + { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; + sha1 = "def9bd03cea0f9b72283dac0ec22d289c7691069"; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; + sha1 = "ccc2421af64d3aae50b558a71cede929a5ab2942"; + }; + } + { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; + sha1 = "e02f0ea1b5dc59d401ec16fb824679f683d3303c"; + }; + } + { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; + sha1 = "86814f6e7a21374c980c10d38b4493e703f4a389"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; + sha1 = "2a183958d417765b9eae334f47758e5d6a82e072"; + }; + } + { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; + }; + } + { + name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; + sha1 = "4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"; + }; + } + { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; + sha1 = "bcb297c5366e79bebadef509549cd93b04f19978"; + }; + } + { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz"; + sha1 = "81a8b535b284476c41be6de06853a8802b98c5dd"; + }; + } + { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; + }; + } + { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a"; + }; + } + { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; + sha1 = "ee601348c370fa334d2207be158777496521fd51"; + }; + } + { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; + }; + } + { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"; + sha1 = "9d9d357cc818aa7ae7935917c1257f67677a0926"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; + }; + } + { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; + }; + } + { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; + }; + } + { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; + }; + } + { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; + }; + } + { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; + }; + } + { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; + sha1 = "dd6c0b357ac1bb142d98537450a319625d13d2a0"; + }; + } + { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; + sha1 = "8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"; + }; + } + { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; + sha1 = "3849a49cc2a22e9743cbd6b52926d30337229af1"; + }; + } + { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; + sha1 = "f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"; + }; + } + { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; + sha1 = "f0ee727874b42a208a48a586b84c3d222c2bbef1"; + }; + } + { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; + sha1 = "65e650fcaddd3d88ddce67c0f834a3d436a32db6"; + }; + } + { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; + sha1 = "d68cf6c9b7f838a8a4144badbe97541ea0904852"; + }; + } + { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; + sha1 = "b9a570fe0d0a8d460116413cb4f97e8e08b2f847"; + }; + } + { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; + sha1 = "a1d16c14862817b6409c0a678d6f9373ca9cd975"; + }; + } + { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; + sha1 = "745661baba295ac06e686822797a69fbaa2ca228"; + }; + } + { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; + sha1 = "b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"; + }; + } + { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; + sha1 = "07640f28867ed16f9511c99c888291f560921cfa"; + }; + } + { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; + sha1 = "2ec76258c70fe08c6d7da154003a480620eba667"; + }; + } + { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; + sha1 = "d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"; + }; + } + { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; + sha1 = "496038602daf1514a64d43d8e17cbb2755e0c3ad"; + }; + } + { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; + sha1 = "3154300b026185666eebb0c0ed7f8415fefcf6f9"; + }; + } + { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; + sha1 = "fa403124542636c786cf9b460a0ffbb48a86e648"; + }; + } + { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; + sha1 = "663fea620d593c93f214a464cd399bf6dc683086"; + }; + } + { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; + sha1 = "eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"; + }; + } + { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; + sha1 = "b407f5c96be0d9f5f88467497fa82b30ac3e8753"; + }; + } + { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; + sha1 = "80073f02ee1bb2d365c3416490e085c95759dec0"; + }; + } + { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; + sha1 = "4ea08696b8d2e65841d0c7706482b048bed1066e"; + }; + } + { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; + sha1 = "d2e963b038771650c922eff593799c96d853255d"; + }; + } + { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; + sha1 = "41bc81200d730abb4456ab8b3fbd5537b59adecd"; + }; + } + { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"; + sha1 = "1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"; + }; + } + { + name = "_babel_plugin_transform_react_inline_elements___plugin_transform_react_inline_elements_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_inline_elements___plugin_transform_react_inline_elements_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.12.1.tgz"; + sha1 = "f7d507200923adbbdacb107feec7ad09cefae631"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz"; + sha1 = "4c2a647de79c7e2b16bfe4540677ba3121e82a08"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz"; + sha1 = "ef43cbca2a14f1bd17807dbe4376ff89d714cf28"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"; + sha1 = "d07de6863f468da0809edcf79a1aa8ce2a82a26b"; + }; + } + { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz"; + sha1 = "8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"; + }; + } + { + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.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_regenerator___plugin_transform_regenerator_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; + sha1 = "5f0a28d842f6462281f06a964e88ba8d7ab49753"; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; + sha1 = "6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"; + }; + } + { + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz"; + sha1 = "04b792057eb460389ff6a4198e377614ea1e7ba5"; + }; + } + { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; + sha1 = "0bf9cac5550fce0cfdf043420f661d645fdc75e3"; + }; + } + { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; + sha1 = "527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"; + }; + } + { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz"; + sha1 = "560224613ab23987453948ed21d0b0b193fa7fad"; + }; + } + { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; + sha1 = "b43ece6ed9a79c0c71119f576d299ef09d942843"; + }; + } + { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; + sha1 = "9ca6be343d42512fbc2e68236a82ae64bc7af78a"; + }; + } + { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; + sha1 = "5232b9f81ccb07070b7c3c36c67a1b78f1845709"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; + sha1 = "cc9661f61390db5c65e3febaccefd5c6ac3faecb"; + }; + } + { + name = "_babel_preset_env___preset_env_7.12.7.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz"; + sha1 = "54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"; + }; + } + { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + path = fetchurl { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; + }; + } + { + name = "_babel_preset_react___preset_react_7.12.7.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz"; + sha1 = "36d61d83223b07b6ac4ec55cf016abb0f70be83b"; + }; + } + { + name = "_babel_runtime_corejs3___runtime_corejs3_7.10.3.tgz"; + path = fetchurl { + name = "_babel_runtime_corejs3___runtime_corejs3_7.10.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.3.tgz"; + sha1 = "931ed6941d3954924a7aa967ee440e60c507b91a"; + }; + } + { + name = "_babel_runtime___runtime_7.0.0.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz"; + sha1 = "adeb78fedfc855aa05bc041640f3f6f98e85424c"; + }; + } + { + name = "_babel_runtime___runtime_7.12.5.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz"; + sha1 = "410e7e487441e1b360c29be715d870d9b985882e"; + }; + } + { + name = "_babel_template___template_7.12.7.tgz"; + path = fetchurl { + name = "_babel_template___template_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz"; + sha1 = "c817233696018e39fbb6c491d2fb684e05ed43bc"; + }; + } + { + name = "_babel_traverse___traverse_7.12.7.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.7.tgz"; + sha1 = "572a722408681cef17d6b0bef69ef2e728ca69f1"; + }; + } + { + name = "_babel_types___types_7.12.7.tgz"; + path = fetchurl { + name = "_babel_types___types_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz"; + sha1 = "6039ff1e242640a29452c9ae572162ec9a8f5d13"; + }; + } + { + name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; + path = fetchurl { + name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"; + sha1 = "75a2e8b51cb758a7553d6804a5932d7aace75c39"; + }; + } + { + name = "_clusterws_cws___cws_3.0.0.tgz"; + path = fetchurl { + name = "_clusterws_cws___cws_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@clusterws/cws/-/cws-3.0.0.tgz"; + sha1 = "518fc8e7d9066e220f6f6aef3158cc14d5a1e98e"; + }; + } + { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + path = fetchurl { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; + }; + } + { + name = "_emotion_cache___cache_10.0.19.tgz"; + path = fetchurl { + name = "_emotion_cache___cache_10.0.19.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.19.tgz"; + sha1 = "d258d94d9c707dcadaf1558def968b86bb87ad71"; + }; + } + { + name = "_emotion_core___core_10.0.17.tgz"; + path = fetchurl { + name = "_emotion_core___core_10.0.17.tgz"; + url = "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.17.tgz"; + sha1 = "3367376709721f4ee2068cff54ba581d362789d8"; + }; + } + { + name = "_emotion_css___css_10.0.14.tgz"; + path = fetchurl { + name = "_emotion_css___css_10.0.14.tgz"; + url = "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.14.tgz"; + sha1 = "95dacabdd0e22845d1a1b0b5968d9afa34011139"; + }; + } + { + name = "_emotion_hash___hash_0.8.0.tgz"; + path = fetchurl { + name = "_emotion_hash___hash_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz"; + sha1 = "bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"; + }; + } + { + name = "_emotion_memoize___memoize_0.7.4.tgz"; + path = fetchurl { + name = "_emotion_memoize___memoize_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz"; + sha1 = "19bf0f5af19149111c40d98bb0cf82119f5d9eeb"; + }; + } + { + name = "_emotion_serialize___serialize_0.11.16.tgz"; + path = fetchurl { + name = "_emotion_serialize___serialize_0.11.16.tgz"; + url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz"; + sha1 = "dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad"; + }; + } + { + name = "_emotion_sheet___sheet_0.9.3.tgz"; + path = fetchurl { + name = "_emotion_sheet___sheet_0.9.3.tgz"; + url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.3.tgz"; + sha1 = "689f135ecf87d3c650ed0c4f5ddcbe579883564a"; + }; + } + { + name = "_emotion_stylis___stylis_0.8.4.tgz"; + path = fetchurl { + name = "_emotion_stylis___stylis_0.8.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.4.tgz"; + sha1 = "6c51afdf1dd0d73666ba09d2eb6c25c220d6fe4c"; + }; + } + { + name = "_emotion_unitless___unitless_0.7.5.tgz"; + path = fetchurl { + name = "_emotion_unitless___unitless_0.7.5.tgz"; + url = "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz"; + sha1 = "77211291c1900a700b8a78cfafda3160d76949ed"; + }; + } + { + name = "_emotion_utils___utils_0.11.2.tgz"; + path = fetchurl { + name = "_emotion_utils___utils_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.2.tgz"; + sha1 = "713056bfdffb396b0a14f1c8f18e7b4d0d200183"; + }; + } + { + name = "_emotion_utils___utils_0.11.3.tgz"; + path = fetchurl { + name = "_emotion_utils___utils_0.11.3.tgz"; + url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz"; + sha1 = "a759863867befa7e583400d322652a3f44820924"; + }; + } + { + name = "_emotion_weak_memoize___weak_memoize_0.2.4.tgz"; + path = fetchurl { + name = "_emotion_weak_memoize___weak_memoize_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz"; + sha1 = "622a72bebd1e3f48d921563b4b60a762295a81fc"; + }; + } + { + name = "_eslint_eslintrc___eslintrc_0.2.1.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz"; + sha1 = "f72069c330461a06684d119384435e12a5d76e3c"; + }; + } + { + name = "_formatjs_intl_unified_numberformat___intl_unified_numberformat_3.3.6.tgz"; + path = fetchurl { + name = "_formatjs_intl_unified_numberformat___intl_unified_numberformat_3.3.6.tgz"; + url = "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.6.tgz"; + sha1 = "ab69818f7568894023cb31fdb5b5c7eed62c6537"; + }; + } + { + name = "_formatjs_intl_utils___intl_utils_2.2.5.tgz"; + path = fetchurl { + name = "_formatjs_intl_utils___intl_utils_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.2.5.tgz"; + sha1 = "eaafd94df3d102ee13e54e80f992a33868a6b1e8"; + }; + } + { + name = "_gamestdio_websocket___websocket_0.3.2.tgz"; + path = fetchurl { + name = "_gamestdio_websocket___websocket_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@gamestdio/websocket/-/websocket-0.3.2.tgz"; + sha1 = "321ba0976ee30fd14e51dbf8faa85ce7b325f76a"; + }; + } + { + name = "_github_webauthn_json___webauthn_json_0.5.7.tgz"; + path = fetchurl { + name = "_github_webauthn_json___webauthn_json_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/@github/webauthn-json/-/webauthn-json-0.5.7.tgz"; + sha1 = "143bc67f6e0f75f8d188e565741507bb08c31214"; + }; + } + { + name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; + path = fetchurl { + name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; + sha1 = "fd3db1d59ecf7cf121e80650bb86712f9b55eced"; + }; + } + { + name = "_istanbuljs_schema___schema_0.1.2.tgz"; + path = fetchurl { + name = "_istanbuljs_schema___schema_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz"; + sha1 = "26520bf09abe4a5644cd5414e37125a8954241dd"; + }; + } + { + name = "_jest_console___console_26.6.2.tgz"; + path = fetchurl { + name = "_jest_console___console_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz"; + sha1 = "4e04bc464014358b03ab4937805ee36a0aeb98f2"; + }; + } + { + name = "_jest_core___core_26.6.3.tgz"; + path = fetchurl { + name = "_jest_core___core_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz"; + sha1 = "7639fcb3833d748a4656ada54bde193051e45fad"; + }; + } + { + name = "_jest_environment___environment_26.6.2.tgz"; + path = fetchurl { + name = "_jest_environment___environment_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz"; + sha1 = "ba364cc72e221e79cc8f0a99555bf5d7577cf92c"; + }; + } + { + name = "_jest_fake_timers___fake_timers_26.6.2.tgz"; + path = fetchurl { + name = "_jest_fake_timers___fake_timers_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz"; + sha1 = "459c329bcf70cee4af4d7e3f3e67848123535aad"; + }; + } + { + name = "_jest_globals___globals_26.6.2.tgz"; + path = fetchurl { + name = "_jest_globals___globals_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz"; + sha1 = "5b613b78a1aa2655ae908eba638cc96a20df720a"; + }; + } + { + name = "_jest_reporters___reporters_26.6.2.tgz"; + path = fetchurl { + name = "_jest_reporters___reporters_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz"; + sha1 = "1f518b99637a5f18307bd3ecf9275f6882a667f6"; + }; + } + { + name = "_jest_source_map___source_map_26.6.2.tgz"; + path = fetchurl { + name = "_jest_source_map___source_map_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz"; + sha1 = "29af5e1e2e324cafccc936f218309f54ab69d535"; + }; + } + { + name = "_jest_test_result___test_result_26.6.2.tgz"; + path = fetchurl { + name = "_jest_test_result___test_result_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz"; + sha1 = "55da58b62df134576cc95476efa5f7949e3f5f18"; + }; + } + { + name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz"; + path = fetchurl { + name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz"; + sha1 = "98e8a45100863886d074205e8ffdc5a7eb582b17"; + }; + } + { + name = "_jest_transform___transform_26.6.2.tgz"; + path = fetchurl { + name = "_jest_transform___transform_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz"; + sha1 = "5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"; + }; + } + { + name = "_jest_types___types_25.5.0.tgz"; + path = fetchurl { + name = "_jest_types___types_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; + sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; + }; + } + { + name = "_jest_types___types_26.6.2.tgz"; + path = fetchurl { + name = "_jest_types___types_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz"; + sha1 = "bef5a532030e1d88a2f5a6d933f84e97226ed48e"; + }; + } + { + name = "_npmcli_move_file___move_file_1.0.1.tgz"; + path = fetchurl { + name = "_npmcli_move_file___move_file_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz"; + sha1 = "de103070dac0f48ce49cf6693c23af59c0f70464"; + }; + } + { + name = "_rails_ujs___ujs_6.0.3.tgz"; + path = fetchurl { + name = "_rails_ujs___ujs_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3.tgz"; + sha1 = "e68a03278e30daea6a110aac5dfa33c60c53055d"; + }; + } + { + name = "_sinonjs_commons___commons_1.8.1.tgz"; + path = fetchurl { + name = "_sinonjs_commons___commons_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; + sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; + }; + } + { + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; + path = fetchurl { + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"; + sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40"; + }; + } + { + name = "_testing_library_dom___dom_7.28.1.tgz"; + path = fetchurl { + name = "_testing_library_dom___dom_7.28.1.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.28.1.tgz"; + sha1 = "dea78be6e1e6db32ddcb29a449e94d9700c79eb9"; + }; + } + { + name = "_testing_library_jest_dom___jest_dom_5.11.6.tgz"; + path = fetchurl { + name = "_testing_library_jest_dom___jest_dom_5.11.6.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.6.tgz"; + sha1 = "782940e82e5cd17bc0a36f15156ba16f3570ac81"; + }; + } + { + name = "_testing_library_react___react_11.2.2.tgz"; + path = fetchurl { + name = "_testing_library_react___react_11.2.2.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.2.tgz"; + sha1 = "099c6c195140ff069211143cb31c0f8337bdb7b7"; + }; + } + { + name = "_types_aria_query___aria_query_4.2.0.tgz"; + path = fetchurl { + name = "_types_aria_query___aria_query_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz"; + sha1 = "14264692a9d6e2fa4db3df5e56e94b5e25647ac0"; + }; + } + { + name = "_types_babel__core___babel__core_7.1.9.tgz"; + path = fetchurl { + name = "_types_babel__core___babel__core_7.1.9.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz"; + sha1 = "77e59d438522a6fb898fa43dc3455c6e72f3963d"; + }; + } + { + name = "_types_babel__generator___babel__generator_7.6.1.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__template___babel__template_7.0.2.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__traverse___babel__traverse_7.0.13.tgz"; + path = fetchurl { + name = "_types_babel__traverse___babel__traverse_7.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz"; + sha1 = "1874914be974a492e1b4cb00585cabb274e8ba18"; + }; + } + { + name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; + path = fetchurl { + name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; + sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03"; + }; + } + { + 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_events___events_3.0.0.tgz"; + path = fetchurl { + name = "_types_events___events_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; + sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; + }; + } + { + name = "_types_glob___glob_7.1.1.tgz"; + path = fetchurl { + name = "_types_glob___glob_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; + sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + }; + } + { + name = "_types_graceful_fs___graceful_fs_4.1.3.tgz"; + path = fetchurl { + name = "_types_graceful_fs___graceful_fs_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; + sha1 = "039af35fe26bec35003e8d86d2ee9c586354348f"; + }; + } + { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; + }; + } + { + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; + }; + } + { + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; + path = fetchurl { + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; + sha1 = "e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"; + }; + } + { + name = "_types_istanbul_reports___istanbul_reports_3.0.0.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_jest___jest_26.0.3.tgz"; + path = fetchurl { + name = "_types_jest___jest_26.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.3.tgz"; + sha1 = "79534e0e94857171c0edc596db0ebe7cb7863251"; + }; + } + { + 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_json5___json5_0.0.29.tgz"; + path = fetchurl { + name = "_types_json5___json5_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + }; + } + { + name = "_types_minimatch___minimatch_3.0.3.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_node___node_14.11.1.tgz"; + path = fetchurl { + name = "_types_node___node_14.11.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.11.1.tgz"; + sha1 = "56af902ad157e763f9ba63d671c39cda3193c835"; + }; + } + { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.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_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } + { + name = "_types_prettier___prettier_2.0.2.tgz"; + path = fetchurl { + name = "_types_prettier___prettier_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz"; + sha1 = "5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3"; + }; + } + { + name = "_types_q___q_1.5.2.tgz"; + path = fetchurl { + name = "_types_q___q_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz"; + sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8"; + }; + } + { + name = "_types_schema_utils___schema_utils_1.0.0.tgz"; + path = fetchurl { + name = "_types_schema_utils___schema_utils_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/schema-utils/-/schema-utils-1.0.0.tgz"; + sha1 = "295d36f01e2cb8bc3207ca1d9a68e210db6b40cb"; + }; + } + { + 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_testing_library__jest_dom___testing_library__jest_dom_5.9.1.tgz"; + path = fetchurl { + name = "_types_testing_library__jest_dom___testing_library__jest_dom_5.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.1.tgz"; + sha1 = "aba5ee062b7880f69c212ef769389f30752806e5"; + }; + } + { + name = "_types_yargs_parser___yargs_parser_15.0.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_yargs___yargs_15.0.5.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 = "_webassemblyjs_ast___ast_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_ast___ast_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz"; + sha1 = "bd850604b4042459a5a41cd7d338cbed695ed964"; + }; + } + { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; + sha1 = "3c3d3b271bddfc84deb00f71344438311d52ffb4"; + }; + } + { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; + sha1 = "203f676e333b96c9da2eeab3ccef33c45928b6a2"; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; + sha1 = "a1442d269c5feb23fcbc9ef759dac3547f29de00"; + }; + } + { + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; + sha1 = "647f8892cd2043a82ac0c8c5e75c36f1d9159f27"; + }; + } + { + name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; + sha1 = "c05256b71244214671f4b08ec108ad63b70eddb8"; + }; + } + { + name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; + sha1 = "25d8884b76839871a08a6c6f806c3979ef712f07"; + }; + } + { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; + sha1 = "4fed8beac9b8c14f8c58b70d124d549dd1fe5790"; + }; + } + { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; + sha1 = "5a4138d5a6292ba18b04c5ae49717e4167965346"; + }; + } + { + name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; + sha1 = "15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; + sha1 = "f19ca0b76a6dc55623a09cffa769e838fa1e1c95"; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; + sha1 = "04d33b636f78e6a6813227e82402f7637b6229ab"; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; + sha1 = "3fe6d79d3f0f922183aa86002c42dd256cfee9cf"; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; + sha1 = "50bc70ec68ded8e2763b01a1418bf43491a7a49c"; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; + sha1 = "2211181e5b31326443cc8112eb9f0b9028721a61"; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; + sha1 = "9d48e44826df4a6598294aa6c87469d642fff65e"; + }; + } + { + name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; + sha1 = "3031115d79ac5bd261556cecc3fa90a3ef451914"; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; + sha1 = "4935d54c85fef637b00ce9f52377451d00d47899"; + }; + } + { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + path = fetchurl { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790"; + }; + } + { + name = "_xtuc_long___long_4.2.2.tgz"; + path = fetchurl { + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; + }; + } + { + name = "abab___abab_2.0.5.tgz"; + path = fetchurl { + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + }; + } + { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + path = fetchurl { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; + sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"; + }; + } + { + name = "acorn_jsx___acorn_jsx_3.0.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; + sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; + }; + } + { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; + }; + } + { + name = "acorn_walk___acorn_walk_8.0.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.0.tgz"; + sha1 = "56ae4c0f434a45fff4a125e7ea95fa9c98f67a16"; + }; + } + { + name = "acorn___acorn_3.3.0.tgz"; + path = fetchurl { + name = "acorn___acorn_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + } + { + name = "acorn___acorn_5.7.3.tgz"; + path = fetchurl { + name = "acorn___acorn_5.7.3.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; + sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + }; + } + { + name = "acorn___acorn_6.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; + }; + } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + }; + } + { + name = "acorn___acorn_8.0.4.tgz"; + path = fetchurl { + name = "acorn___acorn_8.0.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.0.4.tgz"; + sha1 = "7a3ae4191466a6984eee0fe3407a4f3aa9db8354"; + }; + } + { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; + }; + } + { + name = "ajv_errors___ajv_errors_1.0.1.tgz"; + path = fetchurl { + name = "ajv_errors___ajv_errors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz"; + sha1 = "f35986aceb91afadec4102fbd85014950cefa64d"; + }; + } + { + name = "ajv_keywords___ajv_keywords_1.5.1.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; + sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + }; + } + { + name = "ajv___ajv_4.11.8.tgz"; + path = fetchurl { + name = "ajv___ajv_4.11.8.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; + path = fetchurl { + name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; + sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; + }; + } + { + name = "ansi_colors___ansi_colors_3.2.4.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } + { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + } + { + 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_html___ansi_html_0.0.7.tgz"; + path = fetchurl { + name = "ansi_html___ansi_html_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.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_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.2.1.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 = "anymatch___anymatch_2.0.0.tgz"; + path = fetchurl { + name = "anymatch___anymatch_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"; + sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"; + }; + } + { + name = "anymatch___anymatch_3.1.1.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; + sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + }; + } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "aria_query___aria_query_4.2.2.tgz"; + path = fetchurl { + name = "aria_query___aria_query_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz"; + sha1 = "0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"; + }; + } + { + name = "arr_diff___arr_diff_4.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + } + { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + path = fetchurl { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + }; + } + { + name = "arr_union___arr_union_3.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_flatten___array_flatten_2.1.2.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz"; + sha1 = "24ef80a28c1a893617e2149b0c6d0d788293b099"; + }; + } + { + 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_union___array_union_1.0.2.tgz"; + path = fetchurl { + name = "array_union___array_union_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + } + { + name = "array_uniq___array_uniq_1.0.3.tgz"; + path = fetchurl { + name = "array_uniq___array_uniq_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + } + { + name = "array_unique___array_unique_0.3.2.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + } + { + name = "array.prototype.flat___array.prototype.flat_1.2.3.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.flatmap___array.prototype.flatmap_1.2.3.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 = "arrow_key_navigation___arrow_key_navigation_1.2.0.tgz"; + path = fetchurl { + name = "arrow_key_navigation___arrow_key_navigation_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/arrow-key-navigation/-/arrow-key-navigation-1.2.0.tgz"; + sha1 = "edefc5f8b4fc4e384e7c20ddecf81db7ffc970a9"; + }; + } + { + name = "asn1.js___asn1.js_5.4.1.tgz"; + path = fetchurl { + name = "asn1.js___asn1.js_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; + 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 { + name = "assert___assert_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz"; + sha1 = "55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"; + }; + } + { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + path = fetchurl { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + } + { + name = "ast_types_flow___ast_types_flow_0.0.7.tgz"; + path = fetchurl { + name = "ast_types_flow___ast_types_flow_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz"; + sha1 = "f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"; + }; + } + { + name = "astral_regex___astral_regex_1.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; + sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + }; + } + { + name = "async_each___async_each_1.0.3.tgz"; + path = fetchurl { + name = "async_each___async_each_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; + sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; + }; + } + { + name = "async_limiter___async_limiter_1.0.1.tgz"; + path = fetchurl { + name = "async_limiter___async_limiter_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; + sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + }; + } + { + name = "async___async_0.9.2.tgz"; + path = fetchurl { + name = "async___async_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + } + { + name = "async___async_2.6.3.tgz"; + path = fetchurl { + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "atob___atob_2.1.2.tgz"; + path = fetchurl { + name = "atob___atob_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; + sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + }; + } + { + 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"; + 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 = "aws4___aws4_1.10.1.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.0.2.tgz"; + path = fetchurl { + name = "axe_core___axe_core_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.0.2.tgz"; + sha1 = "c7cf7378378a51fcd272d3c09668002a4990b1cb"; + }; + } + { + name = "axios___axios_0.21.0.tgz"; + path = fetchurl { + name = "axios___axios_0.21.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.0.tgz"; + sha1 = "26df088803a2350dff2c27f96fef99fe49442aca"; + }; + } + { + name = "axobject_query___axobject_query_2.2.0.tgz"; + path = fetchurl { + name = "axobject_query___axobject_query_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz"; + sha1 = "943d47e10c0b704aa42275e20edf3722648989be"; + }; + } + { + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + path = fetchurl { + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; + }; + } + { + name = "babel_jest___babel_jest_26.6.3.tgz"; + path = fetchurl { + name = "babel_jest___babel_jest_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz"; + sha1 = "d87d25cb0037577a0c89f82e5755c5d293c01056"; + }; + } + { + name = "babel_loader___babel_loader_8.2.1.tgz"; + path = fetchurl { + name = "babel_loader___babel_loader_8.2.1.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.1.tgz"; + sha1 = "e53313254677e86f27536f5071d807e01d24ec00"; + }; + } + { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + path = fetchurl { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; + }; + } + { + name = "babel_plugin_emotion___babel_plugin_emotion_10.0.33.tgz"; + path = fetchurl { + name = "babel_plugin_emotion___babel_plugin_emotion_10.0.33.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz"; + sha1 = "ce1155dcd1783bbb9286051efee53f4e2be63e03"; + }; + } + { + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.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_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz"; + path = fetchurl { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz"; + sha1 = "8185bd030348d254c6d7dd974355e6a28b21e62d"; + }; + } + { + name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; + path = fetchurl { + name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz"; + sha1 = "4f6844358a1340baed182adbeffa8df9967bc196"; + }; + } + { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + path = fetchurl { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; + }; + } + { + name = "babel_plugin_preval___babel_plugin_preval_5.0.0.tgz"; + path = fetchurl { + name = "babel_plugin_preval___babel_plugin_preval_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-5.0.0.tgz"; + sha1 = "6cabb947ecc241664966e1f99eb56a3b4bb63d1e"; + }; + } + { + name = "babel_plugin_react_intl___babel_plugin_react_intl_6.2.0.tgz"; + path = fetchurl { + name = "babel_plugin_react_intl___babel_plugin_react_intl_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-6.2.0.tgz"; + sha1 = "ac51ca757f318938792fc91e1747515e9225386a"; + }; + } + { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + path = fetchurl { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; + }; + } + { + name = "babel_plugin_transform_react_remove_prop_types___babel_plugin_transform_react_remove_prop_types_0.4.24.tgz"; + path = fetchurl { + name = "babel_plugin_transform_react_remove_prop_types___babel_plugin_transform_react_remove_prop_types_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz"; + sha1 = "f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"; + }; + } + { + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; + path = fetchurl { + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz"; + sha1 = "cf5feef29551253471cfa82fc8e0f5063df07a77"; + }; + } + { + name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz"; + path = fetchurl { + name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz"; + sha1 = "747872b1171df032252426586881d62d31798fee"; + }; + } + { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.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 = "base64_js___base64_js_1.3.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 = "base___base_0.11.2.tgz"; + path = fetchurl { + name = "base___base_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; + sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + }; + } + { + name = "batch___batch_0.6.1.tgz"; + path = fetchurl { + name = "batch___batch_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz"; + 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 = "big.js___big.js_3.2.0.tgz"; + path = fetchurl { + name = "big.js___big.js_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz"; + sha1 = "a5fc298b81b9e0dca2e458824784b65c52ba588e"; + }; + } + { + name = "big.js___big.js_5.2.2.tgz"; + path = fetchurl { + name = "big.js___big.js_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; + sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; + }; + } + { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; + }; + } + { + name = "binary_extensions___binary_extensions_2.1.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 = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "blurhash___blurhash_1.1.3.tgz"; + path = fetchurl { + name = "blurhash___blurhash_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz"; + sha1 = "dc325af7da836d07a0861d830bdd63694382483e"; + }; + } + { + name = "bmp_js___bmp_js_0.1.0.tgz"; + path = fetchurl { + name = "bmp_js___bmp_js_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz"; + sha1 = "e05a63f796a6c1ff25f4771ec7adadc148c07233"; + }; + } + { + name = "bn.js___bn.js_4.11.9.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_5.1.3.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 = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + }; + } + { + name = "bonjour___bonjour_3.5.0.tgz"; + path = fetchurl { + name = "bonjour___bonjour_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + } + { + name = "boolbase___boolbase_1.0.0.tgz"; + path = fetchurl { + name = "boolbase___boolbase_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_2.3.2.tgz"; + path = fetchurl { + name = "braces___braces_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; + sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "bricks.js___bricks.js_1.8.0.tgz"; + path = fetchurl { + name = "bricks.js___bricks.js_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/bricks.js/-/bricks.js-1.8.0.tgz"; + sha1 = "8fdeb3c0226af251f4d5727a7df7f9ac0092b4b2"; + }; + } + { + name = "brorand___brorand_1.1.0.tgz"; + path = fetchurl { + name = "brorand___brorand_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + }; + } + { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + path = fetchurl { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; + }; + } + { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + path = fetchurl { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha1 = "326734642f403dabc3003209853bb70ad428ef48"; + }; + } + { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + path = fetchurl { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha1 = "8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"; + }; + } + { + name = "browserify_des___browserify_des_1.0.2.tgz"; + path = fetchurl { + name = "browserify_des___browserify_des_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz"; + sha1 = "3af4f1f59839403572f1c66204375f7a7f703e9c"; + }; + } + { + name = "browserify_rsa___browserify_rsa_4.0.1.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_sign___browserify_sign_4.2.1.tgz"; + path = fetchurl { + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"; + }; + } + { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + path = fetchurl { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"; + }; + } + { + name = "browserslist___browserslist_4.14.5.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.14.5.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz"; + sha1 = "1c751461a102ddc60e40993639b709be7f2c4015"; + }; + } + { + name = "browserslist___browserslist_4.14.7.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.14.7.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz"; + sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6"; + }; + } + { + name = "bser___bser_2.1.1.tgz"; + path = fetchurl { + name = "bser___bser_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; + sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.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_indexof___buffer_indexof_1.1.1.tgz"; + path = fetchurl { + name = "buffer_indexof___buffer_indexof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha1 = "52fabcc6a606d1a00302802648ef68f639da268c"; + }; + } + { + name = "buffer_writer___buffer_writer_1.0.1.tgz"; + path = fetchurl { + name = "buffer_writer___buffer_writer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz"; + sha1 = "22a936901e3029afcd7547eb4487ceb697a3bf08"; + }; + } + { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + path = fetchurl { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + } + { + name = "buffer___buffer_4.9.2.tgz"; + path = fetchurl { + name = "buffer___buffer_4.9.2.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; + sha1 = "230ead344002988644841ab0244af8c44bbe3ef8"; + }; + } + { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + path = fetchurl { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + } + { + name = "bytes___bytes_3.0.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + name = "cacache___cacache_12.0.4.tgz"; + path = fetchurl { + name = "cacache___cacache_12.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; + sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; + }; + } + { + name = "cacache___cacache_15.0.5.tgz"; + path = fetchurl { + name = "cacache___cacache_15.0.5.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz"; + sha1 = "69162833da29170d6732334643c60e005f5f17d0"; + }; + } + { + name = "cache_base___cache_base_1.0.1.tgz"; + path = fetchurl { + name = "cache_base___cache_base_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; + sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + }; + } + { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + path = fetchurl { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + } + { + name = "caller_path___caller_path_0.1.0.tgz"; + path = fetchurl { + name = "caller_path___caller_path_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz"; + sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; + }; + } + { + name = "caller_path___caller_path_2.0.0.tgz"; + path = fetchurl { + name = "caller_path___caller_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + } + { + name = "callsites___callsites_0.2.0.tgz"; + path = fetchurl { + name = "callsites___callsites_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz"; + sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; + }; + } + { + name = "callsites___callsites_2.0.0.tgz"; + path = fetchurl { + name = "callsites___callsites_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "camelcase___camelcase_6.2.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; + sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + }; + } + { + name = "caniuse_api___caniuse_api_3.0.0.tgz"; + path = fetchurl { + name = "caniuse_api___caniuse_api_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz"; + sha1 = "5e4d90e2274961d46291997df599e3ed008ee4c0"; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001143.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001143.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001143.tgz"; + sha1 = "560f2cfb9f313d1d7e52eb8dac0e4e36c8821c0d"; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz"; + sha1 = "bebde28f893fa9594dadcaa7d6b8e2aa0299df20"; + }; + } + { + name = "capture_exit___capture_exit_2.0.0.tgz"; + path = fetchurl { + name = "capture_exit___capture_exit_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz"; + sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4"; + }; + } + { + 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 = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { + name = "chalk___chalk_4.1.0.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; + sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + }; + } + { + name = "char_regex___char_regex_1.0.2.tgz"; + path = fetchurl { + name = "char_regex___char_regex_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz"; + sha1 = "d744358226217f981ed58f479b1d6bcc29545dcf"; + }; + } + { + name = "chokidar___chokidar_3.4.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz"; + sha1 = "e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"; + }; + } + { + name = "chokidar___chokidar_2.1.8.tgz"; + path = fetchurl { + name = "chokidar___chokidar_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; + sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + }; + } + { + name = "chownr___chownr_2.0.0.tgz"; + path = fetchurl { + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; + }; + } + { + name = "chrome_trace_event___chrome_trace_event_1.0.2.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 = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; + sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + }; + } + { + name = "cipher_base___cipher_base_1.0.4.tgz"; + path = fetchurl { + name = "cipher_base___cipher_base_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; + sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; + }; + } + { + name = "circular_json___circular_json_0.3.3.tgz"; + path = fetchurl { + name = "circular_json___circular_json_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz"; + sha1 = "815c99ea84f6809529d2f45791bdf82711352d66"; + }; + } + { + name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz"; + path = fetchurl { + name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz"; + sha1 = "4186fcca0eae175970aee870b9fe2d6cf8d5655f"; + }; + } + { + name = "class_utils___class_utils_0.3.6.tgz"; + path = fetchurl { + name = "class_utils___class_utils_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; + sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + }; + } + { + name = "classnames___classnames_2.2.6.tgz"; + path = fetchurl { + name = "classnames___classnames_2.2.6.tgz"; + url = "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz"; + sha1 = "43935bffdd291f326dad0a205309b38d00f650ce"; + }; + } + { + name = "clean_stack___clean_stack_2.2.0.tgz"; + path = fetchurl { + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + }; + } + { + name = "cli_cursor___cli_cursor_1.0.2.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + }; + } + { + name = "cli_width___cli_width_2.2.1.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; + }; + } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } + { + name = "cliui___cliui_6.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; + sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; + }; + } + { + name = "cliui___cliui_7.0.3.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.3.tgz"; + sha1 = "ef180f26c8d9bff3927ee52428bfec2090427981"; + }; + } + { + name = "clone_deep___clone_deep_4.0.1.tgz"; + path = fetchurl { + name = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha1 = "c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"; + }; + } + { + name = "co___co_4.6.0.tgz"; + path = fetchurl { + name = "co___co_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + } + { + name = "coa___coa_2.0.2.tgz"; + path = fetchurl { + name = "coa___coa_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz"; + sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3"; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } + { + name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; + path = fetchurl { + name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"; + sha1 = "cc2c8e94fc18bbdffe64d6534570c8a673b27f59"; + }; + } + { + name = "collection_visit___collection_visit_1.0.0.tgz"; + path = fetchurl { + name = "collection_visit___collection_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + } + { + name = "color_blend___color_blend_3.0.0.tgz"; + path = fetchurl { + name = "color_blend___color_blend_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/color-blend/-/color-blend-3.0.0.tgz"; + sha1 = "077073ee59ebce15e084f00590c5bf7577899cb5"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "color_string___color_string_1.5.3.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___color_3.1.2.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 = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "commander___commander_6.2.0.tgz"; + path = fetchurl { + name = "commander___commander_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz"; + sha1 = "b990bfb8ac030aedc6d11bc04d1488ffef56db75"; + }; + } + { + name = "commondir___commondir_1.0.1.tgz"; + path = fetchurl { + name = "commondir___commondir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + }; + } + { + name = "compressible___compressible_2.0.18.tgz"; + path = fetchurl { + name = "compressible___compressible_2.0.18.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; + sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; + }; + } + { + name = "compression_webpack_plugin___compression_webpack_plugin_6.1.1.tgz"; + path = fetchurl { + name = "compression_webpack_plugin___compression_webpack_plugin_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz"; + sha1 = "ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"; + }; + } + { + name = "compression___compression_1.7.4.tgz"; + path = fetchurl { + name = "compression___compression_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz"; + sha1 = "95523eff170ca57c29a0ca41e6fe131f41e5bb8f"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; + path = fetchurl { + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha1 = "8b32089359308d111115d81cad3fceab888f97bc"; + }; + } + { + name = "console_browserify___console_browserify_1.2.0.tgz"; + path = fetchurl { + name = "console_browserify___console_browserify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; + sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + } + { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + path = fetchurl { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; + 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 { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + }; + } + { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } + { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + path = fetchurl { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; + }; + } + { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + path = fetchurl { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + } + { + name = "core_js_compat___core_js_compat_3.7.0.tgz"; + path = fetchurl { + name = "core_js_compat___core_js_compat_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz"; + sha1 = "8479c5d3d672d83f1f5ab94cf353e57113e065ed"; + }; + } + { + name = "core_js_pure___core_js_pure_3.6.5.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___core_js_2.6.11.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_util_is___core_util_is_1.0.2.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 = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + }; + } + { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + }; + } + { + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + path = fetchurl { + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e"; + }; + } + { + name = "create_hash___create_hash_1.2.0.tgz"; + path = fetchurl { + name = "create_hash___create_hash_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz"; + sha1 = "889078af11a63756bcfb59bd221996be3a9ef196"; + }; + } + { + name = "create_hmac___create_hmac_1.1.7.tgz"; + path = fetchurl { + name = "create_hmac___create_hmac_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz"; + sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff"; + }; + } + { + name = "cross_env___cross_env_7.0.2.tgz"; + path = fetchurl { + name = "cross_env___cross_env_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz"; + sha1 = "bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } + { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + path = fetchurl { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec"; + }; + } + { + name = "css_color_names___css_color_names_0.0.4.tgz"; + path = fetchurl { + name = "css_color_names___css_color_names_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz"; + sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; + }; + } + { + name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; + path = fetchurl { + name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; + sha1 = "c198940f63a76d7e36c1e71018b001721054cb22"; + }; + } + { + name = "css_font_size_keywords___css_font_size_keywords_1.0.0.tgz"; + path = fetchurl { + name = "css_font_size_keywords___css_font_size_keywords_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz"; + sha1 = "854875ace9aca6a8d2ee0d345a44aae9bb6db6cb"; + }; + } + { + name = "css_font_stretch_keywords___css_font_stretch_keywords_1.0.1.tgz"; + path = fetchurl { + name = "css_font_stretch_keywords___css_font_stretch_keywords_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz"; + sha1 = "50cee9b9ba031fb5c952d4723139f1e107b54b10"; + }; + } + { + name = "css_font_style_keywords___css_font_style_keywords_1.0.1.tgz"; + path = fetchurl { + name = "css_font_style_keywords___css_font_style_keywords_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz"; + sha1 = "5c3532813f63b4a1de954d13cea86ab4333409e4"; + }; + } + { + name = "css_font_weight_keywords___css_font_weight_keywords_1.0.0.tgz"; + path = fetchurl { + name = "css_font_weight_keywords___css_font_weight_keywords_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz"; + sha1 = "9bc04671ac85bc724b574ef5d3ac96b0d604fd97"; + }; + } + { + name = "css_global_keywords___css_global_keywords_1.0.1.tgz"; + path = fetchurl { + name = "css_global_keywords___css_global_keywords_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz"; + sha1 = "72a9aea72796d019b1d2a3252de4e5aaa37e4a69"; + }; + } + { + name = "css_list_helpers___css_list_helpers_1.0.1.tgz"; + path = fetchurl { + name = "css_list_helpers___css_list_helpers_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-list-helpers/-/css-list-helpers-1.0.1.tgz"; + sha1 = "fff57192202db83240c41686f919e449a7024f7d"; + }; + } + { + name = "css_loader___css_loader_5.0.1.tgz"; + path = fetchurl { + name = "css_loader___css_loader_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.1.tgz"; + sha1 = "9e4de0d6636a6266a585bd0900b422c85539d25f"; + }; + } + { + name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; + path = fetchurl { + name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; + sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7"; + }; + } + { + name = "css_select___css_select_2.1.0.tgz"; + path = fetchurl { + name = "css_select___css_select_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; + sha1 = "6a34653356635934a81baca68d0255432105dbef"; + }; + } + { + name = "css_system_font_keywords___css_system_font_keywords_1.0.0.tgz"; + path = fetchurl { + name = "css_system_font_keywords___css_system_font_keywords_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz"; + sha1 = "85c6f086aba4eb32c571a3086affc434b84823ed"; + }; + } + { + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + path = fetchurl { + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; + }; + } + { + name = "css_tree___css_tree_1.0.0_alpha.39.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_what___css_what_3.3.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.escape___css.escape_1.5.1.tgz"; + path = fetchurl { + name = "css.escape___css.escape_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz"; + sha1 = "42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"; + }; + } + { + name = "css___css_3.0.0.tgz"; + path = fetchurl { + name = "css___css_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz"; + sha1 = "4447a4d58fdd03367c516ca9f64ae365cee4aa5d"; + }; + } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha1 = "37741919903b868565e1c09ea747445cd18983ee"; + }; + } + { + name = "cssnano_preset_default___cssnano_preset_default_4.0.7.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_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; + path = fetchurl { + name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; + sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; + }; + } + { + name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; + path = fetchurl { + name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; + sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; + }; + } + { + name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; + path = fetchurl { + name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; + sha1 = "b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"; + }; + } + { + name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; + path = fetchurl { + name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; + sha1 = "574082fb2859d2db433855835d9a8456ea18bbf3"; + }; + } + { + name = "cssnano___cssnano_4.1.10.tgz"; + path = fetchurl { + name = "cssnano___cssnano_4.1.10.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz"; + sha1 = "0ac41f0b13d13d465487e111b778d42da631b8b2"; + }; + } + { + name = "csso___csso_4.0.3.tgz"; + path = fetchurl { + name = "csso___csso_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; + sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; + }; + } + { + name = "cssom___cssom_0.4.4.tgz"; + path = fetchurl { + name = "cssom___cssom_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; + sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; + }; + } + { + name = "cssom___cssom_0.3.8.tgz"; + path = fetchurl { + name = "cssom___cssom_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; + sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; + }; + } + { + name = "cssstyle___cssstyle_2.3.0.tgz"; + path = fetchurl { + name = "cssstyle___cssstyle_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; + sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; + }; + } + { + name = "csstype___csstype_2.6.13.tgz"; + path = fetchurl { + name = "csstype___csstype_2.6.13.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz"; + sha1 = "a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"; + }; + } + { + name = "cyclist___cyclist_1.0.1.tgz"; + path = fetchurl { + name = "cyclist___cyclist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + }; + } + { + name = "d___d_1.0.1.tgz"; + path = fetchurl { + name = "d___d_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"; + sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a"; + }; + } + { + 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"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "data_urls___data_urls_2.0.0.tgz"; + path = fetchurl { + name = "data_urls___data_urls_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; + sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + 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_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decimal.js___decimal.js_10.2.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 = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "deep_equal___deep_equal_1.1.1.tgz"; + path = fetchurl { + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; + }; + } + { + name = "deep_extend___deep_extend_0.5.1.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz"; + sha1 = "b894a9dd90d3023fbf1c55a394fb858eb2066f1f"; + }; + } + { + name = "deep_is___deep_is_0.1.3.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 = "deepmerge___deepmerge_4.2.2.tgz"; + path = fetchurl { + name = "deepmerge___deepmerge_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; + sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + }; + } + { + name = "default_gateway___default_gateway_4.2.0.tgz"; + path = fetchurl { + name = "default_gateway___default_gateway_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz"; + sha1 = "167104c7500c2115f6dd69b0a536bb8ed720552b"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "define_property___define_property_0.2.5.tgz"; + path = fetchurl { + name = "define_property___define_property_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + } + { + name = "define_property___define_property_1.0.0.tgz"; + path = fetchurl { + name = "define_property___define_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + } + { + name = "define_property___define_property_2.0.2.tgz"; + path = fetchurl { + name = "define_property___define_property_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; + sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + }; + } + { + name = "del___del_4.1.1.tgz"; + path = fetchurl { + name = "del___del_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; + sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + } + { + name = "denque___denque_1.4.1.tgz"; + path = fetchurl { + name = "denque___denque_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz"; + sha1 = "6744ff7641c148c3f8a69c307e51235c1f4a37cf"; + }; + } + { + 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 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "des.js___des.js_1.0.1.tgz"; + path = fetchurl { + name = "des.js___des.js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; + sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "detect_file___detect_file_1.0.0.tgz"; + path = fetchurl { + name = "detect_file___detect_file_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + } + { + name = "detect_newline___detect_newline_3.1.0.tgz"; + path = fetchurl { + name = "detect_newline___detect_newline_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz"; + sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651"; + }; + } + { + name = "detect_node___detect_node_2.0.4.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_passive_events___detect_passive_events_2.0.1.tgz"; + path = fetchurl { + name = "detect_passive_events___detect_passive_events_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/detect-passive-events/-/detect-passive-events-2.0.1.tgz"; + sha1 = "fdbd6f6dd5e6ac10c6189a4cb26ab264d41c0835"; + }; + } + { + name = "diff_sequences___diff_sequences_25.2.6.tgz"; + path = fetchurl { + name = "diff_sequences___diff_sequences_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; + sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; + }; + } + { + name = "diff_sequences___diff_sequences_26.6.2.tgz"; + path = fetchurl { + name = "diff_sequences___diff_sequences_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz"; + sha1 = "48ba99157de1923412eed41db6b6d4aa9ca7c0b1"; + }; + } + { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + path = fetchurl { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha1 = "40e8ee98f55a2149607146921c63e1ae5f3d2875"; + }; + } + { + name = "dns_equal___dns_equal_1.0.0.tgz"; + path = fetchurl { + name = "dns_equal___dns_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + } + { + name = "dns_packet___dns_packet_1.3.1.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_txt___dns_txt_2.0.2.tgz"; + path = fetchurl { + name = "dns_txt___dns_txt_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz"; + 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 { + name = "doctrine___doctrine_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; + sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + }; + } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } + { + name = "dom_accessibility_api___dom_accessibility_api_0.5.4.tgz"; + path = fetchurl { + name = "dom_accessibility_api___dom_accessibility_api_0.5.4.tgz"; + url = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz"; + sha1 = "b06d059cdd4a4ad9a79275f9d414a5c126241166"; + }; + } + { + name = "dom_helpers___dom_helpers_3.4.0.tgz"; + path = fetchurl { + name = "dom_helpers___dom_helpers_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz"; + sha1 = "e9b369700f959f62ecde5a6babde4bccd9169af8"; + }; + } + { + name = "dom_helpers___dom_helpers_5.1.3.tgz"; + path = fetchurl { + name = "dom_helpers___dom_helpers_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz"; + sha1 = "7233248eb3a2d1f74aafca31e52c5299cc8ce821"; + }; + } + { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; + }; + } + { + name = "domain_browser___domain_browser_1.2.0.tgz"; + path = fetchurl { + name = "domain_browser___domain_browser_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz"; + sha1 = "3d31f50191a6749dd1375a7f522e823d42e54eda"; + }; + } + { + name = "domelementtype___domelementtype_1.3.1.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz"; + sha1 = "d048c44b37b0d10a7f2a3d5fee3f4333d790481f"; + }; + } + { + name = "domelementtype___domelementtype_2.0.1.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz"; + sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"; + }; + } + { + name = "domexception___domexception_2.0.1.tgz"; + path = fetchurl { + name = "domexception___domexception_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; + sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; + }; + } + { + name = "domutils___domutils_1.7.0.tgz"; + path = fetchurl { + name = "domutils___domutils_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; + sha1 = "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"; + }; + } + { + name = "dot_prop___dot_prop_5.3.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + }; + } + { + name = "dotenv___dotenv_8.2.0.tgz"; + path = fetchurl { + name = "dotenv___dotenv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; + sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; + }; + } + { + name = "duplexer___duplexer_0.1.2.tgz"; + path = fetchurl { + name = "duplexer___duplexer_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; + sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; + }; + } + { + name = "duplexify___duplexify_3.7.1.tgz"; + path = fetchurl { + name = "duplexify___duplexify_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; + 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 { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "ejs___ejs_2.7.4.tgz"; + path = fetchurl { + name = "ejs___ejs_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz"; + sha1 = "48661287573dcc53e366c7a1ae52c3a120eec9ba"; + }; + } + { + name = "ejs___ejs_3.1.5.tgz"; + path = fetchurl { + name = "ejs___ejs_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz"; + sha1 = "aed723844dc20acb4b170cd9ab1017e476a0d93b"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.574.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.574.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.574.tgz"; + sha1 = "bdd87f62fe70165e5c862a0acf0cee9889e23aa3"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.603.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.603.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz"; + sha1 = "1b71bec27fb940eccd79245f6824c63d5f7e8abf"; + }; + } + { + 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 = "emittery___emittery_0.7.1.tgz"; + path = fetchurl { + name = "emittery___emittery_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz"; + sha1 = "c02375a927a40948c0345cc903072597f5270451"; + }; + } + { + name = "934f314fd8322276765066e8a2a6be5bac61b1cf"; + path = fetchurl { + name = "934f314fd8322276765066e8a2a6be5bac61b1cf"; + url = "https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf"; + sha1 = "1768aa6ab3d6b926f457e082bd4ed7279f6fc9cf"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "emoji_regex___emoji_regex_9.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz"; + sha1 = "48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4"; + }; + } + { + name = "emojis_list___emojis_list_2.1.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz"; + sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + }; + } + { + name = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; + sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126"; + }; + } + { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + }; + } + { + name = "entities___entities_2.0.3.tgz"; + path = fetchurl { + name = "entities___entities_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; + sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; + }; + } + { + name = "errno___errno_0.1.7.tgz"; + path = fetchurl { + name = "errno___errno_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; + sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "error_stack_parser___error_stack_parser_2.0.6.tgz"; + path = fetchurl { + name = "error_stack_parser___error_stack_parser_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz"; + sha1 = "5a99a707bd7a4c58a797902d48d82803ede6aad8"; + }; + } + { + name = "es_abstract___es_abstract_1.17.7.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.17.7.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz"; + sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c"; + }; + } + { + name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; + sha1 = "6e3a0a4bda717e5023ab3b8e90bec36108d22c68"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + }; + } + { + name = "es5_ext___es5_ext_0.10.53.tgz"; + path = fetchurl { + name = "es5_ext___es5_ext_0.10.53.tgz"; + url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; + sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; + }; + } + { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + path = fetchurl { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + } + { + name = "es6_map___es6_map_0.1.5.tgz"; + path = fetchurl { + name = "es6_map___es6_map_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + }; + } + { + name = "es6_set___es6_set_0.1.5.tgz"; + path = fetchurl { + name = "es6_set___es6_set_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + } + { + name = "es6_symbol___es6_symbol_3.1.1.tgz"; + path = fetchurl { + name = "es6_symbol___es6_symbol_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + } + { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + path = fetchurl { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; + }; + } + { + name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; + path = fetchurl { + name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; + sha1 = "b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + }; + } + { + name = "escodegen___escodegen_1.14.3.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + }; + } + { + name = "escope___escope_3.6.0.tgz"; + path = fetchurl { + name = "escope___escope_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz"; + sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + }; + } + { + 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_import___eslint_plugin_import_2.22.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_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.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_promise___eslint_plugin_promise_4.2.1.tgz"; + path = fetchurl { + name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz"; + sha1 = "845fd8b2260ad8f82564c1222fce44ad71d9418a"; + }; + } + { + name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz"; + sha1 = "50b21a412b9574bfe05b21db176e8b7b3b15bff3"; + }; + } + { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.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___eslint_2.13.1.tgz"; + path = fetchurl { + name = "eslint___eslint_2.13.1.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-2.13.1.tgz"; + sha1 = "e4cc8fa0f009fb829aaae23855a29360be1f6c11"; + }; + } + { + name = "eslint___eslint_7.14.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz"; + sha1 = "2d2cac1d28174c510a97b377f122a5507958e344"; + }; + } + { + name = "espree___espree_3.5.4.tgz"; + path = fetchurl { + name = "espree___espree_3.5.4.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz"; + sha1 = "b0f447187c8a8bed944b815a660bddf5deb5d1a7"; + }; + } + { + name = "espree___espree_7.3.0.tgz"; + path = fetchurl { + name = "espree___espree_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz"; + sha1 = "dc30437cf67947cf576121ebd780f15eeac72348"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + 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 = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "estraverse___estraverse_5.2.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 = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "event_emitter___event_emitter_0.3.5.tgz"; + path = fetchurl { + name = "event_emitter___event_emitter_0.3.5.tgz"; + url = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + } + { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + path = fetchurl { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; + }; + } + { + name = "events___events_3.2.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 = "eventsource___eventsource_1.0.7.tgz"; + path = fetchurl { + name = "eventsource___eventsource_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz"; + sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"; + }; + } + { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + path = fetchurl { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha1 = "7fcbdb198dc71959432efe13842684e0525acb02"; + }; + } + { + name = "exec_sh___exec_sh_0.3.4.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 = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + }; + } + { + name = "execa___execa_4.1.0.tgz"; + path = fetchurl { + name = "execa___execa_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz"; + sha1 = "4e5491ad1572f2f17a77d388c6c857135b22847a"; + }; + } + { + name = "exif_js___exif_js_2.3.0.tgz"; + path = fetchurl { + name = "exif_js___exif_js_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/exif-js/-/exif-js-2.3.0.tgz"; + sha1 = "9d10819bf571f873813e7640241255ab9ce1a814"; + }; + } + { + name = "exit_hook___exit_hook_1.1.1.tgz"; + path = fetchurl { + name = "exit_hook___exit_hook_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + }; + } + { + name = "exit___exit_0.1.2.tgz"; + path = fetchurl { + name = "exit___exit_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + } + { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + } + { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + path = fetchurl { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + } + { + name = "expect___expect_26.6.2.tgz"; + path = fetchurl { + name = "expect___expect_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz"; + sha1 = "c6b996bf26bf3fe18b67b2d0f51fc981ba934417"; + }; + } + { + name = "express___express_4.17.1.tgz"; + path = fetchurl { + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + }; + } + { + name = "ext___ext_1.4.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 = "extend_shallow___extend_shallow_2.0.1.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + } + { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "extglob___extglob_2.0.4.tgz"; + path = fetchurl { + name = "extglob___extglob_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; + sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + }; + } + { + 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 { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "faye_websocket___faye_websocket_0.10.0.tgz"; + path = fetchurl { + name = "faye_websocket___faye_websocket_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + } + { + name = "faye_websocket___faye_websocket_0.11.3.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 = "fb_watchman___fb_watchman_2.0.1.tgz"; + path = fetchurl { + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; + }; + } + { + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + path = fetchurl { + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; + }; + } + { + name = "figures___figures_1.7.0.tgz"; + path = fetchurl { + name = "figures___figures_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + }; + } + { + name = "file_entry_cache___file_entry_cache_1.3.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz"; + sha1 = "44c61ea607ae4be9c1402f41f44270cbfe334ff8"; + }; + } + { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + }; + } + { + name = "file_loader___file_loader_6.2.0.tgz"; + path = fetchurl { + name = "file_loader___file_loader_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz"; + sha1 = "baef7cf8e1840df325e4390b4484879480eebe4d"; + }; + } + { + name = "file_type___file_type_12.4.2.tgz"; + path = fetchurl { + name = "file_type___file_type_12.4.2.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz"; + sha1 = "a344ea5664a1d01447ee7fb1b635f72feb6169d9"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "filelist___filelist_1.0.1.tgz"; + path = fetchurl { + name = "filelist___filelist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz"; + sha1 = "f10d1a3ae86c1694808e8f20906f43d4c9132dbb"; + }; + } + { + name = "filesize___filesize_6.1.0.tgz"; + path = fetchurl { + name = "filesize___filesize_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz"; + sha1 = "e81bdaa780e2451d714d71c0d7a4f3238d37ad00"; + }; + } + { + name = "fill_range___fill_range_4.0.0.tgz"; + path = fetchurl { + name = "fill_range___fill_range_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + }; + } + { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"; + }; + } + { + name = "find_cache_dir___find_cache_dir_3.3.1.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_root___find_root_1.1.0.tgz"; + path = fetchurl { + name = "find_root___find_root_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; + sha1 = "abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"; + }; + } + { + name = "find_up___find_up_2.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "findup_sync___findup_sync_3.0.0.tgz"; + path = fetchurl { + name = "findup_sync___findup_sync_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz"; + sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"; + }; + } + { + name = "flat_cache___flat_cache_1.3.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz"; + sha1 = "2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"; + }; + } + { + name = "flat_cache___flat_cache_2.0.1.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; + sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + }; + } + { + name = "flatted___flatted_2.0.2.tgz"; + path = fetchurl { + name = "flatted___flatted_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; + sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; + }; + } + { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + path = fetchurl { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; + }; + } + { + name = "follow_redirects___follow_redirects_1.13.0.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 = "font_awesome___font_awesome_4.7.0.tgz"; + path = fetchurl { + name = "font_awesome___font_awesome_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; + sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; + }; + } + { + name = "for_in___for_in_1.0.2.tgz"; + path = fetchurl { + name = "for_in___for_in_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; + 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 = "form_data___form_data_2.3.3.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 = "forwarded___forwarded_0.1.2.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + } + { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + path = fetchurl { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + } + { + name = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + } + { + name = "front_matter___front_matter_2.1.2.tgz"; + path = fetchurl { + name = "front_matter___front_matter_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/front-matter/-/front-matter-2.1.2.tgz"; + sha1 = "f75983b9f2f413be658c93dfd7bd8ce4078f5cdb"; + }; + } + { + name = "fs_extra___fs_extra_3.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; + }; + } + { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + path = fetchurl { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_1.2.13.tgz"; + path = fetchurl { + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + }; + } + { + 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 { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + } + { + name = "generate_function___generate_function_2.3.1.tgz"; + path = fetchurl { + name = "generate_function___generate_function_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz"; + sha1 = "f069617690c10c868e73b8465746764f97c3479f"; + }; + } + { + name = "generate_object_property___generate_object_property_1.2.0.tgz"; + path = fetchurl { + name = "generate_object_property___generate_object_property_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + } + { + name = "generic_pool___generic_pool_2.4.3.tgz"; + path = fetchurl { + name = "generic_pool___generic_pool_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz"; + sha1 = "780c36f69dfad05a5a045dd37be7adca11a4f6ff"; + }; + } + { + 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 = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_package_type___get_package_type_0.1.0.tgz"; + path = fetchurl { + name = "get_package_type___get_package_type_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; + sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + }; + } + { + name = "get_stream___get_stream_5.2.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + }; + } + { + name = "get_value___get_value_2.0.6.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 = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "glob_parent___glob_parent_3.1.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + } + { + name = "glob_parent___glob_parent_5.1.1.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___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "global_modules___global_modules_1.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"; + sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; + }; + } + { + name = "global_modules___global_modules_2.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; + sha1 = "997605ad2345f27f51539bea26574421215c7780"; + }; + } + { + name = "global_prefix___global_prefix_1.0.2.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + } + { + name = "global_prefix___global_prefix_3.0.0.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; + sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97"; + }; + } + { + name = "globals___globals_11.12.0.tgz"; + path = fetchurl { + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + }; + } + { + name = "globals___globals_12.3.0.tgz"; + path = fetchurl { + name = "globals___globals_12.3.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; + sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; + }; + } + { + name = "globals___globals_9.18.0.tgz"; + path = fetchurl { + name = "globals___globals_9.18.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz"; + sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; + }; + } + { + name = "globby___globby_6.1.0.tgz"; + path = fetchurl { + name = "globby___globby_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + } + { + name = "globule___globule_1.3.2.tgz"; + path = fetchurl { + name = "globule___globule_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz"; + sha1 = "d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"; + }; + } + { + name = "gonzales_pe_sl___gonzales_pe_sl_4.2.3.tgz"; + path = fetchurl { + name = "gonzales_pe_sl___gonzales_pe_sl_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/gonzales-pe-sl/-/gonzales-pe-sl-4.2.3.tgz"; + sha1 = "6a868bc380645f141feeb042c6f97fcc71b59fe6"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.4.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 = "growly___growly_1.3.0.tgz"; + path = fetchurl { + name = "growly___growly_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz"; + sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; + }; + } + { + name = "gzip_size___gzip_size_5.1.1.tgz"; + path = fetchurl { + name = "gzip_size___gzip_size_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz"; + sha1 = "cb9bee692f87c0612b232840a873904e4c135274"; + }; + } + { + name = "handle_thing___handle_thing_2.0.1.tgz"; + path = fetchurl { + name = "handle_thing___handle_thing_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; + sha1 = "857f79ce359580c340d43081cc648970d0bb234e"; + }; + } + { + name = "har_schema___har_schema_2.0.0.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 = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_flag___has_flag_1.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + 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_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { + name = "has_value___has_value_0.3.1.tgz"; + path = fetchurl { + name = "has_value___has_value_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + } + { + name = "has_value___has_value_1.0.0.tgz"; + path = fetchurl { + name = "has_value___has_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + } + { + name = "has_values___has_values_0.1.4.tgz"; + path = fetchurl { + name = "has_values___has_values_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + } + { + name = "has_values___has_values_1.0.0.tgz"; + path = fetchurl { + name = "has_values___has_values_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "hash_base___hash_base_3.1.0.tgz"; + path = fetchurl { + name = "hash_base___hash_base_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; + sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; + }; + } + { + name = "hash.js___hash.js_1.1.7.tgz"; + path = fetchurl { + name = "hash.js___hash.js_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; + sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42"; + }; + } + { + name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; + path = fetchurl { + name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; + sha1 = "4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"; + }; + } + { + name = "history___history_4.10.1.tgz"; + path = fetchurl { + name = "history___history_4.10.1.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz"; + sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"; + }; + } + { + name = "history___history_4.7.2.tgz"; + path = fetchurl { + name = "history___history_4.7.2.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz"; + sha1 = "22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"; + }; + } + { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + path = fetchurl { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + } + { + name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; + path = fetchurl { + name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz"; + sha1 = "c5903cf409c0dfd908f388e619d86b9c1174cb47"; + }; + } + { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + path = fetchurl { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; + sha1 = "ece0acaf71d62c2969c2ec59feff42a4b1a85b45"; + }; + } + { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + path = fetchurl { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha1 = "743298cef4e5af3e194161fbadcc2151d3a058e8"; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.8.8.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 = "hpack.js___hpack.js_2.1.6.tgz"; + path = fetchurl { + name = "hpack.js___hpack.js_2.1.6.tgz"; + url = "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + } + { + name = "hsl_regex___hsl_regex_1.0.0.tgz"; + path = fetchurl { + name = "hsl_regex___hsl_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz"; + sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; + }; + } + { + name = "hsla_regex___hsla_regex_1.0.0.tgz"; + path = fetchurl { + name = "hsla_regex___hsla_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz"; + 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 { + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; + sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; + }; + } + { + 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 { + name = "html_escaper___html_escaper_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; + sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; + }; + } + { + name = "http_deceiver___http_deceiver_1.2.7.tgz"; + path = fetchurl { + name = "http_deceiver___http_deceiver_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } + { + name = "http_errors___http_errors_1.6.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + } + { + name = "http_errors___http_errors_1.7.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; + sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + }; + } + { + name = "http_link_header___http_link_header_1.0.3.tgz"; + path = fetchurl { + name = "http_link_header___http_link_header_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/http-link-header/-/http-link-header-1.0.3.tgz"; + sha1 = "abbc2cdc5e06dd7e196a4983adac08a2d085ec90"; + }; + } + { + name = "http_parser_js___http_parser_js_0.4.10.tgz"; + path = fetchurl { + name = "http_parser_js___http_parser_js_0.4.10.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz"; + sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + }; + } + { + name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; + path = fetchurl { + name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha1 = "183c7dc4aa1479150306498c210cdaf96080a43a"; + }; + } + { + name = "http_proxy___http_proxy_1.18.1.tgz"; + path = fetchurl { + name = "http_proxy___http_proxy_1.18.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; + 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 { + name = "https_browserify___https_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + } + { + name = "human_signals___human_signals_1.1.1.tgz"; + path = fetchurl { + name = "human_signals___human_signals_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz"; + sha1 = "c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "icss_utils___icss_utils_5.0.0.tgz"; + path = fetchurl { + name = "icss_utils___icss_utils_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.0.0.tgz"; + sha1 = "03ed56c3accd32f9caaf1752ebf64ef12347bb84"; + }; + } + { + name = "idb_keyval___idb_keyval_3.2.0.tgz"; + path = fetchurl { + name = "idb_keyval___idb_keyval_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-3.2.0.tgz"; + sha1 = "cbbf354deb5684b6cdc84376294fc05932845bd6"; + }; + } + { + name = "ieee754___ieee754_1.1.13.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; + sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + }; + } + { + name = "iferr___iferr_0.1.5.tgz"; + path = fetchurl { + name = "iferr___iferr_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + } + { + name = "ignore___ignore_3.3.10.tgz"; + path = fetchurl { + name = "ignore___ignore_3.3.10.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz"; + sha1 = "0a97fb876986e8081c631160f8f9f389157f0043"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "immutable___immutable_3.8.2.tgz"; + path = fetchurl { + name = "immutable___immutable_3.8.2.tgz"; + url = "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz"; + sha1 = "c2439951455bb39913daf281376f1530e104adf3"; + }; + } + { + name = "import_cwd___import_cwd_2.1.0.tgz"; + path = fetchurl { + name = "import_cwd___import_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz"; + sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; + }; + } + { + name = "import_fresh___import_fresh_2.0.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; + 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_from___import_from_2.1.0.tgz"; + path = fetchurl { + name = "import_from___import_from_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz"; + sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + }; + } + { + name = "import_local___import_local_2.0.0.tgz"; + path = fetchurl { + name = "import_local___import_local_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz"; + sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; + }; + } + { + name = "import_local___import_local_3.0.2.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 = "imports_loader___imports_loader_1.2.0.tgz"; + path = fetchurl { + name = "imports_loader___imports_loader_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz"; + sha1 = "b06823d0bb42e6f5ff89bc893829000eda46693f"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { + name = "indexes_of___indexes_of_1.0.1.tgz"; + path = fetchurl { + name = "indexes_of___indexes_of_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz"; + sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + }; + } + { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.1.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "ini___ini_1.3.7.tgz"; + path = fetchurl { + name = "ini___ini_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz"; + sha1 = "a09363e1911972ea16d7a8851005d84cf09a9a84"; + }; + } + { + name = "inquirer___inquirer_0.12.0.tgz"; + path = fetchurl { + name = "inquirer___inquirer_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz"; + sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + }; + } + { + name = "internal_ip___internal_ip_4.3.0.tgz"; + path = fetchurl { + name = "internal_ip___internal_ip_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz"; + 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 = "interpret___interpret_1.4.0.tgz"; + path = fetchurl { + name = "interpret___interpret_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; + sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e"; + }; + } + { + name = "intersection_observer___intersection_observer_0.11.0.tgz"; + path = fetchurl { + name = "intersection_observer___intersection_observer_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.11.0.tgz"; + sha1 = "f4ea067070326f68393ee161cc0a2ca4c0040c6f"; + }; + } + { + name = "intl_format_cache___intl_format_cache_2.2.9.tgz"; + path = fetchurl { + name = "intl_format_cache___intl_format_cache_2.2.9.tgz"; + url = "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.2.9.tgz"; + sha1 = "fb560de20c549cda20b569cf1ffb6dc62b5b93b4"; + }; + } + { + name = "intl_messageformat_parser___intl_messageformat_parser_1.4.0.tgz"; + path = fetchurl { + name = "intl_messageformat_parser___intl_messageformat_parser_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz"; + sha1 = "b43d45a97468cadbe44331d74bb1e8dea44fc075"; + }; + } + { + name = "intl_messageformat_parser___intl_messageformat_parser_4.1.4.tgz"; + path = fetchurl { + name = "intl_messageformat_parser___intl_messageformat_parser_4.1.4.tgz"; + url = "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-4.1.4.tgz"; + sha1 = "98f3415e6990d44bebf2e0ad8e4cfbacf3ef5ed3"; + }; + } + { + name = "intl_messageformat___intl_messageformat_2.2.0.tgz"; + path = fetchurl { + name = "intl_messageformat___intl_messageformat_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz"; + sha1 = "345bcd46de630b7683330c2e52177ff5eab484fc"; + }; + } + { + name = "intl_relativeformat___intl_relativeformat_2.2.0.tgz"; + path = fetchurl { + name = "intl_relativeformat___intl_relativeformat_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz"; + sha1 = "6aca95d019ec8d30b6c5653b6629f9983ea5b6c5"; + }; + } + { + name = "intl_relativeformat___intl_relativeformat_6.4.3.tgz"; + path = fetchurl { + name = "intl_relativeformat___intl_relativeformat_6.4.3.tgz"; + url = "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-6.4.3.tgz"; + sha1 = "cb5559e1e257cc2e763583502012a354bb777efe"; + }; + } + { + name = "intl___intl_1.2.5.tgz"; + path = fetchurl { + name = "intl___intl_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz"; + sha1 = "82244a2190c4e419f8371f5aa34daa3420e2abde"; + }; + } + { + name = "invariant___invariant_2.2.4.tgz"; + path = fetchurl { + name = "invariant___invariant_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz"; + sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; + }; + } + { + name = "ip_regex___ip_regex_2.1.0.tgz"; + path = fetchurl { + name = "ip_regex___ip_regex_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + } + { + name = "ip___ip_1.1.5.tgz"; + path = fetchurl { + name = "ip___ip_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + }; + } + { + name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; + sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; + }; + } + { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + }; + } + { + name = "is_arguments___is_arguments_1.0.4.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_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_arrayish___is_arrayish_0.3.2.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz"; + sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; + }; + } + { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_callable___is_callable_1.2.2.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz"; + sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9"; + }; + } + { + name = "is_ci___is_ci_2.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; + sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + }; + } + { + name = "is_color_stop___is_color_stop_1.1.0.tgz"; + path = fetchurl { + name = "is_color_stop___is_color_stop_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz"; + sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; + }; + } + { + name = "is_core_module___is_core_module_2.1.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz"; + sha1 = "a4cc031d9b1aca63eecbd18a650e13cb4eeab946"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + }; + } + { + name = "is_date_object___is_date_object_1.0.2.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_descriptor___is_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + }; + } + { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + }; + } + { + name = "is_directory___is_directory_0.3.1.tgz"; + path = fetchurl { + name = "is_directory___is_directory_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + } + { + name = "is_docker___is_docker_2.1.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_electron___is_electron_2.2.0.tgz"; + path = fetchurl { + name = "is_electron___is_electron_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.0.tgz"; + sha1 = "8943084f09e8b731b3a7a0298a7b5d56f6b7eef0"; + }; + } + { + name = "is_extendable___is_extendable_0.1.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + } + { + name = "is_extendable___is_extendable_1.0.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; + sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; + path = fetchurl { + name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; + sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118"; + }; + } + { + name = "is_glob___is_glob_3.1.0.tgz"; + path = fetchurl { + name = "is_glob___is_glob_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + } + { + name = "is_glob___is_glob_4.0.1.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_my_ip_valid___is_my_ip_valid_1.0.0.tgz"; + path = fetchurl { + name = "is_my_ip_valid___is_my_ip_valid_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; + sha1 = "7b351b8e8edd4d3995d4d066680e664d94696824"; + }; + } + { + name = "is_my_json_valid___is_my_json_valid_2.20.5.tgz"; + path = fetchurl { + name = "is_my_json_valid___is_my_json_valid_2.20.5.tgz"; + url = "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz"; + sha1 = "5eca6a8232a687f68869b7361be1612e7512e5df"; + }; + } + { + name = "is_nan___is_nan_1.3.0.tgz"; + path = fetchurl { + name = "is_nan___is_nan_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.0.tgz"; + sha1 = "85d1f5482f7051c2019f5673ccebdb06f3b0db03"; + }; + } + { + 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_number___is_number_3.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + path = fetchurl { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; + }; + } + { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + path = fetchurl { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; + }; + } + { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + 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_property___is_property_1.0.2.tgz"; + path = fetchurl { + name = "is_property___is_property_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + } + { + name = "is_regex___is_regex_1.1.0.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; + sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; + }; + } + { + name = "is_regex___is_regex_1.1.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_resolvable___is_resolvable_1.1.0.tgz"; + path = fetchurl { + name = "is_resolvable___is_resolvable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88"; + }; + } + { + name = "is_stream___is_stream_1.1.0.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_stream___is_stream_2.0.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_string___is_string_1.0.5.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_svg___is_svg_3.0.0.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_symbol___is_symbol_1.0.3.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_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_url___is_url_1.2.4.tgz"; + path = fetchurl { + name = "is_url___is_url_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz"; + sha1 = "04a4df46d28c4cff3d73d01ff06abeb318a1aa52"; + }; + } + { + name = "is_windows___is_windows_1.0.2.tgz"; + path = fetchurl { + name = "is_windows___is_windows_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; + sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + }; + } + { + name = "is_wsl___is_wsl_1.1.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + } + { + name = "is_wsl___is_wsl_2.2.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isobject___isobject_2.1.0.tgz"; + path = fetchurl { + name = "isobject___isobject_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + 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"; + 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_instrument___istanbul_lib_instrument_4.0.3.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; + sha1 = "873c6fff897450118222774696a3f28902d77c1d"; + }; + } + { + name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "7518fe52ea44de372f460a76b5ecda9ffb73d8a6"; + }; + } + { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.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_reports___istanbul_reports_3.0.2.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 = "jake___jake_10.8.2.tgz"; + path = fetchurl { + name = "jake___jake_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; + sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + }; + } + { + name = "jest_changed_files___jest_changed_files_26.6.2.tgz"; + path = fetchurl { + name = "jest_changed_files___jest_changed_files_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz"; + sha1 = "f6198479e1cc66f22f9ae1e22acaa0b429c042d0"; + }; + } + { + name = "jest_cli___jest_cli_26.6.3.tgz"; + path = fetchurl { + name = "jest_cli___jest_cli_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz"; + sha1 = "43117cfef24bc4cd691a174a8796a532e135e92a"; + }; + } + { + name = "jest_config___jest_config_26.6.3.tgz"; + path = fetchurl { + name = "jest_config___jest_config_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz"; + sha1 = "64f41444eef9eb03dc51d5c53b75c8c71f645349"; + }; + } + { + name = "jest_diff___jest_diff_25.5.0.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; + sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; + }; + } + { + name = "jest_diff___jest_diff_26.6.2.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz"; + sha1 = "1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"; + }; + } + { + name = "jest_docblock___jest_docblock_26.0.0.tgz"; + path = fetchurl { + name = "jest_docblock___jest_docblock_26.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz"; + sha1 = "3e2fa20899fc928cb13bd0ff68bd3711a36889b5"; + }; + } + { + name = "jest_each___jest_each_26.6.2.tgz"; + path = fetchurl { + name = "jest_each___jest_each_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz"; + sha1 = "02526438a77a67401c8a6382dfe5999952c167cb"; + }; + } + { + name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz"; + path = fetchurl { + name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz"; + sha1 = "78d09fe9cf019a357009b9b7e1f101d23bd1da3e"; + }; + } + { + name = "jest_environment_node___jest_environment_node_26.6.2.tgz"; + path = fetchurl { + name = "jest_environment_node___jest_environment_node_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz"; + sha1 = "824e4c7fb4944646356f11ac75b229b0035f2b0c"; + }; + } + { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; + sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; + }; + } + { + name = "jest_get_type___jest_get_type_26.3.0.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_26.3.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0"; + }; + } + { + name = "jest_haste_map___jest_haste_map_26.6.2.tgz"; + path = fetchurl { + name = "jest_haste_map___jest_haste_map_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz"; + sha1 = "dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"; + }; + } + { + name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; + path = fetchurl { + name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz"; + sha1 = "adc3cf915deacb5212c93b9f3547cd12958f2edd"; + }; + } + { + name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz"; + path = fetchurl { + name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz"; + sha1 = "7717cf118b92238f2eba65054c8a0c9c653a91af"; + }; + } + { + name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz"; + path = fetchurl { + name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz"; + sha1 = "8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"; + }; + } + { + name = "jest_message_util___jest_message_util_26.6.2.tgz"; + path = fetchurl { + name = "jest_message_util___jest_message_util_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz"; + sha1 = "58173744ad6fc0506b5d21150b9be56ef001ca07"; + }; + } + { + name = "jest_mock___jest_mock_26.6.2.tgz"; + path = fetchurl { + name = "jest_mock___jest_mock_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz"; + sha1 = "d6cb712b041ed47fe0d9b6fc3474bc6543feb302"; + }; + } + { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + path = fetchurl { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; + sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; + }; + } + { + name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; + path = fetchurl { + name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz"; + sha1 = "d25e7184b36e39fd466c3bc41be0971e821fee28"; + }; + } + { + name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; + path = fetchurl { + name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz"; + sha1 = "6680859ee5d22ee5dcd961fe4871f59f4c784fb6"; + }; + } + { + name = "jest_resolve___jest_resolve_26.6.2.tgz"; + path = fetchurl { + name = "jest_resolve___jest_resolve_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz"; + sha1 = "a3ab1517217f469b504f1b56603c5bb541fbb507"; + }; + } + { + name = "jest_runner___jest_runner_26.6.3.tgz"; + path = fetchurl { + name = "jest_runner___jest_runner_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz"; + sha1 = "2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"; + }; + } + { + name = "jest_runtime___jest_runtime_26.6.3.tgz"; + path = fetchurl { + name = "jest_runtime___jest_runtime_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz"; + sha1 = "4f64efbcfac398331b74b4b3c82d27d401b8fa2b"; + }; + } + { + name = "jest_serializer___jest_serializer_26.6.2.tgz"; + path = fetchurl { + name = "jest_serializer___jest_serializer_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz"; + sha1 = "d139aafd46957d3a448f3a6cdabe2919ba0742d1"; + }; + } + { + name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; + path = fetchurl { + name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz"; + sha1 = "f3b0af1acb223316850bd14e1beea9837fb39c84"; + }; + } + { + name = "jest_util___jest_util_26.6.2.tgz"; + path = fetchurl { + name = "jest_util___jest_util_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz"; + sha1 = "907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"; + }; + } + { + name = "jest_validate___jest_validate_26.6.2.tgz"; + path = fetchurl { + name = "jest_validate___jest_validate_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz"; + sha1 = "23d380971587150467342911c3d7b4ac57ab20ec"; + }; + } + { + name = "jest_watcher___jest_watcher_26.6.2.tgz"; + path = fetchurl { + name = "jest_watcher___jest_watcher_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz"; + sha1 = "a5b683b8f9d68dbcb1d7dae32172d2cca0592975"; + }; + } + { + name = "jest_worker___jest_worker_26.5.0.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_26.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz"; + sha1 = "87deee86dbbc5f98d9919e0dadf2c40e3152fa30"; + }; + } + { + name = "jest_worker___jest_worker_26.6.2.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz"; + sha1 = "7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"; + }; + } + { + name = "jest___jest_26.6.3.tgz"; + path = fetchurl { + name = "jest___jest_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz"; + sha1 = "40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"; + }; + } + { + name = "js_base64___js_base64_2.6.4.tgz"; + path = fetchurl { + name = "js_base64___js_base64_2.6.4.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz"; + sha1 = "f4e686c5de1ea1f867dbcad3d46d969428df98c4"; + }; + } + { + name = "js_string_escape___js_string_escape_1.0.1.tgz"; + path = fetchurl { + name = "js_string_escape___js_string_escape_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz"; + sha1 = "e2625badbc0d67c7533e9edc1068c587ae4137ef"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.14.0.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 = "jsbn___jsbn_0.1.1.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.4.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_16.4.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; + sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; + }; + } + { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + }; + } + { + name = "jsesc___jsesc_0.5.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + 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 { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } + { + name = "json_stable_stringify___json_stable_stringify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify___json_stable_stringify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + }; + } + { + 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 { + name = "json3___json3_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz"; + sha1 = "7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"; + }; + } + { + name = "json5___json5_0.5.1.tgz"; + path = fetchurl { + name = "json5___json5_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + } + { + name = "json5___json5_1.0.1.tgz"; + path = fetchurl { + name = "json5___json5_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; + sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; + }; + } + { + name = "json5___json5_2.1.3.tgz"; + path = fetchurl { + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; + }; + } + { + name = "jsonfile___jsonfile_3.0.1.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsonify___jsonify_0.0.0.tgz"; + path = fetchurl { + name = "jsonify___jsonify_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }; + } + { + name = "jsonpointer___jsonpointer_4.1.0.tgz"; + path = fetchurl { + name = "jsonpointer___jsonpointer_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz"; + sha1 = "501fb89986a2389765ba09e6053299ceb4f2c2cc"; + }; + } + { + 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 = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; + path = fetchurl { + name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz"; + sha1 = "642f1d7b88aa6d7eb9d8f2210e166478444fa891"; + }; + } + { + name = "keycode___keycode_2.2.0.tgz"; + path = fetchurl { + name = "keycode___keycode_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz"; + sha1 = "3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"; + }; + } + { + name = "killable___killable_1.0.1.tgz"; + path = fetchurl { + name = "killable___killable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz"; + sha1 = "4c8ce441187a061c7474fb87ca08e2a638194892"; + }; + } + { + name = "kind_of___kind_of_3.2.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + } + { + name = "kind_of___kind_of_4.0.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + } + { + name = "kind_of___kind_of_5.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; + sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "kleur___kleur_3.0.3.tgz"; + path = fetchurl { + name = "kleur___kleur_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; + sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; + }; + } + { + name = "klona___klona_2.0.4.tgz"; + path = fetchurl { + name = "klona___klona_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; + sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; + }; + } + { + name = "knot.js___knot.js_1.1.5.tgz"; + path = fetchurl { + name = "knot.js___knot.js_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/knot.js/-/knot.js-1.1.5.tgz"; + sha1 = "28e72522f703f50fe98812fde224dd72728fef5d"; + }; + } + { + name = "known_css_properties___known_css_properties_0.3.0.tgz"; + path = fetchurl { + name = "known_css_properties___known_css_properties_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz"; + sha1 = "a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4"; + }; + } + { + name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; + path = fetchurl { + name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; + url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz"; + sha1 = "a00a37121894f224f763268e431c55556b0c0755"; + }; + } + { + name = "language_tags___language_tags_1.0.5.tgz"; + path = fetchurl { + name = "language_tags___language_tags_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz"; + sha1 = "d321dbc4da30ba8bf3024e040fa5c14661f9193a"; + }; + } + { + name = "leven___leven_3.1.0.tgz"; + path = fetchurl { + name = "leven___leven_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; + sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + }; + } + { + name = "line_column___line_column_1.0.2.tgz"; + path = fetchurl { + name = "line_column___line_column_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz"; + sha1 = "d25af2936b6f4849172b312e4792d1d987bc34a2"; + }; + } + { + 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"; + 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 = "loader_runner___loader_runner_2.4.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz"; + sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357"; + }; + } + { + name = "loader_utils___loader_utils_0.2.17.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_0.2.17.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz"; + sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; + }; + } + { + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + }; + } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } + { + name = "locate_path___locate_path_2.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "lodash.capitalize___lodash.capitalize_4.2.1.tgz"; + path = fetchurl { + name = "lodash.capitalize___lodash.capitalize_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz"; + sha1 = "f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9"; + }; + } + { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + path = fetchurl { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + } + { + name = "lodash.get___lodash.get_4.4.2.tgz"; + path = fetchurl { + name = "lodash.get___lodash.get_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + } + { + name = "lodash.has___lodash.has_4.5.2.tgz"; + path = fetchurl { + name = "lodash.has___lodash.has_4.5.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz"; + sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; + }; + } + { + name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; + path = fetchurl { + name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; + sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; + }; + } + { + name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; + path = fetchurl { + name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + } + { + name = "lodash.isobject___lodash.isobject_3.0.2.tgz"; + path = fetchurl { + name = "lodash.isobject___lodash.isobject_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; + sha1 = "3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"; + }; + } + { + name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; + path = fetchurl { + name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; + sha1 = "8489b1cb0d29ff88195cceca448ff6d6cc295c36"; + }; + } + { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + path = fetchurl { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + } + { + name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + path = fetchurl { + name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + 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 = "loglevel___loglevel_1.7.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 = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha1 = "1da27e6710271947695daf6848e847f01d84b920"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "lz_string___lz_string_1.4.4.tgz"; + path = fetchurl { + name = "lz_string___lz_string_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz"; + sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26"; + }; + } + { + name = "make_dir___make_dir_2.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz"; + sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; + }; + } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + }; + } + { + name = "makeerror___makeerror_1.0.11.tgz"; + path = fetchurl { + name = "makeerror___makeerror_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz"; + sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + }; + } + { + name = "map_cache___map_cache_0.2.2.tgz"; + path = fetchurl { + name = "map_cache___map_cache_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + } + { + name = "map_visit___map_visit_1.0.0.tgz"; + path = fetchurl { + name = "map_visit___map_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + } + { + name = "mark_loader___mark_loader_0.1.6.tgz"; + path = fetchurl { + name = "mark_loader___mark_loader_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/mark-loader/-/mark-loader-0.1.6.tgz"; + sha1 = "0abb477dca7421d70e20128ff6489f5cae8676d5"; + }; + } + { + name = "marky___marky_1.2.1.tgz"; + path = fetchurl { + name = "marky___marky_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/marky/-/marky-1.2.1.tgz"; + sha1 = "a3fcf82ffd357756b8b8affec9fdbf3a30dc1b02"; + }; + } + { + name = "md5.js___md5.js_1.3.5.tgz"; + path = fetchurl { + name = "md5.js___md5.js_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz"; + sha1 = "b5d07b8e3216e3e27cd728d72f70d1e6a342005f"; + }; + } + { + name = "mdn_data___mdn_data_2.0.4.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.6.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 = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "memoize_one___memoize_one_5.1.1.tgz"; + path = fetchurl { + name = "memoize_one___memoize_one_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz"; + sha1 = "047b6e3199b508eaec03504de71229b8eb1d75c0"; + }; + } + { + name = "memory_fs___memory_fs_0.4.1.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + }; + } + { + name = "memory_fs___memory_fs_0.5.0.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz"; + sha1 = "324c01288b88652966d161db77838720845a8e3c"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + } + { + name = "merge___merge_1.2.1.tgz"; + path = fetchurl { + name = "merge___merge_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz"; + sha1 = "38bebf80c3220a8a487b6fcfb3941bb11720c145"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + name = "micromatch___micromatch_3.1.10.tgz"; + path = fetchurl { + name = "micromatch___micromatch_3.1.10.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; + sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + }; + } + { + name = "micromatch___micromatch_4.0.2.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; + sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + }; + } + { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + path = fetchurl { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha1 = "f080351c865b0dc562a8462966daa53543c78a4d"; + }; + } + { + name = "mime_db___mime_db_1.44.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_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___mime_1.6.0.tgz"; + path = fetchurl { + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + { + name = "mime___mime_2.4.4.tgz"; + path = fetchurl { + name = "mime___mime_2.4.4.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; + sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + }; + } + { + name = "min_indent___min_indent_1.0.1.tgz"; + path = fetchurl { + name = "min_indent___min_indent_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; + sha1 = "a63f681673b30571fbe8bc25686ae746eefa9869"; + }; + } + { + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.3.1.tgz"; + path = fetchurl { + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.1.tgz"; + sha1 = "1375c88b2bc2a9d197670a55761edcd1b5d72f21"; + }; + } + { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + }; + } + { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_1.1.3.tgz"; + path = fetchurl { + name = "minimist___minimist_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz"; + sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + path = fetchurl { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; + }; + } + { + name = "minipass___minipass_3.1.3.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; + }; + } + { + name = "minizlib___minizlib_2.1.2.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; + }; + } + { + name = "mississippi___mississippi_3.0.0.tgz"; + path = fetchurl { + name = "mississippi___mississippi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; + sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; + }; + } + { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + path = fetchurl { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } + { + name = "mousetrap___mousetrap_1.6.5.tgz"; + path = fetchurl { + name = "mousetrap___mousetrap_1.6.5.tgz"; + url = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz"; + sha1 = "8a766d8c272b08393d5f56074e0b5ec183485bf9"; + }; + } + { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + path = fetchurl { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; + path = fetchurl { + name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + } + { + name = "multicast_dns___multicast_dns_6.2.3.tgz"; + path = fetchurl { + name = "multicast_dns___multicast_dns_6.2.3.tgz"; + url = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229"; + }; + } + { + name = "mute_stream___mute_stream_0.0.5.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.5.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz"; + sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; + }; + } + { + name = "nan___nan_2.14.1.tgz"; + path = fetchurl { + name = "nan___nan_2.14.1.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; + sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; + }; + } + { + name = "nanoid___nanoid_3.1.16.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.16.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.16.tgz"; + sha1 = "b21f0a7d031196faf75314d7c65d36352beeef64"; + }; + } + { + name = "nanomatch___nanomatch_1.2.13.tgz"; + path = fetchurl { + name = "nanomatch___nanomatch_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; + sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + }; + } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; + }; + } + { + name = "next_tick___next_tick_1.0.0.tgz"; + path = fetchurl { + name = "next_tick___next_tick_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + }; + } + { + name = "node_fetch___node_fetch_2.6.1.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + }; + } + { + name = "node_forge___node_forge_0.10.0.tgz"; + path = fetchurl { + name = "node_forge___node_forge_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; + sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3"; + }; + } + { + name = "node_int64___node_int64_0.4.0.tgz"; + path = fetchurl { + name = "node_int64___node_int64_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; + sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + }; + } + { + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; + path = fetchurl { + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; + sha1 = "b64f513d18338625f90346d27b0d235e631f6425"; + }; + } + { + name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; + path = fetchurl { + name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; + sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; + }; + } + { + name = "node_notifier___node_notifier_8.0.1.tgz"; + path = fetchurl { + name = "node_notifier___node_notifier_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz"; + sha1 = "f86e89bbc925f2b068784b31f382afdc6ca56be1"; + }; + } + { + name = "node_releases___node_releases_1.1.61.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.67.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.67.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz"; + sha1 = "28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_path___normalize_path_2.1.1.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "normalize_range___normalize_range_0.1.2.tgz"; + path = fetchurl { + name = "normalize_range___normalize_range_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz"; + sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + }; + } + { + name = "normalize_url___normalize_url_3.3.0.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz"; + sha1 = "b2e1c4dc4f7c6d57743df733a4f5978d18650559"; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + } + { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + }; + } + { + name = "nth_check___nth_check_1.0.2.tgz"; + path = fetchurl { + name = "nth_check___nth_check_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz"; + sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"; + }; + } + { + name = "num2fraction___num2fraction_1.2.2.tgz"; + path = fetchurl { + name = "num2fraction___num2fraction_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz"; + sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } + { + name = "nwsapi___nwsapi_2.2.0.tgz"; + path = fetchurl { + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + 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.1.0.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + }; + } + { + 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 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_copy___object_copy_0.1.0.tgz"; + path = fetchurl { + name = "object_copy___object_copy_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + } + { + name = "object_fit_images___object_fit_images_3.2.4.tgz"; + path = fetchurl { + name = "object_fit_images___object_fit_images_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.4.tgz"; + sha1 = "6c299d38fdf207746e5d2d46c2877f6f25d15b52"; + }; + } + { + 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_is___object_is_1.1.3.tgz"; + path = fetchurl { + name = "object_is___object_is_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz"; + sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object_visit___object_visit_1.0.1.tgz"; + path = fetchurl { + name = "object_visit___object_visit_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; + 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.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.fromentries___object.fromentries_2.0.2.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.getownpropertydescriptors___object.getownpropertydescriptors_2.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.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + name = "object.pick___object.pick_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + } + { + name = "object.values___object.values_1.1.1.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 = "obuf___obuf_1.1.2.tgz"; + path = fetchurl { + name = "obuf___obuf_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz"; + sha1 = "09bea3343d41859ebd446292d11c9d4db619084e"; + }; + } + { + name = "offline_plugin___offline_plugin_5.0.7.tgz"; + path = fetchurl { + name = "offline_plugin___offline_plugin_5.0.7.tgz"; + url = "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-5.0.7.tgz"; + sha1 = "26936ad1a7699f4d67e0a095a258972a4ccf1788"; + }; + } + { + name = "on_finished___on_finished_2.3.0.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 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "on_headers___on_headers_1.0.2.tgz"; + path = fetchurl { + name = "on_headers___on_headers_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; + sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_1.1.0.tgz"; + path = fetchurl { + name = "onetime___onetime_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + }; + } + { + name = "onetime___onetime_5.1.2.tgz"; + path = fetchurl { + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + }; + } + { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + path = fetchurl { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; + sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; + }; + } + { + name = "opener___opener_1.5.2.tgz"; + path = fetchurl { + name = "opener___opener_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; + sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; + }; + } + { + name = "opn___opn_5.5.0.tgz"; + path = fetchurl { + name = "opn___opn_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz"; + sha1 = "fc7164fab56d235904c51c3b27da6758ca3b9bfc"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + }; + } + { + name = "original___original_1.0.2.tgz"; + path = fetchurl { + name = "original___original_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz"; + sha1 = "e442a61cffe1c5fd20a65f3261c26663b303f25f"; + }; + } + { + name = "os_browserify___os_browserify_0.3.0.tgz"; + path = fetchurl { + name = "os_browserify___os_browserify_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + } + { + name = "os_homedir___os_homedir_1.0.2.tgz"; + path = fetchurl { + name = "os_homedir___os_homedir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + } + { + name = "p_each_series___p_each_series_2.1.0.tgz"; + path = fetchurl { + name = "p_each_series___p_each_series_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz"; + sha1 = "961c8dd3f195ea96c747e636b262b800a6b1af48"; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + } + { + name = "p_limit___p_limit_1.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; + sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_limit___p_limit_3.0.2.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz"; + sha1 = "1664e010af3cadc681baafd3e2a437be7b0fb5fe"; + }; + } + { + name = "p_locate___p_locate_2.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_2.1.0.tgz"; + path = fetchurl { + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; + }; + } + { + name = "p_map___p_map_4.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; + }; + } + { + name = "p_retry___p_retry_3.0.1.tgz"; + path = fetchurl { + name = "p_retry___p_retry_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; + sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; + }; + } + { + name = "p_try___p_try_1.0.0.tgz"; + path = fetchurl { + name = "p_try___p_try_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "packet_reader___packet_reader_0.3.1.tgz"; + path = fetchurl { + name = "packet_reader___packet_reader_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz"; + sha1 = "cd62e60af8d7fea8a705ec4ff990871c46871f27"; + }; + } + { + name = "pako___pako_1.0.11.tgz"; + path = fetchurl { + name = "pako___pako_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; + sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; + }; + } + { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + path = fetchurl { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + path = fetchurl { + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4"; + }; + } + { + name = "parse_css_font___parse_css_font_2.0.2.tgz"; + path = fetchurl { + name = "parse_css_font___parse_css_font_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-css-font/-/parse-css-font-2.0.2.tgz"; + sha1 = "7b60b060705a25a9b90b7f0ed493e5823248a652"; + }; + } + { + 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 { + name = "parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + } + { + name = "parse_json___parse_json_5.0.1.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz"; + sha1 = "7cfe35c1ccd641bce3981467e6c2ece61b3b3878"; + }; + } + { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + path = fetchurl { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + } + { + name = "parse5___parse5_5.1.1.tgz"; + path = fetchurl { + name = "parse5___parse5_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; + sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; + }; + } + { + name = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + }; + } + { + name = "pascalcase___pascalcase_0.1.1.tgz"; + path = fetchurl { + name = "pascalcase___pascalcase_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + } + { + name = "path_browserify___path_browserify_0.0.1.tgz"; + path = fetchurl { + name = "path_browserify___path_browserify_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz"; + sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"; + }; + } + { + name = "path_complete_extname___path_complete_extname_1.0.0.tgz"; + path = fetchurl { + name = "path_complete_extname___path_complete_extname_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-1.0.0.tgz"; + sha1 = "f889985dc91000c815515c0bfed06c5acda0752b"; + }; + } + { + name = "path_dirname___path_dirname_1.0.2.tgz"; + path = fetchurl { + name = "path_dirname___path_dirname_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + } + { + name = "path_exists___path_exists_3.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + path = fetchurl { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { + name = "path_parse___path_parse_1.0.6.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_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + } + { + 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 { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "pbkdf2___pbkdf2_3.1.1.tgz"; + path = fetchurl { + name = "pbkdf2___pbkdf2_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; + sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; + }; + } + { + name = "performance_now___performance_now_0.2.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "pg_connection_string___pg_connection_string_0.1.3.tgz"; + path = fetchurl { + name = "pg_connection_string___pg_connection_string_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz"; + sha1 = "da1847b20940e42ee1492beaf65d49d91b245df7"; + }; + } + { + name = "pg_int8___pg_int8_1.0.1.tgz"; + path = fetchurl { + name = "pg_int8___pg_int8_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz"; + sha1 = "943bd463bf5b71b4170115f80f8efc9a0c0eb78c"; + }; + } + { + name = "pg_pool___pg_pool_1.8.0.tgz"; + path = fetchurl { + name = "pg_pool___pg_pool_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.8.0.tgz"; + sha1 = "f7ec73824c37a03f076f51bfdf70e340147c4f37"; + }; + } + { + name = "pg_types___pg_types_1.13.0.tgz"; + path = fetchurl { + name = "pg_types___pg_types_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/pg-types/-/pg-types-1.13.0.tgz"; + sha1 = "75f490b8a8abf75f1386ef5ec4455ecf6b345c63"; + }; + } + { + name = "pg___pg_6.4.2.tgz"; + path = fetchurl { + name = "pg___pg_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/pg/-/pg-6.4.2.tgz"; + sha1 = "c364011060eac7a507a2ae063eb857ece910e27f"; + }; + } + { + name = "pgpass___pgpass_1.0.2.tgz"; + path = fetchurl { + name = "pgpass___pgpass_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz"; + sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; + }; + } + { + name = "picomatch___picomatch_2.2.2.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + }; + } + { + name = "pify___pify_2.3.0.tgz"; + path = fetchurl { + name = "pify___pify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + } + { + name = "pify___pify_4.0.1.tgz"; + path = fetchurl { + name = "pify___pify_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; + sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } + { + name = "pirates___pirates_4.0.1.tgz"; + path = fetchurl { + name = "pirates___pirates_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz"; + sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87"; + }; + } + { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + } + { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "pluralize___pluralize_1.2.1.tgz"; + path = fetchurl { + name = "pluralize___pluralize_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz"; + sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + }; + } + { + name = "portfinder___portfinder_1.0.28.tgz"; + path = fetchurl { + name = "portfinder___portfinder_1.0.28.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; + sha1 = "67c4622852bd5374dd1dd900f779f53462fac778"; + }; + } + { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + path = fetchurl { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + } + { + name = "postcss_calc___postcss_calc_7.0.4.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_colormin___postcss_colormin_4.0.3.tgz"; + path = fetchurl { + name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; + sha1 = "ae060bce93ed794ac71264f08132d550956bd381"; + }; + } + { + name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; + path = fetchurl { + name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; + sha1 = "ca3813ed4da0f812f9d43703584e449ebe189a7f"; + }; + } + { + name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; + path = fetchurl { + name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; + sha1 = "1fbabd2c246bff6aaad7997b2b0918f4d7af4033"; + }; + } + { + name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; + path = fetchurl { + name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; + sha1 = "3fe133cd3c82282e550fc9b239176a9207b784eb"; + }; + } + { + name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; + sha1 = "c8c951e9f73ed9428019458444a02ad90bb9f765"; + }; + } + { + name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; + sha1 = "652aef8a96726f029f5e3e00146ee7a4e755ff57"; + }; + } + { + name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; + path = fetchurl { + 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"; + }; + } + { + name = "postcss_loader___postcss_loader_3.0.0.tgz"; + path = fetchurl { + name = "postcss_loader___postcss_loader_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz"; + sha1 = "6b97943e47c72d845fa9e03f273773d4e8dd6c2d"; + }; + } + { + name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; + path = fetchurl { + name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; + sha1 = "62f49a13e4a0ee04e7b98f42bb16062ca2549e24"; + }; + } + { + name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; + path = fetchurl { + name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; + sha1 = "362bea4ff5a1f98e4075a713c6cb25aefef9a650"; + }; + } + { + name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; + sha1 = "cd4c344cce474343fac5d82206ab2cbcb8afd5a6"; + }; + } + { + name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; + sha1 = "93b29c2ff5099c535eecda56c4aa6e665a663471"; + }; + } + { + name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; + sha1 = "6b9cef030c11e35261f95f618c90036d680db874"; + }; + } + { + name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; + sha1 = "e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"; + }; + } + { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha1 = "cda1f047c0ae80c97dbe28c3e76a43b88025741d"; + }; + } + { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha1 = "ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"; + }; + } + { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha1 = "9ef3151456d3bbfa120ca44898dfca6f2fa01f06"; + }; + } + { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha1 = "d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"; + }; + } + { + name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; + sha1 = "8b35add3aee83a136b0471e0d59be58a50285dd4"; + }; + } + { + name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; + sha1 = "0dbe04a4ce9063d4667ed2be476bb830c825935a"; + }; + } + { + name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; + sha1 = "05f757f84f260437378368a91f8932d4b102917f"; + }; + } + { + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; + sha1 = "c4ebbc289f3991a028d44751cbdd11918b17910c"; + }; + } + { + name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; + sha1 = "cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"; + }; + } + { + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; + sha1 = "8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"; + }; + } + { + name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; + sha1 = "841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"; + }; + } + { + name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; + sha1 = "10e437f86bc7c7e58f7b9652ed878daaa95faae1"; + }; + } + { + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; + sha1 = "bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"; + }; + } + { + name = "postcss_object_fit_images___postcss_object_fit_images_1.1.2.tgz"; + path = fetchurl { + name = "postcss_object_fit_images___postcss_object_fit_images_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-object-fit-images/-/postcss-object-fit-images-1.1.2.tgz"; + sha1 = "8b773043db14672ef6cd6f2cb1f0d8b26a9f573b"; + }; + } + { + name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; + path = fetchurl { + name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; + sha1 = "0cf75c820ec7d5c4d280189559e0b571ebac0eee"; + }; + } + { + name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; + path = fetchurl { + name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; + sha1 = "7fd42ebea5e9c814609639e2c2e84ae270ba48df"; + }; + } + { + name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; + path = fetchurl { + name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; + sha1 = "17efa405eacc6e07be3414a5ca2d1074681d4e29"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.2.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.4.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; + sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; + }; + } + { + name = "postcss_svgo___postcss_svgo_4.0.2.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_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; + path = fetchurl { + name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; + sha1 = "9446911f3289bfd64c6d680f073c03b1f9ee4bac"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; + sha1 = "9ff822547e2893213cf1c30efa51ac5fd1ba8281"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.1.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___postcss_5.2.18.tgz"; + path = fetchurl { + name = "postcss___postcss_5.2.18.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz"; + sha1 = "badfa1497d46244f6390f58b319830d9107853c5"; + }; + } + { + name = "postcss___postcss_7.0.32.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_8.1.6.tgz"; + path = fetchurl { + name = "postcss___postcss_8.1.6.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.1.6.tgz"; + sha1 = "b022ba2cfb8701da234d073ed3128c5a384c35ff"; + }; + } + { + name = "postgres_array___postgres_array_1.0.3.tgz"; + path = fetchurl { + name = "postgres_array___postgres_array_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz"; + sha1 = "c561fc3b266b21451fc6555384f4986d78ec80f5"; + }; + } + { + name = "postgres_bytea___postgres_bytea_1.0.0.tgz"; + path = fetchurl { + name = "postgres_bytea___postgres_bytea_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; + sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + }; + } + { + name = "postgres_date___postgres_date_1.0.7.tgz"; + path = fetchurl { + name = "postgres_date___postgres_date_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz"; + sha1 = "51bc086006005e5061c591cee727f2531bf641a8"; + }; + } + { + name = "postgres_interval___postgres_interval_1.2.0.tgz"; + path = fetchurl { + name = "postgres_interval___postgres_interval_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz"; + sha1 = "b460c82cb1587507788819a06aa0fffdb3544695"; + }; + } + { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + }; + } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "pretty_format___pretty_format_25.5.0.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; + sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; + }; + } + { + name = "pretty_format___pretty_format_26.6.2.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz"; + sha1 = "e35c2705f14cb7fe2fe94fa078345b444120fc93"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "process___process_0.11.10.tgz"; + path = fetchurl { + name = "process___process_0.11.10.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + } + { + name = "progress___progress_1.1.8.tgz"; + path = fetchurl { + name = "progress___progress_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + path = fetchurl { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + } + { + name = "promise.prototype.finally___promise.prototype.finally_3.1.2.tgz"; + path = fetchurl { + name = "promise.prototype.finally___promise.prototype.finally_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz"; + sha1 = "b8af89160c9c673cefe3b4c4435b53cfd0287067"; + }; + } + { + name = "prompts___prompts_2.3.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 = "prop_types_extra___prop_types_extra_1.1.1.tgz"; + path = fetchurl { + name = "prop_types_extra___prop_types_extra_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz"; + sha1 = "58c3b74cbfbb95d304625975aa2f0848329a010b"; + }; + } + { + name = "prop_types___prop_types_15.7.2.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.6.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 = "prr___prr_1.0.1.tgz"; + path = fetchurl { + name = "prr___prr_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + } + { + name = "psl___psl_1.8.0.tgz"; + path = fetchurl { + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; + }; + } + { + name = "public_encrypt___public_encrypt_4.0.3.tgz"; + path = fetchurl { + name = "public_encrypt___public_encrypt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha1 = "4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"; + }; + } + { + name = "pump___pump_2.0.1.tgz"; + path = fetchurl { + name = "pump___pump_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; + sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "pumpify___pumpify_1.5.1.tgz"; + path = fetchurl { + name = "pumpify___pumpify_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; + sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; + }; + } + { + name = "punycode___punycode_1.3.2.tgz"; + path = fetchurl { + name = "punycode___punycode_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + } + { + name = "punycode___punycode_1.4.1.tgz"; + path = fetchurl { + name = "punycode___punycode_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "q___q_1.5.1.tgz"; + path = fetchurl { + name = "q___q_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + }; + } + { + name = "qs___qs_6.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 = "querystring_es3___querystring_es3_0.2.1.tgz"; + path = fetchurl { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + } + { + name = "querystring___querystring_0.2.0.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + } + { + name = "querystringify___querystringify_2.2.0.tgz"; + path = fetchurl { + name = "querystringify___querystringify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; + sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; + }; + } + { + name = "quote___quote_0.4.0.tgz"; + path = fetchurl { + name = "quote___quote_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz"; + sha1 = "10839217f6c1362b89194044d29b233fd7f32f01"; + }; + } + { + name = "raf___raf_3.4.1.tgz"; + path = fetchurl { + name = "raf___raf_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz"; + sha1 = "0742e99a4a6552f445d73e3ee0328af0ff1ede39"; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; + }; + } + { + name = "randomfill___randomfill_1.0.4.tgz"; + path = fetchurl { + name = "randomfill___randomfill_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz"; + sha1 = "c92196fc86ab42be983f1bf31778224931d61458"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + }; + } + { + name = "react_dom___react_dom_16.14.0.tgz"; + path = fetchurl { + name = "react_dom___react_dom_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz"; + sha1 = "7ad838ec29a777fb3c75c3a190f661cf92ab8b89"; + }; + } + { + name = "react_event_listener___react_event_listener_0.6.6.tgz"; + path = fetchurl { + name = "react_event_listener___react_event_listener_0.6.6.tgz"; + url = "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.6.tgz"; + sha1 = "758f7b991cad9086dd39fd29fad72127e1d8962a"; + }; + } + { + name = "react_hotkeys___react_hotkeys_1.1.4.tgz"; + path = fetchurl { + name = "react_hotkeys___react_hotkeys_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-1.1.4.tgz"; + sha1 = "a0712aa2e0c03a759fd7885808598497a4dace72"; + }; + } + { + name = "react_immutable_proptypes___react_immutable_proptypes_2.2.0.tgz"; + path = fetchurl { + name = "react_immutable_proptypes___react_immutable_proptypes_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz"; + sha1 = "cce96d68cc3c18e89617cbf3092d08e35126af4a"; + }; + } + { + name = "react_immutable_pure_component___react_immutable_pure_component_2.2.2.tgz"; + path = fetchurl { + name = "react_immutable_pure_component___react_immutable_pure_component_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-2.2.2.tgz"; + sha1 = "3014d3e20cd5a7a4db73b81f1f1464f4d351684b"; + }; + } + { + name = "react_infinite_scroller___react_infinite_scroller_1.2.4.tgz"; + path = fetchurl { + name = "react_infinite_scroller___react_infinite_scroller_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.2.4.tgz"; + sha1 = "f67eaec4940a4ce6417bebdd6e3433bfc38826e9"; + }; + } + { + name = "react_input_autosize___react_input_autosize_2.2.2.tgz"; + path = fetchurl { + name = "react_input_autosize___react_input_autosize_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz"; + sha1 = "fcaa7020568ec206bc04be36f4eb68e647c4d8c2"; + }; + } + { + name = "react_intl_translations_manager___react_intl_translations_manager_5.0.3.tgz"; + path = fetchurl { + name = "react_intl_translations_manager___react_intl_translations_manager_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz"; + sha1 = "aee010ecf35975673e033ca5d7d3f4147894324d"; + }; + } + { + name = "react_intl___react_intl_2.9.0.tgz"; + path = fetchurl { + name = "react_intl___react_intl_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/react-intl/-/react-intl-2.9.0.tgz"; + sha1 = "c97c5d17d4718f1575fdbd5a769f96018a3b1843"; + }; + } + { + name = "react_is___react_is_16.13.1.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + }; + } + { + name = "react_is___react_is_17.0.1.tgz"; + path = fetchurl { + name = "react_is___react_is_17.0.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; + sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; + }; + } + { + name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; + path = fetchurl { + name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; + sha1 = "4f1a273afdfc8f3488a8c516bfda78f872352362"; + }; + } + { + name = "react_masonry_infinite___react_masonry_infinite_1.2.2.tgz"; + path = fetchurl { + name = "react_masonry_infinite___react_masonry_infinite_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/react-masonry-infinite/-/react-masonry-infinite-1.2.2.tgz"; + sha1 = "20c1386f9ccdda9747527c8f42bc2c02dd2e7951"; + }; + } + { + name = "react_motion___react_motion_0.5.2.tgz"; + path = fetchurl { + name = "react_motion___react_motion_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz"; + sha1 = "0dd3a69e411316567927917c6626551ba0607316"; + }; + } + { + name = "react_notification___react_notification_6.8.5.tgz"; + path = fetchurl { + name = "react_notification___react_notification_6.8.5.tgz"; + url = "https://registry.yarnpkg.com/react-notification/-/react-notification-6.8.5.tgz"; + sha1 = "7ea90a633bb2a280d899e30c93cf372265cce4f0"; + }; + } + { + name = "react_overlays___react_overlays_0.9.2.tgz"; + path = fetchurl { + name = "react_overlays___react_overlays_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.9.2.tgz"; + sha1 = "51ab1c62ded5af4d279bd3b943999531bbd648da"; + }; + } + { + name = "react_redux_loading_bar___react_redux_loading_bar_4.0.8.tgz"; + path = fetchurl { + name = "react_redux_loading_bar___react_redux_loading_bar_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.0.8.tgz"; + sha1 = "e84d59d1517b79f53b0f39c8ddb40682af648c1b"; + }; + } + { + name = "react_redux___react_redux_7.2.2.tgz"; + path = fetchurl { + name = "react_redux___react_redux_7.2.2.tgz"; + url = "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.2.tgz"; + sha1 = "03862e803a30b6b9ef8582dadcc810947f74b736"; + }; + } + { + name = "react_router_dom___react_router_dom_4.3.1.tgz"; + path = fetchurl { + name = "react_router_dom___react_router_dom_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz"; + sha1 = "4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"; + }; + } + { + name = "react_router_scroll_4___react_router_scroll_4_1.0.0_beta.2.tgz"; + path = fetchurl { + name = "react_router_scroll_4___react_router_scroll_4_1.0.0_beta.2.tgz"; + url = "https://registry.yarnpkg.com/react-router-scroll-4/-/react-router-scroll-4-1.0.0-beta.2.tgz"; + sha1 = "d887063ec0f66124aaf450158dd158ff7d3dc279"; + }; + } + { + name = "react_router___react_router_4.3.1.tgz"; + path = fetchurl { + name = "react_router___react_router_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz"; + sha1 = "aada4aef14c809cb2e686b05cee4742234506c4e"; + }; + } + { + name = "react_select___react_select_3.1.0.tgz"; + path = fetchurl { + name = "react_select___react_select_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/react-select/-/react-select-3.1.0.tgz"; + sha1 = "ab098720b2e9fe275047c993f0d0caf5ded17c27"; + }; + } + { + name = "react_sparklines___react_sparklines_1.7.0.tgz"; + path = fetchurl { + name = "react_sparklines___react_sparklines_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/react-sparklines/-/react-sparklines-1.7.0.tgz"; + sha1 = "9b1d97e8c8610095eeb2ad658d2e1fcf91f91a60"; + }; + } + { + name = "react_swipeable_views_core___react_swipeable_views_core_0.13.7.tgz"; + path = fetchurl { + name = "react_swipeable_views_core___react_swipeable_views_core_0.13.7.tgz"; + url = "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.13.7.tgz"; + sha1 = "c082b553f26e83fd20fc17f934200eb717023c8a"; + }; + } + { + name = "react_swipeable_views_utils___react_swipeable_views_utils_0.13.9.tgz"; + path = fetchurl { + name = "react_swipeable_views_utils___react_swipeable_views_utils_0.13.9.tgz"; + url = "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.13.9.tgz"; + sha1 = "a66e98f2f4502d8b00182901f80d13b2f903e10f"; + }; + } + { + name = "react_swipeable_views___react_swipeable_views_0.13.9.tgz"; + path = fetchurl { + name = "react_swipeable_views___react_swipeable_views_0.13.9.tgz"; + url = "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.13.9.tgz"; + sha1 = "d6a6c508bf5288ad55509f9c65916db5df0f2cec"; + }; + } + { + name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; + path = fetchurl { + 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"; + }; + } + { + name = "react_textarea_autosize___react_textarea_autosize_8.3.0.tgz"; + path = fetchurl { + name = "react_textarea_autosize___react_textarea_autosize_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.0.tgz"; + sha1 = "e6e2fd186d9f61bb80ac6e2dcb4c55504f93c2fa"; + }; + } + { + name = "react_toggle___react_toggle_4.1.1.tgz"; + path = fetchurl { + name = "react_toggle___react_toggle_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/react-toggle/-/react-toggle-4.1.1.tgz"; + sha1 = "2317f67bf918ea3508a96b09dd383efd9da572af"; + }; + } + { + name = "react_transition_group___react_transition_group_2.9.0.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz"; + sha1 = "df9cdb025796211151a436c69a8f3b97b5b07c8d"; + }; + } + { + name = "react_transition_group___react_transition_group_4.3.0.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz"; + sha1 = "fea832e386cf8796c58b61874a3319704f5ce683"; + }; + } + { + name = "react___react_16.14.0.tgz"; + path = fetchurl { + name = "react___react_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz"; + 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 { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + 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 { + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readdirp___readdirp_2.2.1.tgz"; + path = fetchurl { + name = "readdirp___readdirp_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; + sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; + }; + } + { + name = "readdirp___readdirp_3.4.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 = "readline2___readline2_1.0.1.tgz"; + path = fetchurl { + name = "readline2___readline2_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz"; + sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; + }; + } + { + name = "redent___redent_3.0.0.tgz"; + path = fetchurl { + name = "redent___redent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; + sha1 = "e557b7998316bb53c9f1f56fa626352c6963059f"; + }; + } + { + name = "redis_commands___redis_commands_1.6.0.tgz"; + path = fetchurl { + name = "redis_commands___redis_commands_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.6.0.tgz"; + sha1 = "36d4ca42ae9ed29815cdb30ad9f97982eba1ce23"; + }; + } + { + name = "redis_errors___redis_errors_1.2.0.tgz"; + path = fetchurl { + name = "redis_errors___redis_errors_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz"; + sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; + }; + } + { + name = "redis_parser___redis_parser_3.0.0.tgz"; + path = fetchurl { + name = "redis_parser___redis_parser_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz"; + sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; + }; + } + { + name = "redis___redis_3.0.2.tgz"; + path = fetchurl { + name = "redis___redis_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/redis/-/redis-3.0.2.tgz"; + sha1 = "bd47067b8a4a3e6a2e556e57f71cc82c7360150a"; + }; + } + { + name = "redux_immutable___redux_immutable_4.0.0.tgz"; + path = fetchurl { + name = "redux_immutable___redux_immutable_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/redux-immutable/-/redux-immutable-4.0.0.tgz"; + sha1 = "3a1a32df66366462b63691f0e1dc35e472bbc9f3"; + }; + } + { + name = "redux_thunk___redux_thunk_2.3.0.tgz"; + path = fetchurl { + name = "redux_thunk___redux_thunk_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz"; + sha1 = "51c2c19a185ed5187aaa9a2d08b666d0d6467622"; + }; + } + { + name = "redux___redux_4.0.5.tgz"; + path = fetchurl { + name = "redux___redux_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz"; + sha1 = "4db5de5816e17891de8a80c424232d06f051d93f"; + }; + } + { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.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___regenerate_1.4.1.tgz"; + path = fetchurl { + name = "regenerate___regenerate_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz"; + sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.12.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.12.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz"; + sha1 = "fa1a71544764c036f8c49b13a08b2594c9f8a0de"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.7.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_transform___regenerator_transform_0.14.5.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4"; + }; + } + { + name = "regex_not___regex_not_1.0.2.tgz"; + path = fetchurl { + name = "regex_not___regex_not_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; + sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + }; + } + { + 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 = "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.1.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 = "regjsgen___regjsgen_0.5.2.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; + sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; + }; + } + { + name = "regjsparser___regjsparser_0.6.4.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; + sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; + }; + } + { + name = "rellax___rellax_1.12.1.tgz"; + path = fetchurl { + name = "rellax___rellax_1.12.1.tgz"; + url = "https://registry.yarnpkg.com/rellax/-/rellax-1.12.1.tgz"; + sha1 = "1b433ef7ac4aa3573449a33efab391c112f6b34d"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "repeat_element___repeat_element_1.1.3.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_string___repeat_string_1.6.1.tgz"; + path = fetchurl { + name = "repeat_string___repeat_string_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; + 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 = "requestidlecallback___requestidlecallback_0.3.0.tgz"; + path = fetchurl { + name = "requestidlecallback___requestidlecallback_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/requestidlecallback/-/requestidlecallback-0.3.0.tgz"; + sha1 = "6fb74e0733f90df3faa4838f9f6a2a5f9b742ac5"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "require_package_name___require_package_name_2.0.1.tgz"; + path = fetchurl { + name = "require_package_name___require_package_name_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz"; + sha1 = "c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"; + }; + } + { + name = "require_uncached___require_uncached_1.0.3.tgz"; + path = fetchurl { + name = "require_uncached___require_uncached_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz"; + sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; + }; + } + { + name = "requires_port___requires_port_1.0.0.tgz"; + path = fetchurl { + name = "requires_port___requires_port_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + } + { + name = "reselect___reselect_4.0.0.tgz"; + path = fetchurl { + name = "reselect___reselect_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz"; + sha1 = "f2529830e5d3d0e021408b246a206ef4ea4437f7"; + }; + } + { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + } + { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; + }; + } + { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + path = fetchurl { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + } + { + name = "resolve_from___resolve_from_1.0.1.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz"; + sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; + }; + } + { + name = "resolve_from___resolve_from_3.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + }; + } + { + name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; + path = fetchurl { + name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz"; + sha1 = "7e9ae21ed815fd63ab189adeee64dc831eefa879"; + }; + } + { + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + path = fetchurl { + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz"; + sha1 = "99d02224d3cf263689becbb393bc560313025dcd"; + }; + } + { + name = "resolve_url___resolve_url_0.2.1.tgz"; + path = fetchurl { + name = "resolve_url___resolve_url_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + } + { + name = "resolve___resolve_1.19.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz"; + sha1 = "1af5bf630409734a067cae29318aac7fa29a267c"; + }; + } + { + name = "restore_cursor___restore_cursor_1.0.1.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + }; + } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } + { + name = "rgb_regex___rgb_regex_1.0.1.tgz"; + path = fetchurl { + name = "rgb_regex___rgb_regex_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz"; + sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; + }; + } + { + name = "rgba_regex___rgba_regex_1.0.0.tgz"; + path = fetchurl { + name = "rgba_regex___rgba_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz"; + sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; + }; + } + { + name = "rimraf___rimraf_2.6.3.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; + sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "ripemd160___ripemd160_2.0.2.tgz"; + path = fetchurl { + name = "ripemd160___ripemd160_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz"; + sha1 = "a1c1a6f624751577ba5d07914cbc92850585890c"; + }; + } + { + name = "rsvp___rsvp_4.8.5.tgz"; + path = fetchurl { + name = "rsvp___rsvp_4.8.5.tgz"; + url = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz"; + sha1 = "c8f155311d167f68f21e168df71ec5b083113734"; + }; + } + { + name = "run_async___run_async_0.1.0.tgz"; + path = fetchurl { + name = "run_async___run_async_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz"; + sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; + }; + } + { + name = "run_queue___run_queue_1.0.3.tgz"; + path = fetchurl { + name = "run_queue___run_queue_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + } + { + name = "rx_lite___rx_lite_3.1.2.tgz"; + path = fetchurl { + name = "rx_lite___rx_lite_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz"; + sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safe_regex___safe_regex_1.1.0.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "sane___sane_4.1.0.tgz"; + path = fetchurl { + name = "sane___sane_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz"; + sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded"; + }; + } + { + name = "sass_lint___sass_lint_1.13.1.tgz"; + path = fetchurl { + name = "sass_lint___sass_lint_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/sass-lint/-/sass-lint-1.13.1.tgz"; + sha1 = "5fd2b2792e9215272335eb0f0dc607f61e8acc8f"; + }; + } + { + name = "sass_loader___sass_loader_10.1.0.tgz"; + path = fetchurl { + name = "sass_loader___sass_loader_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.0.tgz"; + sha1 = "1727fcc0c32ab3eb197cda61d78adf4e9174a4b3"; + }; + } + { + name = "sass___sass_1.29.0.tgz"; + path = fetchurl { + name = "sass___sass_1.29.0.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.29.0.tgz"; + sha1 = "ec4e1842c146d8ea9258c28c141b8c2b7c6ab7f1"; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + { + name = "saxes___saxes_5.0.1.tgz"; + path = fetchurl { + name = "saxes___saxes_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; + sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d"; + }; + } + { + name = "scheduler___scheduler_0.19.1.tgz"; + path = fetchurl { + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; + }; + } + { + name = "schema_utils___schema_utils_1.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz"; + sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770"; + }; + } + { + name = "schema_utils___schema_utils_2.7.1.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; + }; + } + { + name = "schema_utils___schema_utils_3.0.0.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 = "scroll_behavior___scroll_behavior_0.9.12.tgz"; + path = fetchurl { + name = "scroll_behavior___scroll_behavior_0.9.12.tgz"; + url = "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.12.tgz"; + sha1 = "1c22d273ec4ce6cd4714a443fead50227da9424c"; + }; + } + { + name = "select_hose___select_hose_2.0.0.tgz"; + path = fetchurl { + name = "select_hose___select_hose_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + } + { + name = "selfsigned___selfsigned_1.10.8.tgz"; + path = fetchurl { + name = "selfsigned___selfsigned_1.10.8.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz"; + sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_4.3.2.tgz"; + path = fetchurl { + name = "semver___semver_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz"; + sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; + }; + } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.3.4.tgz"; + path = fetchurl { + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + }; + } + { + name = "send___send_0.17.1.tgz"; + path = fetchurl { + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + }; + } + { + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; + }; + } + { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; + }; + } + { + name = "serve_index___serve_index_1.9.1.tgz"; + path = fetchurl { + name = "serve_index___serve_index_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + }; + } + { + name = "serve_static___serve_static_1.14.1.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "set_value___set_value_2.0.1.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + }; + } + { + name = "setimmediate___setimmediate_1.0.5.tgz"; + path = fetchurl { + name = "setimmediate___setimmediate_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.0.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + }; + } + { + name = "sha.js___sha.js_2.4.11.tgz"; + path = fetchurl { + name = "sha.js___sha.js_2.4.11.tgz"; + url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz"; + sha1 = "37a5cf0b81ecbc6943de109ba2960d1b26584ae7"; + }; + } + { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + path = fetchurl { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha1 = "8f2981ad92531f55035b01fb230769a40e02efa3"; + }; + } + { + name = "shallow_equal___shallow_equal_1.2.1.tgz"; + path = fetchurl { + name = "shallow_equal___shallow_equal_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz"; + sha1 = "4c16abfa56043aa20d050324efa68940b0da79da"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "shelljs___shelljs_0.6.1.tgz"; + path = fetchurl { + name = "shelljs___shelljs_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz"; + sha1 = "ec6211bed1920442088fe0f70b2837232ed2c8a8"; + }; + } + { + name = "shellwords___shellwords_0.1.1.tgz"; + path = fetchurl { + name = "shellwords___shellwords_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz"; + 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 = "signal_exit___signal_exit_3.0.3.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 = "simple_swizzle___simple_swizzle_0.2.2.tgz"; + path = fetchurl { + name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + } + { + name = "sisteransi___sisteransi_1.0.5.tgz"; + path = fetchurl { + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; + }; + } + { + name = "slash___slash_1.0.0.tgz"; + path = fetchurl { + name = "slash___slash_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { + name = "slice_ansi___slice_ansi_0.0.4.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz"; + sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + }; + } + { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + }; + } + { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + path = fetchurl { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + }; + } + { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + path = fetchurl { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + }; + } + { + name = "snapdragon___snapdragon_0.8.2.tgz"; + path = fetchurl { + name = "snapdragon___snapdragon_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; + sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + }; + } + { + name = "sockjs_client___sockjs_client_1.4.0.tgz"; + path = fetchurl { + name = "sockjs_client___sockjs_client_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"; + }; + } + { + name = "sockjs___sockjs_0.3.20.tgz"; + path = fetchurl { + name = "sockjs___sockjs_0.3.20.tgz"; + url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz"; + sha1 = "b26a283ec562ef8b2687b44033a4eeceac75d855"; + }; + } + { + name = "source_list_map___source_list_map_2.0.1.tgz"; + path = fetchurl { + name = "source_list_map___source_list_map_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz"; + sha1 = "3993bd873bfc48479cca9ea3a547835c7c154b34"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.6.0.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz"; + sha1 = "3d9df87e236b53f16d01e58150fc7711138e5ed2"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.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_url___source_map_url_0.4.0.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___source_map_0.5.6.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; + }; + } + { + name = "spdy_transport___spdy_transport_3.0.0.tgz"; + path = fetchurl { + name = "spdy_transport___spdy_transport_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha1 = "00d4863a6400ad75df93361a1608605e5dcdcf31"; + }; + } + { + name = "spdy___spdy_4.0.2.tgz"; + path = fetchurl { + name = "spdy___spdy_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; + sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b"; + }; + } + { + name = "split_string___split_string_3.1.0.tgz"; + path = fetchurl { + name = "split_string___split_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; + sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + }; + } + { + name = "split___split_1.0.1.tgz"; + path = fetchurl { + name = "split___split_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz"; + sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "sshpk___sshpk_1.16.1.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_8.0.0.tgz"; + path = fetchurl { + name = "ssri___ssri_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz"; + sha1 = "79ca74e21f8ceaeddfcb4b90143c458b8d988808"; + }; + } + { + name = "stable___stable_0.1.8.tgz"; + path = fetchurl { + name = "stable___stable_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz"; + sha1 = "836eb3c8382fe2936feaf544631017ce7d47a3cf"; + }; + } + { + name = "stack_generator___stack_generator_2.0.5.tgz"; + path = fetchurl { + name = "stack_generator___stack_generator_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz"; + sha1 = "fb00e5b4ee97de603e0773ea78ce944d81596c36"; + }; + } + { + name = "stack_utils___stack_utils_2.0.2.tgz"; + path = fetchurl { + name = "stack_utils___stack_utils_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz"; + sha1 = "5cf48b4557becb4638d0bc4f21d23f5d19586593"; + }; + } + { + name = "stackframe___stackframe_1.2.0.tgz"; + path = fetchurl { + name = "stackframe___stackframe_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz"; + sha1 = "52429492d63c62eb989804c11552e3d22e779303"; + }; + } + { + name = "stacktrace_gps___stacktrace_gps_3.0.4.tgz"; + path = fetchurl { + name = "stacktrace_gps___stacktrace_gps_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz"; + sha1 = "7688dc2fc09ffb3a13165ebe0dbcaf41bcf0c69a"; + }; + } + { + name = "stacktrace_js___stacktrace_js_2.0.2.tgz"; + path = fetchurl { + name = "stacktrace_js___stacktrace_js_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.2.tgz"; + sha1 = "4ca93ea9f494752d55709a081d400fdaebee897b"; + }; + } + { + name = "static_extend___static_extend_0.1.2.tgz"; + path = fetchurl { + name = "static_extend___static_extend_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + } + { + name = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + 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 { + name = "stream_browserify___stream_browserify_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"; + }; + } + { + name = "stream_each___stream_each_1.2.3.tgz"; + path = fetchurl { + name = "stream_each___stream_each_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; + sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae"; + }; + } + { + name = "stream_http___stream_http_2.8.3.tgz"; + path = fetchurl { + name = "stream_http___stream_http_2.8.3.tgz"; + url = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz"; + sha1 = "b2d242469288a5a27ec4fe8933acf623de6514fc"; + }; + } + { + name = "stream_shift___stream_shift_1.0.1.tgz"; + path = fetchurl { + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + }; + } + { + name = "string_length___string_length_4.0.1.tgz"; + path = fetchurl { + name = "string_length___string_length_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz"; + sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_width___string_width_4.2.0.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.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.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.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_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "stringz___stringz_2.1.0.tgz"; + path = fetchurl { + name = "stringz___stringz_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/stringz/-/stringz-2.1.0.tgz"; + sha1 = "5896b4713eac31157556040fb90258fb02c1630c"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_bom___strip_bom_3.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + } + { + name = "strip_bom___strip_bom_4.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz"; + sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"; + }; + } + { + name = "strip_comments___strip_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_comments___strip_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz"; + sha1 = "4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + } + { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + path = fetchurl { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + }; + } + { + name = "strip_indent___strip_indent_3.0.0.tgz"; + path = fetchurl { + name = "strip_indent___strip_indent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; + sha1 = "c32e1cee940b6b3432c771bc2c54bcce73cd3001"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { + name = "strip_json_comments___strip_json_comments_1.0.4.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + } + { + name = "stylehacks___stylehacks_4.0.3.tgz"; + path = fetchurl { + name = "stylehacks___stylehacks_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz"; + sha1 = "6718fcaf4d1e07d8a1318690881e8d96726a71d5"; + }; + } + { + name = "substring_trie___substring_trie_1.0.2.tgz"; + path = fetchurl { + name = "substring_trie___substring_trie_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.2.tgz"; + sha1 = "7b42592391628b4f2cb17365c6cce4257c7b7af5"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + name = "supports_color___supports_color_3.2.3.tgz"; + path = fetchurl { + name = "supports_color___supports_color_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz"; + sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "supports_hyperlinks___supports_hyperlinks_2.1.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 = "svgo___svgo_1.3.2.tgz"; + path = fetchurl { + name = "svgo___svgo_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; + 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 { + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; + sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; + }; + } + { + name = "table___table_3.8.3.tgz"; + path = fetchurl { + name = "table___table_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz"; + sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; + }; + } + { + name = "table___table_5.4.1.tgz"; + path = fetchurl { + name = "table___table_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-5.4.1.tgz"; + sha1 = "0691ae2ebe8259858efb63e550b6d5f9300171e8"; + }; + } + { + name = "tapable___tapable_1.1.3.tgz"; + path = fetchurl { + name = "tapable___tapable_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz"; + sha1 = "a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"; + }; + } + { + name = "tar___tar_6.0.5.tgz"; + path = fetchurl { + name = "tar___tar_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz"; + sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f"; + }; + } + { + name = "tcomb___tcomb_2.7.0.tgz"; + path = fetchurl { + name = "tcomb___tcomb_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz"; + sha1 = "10d62958041669a5d53567b9a4ee8cde22b1c2b0"; + }; + } + { + name = "terminal_link___terminal_link_2.1.1.tgz"; + path = fetchurl { + name = "terminal_link___terminal_link_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz"; + sha1 = "14a64a27ab3c0df933ea546fba55f2d078edc994"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; + sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_4.2.3.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"; + sha1 = "28daef4a83bd17c1db0297070adc07fc8cfc6a9a"; + }; + } + { + name = "terser___terser_4.8.0.tgz"; + path = fetchurl { + name = "terser___terser_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; + sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; + }; + } + { + name = "terser___terser_5.3.4.tgz"; + path = fetchurl { + name = "terser___terser_5.3.4.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.3.4.tgz"; + sha1 = "e510e05f86e0bd87f01835c3238839193f77a60c"; + }; + } + { + name = "tesseract.js_core___tesseract.js_core_2.2.0.tgz"; + path = fetchurl { + name = "tesseract.js_core___tesseract.js_core_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz"; + sha1 = "6ef78051272a381969fac3e45a226e85022cffef"; + }; + } + { + name = "tesseract.js___tesseract.js_2.1.1.tgz"; + path = fetchurl { + name = "tesseract.js___tesseract.js_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/tesseract.js/-/tesseract.js-2.1.1.tgz"; + sha1 = "5c50fc95542ce8d834cb952bfb75a8fc85f1441d"; + }; + } + { + name = "test_exclude___test_exclude_6.0.0.tgz"; + path = fetchurl { + name = "test_exclude___test_exclude_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz"; + sha1 = "04a8698661d805ea6fa293b6cb9e63ac044ef15e"; + }; + } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } + { + name = "throat___throat_5.0.0.tgz"; + path = fetchurl { + name = "throat___throat_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz"; + sha1 = "c5199235803aad18754a667d659b5e72ce16764b"; + }; + } + { + name = "throng___throng_4.0.0.tgz"; + path = fetchurl { + name = "throng___throng_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/throng/-/throng-4.0.0.tgz"; + sha1 = "983c6ba1993b58eae859998aa687ffe88df84c17"; + }; + } + { + name = "through2___through2_2.0.5.tgz"; + path = fetchurl { + name = "through2___through2_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; + sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "thunky___thunky_1.1.0.tgz"; + path = fetchurl { + name = "thunky___thunky_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; + sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d"; + }; + } + { + name = "timers_browserify___timers_browserify_2.0.11.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 = "timsort___timsort_0.3.0.tgz"; + path = fetchurl { + name = "timsort___timsort_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz"; + sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; + }; + } + { + name = "tiny_invariant___tiny_invariant_1.1.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_queue___tiny_queue_0.2.1.tgz"; + path = fetchurl { + name = "tiny_queue___tiny_queue_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz"; + sha1 = "25a67f2c6e253b2ca941977b5ef7442ef97a6046"; + }; + } + { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + path = fetchurl { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz"; + sha1 = "94a30db453df4c643d0fd566060d60a875d84754"; + }; + } + { + name = "tmpl___tmpl_1.0.4.tgz"; + path = fetchurl { + name = "tmpl___tmpl_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz"; + sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + }; + } + { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + path = fetchurl { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { + name = "to_object_path___to_object_path_0.3.0.tgz"; + path = fetchurl { + name = "to_object_path___to_object_path_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + } + { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "to_regex___to_regex_3.0.2.tgz"; + path = fetchurl { + name = "to_regex___to_regex_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; + sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + 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_3.0.1.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; + sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; + }; + } + { + name = "tr46___tr46_2.0.2.tgz"; + path = fetchurl { + name = "tr46___tr46_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz"; + sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; + }; + } + { + name = "ts_essentials___ts_essentials_2.0.12.tgz"; + path = fetchurl { + name = "ts_essentials___ts_essentials_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz"; + sha1 = "c9303f3d74f75fa7528c3d49b80e089ab09d8745"; + }; + } + { + name = "tsconfig_paths___tsconfig_paths_3.9.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 = "tslib___tslib_1.13.0.tgz"; + path = fetchurl { + name = "tslib___tslib_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; + sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; + }; + } + { + 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"; + 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 = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + }; + } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_detect___type_detect_4.0.8.tgz"; + path = fetchurl { + name = "type_detect___type_detect_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; + 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.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + }; + } + { + name = "type___type_1.2.0.tgz"; + path = fetchurl { + name = "type___type_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; + sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; + }; + } + { + name = "type___type_2.0.0.tgz"; + path = fetchurl { + name = "type___type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; + sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.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_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.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_value_ecmascript___unicode_match_property_value_ecmascript_1.2.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_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.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 = "union_value___union_value_1.0.1.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + }; + } + { + name = "uniq___uniq_1.0.1.tgz"; + path = fetchurl { + name = "uniq___uniq_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + } + { + name = "uniqs___uniqs_2.0.0.tgz"; + path = fetchurl { + name = "uniqs___uniqs_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz"; + sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; + }; + } + { + name = "unique_filename___unique_filename_1.1.1.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; + sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + }; + } + { + name = "unique_slug___unique_slug_2.0.2.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; + sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { + name = "unquote___unquote_1.1.1.tgz"; + path = fetchurl { + name = "unquote___unquote_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz"; + sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + }; + } + { + name = "unset_value___unset_value_1.0.0.tgz"; + path = fetchurl { + name = "unset_value___unset_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + } + { + name = "upath___upath_1.2.0.tgz"; + path = fetchurl { + name = "upath___upath_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; + sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894"; + }; + } + { + name = "uri_js___uri_js_4.4.0.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 = "urix___urix_0.1.0.tgz"; + path = fetchurl { + name = "urix___urix_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + } + { + name = "url_parse___url_parse_1.4.7.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___url_0.11.0.tgz"; + path = fetchurl { + name = "url___url_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + } + { + name = "use_composed_ref___use_composed_ref_1.0.0.tgz"; + path = fetchurl { + name = "use_composed_ref___use_composed_ref_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.0.0.tgz"; + sha1 = "bb13e8f4a0b873632cde4940abeb88b92d03023a"; + }; + } + { + name = "use_isomorphic_layout_effect___use_isomorphic_layout_effect_1.0.0.tgz"; + path = fetchurl { + name = "use_isomorphic_layout_effect___use_isomorphic_layout_effect_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.0.0.tgz"; + sha1 = "f56b4ed633e1c21cd9fc76fe249002a1c28989fb"; + }; + } + { + name = "use_latest___use_latest_1.1.0.tgz"; + path = fetchurl { + name = "use_latest___use_latest_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/use-latest/-/use-latest-1.1.0.tgz"; + sha1 = "7bf9684555869c3f5f37e10d0884c8accf4d3aa6"; + }; + } + { + name = "use___use_3.1.1.tgz"; + path = fetchurl { + name = "use___use_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; + sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + }; + } + { + name = "user_home___user_home_2.0.0.tgz"; + path = fetchurl { + name = "user_home___user_home_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "util.promisify___util.promisify_1.0.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; + sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; + }; + } + { + name = "util___util_0.10.3.tgz"; + path = fetchurl { + name = "util___util_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + } + { + name = "util___util_0.10.4.tgz"; + path = fetchurl { + name = "util___util_0.10.4.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz"; + sha1 = "3aa0125bfe668a4672de58857d3ace27ecb76901"; + }; + } + { + name = "util___util_0.11.1.tgz"; + path = fetchurl { + name = "util___util_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz"; + sha1 = "3236733720ec64bb27f6e26f421aaa2e1b588d61"; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "uuid___uuid_8.3.2.tgz"; + path = fetchurl { + name = "uuid___uuid_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz"; + sha1 = "80d5b5ced271bb9af6c445f21a1a04c606cefbe2"; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; + }; + } + { + name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; + path = fetchurl { + name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz"; + sha1 = "b4fe00e35649ef7785a9b7fcebcea05f37c332fc"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "value_equal___value_equal_0.4.0.tgz"; + path = fetchurl { + name = "value_equal___value_equal_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz"; + sha1 = "c5bdd2f54ee093c04839d71ce2e4758a6890abc7"; + }; + } + { + name = "value_equal___value_equal_1.0.1.tgz"; + path = fetchurl { + name = "value_equal___value_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz"; + sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + name = "vendors___vendors_1.0.4.tgz"; + path = fetchurl { + name = "vendors___vendors_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; + 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 = "vm_browserify___vm_browserify_1.1.2.tgz"; + path = fetchurl { + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; + }; + } + { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + path = fetchurl { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; + }; + } + { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + path = fetchurl { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; + sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; + }; + } + { + name = "walker___walker_1.0.7.tgz"; + path = fetchurl { + name = "walker___walker_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz"; + sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + }; + } + { + name = "warning___warning_3.0.0.tgz"; + path = fetchurl { + name = "warning___warning_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz"; + sha1 = "32e5377cb572de4ab04753bdf8821c01ed605b7c"; + }; + } + { + name = "warning___warning_4.0.3.tgz"; + path = fetchurl { + name = "warning___warning_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz"; + sha1 = "16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"; + }; + } + { + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + path = fetchurl { + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; + sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; + }; + } + { + name = "watchpack___watchpack_1.7.4.tgz"; + path = fetchurl { + name = "watchpack___watchpack_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz"; + sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b"; + }; + } + { + name = "wbuf___wbuf_1.7.3.tgz"; + path = fetchurl { + name = "wbuf___wbuf_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz"; + sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df"; + }; + } + { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; + }; + } + { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514"; + }; + } + { + name = "webpack_assets_manifest___webpack_assets_manifest_3.1.1.tgz"; + path = fetchurl { + name = "webpack_assets_manifest___webpack_assets_manifest_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-assets-manifest/-/webpack-assets-manifest-3.1.1.tgz"; + sha1 = "39bbc3bf2ee57fcd8ba07cda51c9ba4a3c6ae1de"; + }; + } + { + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.1.0.tgz"; + path = fetchurl { + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.1.0.tgz"; + sha1 = "31f9e5e187ee32fae2392b21806582cc6fe74cf9"; + }; + } + { + name = "webpack_cli___webpack_cli_3.3.12.tgz"; + path = fetchurl { + name = "webpack_cli___webpack_cli_3.3.12.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz"; + sha1 = "94e9ada081453cd0aa609c99e500012fd3ad2d4a"; + }; + } + { + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.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_server___webpack_dev_server_3.11.0.tgz"; + path = fetchurl { + name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; + sha1 = "8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"; + }; + } + { + name = "webpack_log___webpack_log_2.0.0.tgz"; + path = fetchurl { + name = "webpack_log___webpack_log_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz"; + sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f"; + }; + } + { + name = "webpack_merge___webpack_merge_5.4.0.tgz"; + path = fetchurl { + name = "webpack_merge___webpack_merge_5.4.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.4.0.tgz"; + sha1 = "81bef0a7d23fc1e6c24b06ad8bf22ddeb533a3a3"; + }; + } + { + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933"; + }; + } + { + name = "webpack___webpack_4.44.2.tgz"; + path = fetchurl { + name = "webpack___webpack_4.44.2.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz"; + sha1 = "6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"; + }; + } + { + name = "websocket_driver___websocket_driver_0.6.5.tgz"; + path = fetchurl { + name = "websocket_driver___websocket_driver_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + }; + } + { + name = "websocket_driver___websocket_driver_0.7.3.tgz"; + path = fetchurl { + name = "websocket_driver___websocket_driver_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz"; + sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"; + }; + } + { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + path = fetchurl { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; + }; + } + { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + path = fetchurl { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; + }; + } + { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + path = fetchurl { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; + }; + } + { + name = "whatwg_url___whatwg_url_8.2.2.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz"; + sha1 = "85e7f9795108b53d554cec640b2e8aee2a0d4bfd"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "wicg_inert___wicg_inert_3.1.0.tgz"; + path = fetchurl { + name = "wicg_inert___wicg_inert_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.0.tgz"; + sha1 = "6525f12db188b83f0051bed2ddcf6c1aa5b17590"; + }; + } + { + name = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + }; + } + { + name = "wildcard___wildcard_2.0.0.tgz"; + path = fetchurl { + name = "wildcard___wildcard_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; + sha1 = "a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "worker_farm___worker_farm_1.7.0.tgz"; + path = fetchurl { + name = "worker_farm___worker_farm_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; + sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; + }; + } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + }; + } + { + name = "write___write_1.0.3.tgz"; + path = fetchurl { + name = "write___write_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; + sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; + }; + } + { + name = "write___write_0.2.1.tgz"; + path = fetchurl { + name = "write___write_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz"; + sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; + }; + } + { + name = "ws___ws_6.2.1.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_7.4.0.tgz"; + path = fetchurl { + name = "ws___ws_7.4.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz"; + sha1 = "a5dd76a24197940d4a8bb9e0e152bb4503764da7"; + }; + } + { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + path = fetchurl { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; + }; + } + { + name = "xmlchars___xmlchars_2.2.0.tgz"; + path = fetchurl { + name = "xmlchars___xmlchars_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; + sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "y18n___y18n_4.0.0.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_5.0.5.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; + sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + }; + } + { + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + 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 { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; + }; + } + { + name = "yargs_parser___yargs_parser_18.1.3.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_18.1.3.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.3.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.3.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.3.tgz"; + sha1 = "92419ba867b858c868acf8bae9bf74af0dd0ce26"; + }; + } + { + name = "yargs___yargs_13.3.2.tgz"; + path = fetchurl { + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + { + name = "yargs___yargs_15.4.1.tgz"; + path = fetchurl { + name = "yargs___yargs_15.4.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz"; + sha1 = "0d87a16de01aee9d8bec2bfbf74f67851730f4f8"; + }; + } + { + name = "yargs___yargs_16.1.1.tgz"; + path = fetchurl { + name = "yargs___yargs_16.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.1.1.tgz"; + sha1 = "5a4a095bd1ca806b0a50d0c03611d38034d219a1"; + }; + } + { + name = "zlibjs___zlibjs_0.3.1.tgz"; + path = fetchurl { + name = "zlibjs___zlibjs_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/zlibjs/-/zlibjs-0.3.1.tgz"; + sha1 = "50197edb28a1c42ca659cc8b4e6a9ddd6d444554"; + }; + } + ]; +} diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix index 0e1b207a75..48b5a7195b 100644 --- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.37.5"; + version = "0.37.8"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1wvq5nx3y28w8wn6wyy650gc32hgkx7inbcylrdirhagzqhcm8z6"; + sha256 = "sha256-T3isJcnDUvN4TCd9tZA1p46pamhdPSwIKKAOr6+1F30="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 9477da8a3f..492e0236d1 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-01-16T02-19-44Z"; + version = "2021-02-11T08-23-43Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-eYOarXgx5+rXCw2gMzrH1vVSsIdN4WrHrAUnnCcLtN8="; + sha256 = "sha256-Y2iyi+bdBCLV/MWPPsrrJFEayuQVGsvrs63kOuFljJ8="; }; - vendorSha256 = "sha256-6p/DBgHawsT5PjpzwjrKgZfWm5Z6v1ozMWzGpEiB2jM="; + vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix index 9b276afa4b..b4dfc4791b 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.39.0"; + version = "0.40.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "0ngqlb9d8xml0vnjsn6vpi02sjqldsiirlrzfncrh3hlcrhk4fcn"; + sha256 = "sha256-sBITCHyji55OnopNlDCNypSf/j8LKtarSGPYz5fQZys="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index 520aedf2c3..1d5715176c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "092ry9gq9fpkkgsdymfwzdxz982pp0ljf2gs6mp419ivvllzwhiv"; + sha256 = "sha256-kWl6wkyN/ytnct2MseZ5FQgOL2WeGJDFPPGJxkdcDX8="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 15800041b3..dc0a66524d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.4.0"; + version = "7.4.1"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0mdk3f237gvyjw8fxppfwzs8smhrnrj5aqc2wsykclrl52h5mv2z"; + sha256 = "11gvw8kdz7238jcaiyqk6i0ciy6plixljpzdajlabywgr9jam32g"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1dc03d5hg7f2s9lrqycxm08ry8plkx8lkrfm4q3gjk1cvf5zjwzd"; + sha256 = "1266vj8saf4nh5h6cz8axkk58g1mwgvc9c6caphj71dhvr3snw6i"; }; - vendorSha256 = "0m39dw4raqzm7zxcbncdxf7br5j173czl62xsp94q4g2h719mc9a"; + vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix new file mode 100644 index 0000000000..4b2e76f704 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "flow-exporter"; + version = "1.1.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "neptune-networks"; + repo = pname; + sha256 = "sha256-6FqupoYWRvex7XhM7ly8f7ICnuS9JvCRIVEBIJe+64k="; + }; + + vendorSha256 = "sha256-2raOUOPiMUMydIsfSsnwUAAiM7WyMio1NgL1EoADr2s="; + + meta = with lib; { + description = "Export network flows from kafka to Prometheus"; + homepage = "https://github.com/neptune-networks/flow-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ kloenk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix index a4ba3cee62..965b33aa33 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix @@ -5,20 +5,29 @@ buildGoModule rec { pname = "promscale"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "0179sw5zx552y14lr56adxcgas642xvxpqly6y4m9pi33r1gs8lj"; + sha256 = "sha256-rXOAAd08NTWFRGnJoAY9xllw6dAA7Xu3qcImIVq9ewE="; }; - vendorSha256 = "sha256:04gzf0siz96ar4qdkcw6daswy14i1zvl7ir200adhw1c5phppab6"; + vendorSha256 = "sha256-/woSbtrOI3BVBhh+A2kO1CB1BLzBciwOqvSbGkFeMEU="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; doCheck = false; # Requires access to a docker daemon + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" -version)" == "${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + exit 1 + fi + ''; meta = with lib; { description = "An open-source analytical platform for Prometheus metrics"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix index 6eb9b4eb58..0bdb0680ae 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "pushgateway"; - version = "1.3.1"; + version = "1.4.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "sha256-z8xM9rq7wKH7bwzjSmGh+2pO5Y10szmIH82ztRrOCNs="; + sha256 = "sha256-230JgG+TtAuopkkcUda+0hl8E6WXOtTUygWoyorLiEU="; }; buildUser = "nix@nixpkgs"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix index 6755aeb996..e63cf48516 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,19 +4,19 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "6.1.2"; + version = "6.2.3"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "1g4vh4ay5m3sl00j8rn4db87kfdyxcmnaf0rxnv4ah2fbj5nrh2n"; + sha256 = "sha256-8+ibl2D8hSzFV+snJAxRNTiyYqCndUDGVCVKt2bkPlQ="; }; inherit subPackages postInstall; - vendorSha256 = "12qi94k8fjx0kaq2x977yhan8ynd6j6cbqx1l60gqs2xgkm71k9r"; + vendorSha256 = "sha256-KykxKJxel4E5VB8QAkEpBBaA7hKfSnTDkJ9qlNEln80="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index 755dc15177..2b0be2803e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "1zxx6vyf0fhrz8yqnlakszwziyq20k3kprshh414qxdpqfj9jax6"; + sha256 = "sha256-GJKTQGMmFJeUQn02GWP4KKpKdM8eT+VxDBDzST+5NXk="; }; - vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8"; + vendorSha256 = "sha256-s11iJFcJ1Ez6TkhCU3VD2ThU5/9otHz5rDF8z9ux79E="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index 89de67c404..b34f620749 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -15,7 +15,7 @@ # Services , yajl # Client support -, mpd_clientlib +, libmpdclient # Tag support , libid3tag , nixosTests @@ -70,7 +70,7 @@ let soundcloud = [ curl yajl ]; tidal = [ curl yajl ]; # Client support - libmpdclient = [ mpd_clientlib ]; + libmpdclient = [ libmpdclient ]; # Tag support id3tag = [ libid3tag ]; # Misc diff --git a/third_party/nixpkgs/pkgs/servers/mpd/clientlib.nix b/third_party/nixpkgs/pkgs/servers/mpd/libmpdclient.nix similarity index 73% rename from third_party/nixpkgs/pkgs/servers/mpd/clientlib.nix rename to third_party/nixpkgs/pkgs/servers/mpd/libmpdclient.nix index e0df9458f8..4ff45b527b 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/clientlib.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/libmpdclient.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { - version = "2.19"; pname = "libmpdclient"; + version = "2.19"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; - repo = "libmpdclient"; + repo = pname; rev = "v${version}"; sha256 = "01agvjscdxagw6jcfx0wg81c4b6p8rh0hp3slycmjs2b835kvmq2"; }; @@ -17,8 +23,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client library for MPD (music player daemon)"; homepage = "https://www.musicpd.org/libs/libmpdclient/"; - license = licenses.gpl2; + license = licenses.bsd2; + maintainers = with maintainers; [ ehmry AndersonTorres ]; platforms = platforms.unix; - maintainers = with maintainers; [ ehmry ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index e146adbe12..a40dd71faf 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -58,7 +58,7 @@ in { }; nextcloud20 = generic { - version = "20.0.6"; - sha256 = "859167170402b876b6ef1a37fa4aaa5617b6bf847bb5d50a94f636bae65a34b9"; + version = "20.0.7"; + sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix index 627cd6d627..bace331e05 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix @@ -73,28 +73,12 @@ let --replace /out $out ''; }; - - # Can't use the nixpkgs version of go-bindata, it's an ancient - # ancestor of this more modern one. - bindata = buildGoPackage { - pname = "go-bindata"; - version = "v3.22.0"; - src = fetchFromGitHub { - owner = "kevinburke"; - repo = "go-bindata"; - rev = "v3.22.0"; - sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; - }; - - goPackagePath = "github.com/kevinburke/go-bindata"; - subPackages = [ "go-bindata" ]; - }; in buildGoModule { pname = "influxdb"; version = version; src = src; - nativeBuildInputs = [ bindata pkg-config ]; + nativeBuildInputs = [ go-bindata pkg-config ]; vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a"; subPackages = [ "cmd/influxd" "cmd/influx" ]; diff --git a/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix b/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix index 4fd6a398a3..8e57e25343 100644 --- a/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "6.1.1"; + version = "7.0.0"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "10vvib4089yywd10kigjszsfxkzv8xzj7dy3wr5df8h80rcfa74n"; + sha256 = "sha256-yH60mfuYRv31I0DOEtWxqGCzKOwDYsQh4yjvYO3vq3I="; rev = "v${version}"; }; - vendorSha256 = "0z8ibmpil899xvjaw7siswy22shjhx17a6lnjpr62paqdxy1sfwc"; + vendorSha256 = "sha256-kclpoZ33JOciP2IUCQZB5idA7rgbWxPPFNwZU+pEJFU="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); diff --git a/third_party/nixpkgs/pkgs/servers/pg_tileserv/default.nix b/third_party/nixpkgs/pkgs/servers/pg_tileserv/default.nix index 9f73566486..d9ba4e8e6f 100644 --- a/third_party/nixpkgs/pkgs/servers/pg_tileserv/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pg_tileserv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pg_tileserv"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "CrunchyData"; repo = pname; rev = "v${version}"; - sha256 = "sha256-62cJ0j/UfPW/ujKr0iA7Be8wZYlZ68mpJX8v1tAVREc="; + sha256 = "sha256-PHF8n0rjxvajyC/y2sFcdvxQdDFXkxcDZOkYT10UsE4="; }; vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index c49f930f54..ca0e41f76d 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.2.3943-a91458577"; + version = "1.21.3.4014-58bd20c02"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1wgv37z1j8yh0jck8nawq8qk6vjvc2cap2dj2vdid9dafy9fl7yw"; + sha256 = "15zfhjvp5yzai5ylhljw221v6qm16fma0x0lay9zpgkxrwqw9iaw"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0bjxb2kmq43fi8026jvdbqn14lg33k2520n59l497la56l5d0h37"; + sha256 = "1gig4n6iijipf2njixgpw00pm3g5rgbq1vvd9ljy8cjpv1kb5z0z"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix index 8d3b889110..145a1927f2 100644 --- a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix @@ -11,15 +11,15 @@ , zlib }: stdenv.mkDerivation rec { name = "roon-server"; - version = "100700710"; + version = "100800753"; # N.B. The URL is unstable. I've asked for them to provide a stable URL but # they have ignored me. If this package fails to build for you, you may need # to update the version and sha256. # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 src = fetchurl { - url = "https://web.archive.org/web/20210202130624/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; - sha256 = "sha256-S1c3RvN/HE8zwpGZARYRy/Gu4OTG0CjWbxJhZ3cKoVE="; + url = "https://web.archive.org/web/20210209195555/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; + sha256 = "sha256-uas1vqIDWlYr7jgsrlBeJSPjMxwzVnrkCD9jJljkFZs="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix index ce62b7d1fd..75afedaa2d 100644 --- a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.10"; + version = "1.4.11"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "03sjvmnrspkiq0w73xvp1w61pcxhv0djrdm3mvs8h0dp9pfc1n53"; + sha256 = "sha256-rHMZBwwwX8LIjHcjYFVi2GBwMHMr7ukxzbQJHPBeabc="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index c125732caf..0c422970d5 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -158,7 +158,8 @@ stdenv.mkDerivation rec { description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; platforms = platforms.unix; - broken = stdenv.isDarwin; + # N.B. enableGlusterFS does not build + broken = stdenv.isDarwin || enableGlusterFS; maintainers = with maintainers; [ aneeshusa ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index afae82b4d3..d9a3332e02 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.5"; + version = "0.23.10"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "03wxrf9iyaianlnlcx8ks04r0snpg32a3qbq36cykcq2x55qnczq"; + sha256 = "sha256-EkExTDU7T7FYZrDtF0AF8wjn9fp8y9SLmINYGv8zvXk="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix index 98166d0b38..5479009321 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix @@ -23,8 +23,9 @@ self = stdenv.mkDerivation rec { nativeBuildInputs = [ cmake bison pkg-config rpcsvc-proto ]; - buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ] - ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; + buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] + ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ] + ++ lib.optionals stdenv.isLinux [ libtirpc ]; outputs = [ "out" "static" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 99a81f8754..7459da6d6c 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "0x19p0b9hv1hkhwjm68cm8gskhnsl7np4si8wl0ablf6kasyl3q7"; + sha256 = "030vm83ksfi4daypr4hamvvfs4g1ckww4ldg7rrk6c6hqkppykpa"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/third_party/nixpkgs/pkgs/servers/swego/default.nix b/third_party/nixpkgs/pkgs/servers/swego/default.nix index 4c7c9d7645..91b0995466 100644 --- a/third_party/nixpkgs/pkgs/servers/swego/default.nix +++ b/third_party/nixpkgs/pkgs/servers/swego/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "swego"; - version = "0.7"; + version = "0.9"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "14qww4ndvrxmrgkggr8hyvfpz2v7fw0vq6s8715mxa28f8pfi78b"; + sha256 = "sha256-Wt+2spZfgBWzZEQP+SiDYI5DdLKrwFMgYT1ukbF4x0I="; }; - vendorSha256 = "068drahh0aysrm8cr5pgik27jqyk28bsx5130mc2v3xd0xmk8yp1"; + vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI="; postInstall = '' mv $out/bin/src $out/bin/$pname diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 66cb54f0fe..eb47593c59 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,21 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.4.2"; - tagHash = "f40ccb086c4c3f09b3cc67b7c559bd2c5d3cf953"; # from `git rev-parse v1.4.2` + version = "1.4.4"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0jc7z6ml59a1xs3c3mskj9s34gw7hmixn8dbz3bi81qv0yi9pvnx"; + sha256 = "sha256-zrKkBbsvIqJkPysKx3nJ3EIbePWMZCX9eegekAoqMqk="; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "16aa7jc2h59hnnh0mfmnd0k198dijm9j4c44j80wpzlhf4x27yjs"; + vendorSha256 = "sha256-WvojOnGQ/ssBkoQwIlOVsaEUJmi2ugqgtTAVKJg8Spk="; doCheck = false; @@ -25,7 +24,7 @@ buildGoModule rec { preBuild = '' export buildFlagsArray=( -tags="xversion" - -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version} -X tailscale.com/version.GitCommit=${tagHash}" + -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version}" ) ''; diff --git a/third_party/nixpkgs/pkgs/servers/tarssh/default.nix b/third_party/nixpkgs/pkgs/servers/tarssh/default.nix index 9240b9c51a..ac7f267826 100644 --- a/third_party/nixpkgs/pkgs/servers/tarssh/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tarssh/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { pname = "tarssh"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Freaky"; repo = pname; - sha256 = "1waxfbw9lqbqv8igb291pjqg22324lzv4p7fsdfrkvxf95jd2i03"; + sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk="; }; - cargoSha256 = "1f3anrh2y8yg7l4nilwk0a7c7kq5yvg07cqh75igjdb5a7p9di0j"; + cargoSha256 = "sha256-7X9klYVZ2yE8BPuLhzWkuT7VFpmdOZGSD0D1x3kBNEs="; meta = with lib; { description = "A simple SSH tarpit inspired by endlessh"; diff --git a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix index 6e5ae662b0..22c1df884b 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "0.4.0"; + version = "0.5.0"; pname = "tempo"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "tempo"; - sha256 = "16hrvhnlciaf06l34p3bb3nvmxr8zwbh7zql13zja1hs0kvwxv5c"; + sha256 = "sha256-Har0JJqr6mkliKh25n+F4tork+bzfI/bv19H/rIRb9g="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index 340bad6bdc..d012527817 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.3.4"; + version = "2.4.2"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "1vdnd6nb8bfiwd51rrqhrc9p8lh3fhny49lapgbzk36ynqc97bi5"; + sha256 = "sha256-W6NtlIxeRg432RTiaJHu25Izv1VWNqYetzilCr2gPjU="; stripRoot = false; }; - vendorSha256 = "0h3j0b034yh70c9bscj1k1jy8igsr7p0i014yr0zl7wlc6s6c9bp"; + vendorSha256 = "sha256-kwA0MtmlUEO1eQFr4NpdsMikEFQc3N3Meolw/xw9dgM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index c8722fbe8f..44f207e3b8 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wallabag"; - version = "2.4.0"; + version = "2.4.1"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "11vda7aqq82kpr88v4hr7zg19zfq970n3z4qp25my8b1fvlgdjhi"; + sha256 = "1dqf5ia66kjsnfad2xkm8w6jgs976mf9x0dcd73jybqfgs4j09kj"; }; outputs = [ "out" ]; diff --git a/third_party/nixpkgs/pkgs/shells/oil/default.nix b/third_party/nixpkgs/pkgs/shells/oil/default.nix index 0896b8a504..0c508d0e29 100644 --- a/third_party/nixpkgs/pkgs/shells/oil/default.nix +++ b/third_party/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1z0p08q4808h78bp6nwdszpfavhr4y7n313bp0gg5qdbssnciq1v"; + sha256 = "sha256-KcXu1u/MvvbCLb5a7D09NvfJPaeo0c8Z/Czuk7XR23M="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index bab6ebb686..e957457c8c 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-01-31"; + version = "2021-02-09"; pname = "oh-my-zsh"; - rev = "c52e646bb7b109e15f6dc4047b29ca8c8e029433"; + rev = "f21e646ce6c09198f7f625c597f08af49551fdb0"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0yfpahn9a6aby8ym1slcn8kvric26xy14fk1jjj3f07xvh7xg2y9"; + sha256 = "14m932zbzdbwyfqkn882jarpw4dbmxkfna5pakd4n5b123drjz46"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zplugin/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zinit/default.nix similarity index 73% rename from third_party/nixpkgs/pkgs/shells/zsh/zplugin/default.nix rename to third_party/nixpkgs/pkgs/shells/zsh/zinit/default.nix index c148f60b2e..d59f50ce3b 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zplugin/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zinit/default.nix @@ -1,12 +1,13 @@ { stdenvNoCC, lib, fetchFromGitHub, installShellFiles }: + stdenvNoCC.mkDerivation rec { - pname = "zplugin"; - version = "2.3"; + pname = "zinit"; + version = "3.7"; src = fetchFromGitHub { owner = "zdharma"; repo = pname; rev = "v${version}"; - sha256 = "0qqv5p19s8jb06d6h55dm4acji9x2rpxb2ni3h7fb0q43iz6y85w"; + hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE="; }; # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git dontBuild = true; @@ -18,11 +19,12 @@ stdenvNoCC.mkDerivation rec { # Zplugin's source files install -dm0755 "$outdir" - install -m0644 zplugin{,-side,-install,-autoload}.zsh "$outdir" + # Installing also backward compatibility layer + install -m0644 z{plugin,init}{,-side,-install,-autoload}.zsh "$outdir" install -m0755 git-process-output.zsh "$outdir" # Zplugin autocompletion - installShellCompletion --zsh _zplugin + installShellCompletion --zsh _zinit #TODO:Zplugin-module files # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \; @@ -32,7 +34,7 @@ stdenvNoCC.mkDerivation rec { #TODO:doc output meta = with lib; { - homepage = "https://github.com/zdharma/zplugin"; + homepage = "https://github.com/zdharma/zinit"; description = "Flexible zsh plugin manager"; license = licenses.mit; maintainers = with maintainers; [ pasqui23 ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix new file mode 100644 index 0000000000..0cc1535e53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "zsh-autopair"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "hlissner"; + repo = "zsh-autopair"; + rev = "v${version}"; + sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1"; + }; + + installPhase = '' + install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh + ''; + + meta = with lib; { + homepage = "https://github.com/hlissner/zsh-autopair"; + description = "A plugin that auto-closes, deletes and skips over matching delimiters in zsh intelligently"; + license = licenses.mit; + maintainers = with maintainers; [ _0qq ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix index 98cbf2c80f..d3e2c6534a 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + # make zshrc aware of where zsh-prezto is installed + sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/share/zsh-prezto/|g" runcoms/zshrc + ''; + installPhase = '' mkdir -p $out/share/zsh-prezto cp -R ./ $out/share/zsh-prezto diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix new file mode 100644 index 0000000000..b4d407a70b --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "zsh-system-clipboard"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "kutsan"; + repo = "zsh-system-clipboard"; + rev = "v${version}"; + sha256 = "09lqav1mz5zajklr3xa0iaivhpykv3azkjb7yj9wyp0hq3vymp8i"; + }; + + installPhase = '' + install -D zsh-system-clipboard.zsh $out/share/zsh/${pname}/zsh-system-clipboard.zsh + ''; + + meta = with lib; { + homepage = "https://github.com/kutsan/zsh-system-clipboard"; + description = "A plugin that adds key bindings support for ZLE (Zsh Line Editor) clipboard operations for vi emulation keymaps"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ _0qq ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/stdenv/freebsd/default.nix b/third_party/nixpkgs/pkgs/stdenv/freebsd/default.nix index 38b168c0e7..5aadfd81a2 100644 --- a/third_party/nixpkgs/pkgs/stdenv/freebsd/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/freebsd/default.nix @@ -1,11 +1,170 @@ { lib -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] }: assert crossSystem == localSystem; -let inherit (localSystem) system; in - - +let inherit (localSystem) system; + fetchURL = import ; + trivialBuilder = (import ./trivial-builder.nix); + make = trivialBuilder rec { + inherit (localSystem) system; + name = "make"; + ver = "4.3"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + bash = trivialBuilder rec { + inherit (localSystem) system; + name = "bash"; + ver = "4.4.18"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "08vz660768mnnax7n8d4d85jxafwdmsxsi7fh0hzvmafbvn9wkb0"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + coreutils = trivialBuilder rec { + inherit (localSystem) system; + name = "coreutils"; + ver = "8.31"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-gmp" + "--without-libpth-prefix" + ]; + }; + findutils = trivialBuilder rec { + inherit (localSystem) system; + name = "findutils"; + ver = "4.7.0"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-gmp" + "--without-libpth-prefix" + ]; + }; + diffutils = trivialBuilder rec { + inherit (localSystem) system; + name = "diffutils"; + ver = "3.7"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-libsigsegv-prefix" + ]; + }; + grep = trivialBuilder rec { + inherit (localSystem) system; + name = "grep"; + ver = "3.4"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--disable-perl-regexp" + "--without-libsegsegv-prefix" + ]; + }; + patch = trivialBuilder rec { + inherit (localSystem) system; + name = "patch"; + ver = "2.7.6"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"; + }; + gawk = trivialBuilder rec { + inherit (localSystem) system; + name = "gawk"; + ver = "5.0.1"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; + configureArgs = [ "--disable-nls" + "--disable-mpfr" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-libsegsegv-prefix" + ]; + }; + cpio = trivialBuilder rec { + inherit (localSystem) system; + name = "cpio"; + ver = "2.13"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "126vyg4a8wcdwh6npgvxy6gq433bzgz3ph37hmjpycc4r7cp0x78"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + sed = trivialBuilder rec { + inherit (localSystem) system; + name = "sed"; + ver = "4.8"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + cacert = fetchURL rec { + url = "https://curl.haxx.se/ca/cacert-2020-01-01.pem"; + sha256 = "07q808n307gzaga93abpf6an7c3rd35p18psdc1dd83lspgp1xxd"; + executable = false; + }; + curl = trivialBuilder rec { + inherit (localSystem) system; + name = "curl"; + ver = "7.68.0"; + url = "https://curl.haxx.se/download/${name}-${ver}.tar.xz"; + sha256 = "0nh3j90w6b97wqcgxjfq55qhkz9s38955fbhwzv2fsi7483j895p"; + configureArgs = [ "--disable-nls" + "--disable-ares" + "--disable-debug" + "--disable-ldap" + "--disable-ldaps" + "--disable-rtsp" + "--disable-dict" + "--disable-telnet" + "--disable-tftp" + "--disable-pop3" + "--disable-imap" + "--disable-smb" + "--disable-smtp" + "--disable-gopher" + "--disable-manual" + "--disable-verbose" + "--disable-sspi" + "--disable-tls-srp" + "--disable-unix-sockets" + "--without-brotli" + "--without-gnutls" + "--without-mbedtls" + "--without-wolfssl" + "--without-bearssl" + "--without-libidn2" + "--without-librtmp" + "--without-nghttp2" + "--with-ssl=/usr" + "--with-ca-bundle=${cacert}" + ]; + }; + bashExe = "${bash}/bin/bash"; +in [ ({}: { @@ -13,11 +172,14 @@ let inherit (localSystem) system; in bootstrapTools = derivation { inherit system; + inherit make bash coreutils findutils + diffutils grep patch gawk cpio sed + curl; name = "trivial-bootstrap-tools"; - builder = "/usr/local/bin/bash"; + builder = bashExe; args = [ ./trivial-bootstrap.sh ]; - + buildInputs = [ make ]; mkdir = "/bin/mkdir"; ln = "/bin/ln"; }; @@ -52,6 +214,8 @@ let inherit (localSystem) system; in (prevStage: { __raw = true; + inherit (prevStage) bootstrapTools; + stdenv = import ../generic { name = "stdenv-freebsd-boot-0"; inherit config; @@ -66,7 +230,7 @@ let inherit (localSystem) system; in (prevStage: { inherit config overlays; - stdenv = import ../generic { + stdenv = import ../generic rec { name = "stdenv-freebsd-boot-3"; inherit config; @@ -75,16 +239,30 @@ let inherit (localSystem) system; in initialPath shell fetchurlBoot; cc = import ../../build-support/cc-wrapper { + inherit lib; nativeTools = true; nativePrefix = "/usr"; nativeLibc = true; stdenvNoCC = prevStage.stdenv; + buildPackages = { + inherit (prevStage) stdenv; + }; cc = { name = "clang-9.9.9"; cc = "/usr"; - outPath = "/usr"; + outPath = prevStage.bootstrapTools; }; isClang = true; + bintools = import ../../build-support/bintools-wrapper { + inherit lib; + stdenvNoCC = prevStage.stdenv; + nativeTools = true; + nativeLibc = true; + propagateDoc = false; + nativePrefix = "/usr"; + bintools = { name = "${name}-binutils"; + outPath = prevStage.bootstrapTools; }; + }; }; preHook = "export NIX_NO_SELF_RPATH=1"; diff --git a/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh index fbff4575e5..34b4dbabc2 100644 --- a/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh +++ b/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-bootstrap.sh @@ -3,9 +3,9 @@ set -o nounset set -o pipefail echo Building the trivial bootstrap environment... -echo -echo Needed FreeBSD packages: -echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils +#echo +#echo Needed FreeBSD packages: +#echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils $mkdir -p $out/bin @@ -28,14 +28,36 @@ ln () { fi } -ln /usr/local/bin/bash +ln $bash/bin/bash +ln $make/bin/make + ln /bin/sh -ln /usr/local/bin/gmake make +for i in b2sum base32 base64 basename basenc cat chcon chgrp chmod \ + chown chroot cksum comm cp csplit cut date dd df dir dircolors \ + dirname du echo env expand expr factor false fmt fold install \ + groups head hostid id join kill link ln logname ls md5sum mkdir \ + mkfifo mknod mktemp mv nice nl nohup nproc numfmt od paste pathchk \ + pinky pr printenv printf ptx pwd readlink realpath rm rmdir runcon \ + seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf \ + sleep sort split stat stdbuf stty sum sync tac tee test timeout \ + touch tr true truncate tsort tty uname unexpand uniq unlink uptime \ + users vdir wc who whoami yes +do + ln "$coreutils/bin/$i" "$i" +done -ln /usr/local/bin/lbzip2 +for i in find xargs; do + ln "$findutils/bin/$i" "$i" +done -ln /usr/local/bin/gdiff diff +for i in diff diff3 sdiff; do + ln "$diffutils/bin/$i" "$i" +done + +for i in grep egrep fgrep; do + ln "$grep/bin/$i" "$i" +done ln /usr/bin/locale @@ -45,160 +67,52 @@ ln /usr/bin/hexdump # for bitcoin ln /usr/bin/bzip2 ln /usr/bin/bunzip2 -ln /usr/bin/bzcat ln /usr/bin/bzip2recover ln /usr/bin/xz ln /usr/bin/unxz -ln /usr/bin/xzcat ln /usr/bin/lzma ln /usr/bin/unlzma -ln /usr/bin/lzcat -ln /usr/local/bin/gcp cp -ln /usr/local/bin/gdd dd -ln /usr/local/bin/gmv mv -ln /usr/local/bin/grm rm -ln /usr/local/bin/gls ls -ln /bin/ps ps -ln /usr/local/bin/gcat cat -ln /usr/local/bin/gecho echo -ln /usr/local/bin/gexpr expr -ln /usr/local/bin/gtest test -ln /usr/local/bin/gdate date -ln /usr/local/bin/gchmod chmod -ln /usr/local/bin/grmdir rmdir -ln /usr/local/bin/gsleep sleep -ln /bin/hostname hostname - -ln /usr/local/bin/gid id -ln /usr/local/bin/god od -ln /usr/local/bin/gtr tr -ln /usr/local/bin/gwc wc -ln /usr/local/bin/gcut cut -ln /usr/bin/cmp cmp -ln /usr/local/bin/gsed sed -ln /usr/local/bin/gtar tar -ln /usr/local/bin/xar xar -ln /usr/local/bin/gawk awk -ln /usr/local/bin/genv env -ln /usr/local/bin/gtee tee -ln /usr/local/bin/gcomm comm -ln /usr/local/bin/gcpio cpio -ln /usr/local/bin/curl curl -ln /usr/local/bin/gfind find -ln /usr/local/bin/grep grep # other grep is in /usr/bin +ln /bin/ps +ln /bin/hostname +ln /usr/bin/cmp +ln $sed/bin/sed +ln /usr/bin/tar tar +ln $gawk/bin/gawk +ln $gawk/bin/gawk awk +ln $cpio/bin/cpio +ln $curl/bin/curl curl ln /usr/bin/gzip ln /usr/bin/gunzip -ln /usr/bin/zcat -ln /usr/local/bin/ghead head ln /usr/bin/tail tail # note that we are not using gtail!!! -ln /usr/local/bin/guniq uniq ln /usr/bin/less less -ln /usr/local/bin/gtrue true -# ln /usr/bin/diff diff # we are using gdiff (see above) -ln /usr/local/bin/egrep egrep -ln /usr/local/bin/fgrep fgrep -ln /usr/local/bin/gpatch patch -ln /usr/local/bin/guname uname -ln /usr/local/bin/gtouch touch -ln /usr/local/bin/gsplit split -ln /usr/local/bin/gxargs xargs +ln $patch/bin/patch patch ln /usr/bin/which which -ln /usr/local/bin/ginstall install -ln /usr/local/bin/gbasename basename -ln /usr/local/bin/gdirname dirname -ln /usr/local/bin/greadlink readlink -ln /usr/local/bin/gln ln -ln /usr/local/bin/gyes yes -ln /usr/local/bin/gwhoami whoami -ln /usr/local/bin/gvdir vdir -ln /usr/local/bin/gusers users -ln /usr/local/bin/guptime uptime -ln /usr/local/bin/gunlink unlink -ln /usr/local/bin/gtty tty -ln /usr/local/bin/gunexpand unexpand -ln /usr/local/bin/gtsort tsort -ln /usr/local/bin/gtruncate truncate -ln /usr/local/bin/gtimeout timeout -ln /usr/local/bin/gtac tac -ln /usr/local/bin/gsync sync -ln /usr/local/bin/gsum sum -ln /usr/local/bin/gstty stty -ln /usr/local/bin/gstdbuf stdbuf -ln /usr/local/bin/gsort sort -ln /usr/local/bin/gruncon runcon -ln /usr/local/bin/gseq seq -ln /usr/local/bin/gsha1sum sha1sum -ln /usr/local/bin/gsha224sum sha224sum -ln /usr/local/bin/gsha256sum sha256sum -ln /usr/local/bin/gsha384sum sha384sum -ln /usr/local/bin/gsha512sum sha512sum -ln /usr/local/bin/gshred shred -ln /usr/local/bin/gshuf shuf -ln /usr/local/bin/grealpath realpath -ln "/usr/local/bin/g[" "[" -ln /usr/local/bin/gbase64 base64 -ln /usr/local/bin/gchcon chcon -ln /usr/local/bin/gchgrp chgrp -ln /usr/local/bin/gchown chown -ln /usr/local/bin/gchroot chroot -ln /usr/local/bin/gcksum cksum -ln /usr/local/bin/gcsplit csplit -ln /usr/local/bin/gdf df -ln /usr/local/bin/gdircolors dircolors -ln /usr/local/bin/gdu du -ln /usr/local/bin/gexpand expand -ln /usr/local/bin/gfactor factor -ln /usr/local/bin/gfalse false -ln /usr/local/bin/gfmt fmt -ln /usr/local/bin/gfold fold -ln /usr/local/bin/ggroups groups -ln /usr/local/bin/ghostid hostid -ln /usr/local/bin/gjoin join -ln /usr/local/bin/gkill kill -ln /usr/local/bin/glink link -ln /usr/local/bin/glogname logname -ln /usr/local/bin/gmd5sum md5sum -ln /usr/local/bin/gmkdir mkdir -ln /usr/local/bin/gmkfifo mkfifo -ln /usr/local/bin/gmknod mknod -ln /usr/local/bin/gmktemp mktemp -ln /usr/local/bin/gnice nice -ln /usr/local/bin/gnl nl -ln /usr/local/bin/gnohup nohup -ln /usr/local/bin/gnproc nproc -ln /usr/local/bin/gnumfmt numfmt -ln /usr/local/bin/gnustat nustat -ln /usr/local/bin/gpaste paste -ln /usr/local/bin/gpathchk pathchk -ln /usr/local/bin/gpinky pinky -ln /usr/local/bin/gpr pr -ln /usr/local/bin/gprintenv printenv -ln /usr/local/bin/gprintf printf -ln /usr/local/bin/gptx ptx -ln /usr/local/bin/gpwd pwd - -# binutils +## binutils # pkg info -l binutils | grep usr/local/bin -ln /usr/local/bin/addr2line -ln /usr/local/bin/ar -ln /usr/local/bin/as -ln /usr/local/bin/c++filt -ln /usr/local/bin/dwp -ln /usr/local/bin/elfedit -ln /usr/local/bin/gprof -ln /usr/local/bin/ld -ln /usr/local/bin/ld.bfd -ln /usr/local/bin/ld.gold -ln /usr/local/bin/nm -ln /usr/local/bin/objcopy -ln /usr/local/bin/objdump -ln /usr/local/bin/ranlib -ln /usr/local/bin/readelf -ln /usr/local/bin/size -ln /usr/local/bin/strings -ln /usr/local/bin/strip +ln /usr/bin/addr2line +ln /usr/bin/ar +ln /usr/bin/as +ln /usr/bin/c++filt +#ln /usr/bin/dwp +#ln /usr/bin/elfedit +ln /usr/bin/gprof +ln /usr/bin/ld +#ln /usr/bin/ld.bfd +#ln /usr/bin/ld.gold +ln /usr/bin/nm +ln /usr/bin/objcopy +ln /usr/bin/objdump +ln /usr/bin/ranlib +ln /usr/bin/readelf +ln /usr/bin/size +ln /usr/bin/strings +ln /usr/bin/strip + +ln /usr/bin/cc +ln /usr/bin/cpp +ln /usr/bin/c++ #pkg info -l llvm37 | grep usr/local/bin diff --git a/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.nix b/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.nix new file mode 100644 index 0000000000..64265081f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.nix @@ -0,0 +1,13 @@ +{ system, name, ver, url, sha256, configureArgs ? [], executable ? false } : + +let fetchURL = import ; + +in derivation { + inherit system configureArgs; + name = "trivial-bootstrap-${name}-${ver}"; + dname = "${name}-${ver}"; + src = fetchURL { + inherit url sha256 executable; + }; + builder = ./trivial-builder.sh; +} diff --git a/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.sh b/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.sh new file mode 100755 index 0000000000..ac5601b5ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/stdenv/freebsd/trivial-builder.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +export PATH=/bin:/sbin:/usr/bin:/usr/sbin + +tar -zxvf $src +cd $dname +mkdir -p $out/bin +./configure --prefix=$out $configureArgs +make +make install diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix index 160ca5d4e0..e170aae737 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -66,7 +66,7 @@ let # {pkgs, ...}: # { # allowUnfree = false; - # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name); + # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "vscode" x.name); # } allowUnfreePredicate = config.allowUnfreePredicate or (x: false); diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix index 52d57a6dec..476fab3eed 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix @@ -152,12 +152,12 @@ let inherit lib config stdenv; }) mkDerivation; - # Slated for deprecation in 21.11 - lib = builtins.trace + # Slated for removal in 21.11 + lib = if config.allowAliases or true then builtins.trace ( "Warning: `stdenv.lib` is deprecated and will be removed in the next release." - + " Please use `pkgs.lib` instead." + + " Please use `lib` instead." + " For more information see https://github.com/NixOS/nixpkgs/issues/108938") - lib; + lib else throw "`stdenv.lib` is a deprecated alias for `lib`"; inherit fetchurlBoot; diff --git a/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix index bb763962ce..b92344bf9c 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { pname = "nx-libs"; - version = "3.5.99.25"; + version = "3.5.99.26"; src = fetchFromGitHub { owner = "ArcticaProject"; repo = "nx-libs"; rev = version; - sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc"; + sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config which diff --git a/third_party/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix b/third_party/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix index c8f3bd52c3..9250a10064 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, libxcb }: +{ lib, stdenv, fetchurl, libxcb, xcbutil, xcb-util-cursor }: stdenv.mkDerivation rec { pname = "wmutils-core"; - version = "1.1"; + version = "1.5"; src = fetchurl { url = "https://github.com/wmutils/core/archive/v${version}.tar.gz"; - sha256 = "0aq95khs154j004b79w9rgm80vpggxfqynha5rckm2cx20d1fa5s"; + sha256 = "0wk39aq2lrnc0wjs8pv3cigw3lwy2qzaw0v61bwknd5wabm25bvj"; }; - buildInputs = [ libxcb ]; + buildInputs = [ libxcb xcbutil xcb-util-cursor ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xsettingsd/SConstruct.patch b/third_party/nixpkgs/pkgs/tools/X11/xsettingsd/SConstruct.patch deleted file mode 100644 index bae8d1efc1..0000000000 --- a/third_party/nixpkgs/pkgs/tools/X11/xsettingsd/SConstruct.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index bebc82e..3e0127b 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -59,6 +59,8 @@ srcs = Split('''\ - ''') - libxsettingsd = env.Library('xsettingsd', srcs) - env['LIBS'] = libxsettingsd -+env['ENV']['PATH'] = os.environ.get('PATH', '') -+env['ENV']['PKG_CONFIG_PATH'] = os.environ.get('PKG_CONFIG_PATH', '') - env.ParseConfig('pkg-config --cflags --libs x11') - - xsettingsd = env.Program('xsettingsd', 'xsettingsd.cc') diff --git a/third_party/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix index 7572e19fbf..0fe260e3db 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix @@ -1,38 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkg-config, libX11 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11 }: stdenv.mkDerivation rec { pname = "xsettingsd"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "derat"; repo = "xsettingsd"; rev = "v${version}"; - sha256 = "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v"; + sha256 = "sha256-CIYshZqJICuL8adKHIN4R6nudaqWOCK2UPrGhsKf9pE="; }; - patches = [ - ./SConstruct.patch - ]; - - nativeBuildInputs = [ scons pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libX11 ]; - buildPhase = '' - scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES - ''; - - installPhase = '' - install -D -t "$out"/bin xsettingsd dump_xsettings - install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 + # we end up with symlinked unit files if we don't move them around ourselves + postFixup = '' + rm -r $out/lib/systemd + mv $out/share/systemd $out/lib ''; meta = with lib; { description = "Provides settings to X11 applications via the XSETTINGS specification"; homepage = "https://github.com/derat/xsettingsd"; license = licenses.bsd3; + maintainers = with maintainers; [ romildo ]; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix index 55c5f86361..234b89f94c 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xwallpaper"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; rev = "v${version}"; - sha256 = "121ai4dc0v65qk12gn9w62ixly8hc8a5qrygkbb82vy8ck4jqxj7"; + sha256 = "sha256-WYtbwMFzvJ0Xr84gGoKSofSSnmb7Qn6ioGMOnQOqdII="; }; preConfigure = "./autogen.sh"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index 614393af8f..2360ef20e1 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.1"; # N.B: if you change this, change botocore to a matching version too + version = "1.19.5"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-8T0zFxR7hLdt2ZZvkshckIO2XNGZIbQuwfeGxqQs7rs="; + sha256 = "sha256-SwYL2ViwazP2MDZbW9cRThvg6jVOMlkfsbpY6QDsjQY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 8913bed39d..89b9682460 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-LVWUfaACdDp9xsuXHysPO/8QMdaDqS+yhP2U9cc4jh4="; + sha256 = "sha256-uriXZ4fEUswSBh9hv122wkAPHOnmt6+AodKkCHAMSh8="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index 1c263a1969..ba6f9d074b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.10"; + version = "4.11"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0s8lbvh2vsqphvspyjyxp5s589gf2wrjpka8v496lf6fv1nsi5s8"; + sha256 = "1pcgxpmiiskq770sn25861dj0z8l24nzc1jbzyql7cxn0w5bnw1x"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index c413934590..afdbbbe945 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e9fdqsv/P3zZdjsdAkwO21txPS1aWd0DuqRQUdr1vX4="; + sha256 = "sha256-OaHsNxrOrPlAwtFDY3Tnx+nOabax98xcGQeNds32iOA="; }; - cargoSha256 = "sha256-ilSDLbPQnmhQcNbtKCpUNmyZY0JUY/Ksg0sj/t7veT0="; + cargoSha256 = "sha256-miOfm1Sw6tIICkT9T2V82cdGG2STo9vuLPWsAN/8wuM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix index 8ed8b0b812..3ed29af25f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssmsh"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "bwhaley"; repo = pname; rev = "v${version}"; - sha256 = "0mgx4q21f6rxih79l0hwgzwafxviz5a33dpvc5k0z172sfw0dmj1"; + sha256 = "sha256-WZ2glv/f4LwTK/G8QdaVRIAHvgGLPLPL8xjAg/kUokQ="; }; - vendorSha256 = "147f02bl3sf073dy2ximbavdcbphdn7djgisla1cyyy4ng6dhf7f"; + vendorSha256 = "sha256-17fmdsfOrOaySPsXofLzz0+vmiemg9MbnWhRoZ67EuQ="; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index 309bf4803f..3d91847a9a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.5"; + version = "1.5.9"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "0r0szzw3xl9cn5vcqgn6sc4wbk2j17r1rhg14qgix835lzp9wpdv"; + sha256 = "sha256-fR4MFEytYZA4zt4WFGnEp9YDCtX6peQoI+NynqyReT8="; }; - vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r"; + vendorSha256 = "sha256-GQACtHTid1Aq5iSQqks10hmGS+VUlwNoM1LG+liynhU="; subPackages = [ "cmd/stripe" diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 0a4bf934d8..d2d2a138d6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "11fd32qb69g23lxrynsnfy8a783sl60rzknvq4shdg41p2ikigdk"; + sha256 = "sha256-E/tPjVc+XLDCFYzloAipwWjB4I86kAe/6NVoJSCrY2M="; }; - vendorSha256 = "09birwc8x90l2y0znf4fwny3phnmq0cz0l2z3xzwg0j3msrdl2np"; + vendorSha256 = "sha256-YoQF0Eug747LhsR3V0IplwXgm0ndDqK1pUVjguOhjOU="; subPackages = [ "cmd/trivy" ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpdas/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpdas/default.nix index 255d28b62b..8b12b6fc16 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpdas/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpdas/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, mpd_clientlib, curl }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libmpdclient +, curl +}: stdenv.mkDerivation rec { pname = "mpdas"; @@ -13,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mpd_clientlib curl ]; + buildInputs = [ libmpdclient curl ]; makeFlags = [ "CONFIG=/etc" "DESTDIR=" "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix index 1fa0d155a3..afb1c9a3dc 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix @@ -1,5 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, libdaemon -, mpd_clientlib, curl, sqlite, bundlerEnv, libnotify, pandoc }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, glib +, libdaemon +, libmpdclient +, curl +, sqlite +, bundlerEnv +, libnotify +, pandoc +}: let gemEnv = bundlerEnv { @@ -7,8 +21,8 @@ let gemdir = ./.; }; in stdenv.mkDerivation { - version = "20161228"; pname = "mpdcron"; + version = "20161228"; src = fetchFromGitHub { owner = "alip"; @@ -17,21 +31,33 @@ in stdenv.mkDerivation { sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw"; }; - meta = with lib; { - description = "A cron like daemon for mpd"; - homepage = "http://alip.github.io/mpdcron/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ lovek323 manveru ]; - }; - - buildInputs = - [ autoconf automake libtool pkg-config glib libdaemon pandoc - mpd_clientlib curl sqlite gemEnv.wrappedRuby libnotify ]; + buildInputs = [ + autoconf + automake + libtool + pkg-config + glib + libdaemon + pandoc + libmpdclient + curl + sqlite + gemEnv.wrappedRuby + libnotify + ]; preConfigure = '' ./autogen.sh ''; configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ]; + + meta = with lib; { + description = "A cron like daemon for mpd"; + homepage = "http://alip.github.io/mpdcron/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ lovek323 manveru ]; + }; } +# TODO: autoreconfHook this diff --git a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix index 3d9772de40..f35c7a44b5 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "JmBTwI/wUEytkhu0SYbTX6/dDQG6xvN2odEYTVpztok="; + sha256 = "sha256-Lr2c24hZU8A/Cd8xGA7rfqga67ghz0XJ/cs/z/hSlPU="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/third_party/nixpkgs/pkgs/tools/backup/dump/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dump/default.nix index a709d84a61..75a449a127 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/dump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/dump/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "dump"; - version = "0.4b46"; + version = "0.4b47"; src = fetchurl { url = "mirror://sourceforge/dump/dump-${version}.tar.gz"; - sha256 = "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0"; + sha256 = "sha256-0CGs3k+77T2T662YFCL2cfSNZrKeyI196DZC7Pv/T9A="; }; buildInputs = [ e2fsprogs pkg-config ncurses readline ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix b/third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix index 0f79811f96..438e169d23 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix @@ -1,7 +1,7 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.5"; + name = "ncompress-4.2.4.6"; builder = ./builder.sh; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm"; + sha256 = "0sw3c7h80v9pagfqfx16ws9w2y3yrajrdk54bgiwdm0b0q06lyzv"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch b/third_party/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch index 49aa4e65c7..b61b1272f8 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch +++ b/third_party/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch @@ -1,25 +1,6 @@ diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def --- ncompress-4.2.4.2.orig/Makefile.def 2007-09-06 22:28:42.000000000 -0500 +++ ncompress-4.2.4.2/Makefile.def 2009-08-18 12:30:53.000000000 -0500 -@@ -3,14 +3,16 @@ - # C complier - #CC=cc - -+PREFIX=/usr/local -+ - # Install prefix - DESTDIR= - - # Install directory for binarys --BINDIR=/usr/local/bin -+BINDIR=$(PREFIX)/bin - - # Install directory for manual --MANDIR=/usr/local/man/man1 -+MANDIR=$(PREFIX)/man/man1 - - # compiler options: - # options is a collection of: @@ -31,7 +33,7 @@ # -DDEF_ERRNO=1 Define error (not defined in errno.h). # -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286. diff --git a/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix index 7517e599e7..a4cdcc0854 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, zlib, util-linux }: let name = "pigz"; - version = "2.4"; + version = "2.6"; in stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; - sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; + sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index ce6c125814..61cc457369 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -9,7 +9,7 @@ , babeltrace, gperf , gtest , cunit, snappy -, makeWrapper +, rocksdb, makeWrapper , leveldb, oathToolkit , libnl, libcap_ng , rdkafka @@ -146,7 +146,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka + snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 @@ -176,6 +176,7 @@ in rec { "-DWITH_SYSTEM_BOOST=ON" + "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_SYSTEM_GTEST=ON" "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" "-DWITH_SYSTEMD=OFF" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index ffe716dcee..154b000666 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -71,5 +71,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.eelco ]; + # imager.c:70:2: error: unknown type name 'loff_t'; did you mean 'off_t'? + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix index a3056a80aa..ddd37387fa 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rar2fs"; - version = "1.29.2"; + version = "1.29.4"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "0j7ai0gcbln2lyfc87xxmj0zpf3lnqa6fdm5rar3kdqhczb7s93y"; + sha256 = "sha256-O14KuzngzsGazvwz3FCPe0SplO8I6CPJjpCLBPcZq6k="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 593004d552..322f57fdca 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "120x2hlbhpm90bzxz70z764552ffrjpidmp1y6gafx70zp0hrks4"; + sha256 = "04zvpws1nk3r2kr1k5in9di9fhn4zzciyndgnxnijmhiqpyrx072"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix index 526300f2dd..de86622126 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-sB8W5n3FvRAB9ygFg63NecSZgUw8FGk4pzviIbRF2vk="; + sha256 = "sha256-dBgDIS6U2iKzyo5nO0NOD488zfEbaZJH7luJN6khrnc="; }; - cargoSha256 = "sha256-0cFk1GnEJxMfY9GvQTdI5tkgtxGkH3ZQFTloo4/C+sY="; + cargoSha256 = "sha256-/i5ZBCWFlhoheHsCI5f9yJ7sa6l/DB4AJckq5orinwI="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix index 07d4d1dd30..92956aa53e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.4"; + version = "2.9.5"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr"; + sha256 = "sha256-KV/Ti6mPW+FASjug6q8Qfgra8L/TIyl/Y6JwANzQreE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix index c4b8622f47..75e69a5d49 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,64 +1,58 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, python36 -, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase -, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core -, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre -, bison, flex, libpthreadstubs, libX11 -, embree2, makeWrapper, gsettings-desktop-schemas, glib -, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp, rocm-opencl-runtime -}: +{ lib, config, stdenv, fetchFromGitHub, symlinkJoin, wrapGAppsHook, cmake, boost172 +, pkg-config, flex, bison, libpng, libtiff, zlib, python3, embree, openexr +, openimagedenoise, openimageio, tbb, c-blosc, gtk3, pcre, doxygen +# OpenCL Support +, withOpenCL ? true, ocl-icd +# Cuda Support +, withCuda ? config.cudaSupport or false, cudatoolkit }: let - python = python36; + boostWithPython = boost172.override { + enablePython = true; + enableNumpy = true; + python = python3; + }; - boost_static = boost165.override { - inherit python; - enableStatic = true; - enablePython = true; - }; + # Requires a version number like "" + pythonVersion = (lib.versions.major python3.version) + + (lib.versions.minor python3.version); - version = "2.0"; - sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; - -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "luxcorerender"; - inherit version; + version = "2.4"; src = fetchFromGitHub { owner = "LuxCoreRender"; repo = "LuxCore"; rev = "luxcorerender_v${version}"; - inherit sha256; + sha256 = "0xvivw79719fa1q762b76nyvzawfd3hmp8y5j04bax8a7f8mfa9k"; }; - nativeBuildInputs = [ cmake flex bison doxygen makeWrapper pkg-config ]; - buildInputs = [ - embree2 zlib boost_static libjpeg - libtiff libpng ilmbase freetype openexr openimageio - tbb qt5.full c-blosc libGLU pcre - libX11 libpthreadstubs python libXdmcp libxkbcommon - epoxy at-spi2-core dbus - # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk3 - # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme - (lib.getLib dconf) - ] ++ lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ]; + nativeBuildInputs = [ pkg-config cmake flex bison doxygen wrapGAppsHook ]; - cmakeFlags = [ - "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" - "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" - "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" - "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" - "-DPYTHON_LIBRARY=${python}/lib/libpython3.so" - "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.pythonVersion}" - "-DEMBREE_INCLUDE_PATH=${embree2}/include" - "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" - "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" - ] ++ lib.optional withOpenCL - "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; + buildInputs = [ + libpng + libtiff + zlib + boostWithPython.dev + python3 + embree + openexr + openimagedenoise + tbb + c-blosc + gtk3 + pcre + openimageio.dev + openimageio.out + ] ++ lib.optionals withOpenCL [ ocl-icd ] + ++ lib.optionals withCuda [ cudatoolkit ]; + + cmakeFlags = [ "-DPYTHON_V=${pythonVersion}" ] + ++ lib.optional (!withOpenCL) "-DLUXRAYS_DISABLE_OPENCL=1" + ++ lib.optional (!withCuda) "-DLUXRAYS_DISABLE_CUDA=1"; preConfigure = '' - NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}" NIX_LDFLAGS+=" -lpython3" ''; @@ -69,13 +63,6 @@ in stdenv.mkDerivation { cp -va lib/* $out/lib ''; - preFixup = '' - wrapProgram "$out/bin/luxcoreui" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ - --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" - ''; - meta = with lib; { description = "Open source, physically based, unbiased rendering engine"; homepage = "https://luxcorerender.org/"; @@ -85,7 +72,6 @@ in stdenv.mkDerivation { }; } - # TODO (might not be necessary): # # luxcoreui still gives warnings like: "failed to commit changes to diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix index 7fba539977..579dcad4cc 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "pngcheck-2.3.0"; + name = "pngcheck-3.0.2"; src = fetchurl { url = "mirror://sourceforge/png-mng/${name}.tar.gz"; - sha256 = "0pzkj1bb4kdybk6vbfq9s0wzdm5szmrgixkas3xmbpv4mhws1w3p"; + sha256 = "sha256-DX4mLyQRb93yhHqM61yS2fXybvtC6f/2PsK7dnYTHKc="; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix index 2fd56d0737..aa525abacb 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "scrot"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "12xq6glg70icwsvbnfw9gm4dahlbnrc7b6adpd0mpf89h4sj2gds"; + sha256 = "sha256-4vguodLnCj0sOBLM4oJXTfX1p8hIo3WTwIuViPtZxHQ="; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix index dd6ecb473e..20dfe15dc6 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libav, libxslt }: +{ lib, stdenv, fetchurl, pkg-config, ffmpeg, libxslt }: stdenv.mkDerivation rec { pname = "unpaper"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libav libxslt ]; + buildInputs = [ ffmpeg libxslt ]; meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 9b29e114b8..333c4848db 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.10.2"; + version = "8.10.5"; outputs = [ "bin" "out" "man" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "1psi39a4h0awwbyizbsk467z0djwq0rh8hvkklbsd5b92m7768sp"; + sha256 = "sha256-h21Ep6f4/y+m0kdrCA5dcULFeOOyLtMx2etAziG6f9Y="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix index 39b12326e8..39aa8fe06e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix @@ -2,18 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1q248jnbv64mkvg18465dpvjkw2v2hfqyvdvdixyrwyrnlv5cicv"; + sha256 = "1n1qwlh1zinq5ngx04cvs69z8zr12yywr70vbrc946kbh4hx6pk9"; }; - # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 + + # tests need an interactive terminal doCheck = false; - cargoSha256 = "18rskn8fchlgk295yk8sc2g1x6h43rmhqif871hgzdx1i35sbajr"; + cargoSha256 = "0bdjfcyx2cwz68gcx0393h4ysccarfp02pvvp0a5xgkq11bad0r0"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 3f42894ef9..0daeaa794c 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -7,6 +7,7 @@ , gobject-introspection , gtk2 , gtk3 +, gtk4 , pcre , libuuid , libselinux @@ -36,12 +37,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" - # disabled since we currently don't have gtk4 in nixpkgs - "-DENABLE_GTK4_IM_MODULE=off" ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; buildInputs = [ gtk3 + gtk4 gobject-introspection fcitx5 pcre diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 8b53092194..b51efc2cb8 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ibus-libpinyin"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; rev = version; - sha256 = "0b8rilk9zil9gvfhlk3rphcby6ph11dw66j175wp0na6h6hjlaf2"; + sha256 = "sha256-fEEiwRoGGFAki1DMQvGuzjz2NAjhExyH11l8KTwjjsI="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { isIbusEngine = true; description = "IBus interface to the libpinyin input method"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 07ab09b8e6..8fbd925448 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "0lb2vcnkzy64474j7306ydyw1ali0qbx07sxfms2fqv1nmh161i2"; + sha256 = "sha256-kPTysHTC+j8BMnzsddRa4Tg54idejApTqmLrP20pu5M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index a7a640b2c6..00a499fb10 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.9.25"; + version = "1.12.3"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "0v570qpnb2q79aqr9f0xnska34y7hw34ibiwsf7ybcw69fhi1zkg"; + sha256 = "sha256-iVbct7p+i8ifSQzOFUUnJU0RHX36cFiTlv7p79iawj8="; }; postPatch = '' @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { -e "/export IBUS_LOCALEDIR=/ s/^.$//" \ -i "setup/ibus-setup-table.in" substituteInPlace engine/tabcreatedb.py --replace '/usr/share/ibus-table' $out/share/ibus-table + substituteInPlace engine/ibus_table_location.py \ + --replace '/usr/libexec' $out/libexec \ + --replace '/usr/share/ibus-table/' $out/share/ibus-table/ ''; buildInputs = [ @@ -34,6 +37,7 @@ stdenv.mkDerivation rec { gtk3 ibus (python3.withPackages (pypkgs: with pypkgs; [ + dbus-python pygobject3 (toPythonModule ibus) ])) diff --git a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix index a671090460..e79774da91 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.35.1"; + version = "3.2.36"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "s2wnwcdrcJLG5NhugSkntBCYfPuv3T/9+PclbmK0BJ4="; + sha256 = "sha256-pgA0mRglIBObNNUQIozNy6EvJQSmHRF+kN4EjqL4tt4="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 48d8b7c893..dc1a49a40b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-S1bnzuOZGQLdVJUH+A29KxF84dj2OeLJ4XajfTDdjUY="; + sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA="; }; - vendorSha256 = "sha256-X1h0EcUf8MWt929huNjt0WnhFqhVZu07JGi7c5hdXoY="; + vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix index 3f2218ac87..67249d7645 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2020-08-06"; + version = "unstable-2021-01-31"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "9f99bec1f0293e84d6d8a990a1940c1422e3b0ce"; - sha256 = "1n4lgzsgg4502zh113d7pb1hw6bykqx6vpfp8j08z7y5clmdiwa6"; + rev = "01e579176981356fb90d4aa58fea2d6c273a45a5"; + sha256 = "0d98v67ajsc80i962myh0j4ph7bn3csk8y9jf8b5rfqd1zg737hb"; }; # Fix ".cht.sh-wrapped" in the help message @@ -36,7 +36,9 @@ stdenv.mkDerivation { --prefix PATH : "${lib.makeBinPath [ curl rlwrap ncurses xsel ]}" ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/chubin/cheat.sh.git"; + }; meta = with lib; { description = "CLI client for cheat.sh, a community driven cheat sheet"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix index 6dad6173ed..dfad9569d2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1arllkiz1hk12hq5b2zpg3f8i9lxl66mil5sdv8gnhflmb37vbv3"; - buildFlagsArray = [ "-ldflags=-X main.GitSha=${src.rev}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.GitSha=${src.rev}" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix index 4808fe3ef5..462fc51b28 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc"; + sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8="; }; - cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww"; + cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s="; meta = with lib; { description = "A high performance code minimap render"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix index 604ba0cbf7..41f2bede99 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix @@ -1,21 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 -, pciutils, pkg-config, gtk2, ddccontrol-db -, makeDesktopItem +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, intltool +, libxml2 +, pciutils +, pkg-config +, gtk2 +, ddccontrol-db }: -let version = "0.4.4"; in stdenv.mkDerivation rec { pname = "ddccontrol"; - inherit version; + version = "0.5.1"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = "0.4.4"; - sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2"; + rev = "0.5.1"; + sha256 = "sha256-e6Rzzz5S+Um2ZBuUkfAJQA4V+zqCqsUHB0f1t/dTU2w="; }; - nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + intltool + pkg-config + ]; buildInputs = [ libxml2 @@ -24,8 +34,6 @@ stdenv.mkDerivation rec { ddccontrol-db ]; - hardeningDisable = [ "format" "bindnow" ]; - prePatch = '' oldPath="\$""{datadir}/ddccontrol-db" newPath="${ddccontrol-db}/share/ddccontrol-db" @@ -37,29 +45,11 @@ stdenv.mkDerivation rec { intltoolize --force ''; - postInstall = '' - mkdir -p $out/share/applications/ - cp $desktopItem/share/applications/* $out/share/applications/ - for entry in $out/share/applications/*.desktop; do - substituteAllInPlace $entry - done - ''; - - desktopItem = makeDesktopItem { - name = "gddccontrol"; - desktopName = "gddccontrol"; - genericName = "DDC/CI control"; - comment = meta.description; - exec = "@out@/bin/gddccontrol"; - icon = "gddccontrol"; - categories = "Settings;HardwareSettings;"; - }; - meta = with lib; { description = "A program used to control monitor parameters by software"; homepage = "https://github.com/ddccontrol/ddccontrol"; - license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ lib.maintainers.pakhfn ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with lib.maintainers; [ pakhfn ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 4f519d6858..1e2efc7f9c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "0.9.9"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1ppiddnrvkbb9iir28kl9hzpww0hpgb05jfxzf07xsqkdfb4qv71"; + sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 2d7715274b..9437ef12f4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man +{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R @@ -16,18 +16,17 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "163"; + version = "166"; src = fetchurl { - url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-pCAOMRZ3sn1jhdT5RuIZoMR1e6GEYJYyd4mZt7+0lWE="; + url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; + sha256 = "sha256-6VhHG3MxmIczolOYqU4D1m00h8w2n0ku4dy/dFEYqk0="; }; outputs = [ "out" "man" ]; patches = [ ./ignore_links.patch - ./skip-failing-test.patch ]; postPatch = '' @@ -38,7 +37,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace doc/Makefile --replace "../bin" "$out/bin" ''; - nativeBuildInputs = [ docutils help2man ]; + nativeBuildInputs = [ docutils help2man installShellFiles ]; # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh @@ -60,14 +59,19 @@ python3Packages.buildPythonApplication rec { hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt ] ++ (with python3Packages; [ binwalk guestfs h5py ])); - checkInputs = with python3Packages; [ pytest ] ++ pythonPath; + checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; postInstall = '' make -C doc - mkdir -p $out/share/man/man1 - cp doc/diffoscope.1 $out/share/man/man1/diffoscope.1 + installManPage doc/diffoscope.1 ''; + # Disable flaky test and a failing one + disabledTests = [ + "test_android_manifest" + "test_sbin_added_to_path" + ]; + meta = with lib; { description = "Perform in-depth comparison of files, archives, and directories"; longDescription = '' @@ -80,9 +84,9 @@ python3Packages.buildPythonApplication rec { diffoscope is developed as part of the "reproducible builds" Debian project and was formerly known as "debbindiff". ''; - homepage = "https://diffoscope.org/"; - license = licenses.gpl3Plus; + homepage = "https://diffoscope.org/"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ dezgeg ma27 danielfullmer ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch deleted file mode 100644 index bf871d295b..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/test_tools.py b/tests/test_tools.py -index f0010678..1c3c7ce1 100644 ---- a/tests/test_tools.py -+++ b/tests/test_tools.py -@@ -21,6 +21,7 @@ import os - import pytest - - -+@pytest.mark.skip() - def test_sbin_added_to_path(): - from diffoscope.tools import tool_required - diff --git a/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix index b848306811..a56107ebce 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-ls"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mayflower"; repo = "docker-ls"; rev = "v${version}"; - sha256 = "sha256-VyVrCBdIZAQ+p0leD6i4sMxD4p6nEXG9Si+nJGdUQPM="; + sha256 = "sha256-4+REt0NH4S367qFsyJncVedUrC4t1zw5o0CLTiQfIz8="; }; vendorSha256 = "sha256-UulcjQOLEIP++eoYQTEIbCJW51jyE312dMxB8+AKcdU="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix index ed8a11e182..ee3573f9f4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -2,26 +2,24 @@ buildGoModule rec { pname = "duf"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "0n0nvrqrlr75dmf2j6ja615ighzs35cfixn7z9cwdz3vhj1xhc5f"; + sha256 = "sha256-Wm3gfir6blQFLLi+2bT5Y/5tf7qUxEddJQ7tCYfBGgM="; }; - dontStrip = true; + vendorSha256 = "0icxy6wbqjqawr6i5skwp1z37fq303p8f95crd8lwn6pjjiqzk4i"; - vendorSha256 = "1jqilfsirj7bkhzywimzf98w2b4s777phb06nsw6lr3bi6nnwzr1"; - - buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ petabyteboy penguwin ]; + maintainers = with maintainers; [ petabyteboy penguwin SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix index 7997f2119a..781ee30deb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -8,11 +8,11 @@ rustPlatform.buildRustPackage rec { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-JwGa1icwV1yqxy90Psd9bzM7VzM7HPA6kONkI3Y745Q="; + sha256 = "1knl7kwngmq598bnlvlq9x8sqp914sv1abfm55kw9f7mja2d6pw0"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' - rm -rf $out/src/test_dir3/ + rm -r $out/tests/test_dir_unicode/ ''; }; @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; - maintainers = [ maintainers.infinisil ]; + maintainers = with maintainers; [ infinisil SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/edir/default.nix b/third_party/nixpkgs/pkgs/tools/misc/edir/default.nix new file mode 100644 index 0000000000..7cd621be76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/edir/default.nix @@ -0,0 +1,19 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "edir"; + version = "2.7.3"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "06nsy9ikljc437368l38hsw75whacn3j6jwmdgg766q61pnifhkp"; + }; + + meta = with lib; { + description = "Program to rename and remove files and directories using your editor"; + homepage = "https://github.com/bulletmark/edir"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ guyonvarch ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix index 83aa6c505d..f275d25467 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib -, darwin, libiconv, installShellFiles +, Security, libiconv, installShellFiles }: with rustPlatform; @@ -28,9 +28,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ - libiconv darwin.apple_sdk.frameworks.Security ] - ; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix index 6e8bb7fd96..12e63686d5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }: stdenv.mkDerivation rec { - version = "5.45.4"; pname = "expect"; + version = "5.45.4"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for automating interactive applications"; homepage = "http://expect.sourceforge.net/"; - license = "Expect"; + license = licenses.publicDomain; platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix index d6b0c84b61..17e67c0bc7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0hil3mvrwpwy60x9s16bf8vgvfv11sdarcbk45zjlgjzfhh8h2qr"; + sha256 = "sha256-SdmcyOgK8k07pkjOVWLbNj36ktJnkQWJ8ObPiMgcMYk="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 6611b3e921..febaa4415a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.155.0"; + version = "0.155.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wVHBcxbrU6WvBAegQYDRDvLbuoU49/Cm19ujghNyi2A="; + sha256 = "sha256-eVRsDyPlUvVhEnN8aJW8vPw4UqvK2/6pblgnwH2RhkY="; }; - vendorSha256 = "sha256-k4TphR8z3DtoqJm6o6QILvQ1rHIldi1BpQJbEyWKv9U="; + vendorSha256 = "sha256-VFFwp+n13NL3YpzdWPVzgrH8d4BQHffwpRXvYn9MSaQ="; buildFlagsArray = [ "-ldflags=" diff --git a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix index fca9cecc01..d58661babc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , rustPlatform -, darwin +, Security , libiconv }: @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs"; }; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; doInstallCheck = true; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix index 6a6af1391b..e5f3afb03d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix @@ -1,20 +1,19 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , upx }: -let - version = "20202807"; +stdenv.mkDerivation rec { pname = "hdl-dump"; -in stdenv.mkDerivation { - inherit pname version; + version = "20202807"; # Using AkuHAK's repo because playstation2's repo is outdated src = fetchFromGitHub { owner = "AKuHAK"; repo = pname; - rev = "be37e112a44772a1341c867dc3dfee7381ce9e59"; - sha256 = "0akxak6hm11h8z6jczxgr795s4a8czspwnhl3swqxp803dvjdx41"; + rev = "0c98b235c83c0fca1da93648f05ea5f940a4aee0"; + sha256 = "1s3wflqjjlcslpa9n5chr8dbamhmfk88885dzw68apz4vf6g27iq"; }; buildInputs = [ upx ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/iotools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/iotools/default.nix new file mode 100644 index 0000000000..12411aac6c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/iotools/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "iotools"; + version = "unstable-2017-12-11"; + + src = fetchFromGitHub { + owner = "adurbin"; + repo = pname; + rev = "18949fdc4dedb1da3f51ee83a582b112fb9f2c71"; + sha256 = "0vymnah44d5bzsjhfmxkcrlrikkp0db22k7a1s8bknz7glk9fldn"; + }; + + makeFlags = [ "DEBUG=0" "STATIC=0" ]; + + installPhase = '' + install -Dm755 iotools -t $out/bin + ''; + + meta = with lib; { + description = "Set of simple command line tools which allow access to + hardware device registers"; + longDescription = '' + Provides a set of simple command line tools which allow access to + hardware device registers. Supported register interfaces include PCI, + IO, memory mapped IO, SMBus, CPUID, and MSR. Also included are some + utilities which allow for simple arithmetic, logical, and other + operations. + ''; + homepage = "https://github.com/adurbin/iotools"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ felixsinger ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix index 4f13d0a17a..c42abee5e2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1f6qv701c4c9s4hliha7kp8wraq4jfx1jdk86ii10akkm07fkdlz"; + sha256 = "sha256-1gx3rStqIxLt/iRgpdp5z7tX1/wA0miZ1y5WTeGQ1Vs="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/third_party/nixpkgs/pkgs/tools/misc/jstest-gtk/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jstest-gtk/default.nix new file mode 100644 index 0000000000..6824753c73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/jstest-gtk/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, gtkmm3, libsigcxx, xorg }: + +stdenv.mkDerivation rec { + pname = "jstest-gtk"; + version = "2018-07-10"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = "62f6e2d7d44620e503149510c428df9e004c9f3b"; + sha256 = "0icbbhrj5aqljhiavdy3hic60vp0zzfzyg0d6vpjaqkbzd5pv9d8"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtkmm3 libsigcxx xorg.libX11 ]; + + meta = with lib; { + description = "A simple joystick tester based on Gtk+"; + longDescription = '' + It provides you with a list of attached joysticks, a way to display which + buttons and axis are pressed, a way to remap axis and buttons and a way + to calibrate your joystick. + ''; + homepage = "https://jstest-gtk.gitlab.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix index 8f41499ca0..a9c7365253 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix @@ -2,20 +2,21 @@ buildGoPackage rec { pname = "lnch"; - version = "2017-02-16"; + version = "unstable-2021-02-10"; goPackagePath = "github.com/oem/${pname}"; src = fetchFromGitHub { owner = "oem"; repo = pname; - rev = "f24eed5392f01d2c8a9cfe9cdf70dcfbbf4b6b36"; - sha256 = "0skzrjnbxq1yj7y64cq7angp4wqnrgw1xp9v8vw9zp8f8zwmpy0y"; + rev = "6ed336dd893afa071178b8ac6f6297d23fc55514"; + sha256 = "K2TV+mx6C3/REJyDpC6a/Zn/ZZFxkDMC3EnkveH6YNQ="; }; meta = with lib; { homepage = "https://github.com/oem/lnch"; - description = "A small go app that launches a process and moves it out of the process group"; - license = licenses.publicDomain; # really I don't know + description = "Launches a process and moves it out of the process group"; + license = licenses.mit; + platforms = with platforms; all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix index 182e844eb8..fce376bb32 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix @@ -1,22 +1,38 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, boost, libgcrypt, systemd, mpd_clientlib, curl }: +{ lib +, stdenv +, fetchurl +, pkg-config +, meson +, ninja +, boost +, curl +, libgcrypt +, libmpdclient +, systemd +}: stdenv.mkDerivation rec { pname = "mpdscribble"; version = "0.23"; src = fetchurl { - url = - "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"; + url = "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"; sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53"; }; - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ]; + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + libmpdclient + curl + boost + libgcrypt + systemd + ]; meta = with lib; { - description = "A Music Player Daemon (MPD) client which submits information about tracks being played to a scrobbler (e.g. last.fm)"; + description = "A MPD client which submits info about tracks being played to a scrobbler"; homepage = "https://www.musicpd.org/clients/mpdscribble/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.sohalt ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix index 6297e61312..783f93daab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mysqltuner"; - version = "1.7.17"; + version = "1.7.21"; src = fetchFromGitHub { owner = "major"; repo = "MySQLTuner-perl"; rev = version; - sha256 = "0wjdqraa6r6kd6rsgrn177dq6xsnnr1sgnbs9whknjbs4fn3wwl5"; + sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0="; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 12cd999077..5dab204497 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -14,8 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-TqWe4eARQmmWcwnvb6BIZrzGeKMpiIObPv0cW1JvWj4="; - buildInputs = with stdenv; - lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; meta = with lib; { description = "Git repository summary on your terminal"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix b/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix index 922ef65be2..ef464e7b75 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "oppai-ng"; - version = "3.3.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Francesco149"; repo = pname; rev = version; - sha256 = "0ymprwyv92pr58851wzryymhfznnpwcbg4m1yri0c9cyzvabwmfk"; + sha256 = "sha256-fUtyQaHcNBmDs1BPbFGieKY/CFyETqBxYzzIXSERFJY="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix index e7a5d38a91..cb3e8bd057 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9"; + sha256 = "sha256-JV8ch4us7HDDAg/1qcsPa9hhygAJ8kYI31729i1SQ8A="; }; nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix index b5675f8287..0b300b079d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pcb2gcode"; - version = "2.1.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "pcb2gcode"; repo = "pcb2gcode"; rev = "v${version}"; - sha256 = "0nzglcyh6ban27cc73j4l7w7r9k38qivq0jz8iwnci02pfalw4ry"; + sha256 = "sha256-GSLWpLp/InAxVolKmBIjljpe3ZzmS/87TWKwzax5SkY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix index da69d5a8b9..348670c3bb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.2.0"; + version = "10.2.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-eoKHgbSyOEkwzki5wWuZlOAmZljxOMXcztA/g8TtutQ="; + sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg="; }; buildInputs = [ php ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/piston-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/piston-cli/default.nix new file mode 100644 index 0000000000..bf9c7c9096 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/piston-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "piston-cli"; + version = "1.2.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "bf0hhKb+6+07HhrkFrsWCnUQfsQWOdK/dPTlt9iZTno="; + }; + + propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ]; + + checkPhase = '' + $out/bin/piston --help > /dev/null + ''; + + meta = with lib; { + description = "Piston api tool"; + homepage = "https://github.com/Shivansh-007/piston-cli"; + license = licenses.mit; + maintainers = with maintainers; [ ethancedwards8 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 0355c65ac6..eb267e6007 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.0"; + version = "1.2021.1"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-QERrsTB8GO+B8DZkl1Ruru9Bw+uL9ojQbJ321sbqIws="; + sha256 = "sha256-FOM+hao1lx6EJMccbhLzvVVmCR3F/igHTGN1vhhdmdQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index 9d95085296..0e094a4b2a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.8"; + version = "2021.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1iyl6bjkj3drlwds579bh25xcmlwj9lkkbdmcdanq5b3shbmpyhi"; + sha256 = "sha256-1GpM7IW27MgbXG6iVo5qnWaotwN1GgcXf7dFGRF8s0w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix index dbfb5fb1cf..1d1ed78b2f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -5,25 +5,24 @@ stdenv.mkDerivation rec { pname = "smenu"; src = fetchFromGitHub { - owner = "p-gen"; - repo = "smenu"; - rev = "v${version}"; + owner = "p-gen"; + repo = "smenu"; + rev = "v${version}"; sha256 = "1p8y1fgrfb7jxmv5ycvvnqaz7ghdi50paisgzk71169fqwp1crfa"; }; buildInputs = [ ncurses ]; meta = with lib; { - homepage = "https://github.com/p-gen/smenu"; - description = "Terminal selection utility"; + homepage = "https://github.com/p-gen/smenu"; + description = "Terminal selection utility"; longDescription = '' Terminal utility that allows you to use words coming from the standard input to create a nice selection window just below the cursor. Once done, your selection will be sent to standard output. ''; - license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.unix; + license = licenses.gpl2Only; + maintainers = with maintainers; [ matthiasbeyer SuperSandro2000 ]; + platforms = platforms.unix; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix index d26c750a0c..ff6a22cef8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six -, pytest, pytest-mock +, go, mock, pytestCheckHook, pytest-mock }: buildPythonApplication rec { @@ -16,22 +16,12 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorama decorator psutil pyte six ]; - checkInputs = [ pytest pytest-mock ]; - - checkPhase = '' - export HOME=$TMPDIR - export LANG=en_US.UTF-8 - export XDG_CACHE_HOME=$TMPDIR/cache - export XDG_CONFIG_HOME=$TMPDIR/config - py.test - ''; - - doCheck = false; # The above is only enough for tests to pass outside the sandbox. + checkInputs = [ go mock pytestCheckHook pytest-mock ]; meta = with lib; { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ma27 SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 6a21bc5678..2fb41edaa7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.0.2"; + version = "6.4.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1pqf7rs9b8j54rwg8i8alvf65c4jfp5q2hv3yr60aiidfjrawp34"; + sha256 = "sha256-xrp2oGqJRhjYYZ0dDvYiUfgKM2mazOAlkJQyawDk2y4="; }; - cargoSha256 = "1wh7xywp92h3in9a2nr6sia6l3852kw4s688sr1c2wjdf2i58lsg"; + cargoSha256 = "sha256-EK48mrTYgh0AgC53rvVRFfdZP/FS9LOZWr8TF13qEl0="; buildInputs = lib.optional stdenv.isDarwin Foundation; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Upgrade all the things"; homepage = "https://github.com/r-darwish/topgrade"; - license = licenses.gpl3; - maintainers = with maintainers; [ Br1ght0ne hugoreeves ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Br1ght0ne hugoreeves SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttwatch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ttwatch/default.nix index 5e54134541..ecfc40bdf6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ttwatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ttwatch/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "ttwatch"; - version = "2020-02-05"; + version = "2020-06-24"; src = fetchFromGitHub { owner = "ryanbinns"; repo = "ttwatch"; - rev = "bfdf1372515574e1fb3871dc1039f8d8a5dbdada"; - sha256 = "07nd4dbkchxy8js1h1f6pzn63pls2afww97wyiiw6zid43mpqyg4"; + rev = "260aff5869fd577d788d86b546399353d9ff72c1"; + sha256 = "0yd2hs9d03gfvwm1vywpg2qga6x5c74zrj665wf9aa8gmn96hv8r"; }; nativeBuildInputs = [ cmake perl pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix new file mode 100644 index 0000000000..533ef192e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles }: + +buildGoModule rec { + pname = "upterm"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "owenthereal"; + repo = "upterm"; + rev = "v${version}"; + sha256 = "007hgkkn1cq1i0rkn45i3bz5q9irzm67cz0j5glr6f6d4s0nkjiq"; + }; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + $out/bin/gendoc + rm $out/bin/gendoc + installManPage etc/man/man*/* + installShellCompletion --bash --name upterm.bash etc/completion/upterm.bash_completion.sh + installShellCompletion --zsh --name _upterm etc/completion/upterm.zsh_completion + ''; + + doCheck = true; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Secure terminal-session sharing"; + homepage = "https://upterm.dev"; + license = licenses.asl20; + maintainers = with maintainers; [ hax404 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/venus/default.nix b/third_party/nixpkgs/pkgs/tools/misc/venus/default.nix deleted file mode 100644 index 28c4508525..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/venus/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "venus"; - version = "unstable-2011-02-18"; - - src = fetchFromGitHub { - owner = "rubys"; - repo = "venus"; - rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b"; - sha256 = "10yyx4jaxxbwhica12aiw119aywghcr7b24gs9lrmafpa6xd3an2"; - }; - - preConfigure = '' - substituteInPlace tests/test_spider.py \ - --replace "urllib.urlopen('http://127.0.0.1:%d/' % _PORT).read()" "" \ - --replace "[200,200,200,200,404]" "[200,200,200,404]" - substituteInPlace planet.py \ - --replace "#!/usr/bin/env python" "#!${python}/bin/python" - substituteInPlace tests/test_apply.py \ - --replace "'xsltproc" "'${libxslt.bin}/bin/xsltproc" - substituteInPlace planet/shell/xslt.py \ - --replace "'xsltproc" "'${libxslt.bin}/bin/xsltproc" - ''; - - doCheck = true; - checkPhase = "python runtests.py"; - - buildInputs = [ python libxslt - libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -R ./* $out/ - ln -s $out/planet.py $out/bin/venus-planet - wrapProgram $out/planet.py \ - --prefix PYTHONPATH : $PYTHONPATH:${pythonPackages.lxml}/lib/${python.libPrefix}/site-packages:${pythonPackages.genshi}/lib/${python.libPrefix}/site-packages - python runtests.py - ''; - - meta = { - description = "News feed reader"; - longDescription = '' - Planet Venus is an awesome ‘river of news’ feed reader. It downloads news - feeds published by web sites and aggregates their content together into a - single combined feed, latest news first. - ''; - homepage = "http://intertwingly.net/code/venus/docs/index.html"; - license = lib.licenses.psfl; - platforms = lib.platforms.all; - maintainers = []; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix index 2220c026c4..f3eb1f9ad8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix @@ -2,17 +2,21 @@ buildGoModule rec { pname = "vsh"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "0s4i4x8kd9s2igdshgsbs6n3k670h7r6g1mn1pzlj0kpmggnhfik"; + sha256 = "1f6szcdakfx3zap1zpkrcs134plv7vnyilzcxs5jbhrrbr6q1807"; }; - # vendor dir is already part of repository - vendorSha256 = null; + vendorSha256 = "0a2kjql4ibglxkq5dgzr2sxxxm38nf83s4rsk2gd1cf7v0flr02j"; + + # vendor dir in vsh repo is incomplete + deleteVendor = true; + + runVend = true; # make sure version gets set at compile time buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wob/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wob/default.nix index cbc09b0ce6..e0622e5416 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wob/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wob/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "0v7xm8zd9237v5j5h79pd0x6dkal5fgg1ly9knssjpv3hswwyv40"; + sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index fe065bf4ab..1fc8a3916b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.02.04.1"; + version = "2021.02.10"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0rn8plld2bzmwbcvxxgz3hn24kjyal5kkwbpb5nd4w84mdjkhjqa"; + sha256 = "08liybkivqb32nbrzvvlv56yw6418zwmml7p6dbqcivhdgvas1yn"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix index 419846a9d3..64ae387e1a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "0q0qs07kmkpjv68j2bjgsrv6shl76mssnchfv82vjf8abkf8343b"; + sha256 = "sha256-k3Q4Fc2T7ElZb98+DVodC7zMHv5yfdwOIkSk0k04WCo="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix index c5ca2965e9..1e1ec8723b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -4,7 +4,6 @@ , rustPlatform , withFzf ? true , fzf - # checkInputs , fish , powershell @@ -13,12 +12,10 @@ , xonsh , zsh }: -let - version = "0.5.0"; -in -rustPlatform.buildRustPackage { + +rustPlatform.buildRustPackage rec { pname = "zoxide"; - inherit version; + version = "0.5.0"; src = fetchFromGitHub { owner = "ajeetdsouza"; @@ -55,6 +52,6 @@ rustPlatform.buildRustPackage { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ysndr cole-h ]; + maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix index 7d9a07badb..b918516f92 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cassowary"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HRshuMnRPMzatOYYI//yEtjC46kORGXaAWJJjLHW2+k="; + sha256 = "sha256-1so9EMry7U6GfpxgqLpcqC+ZaWAn4qAsnyDZvo0FAZY="; }; vendorSha256 = "sha256-d8JPsHBGkZ/MeoHTCLxi6JeNomER/0veWjqmqGal8eE="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/connman/connman.nix b/third_party/nixpkgs/pkgs/tools/networking/connman/connman.nix index 21fa038707..d8380340ca 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/connman/connman.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/connman/connman.nix @@ -55,10 +55,10 @@ let inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "connman"; - version = "1.38"; + version = "1.39"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"; + sha256 = "sha256-n2KnFpt0kcZwof8uM1sNlmMI+y9i4oXHgRBeuQ8YGvM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index d43c121bbf..68a6660db9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.33.9"; + version = "0.34.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1q3w2wv4lTIYPTO3weuZ0C2KeXcFWVV5KRJw2YRNWSE="; + sha256 = "sha256-XwXGhFyPsJWHWea3Cj3X6mOV/oseaRAMaEHoppX+WRw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 5e09ddd430..6ff8ba096b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-YBSM3+3WsZxAHbzXXM12pTwgvHbEkDK6Mq+YoKXEle0="; + sha256 = "sha256-eSRTlTC79VWCnH9Yhr4Lf8+NnI/+CGe3AQvrZwq/vks="; }; buildInputs = [ openssl zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix index c5e12317fd..a323087575 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix @@ -1,30 +1,23 @@ -{ lib, fetchFromGitHub, python3Packages, docutils, fetchpatch }: +{ lib, fetchFromGitHub, python3Packages, docutils }: python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { - owner = "jakubroztocil"; + owner = "httpie"; repo = "httpie"; rev = version; - sha256 = "0caazv24jr0844c4mdx77vzwwi5m869n10wa42cydb08ppx1xxj6"; + sha256 = "00lafjqg9nfnak0nhcr2l2hzzkwn2y6qv0wdkm6r6f69snizy3hf"; }; + patches = [ + ./strip-venv.patch + ]; + outputs = [ "out" "doc" "man" ]; - propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; - dontUseSetuptoolsCheck = true; - patches = [ - ./strip-venv.patch - - # Fix `test_ciphers_none_can_be_selected` - # TODO: remove on next release - (fetchpatch { - url = "https://github.com/jakubroztocil/httpie/commit/49e71d252f54871a6bc49cb1cba103d385a543b8.patch"; - sha256 = "13b2faf50gimj7f17dlx4gmd8ph8ipgihpzfqbvmfjlbf1v95fsj"; - }) - ]; + propagatedBuildInputs = with python3Packages; [ pygments requests requests-toolbelt setuptools ]; checkInputs = with python3Packages; [ mock @@ -70,15 +63,6 @@ python3Packages.buildPythonApplication rec { toHtml CHANGELOG.rst $docdir/html/CHANGELOG.html toHtml CONTRIBUTING.rst $docdir/html/CONTRIBUTING.html - # change a few links to the local files - substituteInPlace $docdir/html/index.html \ - --replace \ - 'https://github.com/jakubroztocil/httpie/blob/master/CHANGELOG.rst' \ - "CHANGELOG.html" \ - --replace \ - 'https://github.com/jakubroztocil/httpie/blob/master/CONTRIBUTING.rst' \ - "CONTRIBUTING.html" - ${docutils}/bin/rst2man \ --strip-elements-with-class=no-web \ --title=http \ @@ -94,10 +78,14 @@ python3Packages.buildPythonApplication rec { export PATH=${docutils}/bin:$PATH ''; - meta = { + checkPhase = '' + py.test ./httpie ./tests --doctest-modules --verbose ./httpie ./tests -k 'not test_chunked and not test_verbose_chunked and not test_multipart_chunked and not test_request_body_from_file_by_path_chunked' + ''; + + meta = with lib; { description = "A command line HTTP client whose goal is to make CLI human-friendly"; homepage = "https://httpie.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ antono relrod schneefux ]; + license = licenses.bsd3; + maintainers = with maintainers; [ antono relrod schneefux SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch b/third_party/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch index 99ea80a3f5..9cfddbfdf7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch +++ b/third_party/nixpkgs/pkgs/tools/networking/httpie/strip-venv.patch @@ -1,11 +1,11 @@ diff --git a/tests/test_docs.py b/tests/test_docs.py -index 7a41822..720ecf6 100644 +index 340e64d..a6b4dc9 100644 --- a/tests/test_docs.py +++ b/tests/test_docs.py -@@ -41,12 +41,10 @@ assert filenames - +@@ -42,15 +42,10 @@ assert filenames # HACK: hardcoded paths, venv should be irrelevant, etc. - # TODO: replaces the process with Python code + # TODO: simplify by using the Python API instead of a subprocess + # then we wont’t need the paths. -VENV_BIN = Path(__file__).parent.parent / 'venv/bin' -VENV_PYTHON = VENV_BIN / 'python' -VENV_RST2PSEUDOXML = VENV_BIN / 'rst2pseudoxml.py' @@ -13,7 +13,10 @@ index 7a41822..720ecf6 100644 +VENV_RST2PSEUDOXML = 'rst2pseudoxml.py' --@pytest.mark.skipif(not os.path.exists(VENV_RST2PSEUDOXML), reason='docutils not installed') +-@pytest.mark.skipif( +- not VENV_RST2PSEUDOXML.exists(), +- reason='docutils not installed', +-) @pytest.mark.parametrize('filename', filenames) def test_rst_file_syntax(filename): p = subprocess.Popen( diff --git a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 4194605df5..f4ef542a96 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -64,8 +64,6 @@ stdenv.mkDerivation rec { (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; }) ]; - NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql"; - checkInputs = [ dejagnu ]; doCheck = false; # fails 1 out of a bunch of tests, looks like a bug doInstallCheck = false; # fails diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 9d667d0ee1..130a7a18ae 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-01-16T02-45-34Z"; + version = "2021-02-10T07-32-57Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-1JUCoeLFMDvzT5KdQw+ZdYWPgdWKIL3kJ/LCIsqc6xE="; + sha256 = "sha256-dwgQ322KV1aR1RYSowHkb7Q0Pn7vuiV6Me1s6cMyaEs="; }; - vendorSha256 = "sha256-3wWUIFpNXom2MuUEDgAAEHlWRXhUzId+shZW/i5Rw4A="; + vendorSha256 = "sha256-MXCZZZ7NGDu8NMBzfIiNdRduvj7d7nboN2r8ObGx4dQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix index b03678858a..5ddbf24bb6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config , makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion -, libutempter ? null, withUtempter ? stdenv.isLinux }: +, withUtempter ? stdenv.isLinux, libutempter }: stdenv.mkDerivation rec { pname = "mosh"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - meta = { + meta = with lib; { homepage = "https://mosh.org/"; description = "Mobile shell (ssh replacement)"; longDescription = '' @@ -56,8 +56,8 @@ stdenv.mkDerivation rec { Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links. ''; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [viric]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix index 8296bc4791..1257c167e7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix @@ -1,17 +1,15 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , libcap, ncurses -, withGtk ? false, gtk3 ? null }: - -assert withGtk -> gtk3 != null; +, withGtk ? false, gtk3 }: stdenv.mkDerivation rec { pname = "mtr${lib.optionalString withGtk "-gui"}"; version = "0.94"; src = fetchFromGitHub { - owner = "traviscross"; - repo = "mtr"; - rev = "v${version}"; + owner = "traviscross"; + repo = "mtr"; + rev = "v${version}"; sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; }; @@ -38,9 +36,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A network diagnostics tool"; - homepage = "https://www.bitwizard.nl/mtr/"; - license = licenses.gpl2; + homepage = "https://www.bitwizard.nl/mtr/"; + license = licenses.gpl2; maintainers = with maintainers; [ koral orivej raskin globin ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix index 61f0a00a9b..06684016ab 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; - buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ]; + buildFlagsArray = [ "-ldflags=" "-X main.Build=${version}" ]; meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix index 0b5a0d96ae..efb57e7d24 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "3.0.30"; + version = "3.0.31"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "sha256-pP4kHF2nAQsoS/ienp4xoyHx8+scx5ZVnT+6ublBXuE="; + sha256 = "sha256-B3cpo6rHkiKk6NiKZQ2QKNFv1LDWA42o9fXkcSDQBOs="; }; hardeningEnable = [ "pie" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/swaks/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swaks/default.nix index 85e8998947..fb82217772 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/swaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/swaks/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "swaks"; - version = "20190914.0"; + version = "20201014.0"; src = fetchurl { url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz"; - sha256 = "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp"; + sha256 = "0c2sx4nrh4whsqzj6m5ay8d7yqan3aqgg436p8jb25bs91ykn2pv"; }; buildInputs = [ perl makeWrapper ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.jetmore.org/john/code/swaks/"; description = "A featureful, flexible, scriptable, transaction-oriented SMTP test tool"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; []; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 36269327e8..059c531cc6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.0"; + version = "0.34.3"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "1fnykdk35937ld8dyzjs571klz187jr8wlj8ljn78pajx1cd84k6"; + sha256 = "sha256-tkIoLYfqlnyyAAgEKyQgE317uwyhc8xRTCTUXi+9r9s="; }; - vendorSha256 = "19qx7ab6ar609cxxdsb9i2c3h7icqgf5bhi28lnsdk3bdjxr27vz"; + vendorSha256 = "sha256-DviK+MkJwcv2Dhwmqra5G/fTaWxXFbUSUVnAkSHjeII="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix b/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix index 65ba8d17bc..7b9a3c42d6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "termshark"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gcla"; repo = "termshark"; rev = "v${version}"; - sha256 = "14h548apg3zvjvq6yy22hpw2ziy5vmwyr04vv59ls1mjg4qf2v8b"; + sha256 = "sha256-vS6j8Mcri3SI/6HqtFX/EzVl8S0lx8fWU+0ddjzJz8g="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - vendorSha256 = "14apff3vcbndr30765lzi4qswakavb4396bjixxvpxv6i5c04dq7"; + vendorSha256 = "sha256-md9HHiYOsBimCBjD1FyjTqnskCZksQiEggWd5UW0RPM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix index 3ef125382b..f250b8d6b6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix @@ -7,13 +7,13 @@ with rustPlatform; buildRustPackage rec { pname = "tox-node"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "tox-rs"; repo = "tox-node"; rev = "v${version}"; - sha256 = "0bar42nigjwn7dq48rmg74sm3gnfqvb6gnd9g1n0i8nmynd00wvn"; + sha256 = "sha256-tB6v2NEBdTNHf89USdQOr/pV0mbxxb8ftOYPPJMvz5Y="; }; buildInputs = [ libsodium openssl ]; @@ -31,7 +31,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "087ccb824hmmxmnn5c2bzww2q888a8zy6y7rwgsdfr8rbay2c909"; + cargoSha256 = "sha256-kCT2ulB+c2OlsABkyXyzrHfD/G92EPCdTO34FR5oSws="; meta = with lib; { description = "A server application to run tox node written in pure Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix new file mode 100644 index 0000000000..b724695901 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "xh"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "ducaale"; + repo = "xh"; + rev = "v${version}"; + sha256 = "0b7q0xbfbrhvpnxbm9bd1ncdza9k2kcmcir3qhqzb2pgsb5b5njx"; + }; + + cargoSha256 = "02fgqys9qf0jzs2n230pyj151v6xbm6wm2rd9qm5gsib6zaq7gfa"; + + buildInputs = lib.optional stdenv.isDarwin Security; + + checkFlagsArray = [ "--skip=basic_options" ]; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/xh --help > /dev/null + ''; + + meta = with lib; { + description = "Yet another HTTPie clone in Rust"; + homepage = "https://github.com/ducaale/xh"; + license = licenses.mit; + maintainers = with maintainers; [ payas SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix index c1141362f8..fed7de01b9 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix @@ -1,20 +1,29 @@ -{ stdenv, lib, fetchurl, lua, openssl, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitLab, pkg-config, scdoc, openssl, zlib +, luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform, lua +}: stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.10.5"; + version = "2.12.2"; - src = fetchurl { - url = "https://dev.alpinelinux.org/archive/apk-tools/apk-tools-${version}.tar.xz"; - sha256 = "00z3fqnv8vk2czdm4p2q4sldq0n8sxyf2qfwppyk7wj59d2sq8dp"; + src = fetchFromGitLab { + domain = "gitlab.alpinelinux.org"; + owner = "alpine"; + repo = "apk-tools"; + rev = "v${version}"; + sha256 = "1crx2xlswi7i0mwgzrfphpf49ghfnh79fi5dn1sl611j9sy9wa29"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ lua openssl zlib ]; + nativeBuildInputs = [ pkg-config scdoc ] + ++ lib.optionals luaSupport [ lua lua.pkgs.lua-zlib ]; + buildInputs = [ openssl zlib ] ++ lib.optional luaSupport lua; + strictDeps = true; makeFlags = [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" "SBINDIR=$(out)/bin" "LIBDIR=$(out)/lib" + "LUA=${if luaSupport then "lua" else "no"}" "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}" "MANDIR=$(out)/share/man" "DOCDIR=$(out)/share/doc/apk" @@ -30,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.alpinelinux.org/alpine/apk-tools"; description = "Alpine Package Keeper"; maintainers = with maintainers; [ qyliss ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; broken = stdenv.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix index 1497d09734..e5da9a1d7b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.4.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qx989u2893Jv4/ZUdSqZk+q/FUjo0GDoVzeS63AO2HA="; + sha256 = "sha256-dDFc13IVD4f5UgiHXAcqRKoZEPTn/iBOogT3XfdstK0="; }; - cargoSha256 = "sha256-s0RIEZw8FOdKqMXgDPNXmqp7V6flzE8eF1J/rSK+qKs="; + cargoSha256 = "sha256-QsYOR7tk5cRCF0+xkpJ/F+Z3pjBPxTDFvA1gEi82AOQ="; meta = with lib; { description = "Mirror installed software on multiple machines"; homepage = "https://github.com/tversteeg/emplace"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix new file mode 100644 index 0000000000..8f88ae0876 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix @@ -0,0 +1,59 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, perl, file }: + +buildGoModule rec { + pname = "holo-build"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "holocm"; + repo = pname; + rev = "v${version}"; + sha256 = "0lypbgf96bcc4m3968xa4il1zwprsdyc0pw6pl9mqq7djxabikd0"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace 'VERSION :=' 'VERSION ?=' + substituteInPlace src/holo-build.sh \ + --replace '/usr/lib/holo/holo-build' '${placeholder "out"}/lib/holo/holo-build' + ''; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles perl ]; + + subPackages = [ "src/holo-build" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ]; + + postBuild = '' + make build/man/holo-build.8 VERSION=${version} + ''; + + checkInputs = [ file ]; + + checkPhase = '' + ln -s ../../go/bin/holo-build build/holo-build + go build -ldflags "-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" -o build/dump-package ./src/dump-package + bash test/compiler/run_tests.sh + bash test/interface/run_tests.sh + ''; + + postInstall = '' + installManPage build/man/* + installShellCompletion --bash --name holo-build util/autocomplete.bash + installShellCompletion --zsh --name _holo-build util/autocomplete.zsh + + # install wrapper script + mkdir -p $out/lib/holo + mv $out/bin/holo-build $out/lib/holo/holo-build + cp src/holo-build.sh $out/bin/holo-build + ''; + + meta = with lib; { + description = "Cross-distribution system package compiler"; + homepage = "http://holocm.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch index 56bafb2f7b..53f2c04f9e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch +++ b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch @@ -1,5 +1,25 @@ ---- src/libdnf/hy-iutil.cpp 2020-12-02 07:53:42.000000000 -0800 -+++ src/libdnf/hy-iutil.cpp 2020-12-21 14:24:14.000000000 -0800 +diff --git src/libdnf/config.h src/libdnf/config.h +index 16121f6f..737d0bc4 100644 +--- src/libdnf/config.h ++++ src/libdnf/config.h +@@ -18,7 +18,12 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++ ++#ifdef __APPLE__ ++#include ++#else + #include ++#endif + + + #if __WORDSIZE == 32 + #include "config-32.h" +diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp +index 497c560d..5de077fa 100644 +--- src/libdnf/hy-iutil.cpp ++++ src/libdnf/hy-iutil.cpp @@ -22,7 +22,7 @@ #include #include @@ -9,8 +29,10 @@ #include #include #include ---- src/libdnf/hy-util.cpp 2020-12-02 07:53:42.000000000 -0800 -+++ src/libdnf/hy-util.cpp 2020-12-21 14:23:21.000000000 -0800 +diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp +index 295fdc1b..9d584b8a 100644 +--- src/libdnf/hy-util.cpp ++++ src/libdnf/hy-util.cpp @@ -24,7 +24,20 @@ #include #include diff --git a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 08702e8bf6..59df56f86f 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -1,15 +1,15 @@ { gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check -, pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: +, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.55.2"; + version = "0.58.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq"; + sha256 = "0an8giv0lm0qqc76fpmqg42ra081mlj62b9r0s1p0sgb3270l76l"; }; patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix index 9ec5c3c13b..4009d11130 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.12.1"; + version = "1.13.0"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "0793j35fcv6bbz2pkd5rcsmx37hb1f0y48r4758cbfnl9rbp9y4z"; + sha256 = "sha256-gK1pkcZAJVXx0cYGs8PA4iPSMOwgJZI9Hqrrs1ZITDo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix index 8e866abb3c..498d6d21f3 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microdnf"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "0a7lc3qsnblvznzsz3544l3n84184xi85zf7c3m3jhnmpmxsg39h"; + sha256 = "1is8hqckjdz1h9w44iq1ljyfs5b0qd2cyivl30ny4dv8m8zba4zv"; }; nativeBuildInputs = [ pkg-config cmake gettext help2man ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index d22b4216ea..bd19f30f1c 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F3SDcO5E0d5/aEJLdy0fJqB6brwf4C9Imtk1R5zOT5A="; + sha256 = "sha256-EIHEdU1H5XhhzuWJUEvnKNsuNV8CBJrHBlaZlSfrSro="; }; - vendorSha256 = "sha256-fGhe0EukTWk/4tGPiFMit7zBD4380AkgxrQ3pzImsFU="; + vendorSha256 = "sha256-aSoryidfAfqPBpOtAXFJsq1ZcqJqpGiX3pZz5GpkKqQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixops/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixops/default.nix index 96e6ec3f55..0dcbeb8abf 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixops/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixops/default.nix @@ -1,16 +1,70 @@ -{ callPackage, fetchurl, fetchpatch }: +{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? [] +, fetchurl, fetchpatch +}: -callPackage ./generic.nix (rec { +let version = "1.7"; + +in python2Packages.buildPythonApplication { + pname = "nixops"; + inherit version; + src = fetchurl { url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3"; }; + patches = [ - # follow redirect in nixos-infect. Remove with the next release. (fetchpatch { url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch"; sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0"; }) + ./optional-virtd.patch ]; -}) + + buildInputs = [ libxslt ]; + + pythonPath = with python2Packages; + [ prettytable + boto + boto3 + hetzner + libcloud + adal + # Go back to sqlite once Python 2.7.13 is released + pysqlite + datadog + digital-ocean + typing + ] + ++ lib.optional (!libvirt.passthru.libvirt.meta.insecure or true) libvirt + ++ nixopsAzurePackages; + + checkPhase = + # Ensure, that there are no (python) import errors + '' + SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt \ + HOME=$(pwd) \ + $out/bin/nixops --version + ''; + + postInstall = '' + make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ + docdir=$out/share/doc/nixops mandir=$out/share/man + + mkdir -p $out/share/nix/nixops + cp -av "nix/"* $out/share/nix/nixops + + # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL + # the version of openssh is causing errors when have big networks (40+) + wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" + ''; + + meta = { + homepage = "https://github.com/NixOS/nixops"; + description = "NixOS cloud provisioning and deployment tool"; + maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixops/generic.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixops/generic.nix deleted file mode 100644 index 564256de35..0000000000 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixops/generic.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? [] -# version args -, src, version -, meta ? {} -, patches ? null -}: - -python2Packages.buildPythonApplication { - name = "nixops-${version}"; - inherit version src patches; - - buildInputs = [ libxslt ]; - - pythonPath = with python2Packages; - [ prettytable - boto - boto3 - hetzner - libcloud - adal - # Go back to sqlite once Python 2.7.13 is released - pysqlite - datadog - digital-ocean - libvirt - typing - ] ++ nixopsAzurePackages; - - checkPhase = - # Ensure, that there are no (python) import errors - '' - SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt \ - HOME=$(pwd) \ - $out/bin/nixops --version - ''; - - postInstall = '' - make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ - docdir=$out/share/doc/nixops mandir=$out/share/man - - mkdir -p $out/share/nix/nixops - cp -av "nix/"* $out/share/nix/nixops - - # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL - # the version of openssh is causing errors when have big networks (40+) - wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" - ''; - - meta = { - homepage = "https://github.com/NixOS/nixops"; - description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl3; - } // meta; -} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix deleted file mode 100644 index dc0c733ca7..0000000000 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ callPackage, newScope, pkgs, fetchurl }: - -callPackage ./generic.nix (rec { - version = "1.6.1"; - src = fetchurl { - url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; - }; - nixopsAzurePackages = with python2Packages; [ - azure-storage - azure-mgmt-compute - azure-mgmt-network - azure-mgmt-resource - azure-mgmt-storage - ]; - # nixops is incompatible with the most recent versions of listed - # azure-mgmt-* packages, therefore we are pinning them to - # package-private versions, so that they don't get trampled by - # updates. - # see - # https://github.com/NixOS/nixops/issues/1065 - python2Packages = pkgs.python2Packages.override { - overrides = (self: super: let callPackage = newScope self; in { - azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; - azure-mgmt-network = callPackage ./azure-mgmt-network { }; - azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; - azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; - azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; - azure-storage = callPackage ./azure-storage { }; - }); - }; -}) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixops/optional-virtd.patch b/third_party/nixpkgs/pkgs/tools/package-management/nixops/optional-virtd.patch new file mode 100644 index 0000000000..3697fdde8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixops/optional-virtd.patch @@ -0,0 +1,24 @@ +diff --git a/nixops/backends/libvirtd.py b/nixops/backends/libvirtd.py +index bc5f4af7..edd1348b 100644 +--- a/nixops/backends/libvirtd.py ++++ b/nixops/backends/libvirtd.py +@@ -8,12 +8,18 @@ import shutil + import string + import subprocess + import time +-import libvirt + + from nixops.backends import MachineDefinition, MachineState + import nixops.known_hosts + import nixops.util + ++try: ++ import libvirt ++except: ++ class libvirt(object): ++ def __getattribute__(self, name): ++ raise ValueError("The libvirt backend has been disabled because of security issues.") ++ + # to prevent libvirt errors from appearing on screen, see + # https://www.redhat.com/archives/libvirt-users/2017-August/msg00011.html + diff --git a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix index e4e60442c8..ec5017c54c 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "0a5727igwafwvj8rr5lv0lx8rlfji3qkzmrbp0d15w5dc4fhknp0"; + sha256 = "0i7p0jj7avmq3b2qlcpwcflipndrnwsvwvhc5aal7rm95aa7xhja"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch index 536072cafc..619d80bd8a 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,5 +1,5 @@ diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py -index 6506dae..2f762c9 100755 +index fec0563..d158b96 100755 --- a/src/protontricks/cli.py +++ b/src/protontricks/cli.py @@ -14,7 +14,7 @@ import os @@ -38,7 +38,7 @@ index 6506dae..2f762c9 100755 else: logger.info("Steam Runtime disabled.") -@@ -194,7 +189,7 @@ def main(args=None): +@@ -201,7 +196,7 @@ def main(args=None): winetricks_path=winetricks_path, proton_app=proton_app, steam_app=steam_app, @@ -46,8 +46,8 @@ index 6506dae..2f762c9 100755 + steam_runtime=steam_runtime, command=[winetricks_path, "--gui"] ) - return -@@ -261,7 +256,7 @@ def main(args=None): + +@@ -269,7 +264,7 @@ def main(args=None): winetricks_path=winetricks_path, proton_app=proton_app, steam_app=steam_app, @@ -56,7 +56,7 @@ index 6506dae..2f762c9 100755 command=[winetricks_path] + args.winetricks_command) elif args.command: run_command( -@@ -269,7 +264,7 @@ def main(args=None): +@@ -277,7 +272,7 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, command=args.command, @@ -66,7 +66,7 @@ index 6506dae..2f762c9 100755 # escaping it cwd=steam_app.install_path, diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index 215b31d..aa545b8 100644 +index fa5772d..4f30cd3 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py @@ -11,7 +11,7 @@ from .util import lower_dict @@ -78,7 +78,7 @@ index 215b31d..aa545b8 100644 "find_appid_proton_prefix", "get_steam_lib_paths", "get_steam_apps", "get_custom_proton_installations" ) -@@ -245,37 +245,6 @@ def find_steam_path(): +@@ -254,37 +254,6 @@ def find_steam_path(): return None, None @@ -117,7 +117,7 @@ index 215b31d..aa545b8 100644 APPINFO_STRUCT_SECTION = " 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,9 +31,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.27) + metasploit-payloads (= 2.0.28) metasploit_data_models - metasploit_payloads-mettle (= 1.0.5) + metasploit_payloads-mettle (= 1.0.6) mqtt msgpack nessus_rest @@ -124,23 +124,23 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.422.0) - aws-sdk-core (3.111.2) + aws-partitions (1.424.0) + aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.221.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-ec2 (1.224.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.46.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-iam (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.88.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -183,10 +183,10 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.7) + i18n (1.8.8) concurrent-ruby (~> 1.0) io-console (0.5.7) - irb (1.3.2) + irb (1.3.3) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) @@ -214,7 +214,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.27) + metasploit-payloads (2.0.28) metasploit_data_models (4.1.1) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -224,7 +224,7 @@ GEM pg railties (~> 5.2.2) recog (~> 2.0) - metasploit_payloads-mettle (1.0.5) + metasploit_payloads-mettle (1.0.6) method_source (1.0.0) mini_portile2 (2.5.0) minitest (5.14.3) @@ -238,7 +238,7 @@ GEM net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.2.1) - nio4r (2.5.4) + nio4r (2.5.5) nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -260,7 +260,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.2.0) + puma (5.2.1) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -281,10 +281,10 @@ GEM thor (>= 0.19.0, < 2.0) rake (13.0.3) rb-readline (0.5.5) - recog (2.3.18) + recog (2.3.19) nokogiri redcarpet (3.5.1) - reline (0.2.2) + reline (0.2.3) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -294,7 +294,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.14) + rex-core (0.1.15) rex-encoder (0.1.5) metasm rex-arch @@ -374,6 +374,7 @@ GEM unf_ext (0.0.7.7) warden (1.2.9) rack (>= 2.0.9) + webrick (1.7.0) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -381,7 +382,8 @@ GEM xdr (3.0.2) activemodel (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0) - xmlrpc (0.3.1) + xmlrpc (0.3.2) + webrick zeitwerk (2.4.2) PLATFORMS diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index f50c29aebb..e11b1dd299 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.28"; + version = "6.0.29"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-EX3rwg8aMEb1opw/y1+Dai/1SmrfmZye5TWM3w9YiuM="; + sha256 = "sha256-QDgInLW/uOBGf0ioPPBMUZv/c9tA7OtTOfp2CEAjf24="; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index e8d8e01b6d..d33ca7ce03 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -114,60 +114,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01j13abaxzi32gbdrm1v292kh331rlgcr6w1jl78hpcw6hp74r99"; + sha256 = "1dxyx3pnih7g23hq794ldapsszddcmldxf6pq3z99q4d8rg8rrqp"; type = "gem"; }; - version = "1.422.0"; + version = "1.424.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; + sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp"; type = "gem"; }; - version = "3.111.2"; + version = "3.112.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mwd98gmnakz9bkn5kqn5wbk5q2iz7hsbd1xi8256f6ppw07wzi3"; + sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9"; type = "gem"; }; - version = "1.221.0"; + version = "1.224.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j0llz7m9qymfn54vim99k0fjg6vsw71ylcagz1csay6qkjxipg7"; + sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1"; type = "gem"; }; - version = "1.46.0"; + version = "1.47.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; + sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i"; type = "gem"; }; - version = "1.41.0"; + version = "1.42.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; + sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v"; type = "gem"; }; - version = "1.87.0"; + version = "1.88.0"; }; aws-sigv4 = { groups = ["default"]; @@ -424,10 +424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; + sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs"; type = "gem"; }; - version = "1.8.7"; + version = "1.8.8"; }; io-console = { groups = ["default"]; @@ -444,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "166xravh6r82w46d8hcjrg55gnyjdf0501g16lb48i2h06k363l2"; + sha256 = "00c95xk8c9wzcs5imsrm85jk06y8l4dbnzhvqap98nprr9mxxnvl"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; jmespath = { groups = ["default"]; @@ -524,12 +524,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "84ecddbbed1f1957b8684c2027bb8a3e5eb163a0"; - sha256 = "1qwab07xz31mwng9r6fzd95gabvahdgwngwwlbslcc0s1z1fnz8i"; + rev = "f54a838fa686f495854a71cb32fadcb1853b6201"; + sha256 = "0vkz4d00hxps759ypv20vdrzz6si9kq3ra28gx3f1f5znnf0hf20"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.28"; + version = "6.0.29"; }; metasploit-model = { groups = ["default"]; @@ -546,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3jn9gjy1bknyd7wrwwfbcjwlmijd6nnsjzyqc7yszjjy0yqca2"; + sha256 = "1xln6zgdiimrbwjbdhi9008bjhmwqm13zky4310pvr7g8riffwqx"; type = "gem"; }; - version = "2.0.27"; + version = "2.0.28"; }; metasploit_data_models = { groups = ["default"]; @@ -566,10 +566,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z6gnidpcpdm80vvl0yw1h10kchkaw9whcsv2kwy7ih6247l7nbq"; + sha256 = "1mxhybic6myh993fs4jmp0hz998ryf362y0b33wqanff1n8aj75k"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; method_source = { groups = ["default"]; @@ -696,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + sha256 = "0xbrmq1pvmszrwf40lzwmf8krs2b56720i7wsz9gh274qljkzklf"; type = "gem"; }; - version = "2.5.4"; + version = "2.5.5"; }; nokogiri = { groups = ["default"]; @@ -816,10 +816,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fmcz4dp7ggkv1h4n51vn1gq0r4zbkw7sr2ssl4ws1khb86grkv5"; + sha256 = "10kj484ppkjdg1j8jac4bxdv1082bd6g6xhrj70chlp7lkgl8ggh"; type = "gem"; }; - version = "5.2.0"; + version = "5.2.1"; }; racc = { groups = ["default"]; @@ -916,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69"; + sha256 = "00czf392immsaff10snjxky2vpnfck1bgszpckx15y2kydag5k9i"; type = "gem"; }; - version = "2.3.18"; + version = "2.3.19"; }; redcarpet = { groups = ["default"]; @@ -936,10 +936,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zinl7l63gzy6y477j8w1azfm5655h2026hxl49w4c73qcfdjj3x"; + sha256 = "18xpix2hn4x4hihn0fjsv6i7jr7zjfbwzs94hwn48klyq3yrym2h"; type = "gem"; }; - version = "0.2.2"; + version = "0.2.3"; }; rex-arch = { groups = ["default"]; @@ -966,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw"; + sha256 = "1bjz0mhxijvfq535hpzswr83yrq3ghkkmqna63yjsabh61qpxx16"; type = "gem"; }; - version = "0.1.14"; + version = "0.1.15"; }; rex-encoder = { groups = ["default"]; @@ -1341,6 +1341,16 @@ }; version = "1.2.9"; }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; + }; websocket-driver = { groups = ["default"]; platforms = []; @@ -1386,10 +1396,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1"; + sha256 = "1xa79ry3976ylap38cr5g6q3m81plm611flqd3dwgnmgbkycb6jp"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; zeitwerk = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix b/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix index 617224a6af..76aea2bbd5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix @@ -14,13 +14,13 @@ with lib; stdenv.mkDerivation rec { pname = "rng-tools"; - version = "6.9"; + version = "6.11"; src = fetchFromGitHub { owner = "nhorman"; repo = "rng-tools"; rev = "v${version}"; - sha256 = "065jf26s8zkicb95zc9ilksjdq9gqrh5vcx3mhi6mypbnamn6w98"; + sha256 = "sha256-qheJaeVX2zuv0mvKEd6wcbSHFjiJE0t5hVCJiRSKm3M="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix index 706c9edc48..b0172ff1d5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -23,16 +23,18 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "1.0.0"; + # Upstream has separate version numbering for the library and the CLI frontend. + # This derivation provides the CLI frontend, and thus uses its version number. + version = "0.24.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia"; - rev = "v${version}"; - sha256 = "0y80bl786m29ww3272qsl1ql0xc3pwd6iiqlkv3nmhnjsmygbn0d"; + rev = "sq/v${version}"; + sha256 = "0zavkf0grkqljyiywcprsiv8igidk8vc3yfj3fzqvbhm43vnnbdw"; }; - cargoSha256 = "03ngywa5z0c7qmdmhynk13xcivhg8gpivvpzg2gxp34gfr7j438l"; + cargoSha256 = "172f0gsy5hssrqv0l1np3c0qd1ayp6nqbpqmgwrkc4l37y5fn232"; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix index fddd10da61..b37273aeb1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.2.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "1kjis0ylvmv1gvzp5qvi9a7x4611bjv8yx5mb6nkc0a8lscwb4c3"; + sha256 = "sha256-RZFh9RVU8RwtLGIP7OWnf0yNsXfElqWSXieljqp8ahU="; }; - vendorSha256 = "0yfybzwjvnan4qf5w25k22iwh5hp9v8si93p4jv9bx25rw91swws"; + vendorSha256 = "sha256-Ya/33ocPhY5OSnCEyULsOIHaxwb1yNEle3JEYo/7/Yk="; # tests want to download a vulnerable Terraform project doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index ca68f8b71f..8766e957aa 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.4.6"; + version = "0.4.4.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "1p0zpqmbskygx0wmiijhprg8r45n2wqbbjl7kv4gbb83b0alq5az"; + sha256 = "1vh5kdx7s74il8a6gr7jydbpv0an01nla4y2r8w7h33z2wk2jv9j"; }; outputs = [ "out" "geoip" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 4d9893e103..5126176855 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1pgyyl2zgnr3wy4k8c5xsk2s5dpl97xdfq67lpfss7fz1bij8x47"; + sha256 = "1g6fz6dl90cb5pnvvmkndqgncfjy50j9jw3xzn8s91yzvvld8ds7"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index 775bd8c695..b30f8d1af1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip }: let - version = "1.6.1"; + version = "1.6.2"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1la2pylcj9y5gr7hr4aaa49427y3lgxi2phhl46pqmr7an62pkbm"; + sha256 = "1vcxnky8qnn2ib33r9604cbjrgm939ddrhwqcjylbv217cmc9alf"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1a2rhv5bpv43qp74a49msrwr7djzy86irsn73jl0xnkh0k6ijci1"; + sha256 = "0mcav36dcmvky8v4y65jvh837i72aqz7arv2ivjpajym3gf7qrq1"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "0snswwai2ya26crm3ksifrmbdnajr36v4vamh7g65plg6vzban9a"; + sha256 = "1is7s445jc4ll2lyfxgjwwl89fly1l8kskqp2p8z179d8hhgd0ms"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0ix99da3xd4z200dgvpfc2h1sfx6l8cipichvfjlj39md45grs89"; + sha256 = "0i5d87a393464r68rjv83bjhg51yaysccqbwaaydmzk1m45icg7x"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix index 1ece53203b..906ca618e4 100644 --- a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.15"; + version = "3.14.16"; src = fetchFromGitHub { - sha256 = "sha256-vRtDctiulR5YmcwNCZtSU/tsRjs1+DP07NFVSL1TSuI="; + sha256 = "sha256-VZIeyLJBlh5/r0EHinSiPiQyCNUBFBYjDZ6nTVnZBbE="; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix index 0c27e9e4e7..1cc0ba8773 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -2,17 +2,19 @@ buildGoModule rec { pname = "gotop"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "09cs97fjjxcjxzsl2kh8j607cs5zy2hnrh1pb21pggzhg7dzsz0w"; + sha256 = "sha256-3t6I4ah9gUmPlIBRL86BdgiUaMNiKNEeoUSRMASz1Yc="; }; runVend = true; - vendorSha256 = "1mbjl7b49naaqkr2j658j17z9ryf5g3x6q34gvmrm7n9y082ggnz"; + vendorSha256 = "sha256-GcIaUIuTiSY1aKxRtclfl7hMNaZZx4uoVG7ahjF/4Hs="; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix index 925b60d543..9048aa966f 100644 --- a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.71"; + version = "21.72"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "1g671fvkg6r30n9vwwlqpdd6yn6jf7n9ynjmslblk7kbnabzayby"; + sha256 = "sha256-T/netiZqox+qa19wH+h8cbsGbiM+9VrSEIjccrPYqws="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix index 7f24be893b..b941c5f727 100644 --- a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.3.00-1"; + version = "3.3.01-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "sha256-P1AYo4Ao9lDxJXyZd64wBxNgQIvEcT00ThjtcB2v52I="; + sha256 = "sha256-wY9wsxBByxqy9qk/7UoKiUSpFGS1rFpdyTs3ig6OJRs="; }; buildInputs = [ perl makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix b/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix index bdf2a4bcd3..6fd66b40e1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "logcheck"; - version = "1.3.20"; + version = "1.3.22"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "1rmkvxhcwr9gb6z4dlgr6rrx5l70hshlxdggs6qx0w1ljcmx1dlz"; + sha256 = "sha256-e7XeRNlFsexlVskK2OnLTmNV/ES2xWU+/+AElexV6E4="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index 44c5e42a49..e727734be6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -15,14 +15,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.28.0"; + version = "1.29.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1266jbfw55r1zh00xi6c90j2fs9hw8hmsb7686rh04l8mffny9f4"; + sha256 = "sha256-Wmfqxjy0kCy8vsegoe+Jn5Az/XEZxeHZDRMLmOrp+Iw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix index ae4ee9efa6..cf88dc846f 100644 --- a/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.6.5"; + version = "4.10.1"; pname = "sleuthkit"; src = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = "${pname}-${version}"; - sha256 = "1q1cdixnfv9v4qlzza8xwdsyvq1vdw6gjgkd41yc1d57ldp1qm0c"; + sha256 = "142kkpkpawpqyc88pr6xdvlagw6djaah1schyjxq9qdq9cnqx0dw"; }; postPatch = '' - substituteInPlace tsk/img/ewf.c --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset + substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 9eaf00b537..954c9eb411 100644 --- a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, autoreconfHook -, mailutils, inetutils +, mailutils, enableMail ? true +, inetutils , IOKit, ApplicationServices }: let @@ -26,7 +27,7 @@ in stdenv.mkDerivation rec { postPatch = "cp -v ${driverdb} drivedb.h"; configureFlags = [ - "--with-scriptpath=${lib.makeBinPath [ mailutils inetutils ]}" + "--with-scriptpath=${lib.makeBinPath ([ inetutils ] ++ lib.optional enableMail mailutils)}" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix b/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix index c9af119fb7..97c61d2da0 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libyamlcpp, pkg-config -, smartSupport ? false, libatasmart }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libyamlcpp +, pkg-config +, procps +, coreutils +, smartSupport ? false, libatasmart +}: stdenv.mkDerivation rec { pname = "thinkfan"; @@ -12,36 +20,40 @@ stdenv.mkDerivation rec { sha256 = "18vgm5w5pjnpipa34j4x87q10695w2jnqwvc2f027afy7mnzw7kz"; }; + postPatch = '' + # fix hardcoded install path + substituteInPlace CMakeLists.txt --replace /etc $out/etc + + # fix command paths in unit files + for unit in rcscripts/systemd/*; do + substituteInPlace "$unit" \ + --replace /bin/kill ${procps}/bin/kill \ + --replace /usr/bin/pkill ${procps}/bin/pkill \ + --replace /usr/bin/sleep ${coreutils}/bin/sleep + done + ''; + cmakeFlags = [ "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}" "-DUSE_NVML=OFF" + # force install unit files + "-DSYSTEMD_FOUND=ON" ] ++ lib.optional smartSupport "-DUSE_ATASMART=ON"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart; - installPhase = '' - runHook preInstall - - install -Dm755 {.,$out/bin}/thinkfan - - cd "$NIX_BUILD_TOP"; cd "$sourceRoot" # attempt to be a bit robust - install -Dm644 {.,$out/share/doc/thinkfan}/README.md - cp -R examples $out/share/doc/thinkfan - install -Dm644 {src,$out/share/man/man1}/thinkfan.1 - - runHook postInstall - ''; - - meta = with lib; { - description = "A minimalist fan control program"; - longDescription = "A minimalist fan control program. Originally designed -specifically for IBM/Lenovo Thinkpads, it now supports any kind of system via -the sysfs hwmon interface (/sys/class/hwmon)."; - license = licenses.gpl3; + meta = { + description = "A simple, lightweight fan control program"; + longDescription = '' + Thinkfan is a minimalist fan control program. Originally designed + specifically for IBM/Lenovo Thinkpads, it now supports any kind of + system via the sysfs hwmon interface (/sys/class/hwmon). + ''; + license = lib.licenses.gpl3Plus; homepage = "https://github.com/vmatare/thinkfan"; - maintainers = with maintainers; [ domenkozar ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ domenkozar rnhmjoj ]; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix b/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix index 92878c5386..0d3b6f4d6b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "rfrail3"; repo = "tuptime"; rev = version; - sha256 = "0nk3yyjavgmc435vj3f0siw4y5nwipsbcsvsf5m7mgvq0xi8f3ls"; + sha256 = "sha256-2Q1czKvwdVq+2+64k4SOghw05CUlT5HdZpvKMRbGdDY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix b/third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix index 5b03f6e89a..97b06b9a0c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ansifilter"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = "0by4rhy30l7jgxvq6mwf8p43s1472q96l3g7n2skq2lnkjrvx1ar"; + sha256 = "sha256-Zs8BfTakPV9q4gYJzjtYZHSU7mwOQfxoLFmL/859fTk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix index 04d41b74db..364d3c6edc 100644 --- a/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix @@ -1,26 +1,36 @@ -{ lib, stdenv, fetchurl, perl /*, xmlto */}: +{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto }: stdenv.mkDerivation rec { - name = "colordiff-1.0.19"; + pname = "colordiff"; + version = "1.0.19"; - src = fetchurl { - urls = [ - "https://www.colordiff.org/${name}.tar.gz" - "http://www.colordiff.org/archive/${name}.tar.gz" - ]; - sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26"; + src = fetchFromGitHub { + owner = "daveewart"; + repo = "colordiff"; + rev = "v${version}"; + sha256 = "1v7s1yn0qvn08iwm5js8mxn442392qyr7s9ij506byfd497ag7qk"; }; - buildInputs = [ perl /* xmlto */ ]; + nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m xmlto ]; - dontBuild = 1; # do not build doc yet. + buildInputs = [ perl ]; - installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install''; + postPatch = '' + substituteInPlace Makefile \ + --replace 'TMPDIR=colordiff-''${VERSION}' "" + ''; + + installFlags = [ + "INSTALL_DIR=/bin" + "MAN_DIR=/share/man/man1" + "DESTDIR=${placeholder "out"}" + ]; meta = with lib; { description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; homepage = "https://www.colordiff.org/"; - license = licenses.gpl3; - platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix index c91d2f2081..dbfb85fc58 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "5.0"; + version = "5.2"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-PN7YSpTl7RoW5zgoYjXHDFB6sTroSA3TNpTCsOsdB34="; + sha256 = "sha256-bjDQwtIsY+Dvv270DACvyU+MNPyI7EZcob6F/aebVac="; }; - vendorSha256 = "sha256-1YQD+QwCOAPOsj946DNF92LYKfRgXZXcfhIADP8s2CY="; + vendorSha256 = "sha256-l6zHsis2fais5HQJQdfsSC0sPdcF4BeWoUznpl3Fh1g="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch deleted file mode 100644 index 967bcd3948..0000000000 --- a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4315b58e0bffedd145cec61f96062292cd98278e Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Thu, 23 Jul 2020 21:37:33 +0200 -Subject: [PATCH] Make compatible with pdfminer.six version 20200720 - ---- - setup.py | 2 +- - src/ocrmypdf/pdfinfo/layout.py | 8 ++++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index bd95ed9..d1f4ab1 100644 ---- a/setup.py -+++ b/setup.py -@@ -83,7 +83,7 @@ setup( - 'cffi >= 1.9.1', # must be a setup and install requirement - 'coloredlogs >= 14.0', # strictly optional - 'img2pdf >= 0.3.0, < 0.4', # pure Python, so track HEAD closely -- 'pdfminer.six >= 20191110, <= 20200517', -+ 'pdfminer.six >= 20191110, <= 20200720', - 'pikepdf >= 1.14.0, < 2', - 'Pillow >= 7.0.0', - 'pluggy >= 0.13.0', -diff --git a/src/ocrmypdf/pdfinfo/layout.py b/src/ocrmypdf/pdfinfo/layout.py -index 98bd82e..8b41e14 100644 ---- a/src/ocrmypdf/pdfinfo/layout.py -+++ b/src/ocrmypdf/pdfinfo/layout.py -@@ -26,7 +26,11 @@ import pdfminer.pdfdevice - import pdfminer.pdfinterp - from pdfminer.converter import PDFLayoutAnalyzer - from pdfminer.layout import LAParams, LTChar, LTPage, LTTextBox --from pdfminer.pdfdocument import PDFTextExtractionNotAllowed -+try: -+ from pdfminer.pdfdocument import PDFTextExtractionNotAllowedError -+except ImportError: -+ # Fallback for pdfminer < 20200720 -+ from pdfminer.pdfdocument import PDFTextExtractionNotAllowed as PDFTextExtractionNotAllowedError - from pdfminer.pdffont import PDFSimpleFont, PDFUnicodeNotDefined - from pdfminer.pdfpage import PDFPage - from pdfminer.utils import bbox2str, matrix2str -@@ -239,7 +243,7 @@ def get_page_analysis(infile, pageno, pscript5_mode): - with Path(infile).open('rb') as f: - page = PDFPage.get_pages(f, pagenos=[pageno], maxpages=0) - interp.process_page(next(page)) -- except PDFTextExtractionNotAllowed: -+ except PDFTextExtractionNotAllowedError: - raise EncryptedPdfError() - finally: - if pscript5_mode: --- -2.27.0 - diff --git a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix index f68e155813..6843e945fd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix @@ -7,7 +7,8 @@ , python3 , python3Packages , qpdf -, lib, stdenv +, lib +, stdenv , tesseract4 , unpaper , substituteAll @@ -29,18 +30,17 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "11.3.3"; + version = "11.6.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0qv34clid65p11dgqalyk7b7myn5ibiz8i9xxhxkmjblw297p6ak"; + sha256 = "0inmmpam0vcm5n4sm6lh9p5swk44clknvm1cdwk9cax01mdqljza"; }; nativeBuildInputs = with python3Packages; [ - pytestrunner setuptools setuptools-scm-git-archive setuptools_scm @@ -65,8 +65,7 @@ buildPythonApplication rec { pytest pytest-helpers-namespace pytest_xdist - pytestcov - pytestrunner + pytest-cov python-xmp-toolkit pytestCheckHook ] ++ runtimeDeps; @@ -83,7 +82,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/jbarlow83/OCRmyPDF"; description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; - license = licenses.gpl3; + license = with licenses; [ mpl20 mit ]; platforms = platforms.linux; maintainers = [ maintainers.kiwi ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock index 6c3ce51c6a..b1bfe4aaa8 100644 --- a/third_party/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock @@ -4,7 +4,7 @@ GEM chronic (0.10.2) highline (2.0.3) rchardet (1.8.0) - reckon (0.6.0) + reckon (0.7.1) chronic (>= 0.3.0) highline (>= 1.5.2) rchardet (>= 1.8.0) @@ -16,4 +16,4 @@ DEPENDENCIES reckon BUNDLED WITH - 2.1.4 + 1.17.2 diff --git a/third_party/nixpkgs/pkgs/tools/text/reckon/default.nix b/third_party/nixpkgs/pkgs/tools/text/reckon/default.nix index 261149229b..bbefa94637 100644 --- a/third_party/nixpkgs/pkgs/tools/text/reckon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/reckon/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { gemdir = ./.; }; in '' + runHook preInstall mkdir -p $out/bin makeWrapper ${env}/bin/reckon $out/bin/reckon + runHook postInstall ''; passthru.updateScript = bundlerUpdateScript "reckon"; diff --git a/third_party/nixpkgs/pkgs/tools/text/reckon/gemset.nix b/third_party/nixpkgs/pkgs/tools/text/reckon/gemset.nix index 50802ccd80..09a4e704d0 100644 --- a/third_party/nixpkgs/pkgs/tools/text/reckon/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/text/reckon/gemset.nix @@ -1,5 +1,7 @@ { chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -11,7 +13,7 @@ groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; @@ -21,7 +23,7 @@ groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; type = "gem"; }; @@ -33,9 +35,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zkbmwx5bp2dr54bwhkn831918ijwh022rq45qg38wz2skih7izp"; + sha256 = "0hsmzjxj1f5ma816gag1b3bdjbynhj2szgar955fcs3gbbzv4sk7"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/robodoc/default.nix b/third_party/nixpkgs/pkgs/tools/text/robodoc/default.nix new file mode 100644 index 0000000000..e30e873979 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/robodoc/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "robodoc"; + version = "4.99.44"; + + src = fetchFromGitHub { + owner = "gumpu"; + repo = "ROBODoc"; + rev = "v${version}"; + sha256 = "l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://github.com/gumpu/ROBODoc"; + description = "Documentation Extraction Tool"; + longDescription = '' + ROBODoc is program documentation tool. The idea is to include for every + function or procedure a standard header containing all sorts of + information about the procedure or function. ROBODoc extracts these + headers from the source file and puts them in a separate + autodocs-file. ROBODoc thus allows you to include the program + documentation in the source code and avoid having to maintain two separate + documents. Or as Petteri puts it: "robodoc is very useful - especially for + programmers who don't like writing documents with Word or some other + strange tool." + + ROBODoc can format the headers in a number of different formats: HTML, + RTF, LaTeX, or XML DocBook. In HTML mode it can generate cross links + between headers. You can even include parts of your source code. + + ROBODoc works with many programming languages: For instance C, Pascal, + Shell Scripts, Assembler, COBOL, Occam, Postscript, Forth, Tcl/Tk, C++, + Java -- basically any program in which you can use remarks/comments. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix b/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix index 2e60d2a31c..c8eb43a51c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, boost }: -let - name = "source-highlight"; +stdenv.mkDerivation rec { + pname = "source-highlight"; version = "3.1.9"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz"; + url = "mirror://gnu/src-highlite/${pname}-${version}.tar.gz"; sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs"; }; @@ -26,15 +23,15 @@ stdenv.mkDerivation { enableParallelBuilding = false; - meta = { + meta = with lib; { description = "Source code renderer with syntax highlighting"; + longDescription = '' + GNU Source-highlight, given a source file, produces a document + with syntax highlighting. + ''; homepage = "https://www.gnu.org/software/src-highlite/"; - license = lib.licenses.gpl3Plus; - platforms = with lib.platforms; linux ++ darwin; - longDescription = - '' - GNU Source-highlight, given a source file, produces a document - with syntax highlighting. - ''; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index bc7c43ca6e..59f5e7c0c0 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.8.1"; + version = "2.9.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0xvsg5j0nv6p6wskxg4gz79di6p495c78xbwl3xmh0wyk7g78lkx"; + sha256 = "sha256-ItkWmBq1mBVZfHcnqDp8koEAWBH3k9Et2bFA2mNYjVY="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix index afcb649d92..4d0f87354a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, texinfo, which }: stdenv.mkDerivation rec { - name = "wdiff-1.2.2"; + pname = "wdiff"; + version = "1.2.2"; src = fetchurl { - url = "mirror://gnu/wdiff/${name}.tar.gz"; + url = "mirror://gnu/wdiff/${pname}-${version}.tar.gz"; sha256 = "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl"; }; @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { checkInputs = [ which ]; - meta = { + meta = with lib; { homepage = "https://www.gnu.org/software/wdiff/"; description = "Comparing files on a word by word basis"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ eelco SuperSandro2000 ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index 40606199b8..805373e8ee 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -2,23 +2,25 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.9"; + version = "0.8.1"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c"; + sha512 = "28kwj053lm3510cq7pg4rqx6linv5zphhm2h6r9icigclfq7j9ybnd7vqbn2v4ay0r8ghac5cjbqab5zy8cjlgllwhwsxg0dnk75x2i"; }; nativeBuildInputs = [ which ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; configurePhase = '' + runHook preConfigure ./configure PREFIX=''${!outputDev} \ BINDIR=''${!outputBin}/bin \ LIBDIR=''${!outputLib}/lib \ MANDIR=''${!outputMan}/share/man + runHook postConfigure ''; # Fix lib extension so that fixDarwinDylibNames detects it diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix index 03ce2eb5ee..73370eb011 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages +{ lib, stdenv, fetchFromGitHub, ruby, dune_2, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let @@ -35,12 +35,12 @@ let in stdenv.mkDerivation rec { pname = "satysfi"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "gfngfn"; repo = "SATySFi"; rev = "v${version}"; - sha256 = "1y72by6d15bc6qb1lv1ch6cm1i74gyr0w127nnvs2s657snm0y1n"; + sha256 = "1wdmcz2b7v37msmsvjvbyj7x5a80qfws8a7w72q0g5959pw5fdxj"; fetchSubmodules = true; }; @@ -70,7 +70,8 @@ in meta = with lib; { homepage = "https://github.com/gfngfn/SATySFi"; description = "A statically-typed, functional typesetting system"; - license = licenses.lgpl3; + changelog = "https://github.com/gfngfn/SATySFi/blob/v${version}/CHANGELOG.md"; + license = licenses.lgpl3Only; maintainers = [ maintainers.mt-caret maintainers.marsam ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix b/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix index 41d4dd63d5..d07d6e5342 100644 --- a/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/atomicparsley/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "20210114.184825.1dbe1be"; + version = "20210124.204813.840499f"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "sha256-dyrfr3bsRzEWaAr9K+7SchFVl63cZawyIjmstOI9e5I="; + sha256 = "sha256-/bkfgIWlQobaiad2WD7DUUrTwfYurP7YAINaLTwBEcE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/video/untrunc/default.nix b/third_party/nixpkgs/pkgs/tools/video/untrunc/default.nix deleted file mode 100644 index 3ef025f587..0000000000 --- a/third_party/nixpkgs/pkgs/tools/video/untrunc/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, gcc, libav_12, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "untrunc"; - version = "2020.02.09"; - - src = fetchFromGitHub { - owner = "ponchio"; - repo = "untrunc"; - rev = "4eed44283168c727ace839ff7590092fda2e0848"; - sha256 = "0nfj67drc6bxqlkf8a1iazqhi0w38a7rjrb2bpa74gwq6xzygvbr"; - }; - - buildInputs = [ gcc libav_12 ]; - - # Untrunc uses the internal libav headers 'h264dec.h' and 'config.h'. - # The latter must be created through 'configure'. - libavConfiguredSrc = libav_12.overrideAttrs (oldAttrs: { - name = "libav-configured-src"; - outputs = [ "out" ]; - phases = [ "unpackPhase" "patchPhase" "configurePhase" "installPhase" ]; - installPhase = "cp -r . $out"; - }); - - buildCommand = '' - mkdir -p $out/bin - g++ -o $out/bin/untrunc \ - -Wno-deprecated-declarations \ - $src/file.cpp $src/main.cpp $src/track.cpp $src/atom.cpp $src/mp4.cpp \ - -I$libavConfiguredSrc -lavformat -lavcodec -lavutil - ''; - - meta = with lib; { - description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video"; - license = licenses.gpl2; - homepage = "https://github.com/ponchio/untrunc"; - maintainers = [ maintainers.earvstedt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index bb2fb36bb5..e16cde6601 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -115,6 +115,7 @@ mapAliases ({ cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 + cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 cv = progress; # added 2015-09-06 d1x_rebirth = dxx-rebirth; # added 2018-04-25 @@ -150,6 +151,7 @@ mapAliases ({ dydisnix = throw "dydisnix has been removed."; # added 2021-01-27 dysnomia = throw "dysnomia has been removed."; # added 2021-01-27 dwarf_fortress = dwarf-fortress; # added 2016-01-23 + dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 @@ -178,6 +180,9 @@ mapAliases ({ firestr = throw "firestr has been removed."; # added 2019-12-08 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 flameGraph = flamegraph; # added 2018-04-25 + flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 @@ -261,10 +266,12 @@ mapAliases ({ gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 + hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 + ht-rust = xh; # added 2021-02-13 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 @@ -384,6 +391,7 @@ mapAliases ({ mono-zeroconf = throw "mono-zeroconf was deprecated on 2019-09-20: abandoned by upstream."; mozart = mozart2-binary; # added 2019-09-23 mozart-binary = mozart2-binary; # added 2019-09-23 + mpd_clientlib = libmpdclient; # added 2021-02-11 mpich2 = mpich; # added 2018-08-06 msf = metasploit; # added 2018-04-25 libmsgpack = msgpack; # added 2018-08-17 @@ -528,6 +536,7 @@ mapAliases ({ pyo3-pack = maturin; pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10 pulseaudioLight = pulseaudio; # added 2018-04-25 + pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and pulseeffects-pw if you use PipeWire."; # added 2021-02-13, move back once we default to PipeWire audio server. phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 @@ -709,6 +718,7 @@ mapAliases ({ ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 unifiStable = unifi6; # added 2020-12-28 + untrunc = untrunc-anthwlock; # added 2021-02-01 usb_modeswitch = usb-modeswitch; # added 2016-05-10 usbguard-nox = usbguard; # added 2019-09-04 utillinux = util-linux; # added 2020-11-24 @@ -717,6 +727,7 @@ mapAliases ({ v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38"; vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 + venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 vimbWrapper = vimb; # added 2015-01 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 @@ -838,7 +849,7 @@ mapAliases ({ todolist = throw "todolist is now ultralist."; # added 2020-12-27 - /* Cleanup before 21.03 */ + /* Cleanup before 21.05 */ riot-desktop = throw "riot-desktop is now element-desktop!"; riot-web = throw "riot-web is now element-web"; @@ -847,6 +858,8 @@ mapAliases ({ /* Added 2021-01-02 */ ttyrec = ovh-ttyrec; + zplugin = zinit; # Added 2021-01-30 + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 9bb455341e..d0a3c3dee8 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -297,6 +297,8 @@ in docker-sync = callPackage ../tools/misc/docker-sync { }; + dockle = callPackage ../development/tools/dockle { }; + docui = callPackage ../tools/misc/docui { }; dotfiles = callPackage ../applications/misc/dotfiles { }; @@ -705,6 +707,10 @@ in afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; + agate = callPackage ../servers/gemini/agate { + inherit (darwin.apple_sdk.frameworks) Security; + }; + agda-pkg = callPackage ../development/tools/agda-pkg { }; agrep = callPackage ../tools/text/agrep { }; @@ -1112,6 +1118,8 @@ in bmap-tools = callPackage ../tools/misc/bmap-tools { }; + bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; + bonnie = callPackage ../tools/filesystems/bonnie { }; bonfire = callPackage ../tools/misc/bonfire { }; @@ -1261,6 +1269,8 @@ in fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + flavours = callPackage ../applications/misc/flavours { }; + flood = nodePackages.flood; fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; @@ -1327,7 +1337,9 @@ in gremlin-console = callPackage ../applications/misc/gremlin-console { }; - grex = callPackage ../tools/misc/grex { }; + grex = callPackage ../tools/misc/grex { + inherit (darwin.apple_sdk.frameworks) Security; + }; gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; @@ -2454,6 +2466,8 @@ in interlock = callPackage ../servers/interlock {}; + iotools = callPackage ../tools/misc/iotools { }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; @@ -2662,8 +2676,6 @@ in pbgopy = callPackage ../tools/text/pbgopy { }; - pbpst = callPackage ../applications/misc/pbpst { }; - pbzx = callPackage ../tools/compression/pbzx { }; pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; @@ -3115,7 +3127,7 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_20_12_0; + citrix_workspace = citrix_workspace_21_01_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_20_04_0 @@ -3123,6 +3135,7 @@ in citrix_workspace_20_09_0 citrix_workspace_20_10_0 citrix_workspace_20_12_0 + citrix_workspace_21_01_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -3736,6 +3749,8 @@ in edid-generator = callPackage ../tools/misc/edid-generator { }; + edir = callPackage ../tools/misc/edir { }; + editres = callPackage ../tools/graphics/editres { }; edit = callPackage ../applications/editors/edit { }; @@ -3983,7 +3998,9 @@ in eva = callPackage ../tools/misc/eva { }; - exa = callPackage ../tools/misc/exa { }; + exa = callPackage ../tools/misc/exa { + inherit (darwin.apple_sdk.frameworks) Security; + }; exempi = callPackage ../development/libraries/exempi { stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv; @@ -4346,6 +4363,8 @@ in gtk = gtk3; }; + free42 = callPackage ../applications/misc/free42 { }; + galen = callPackage ../development/tools/galen {}; gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; @@ -4826,6 +4845,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + robodoc = callPackage ../tools/text/robodoc { }; + ucg = callPackage ../tools/text/ucg { }; grive2 = callPackage ../tools/filesystems/grive2 { }; @@ -4981,9 +5002,7 @@ in hdf4 = null; }; - haproxy = callPackage ../tools/networking/haproxy { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; + haproxy = callPackage ../tools/networking/haproxy { }; hackertyper = callPackage ../tools/misc/hackertyper { }; @@ -5009,8 +5028,6 @@ in haste-client = callPackage ../tools/misc/haste-client { }; - hal-flash = callPackage ../os-specific/linux/hal-flash { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; @@ -5420,7 +5437,7 @@ in jo = callPackage ../development/tools/jo { }; - jrnl = callPackage ../applications/misc/jrnl { }; + jrnl = python3Packages.callPackage ../applications/misc/jrnl { }; jsawk = callPackage ../tools/text/jsawk { }; @@ -5824,6 +5841,8 @@ in np2kai = callPackage ../misc/emulators/np2kai { }; + ox = callPackage ../applications/editors/ox { }; + file-rename = callPackage ../tools/filesystems/file-rename { }; kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {}; @@ -6050,7 +6069,7 @@ in lzip = callPackage ../tools/compression/lzip { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { qt5 = qt514; }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; lzma = xz; # TODO: move to aliases.nix @@ -6499,16 +6518,13 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = nomad_0_12; + nomad = nomad_1_0; # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. - nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { - buildGoPackage = buildGo114Package; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; + # Upstream partially documents used Go versions here + # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; inherit (linuxPackages) nvidia_x11; @@ -6668,6 +6684,8 @@ in opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; + openfpgaloader = callPackage ../development/tools/misc/openfpgaloader { }; + openfortivpn = callPackage ../tools/networking/openfortivpn { }; obexfs = callPackage ../tools/bluetooth/obexfs { }; @@ -7171,6 +7189,8 @@ in povray = callPackage ../tools/graphics/povray { }; + power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; + ppl = callPackage ../development/libraries/ppl { }; pplatex = callPackage ../tools/typesetting/tex/pplatex { }; @@ -7989,6 +8009,8 @@ in stubby = callPackage ../tools/networking/stubby { }; + surface-control = callPackage ../applications/misc/surface-control { }; + syntex = callPackage ../tools/graphics/syntex {}; sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; @@ -8365,7 +8387,9 @@ in toilet = callPackage ../tools/misc/toilet { }; - tokei = callPackage ../development/tools/misc/tokei { }; + tokei = callPackage ../development/tools/misc/tokei { + inherit (darwin.apple_sdk.frameworks) Security; + }; toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; @@ -8409,10 +8433,14 @@ in trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules {}; + trezorctl = with python3Packages; toPythonApplication trezor; + trezord = callPackage ../servers/trezord { }; trezor_agent = with python3Packages; toPythonApplication trezor_agent; + trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -8497,6 +8525,8 @@ in libX11 = xorg.libX11; }; + twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader { }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twtxt = callPackage ../applications/networking/twtxt { }; @@ -8553,12 +8583,12 @@ in untex = callPackage ../tools/text/untex { }; - untrunc = callPackage ../tools/video/untrunc { }; - untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; up = callPackage ../tools/misc/up { }; + upterm = callPackage ../tools/misc/upterm { }; + upx = callPackage ../tools/compression/upx { }; uq = callPackage ../misc/uq { }; @@ -8970,10 +9000,6 @@ in hitch = callPackage ../servers/hitch { }; - venus = callPackage ../tools/misc/venus { - python = python27; - }; - veracrypt = callPackage ../applications/misc/veracrypt { wxGTK = wxGTK30; }; @@ -9233,10 +9259,12 @@ in zplug = callPackage ../shells/zsh/zplug { }; - zplugin = callPackage ../shells/zsh/zplugin {} ; + zinit = callPackage ../shells/zsh/zinit {} ; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; + zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; + zsh-bd = callPackage ../shells/zsh/zsh-bd { }; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; @@ -9251,6 +9279,8 @@ in zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; + zsh-system-clipboard = callPackage ../shells/zsh/zsh-system-clipboard { }; + zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; @@ -10039,7 +10069,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104; inherit (haskellPackages) ghc; @@ -10173,6 +10203,8 @@ in inherit (emacs.pkgs.melpaStablePackages) irony; }; + holo-build = callPackage ../tools/package-management/holo-build { }; + hugs = callPackage ../development/interpreters/hugs { }; openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; @@ -10822,7 +10854,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - maturin = callPackage ../development/tools/rust/maturin { }; + maturin = callPackage ../development/tools/rust/maturin { + inherit (darwin.apple_sdk.frameworks) Security; + }; + inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { @@ -10875,6 +10910,8 @@ in smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage ../development/compilers/smlnj { }; + smlpkg = callPackage ../tools/package-management/smlpkg { }; + solc = callPackage ../development/compilers/solc { }; souffle = callPackage ../development/compilers/souffle { @@ -11088,12 +11125,15 @@ in }; beam = callPackage ./beam-packages.nix { }; + beam_nox = callPackage ./beam-packages.nix { wxSupport = false; }; inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 - erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 + erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + erlang_nox = beam_nox.interpreters.erlang; + inherit (beam.packages.erlang) rebar rebar3 fetchHex beamPackages @@ -11689,6 +11729,8 @@ in avrdude = callPackage ../development/tools/misc/avrdude { }; + b4 = callPackage ../development/tools/b4 { }; + babeltrace = callPackage ../development/tools/misc/babeltrace { }; bam = callPackage ../development/tools/build-managers/bam {}; @@ -11736,6 +11778,16 @@ in bazel_self = bazel_3; }; + bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk11_headless; + buildJdkName = "java11"; + runJdk = jdk11_headless; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + bazel_self = bazel_4; + }; + bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; buildozer = bazel-buildtools; @@ -12110,6 +12162,8 @@ in editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; + edb = libsForQt5.callPackage ../development/tools/misc/edb { }; + eggdbus = callPackage ../development/tools/misc/eggdbus { }; effitask = callPackage ../applications/misc/effitask { }; @@ -12620,7 +12674,7 @@ in pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -13777,6 +13831,10 @@ in rev = "v${version}"; sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; }; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -14518,6 +14576,8 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; + libaudec = callPackage ../development/libraries/libaudec { }; + libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; @@ -15635,6 +15695,8 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + libcyaml = callPackage ../development/libraries/libcyaml { }; + rang = callPackage ../development/libraries/rang { }; libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { @@ -16165,7 +16227,7 @@ in poco = callPackage ../development/libraries/poco { }; - podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; + podofo = callPackage ../development/libraries/podofo { }; polkit = callPackage ../development/libraries/polkit { }; @@ -16608,6 +16670,8 @@ in shapelib = callPackage ../development/libraries/shapelib { }; + sharness = callPackage ../development/libraries/sharness { }; + shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; skaffold = callPackage ../development/tools/skaffold { }; @@ -17848,6 +17912,8 @@ in mailman-web = with python3.pkgs; toPythonApplication mailman-web; + mastodon = callPackage ../servers/mastodon { }; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -17885,7 +17951,7 @@ in inherit (callPackages ../servers/mpd { }) mpd mpd-small mpdWithFeatures; - mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; + libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; mpdscribble = callPackage ../tools/misc/mpdscribble { }; @@ -18049,7 +18115,11 @@ in libpulseaudio = libpulseaudio-vanilla; - pulseeffects = callPackage ../applications/audio/pulseeffects { + pulseeffects-pw = callPackage ../applications/audio/pulseeffects { + boost = boost172; + }; + + pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { boost = boost172; }; @@ -18242,6 +18312,7 @@ in prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; + prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; @@ -18307,7 +18378,7 @@ in rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; - elixir = elixir_1_8; + elixir = beam_nox.interpreters.elixir_1_8; erlang = erlang_nox; }; @@ -18634,6 +18705,8 @@ in libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches; + aseq2json = callPackage ../os-specific/linux/aseq2json {}; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; @@ -18753,9 +18826,10 @@ in erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; + fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; - fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; + fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl/legacy.nix { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; @@ -20859,9 +20933,7 @@ in ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { }; - twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { - inherit (nodePackages) svgo; - }; + twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { }; twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { }; @@ -21416,7 +21488,7 @@ in cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { - inherit (darwin.apple_sdk.frameworks) CoreAudio; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; ffmpeg = ffmpeg_2; }; @@ -21654,14 +21726,9 @@ in inherit (gnome2) libgnomeui; }; - dwm = callPackage ../applications/window-managers/dwm { - patches = config.dwm.patches or []; - }; + dwl = callPackage ../applications/window-managers/dwl { }; - dwm-git = callPackage ../applications/window-managers/dwm/git.nix { - patches = config.dwm.patches or []; - conf = config.dwm.conf or null; - }; + dwm = callPackage ../applications/window-managers/dwm { }; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; @@ -21820,6 +21887,8 @@ in eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; + etebase-server = with python3Packages; toPythonApplication etebase-server; + etesync-dav = callPackage ../applications/misc/etesync-dav {}; etherape = callPackage ../applications/networking/sniffers/etherape { }; @@ -22229,14 +22298,6 @@ in flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; - flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); - - flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix (config.flashplayer or {}); - - flashplayer-standalone-debugger = flashplayer-standalone.override { - debug = true; - }; - fluxbox = callPackage ../applications/window-managers/fluxbox { }; fme = callPackage ../applications/misc/fme { @@ -22658,6 +22719,10 @@ in ht = callPackage ../applications/editors/ht { }; + xh = callPackage ../tools/networking/xh { + inherit (darwin.apple_sdk.frameworks) Security; + }; + hubstaff = callPackage ../applications/misc/hubstaff { }; hue-cli = callPackage ../tools/networking/hue-cli { }; @@ -22763,6 +22828,8 @@ in waybar = callPackage ../applications/misc/waybar {}; + wbg = callPackage ../applications/misc/wbg { }; + hikari = callPackage ../applications/window-managers/hikari { }; i3 = callPackage ../applications/window-managers/i3 { @@ -23058,6 +23125,8 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; + kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { @@ -23176,6 +23245,8 @@ in lame = callPackage ../development/libraries/lame { }; + labwc = callPackage ../applications/window-managers/labwc { }; + larswm = callPackage ../applications/window-managers/larswm { }; lash = callPackage ../applications/audio/lash { }; @@ -23236,11 +23307,10 @@ in }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libsForQt514.callPackage ../applications/office/libreoffice + libreoffice = libsForQt5.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; - jdk = jdk11; }); }); @@ -23248,7 +23318,6 @@ in libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { variant = "fresh"; - jdk = jdk11; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; @@ -23256,10 +23325,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { - stdenv = gcc9Stdenv; # Fails in multiple ways with gcc10 - icu = icu64; variant = "still"; - jdk = jdk8; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -23533,6 +23599,8 @@ in mmsd = callPackage ../tools/networking/mmsd { }; + mmtc = callPackage ../applications/audio/mmtc { }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; @@ -23591,6 +23659,7 @@ in mopidy-soundcloud mopidy-spotify mopidy-spotify-tunigo + mopidy-subidy mopidy-tunein mopidy-youtube; @@ -23820,6 +23889,8 @@ in i3GapsSupport = false; }; + yambar = callPackage ../applications/misc/yambar { }; + polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { @@ -23889,6 +23960,8 @@ in rep-gtk = callPackage ../development/libraries/rep-gtk { }; + reproc = callPackage ../development/libraries/reproc { }; + sawfish = callPackage ../applications/window-managers/sawfish { }; sc68 = callPackage ../applications/audio/sc68 { }; @@ -24309,6 +24382,8 @@ in pistol = callPackage ../tools/misc/pistol { }; + piston-cli = callPackage ../tools/misc/piston-cli { }; + plater = libsForQt5.callPackage ../applications/misc/plater { }; plexamp = callPackage ../applications/audio/plexamp { }; @@ -25081,6 +25156,8 @@ in tabula = callPackage ../applications/misc/tabula { }; + tabula-java = callPackage ../applications/misc/tabula-java { }; + tasknc = callPackage ../applications/misc/tasknc { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -25166,7 +25243,9 @@ in ticpp = callPackage ../development/libraries/ticpp { }; - tickrs = callPackage ../applications/misc/tickrs { }; + tickrs = callPackage ../applications/misc/tickrs { + inherit (darwin.apple_sdk.frameworks) Security; + }; tig = callPackage ../applications/version-management/git-and-tools/tig { }; @@ -25531,7 +25610,9 @@ in volnoti = callPackage ../applications/misc/volnoti { }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; + vorbis-tools = callPackage ../applications/audio/vorbis-tools { + autoreconfHook = buildPackages.autoreconfHook269; + }; vscode = callPackage ../applications/editors/vscode/vscode.nix { }; @@ -25961,6 +26042,8 @@ in xineUI = callPackage ../applications/video/xine-ui { }; + xlsxgrep = callPackage ../applications/search/xlsxgrep { }; + xmind = callPackage ../applications/misc/xmind { }; xneur = callPackage ../applications/misc/xneur { @@ -26327,6 +26410,8 @@ in abbaye-des-morts = callPackage ../games/abbaye-des-morts { }; + abuse = callPackage ../games/abuse { }; + adom = callPackage ../games/adom { }; airstrike = callPackage ../games/airstrike { }; @@ -27228,9 +27313,7 @@ in wesnoth-dev = wesnoth; - widelands = callPackage ../games/widelands { - lua = lua5_2; - }; + widelands = callPackage ../games/widelands { }; worldofgoo = callPackage ../games/worldofgoo { }; @@ -27322,6 +27405,8 @@ in zeroad = zeroadPackages.zeroad; + _0verkill = callPackage ../games/0verkill { }; + ### DESKTOP ENVIRONMENTS cdesktopenv = callPackage ../desktops/cdesktopenv { }; @@ -27352,6 +27437,7 @@ in easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; freon = callPackage ../desktops/gnome-3/extensions/freon { }; + fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; @@ -28508,8 +28594,6 @@ in cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; - cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { }; - # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; @@ -28695,6 +28779,8 @@ in libjack2 = jack2.override { prefix = "lib"; }; jack2Full = jack2; # TODO: move to aliases.nix + jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; + keynav = callPackage ../tools/X11/keynav { }; kmon = callPackage ../tools/system/kmon { }; @@ -28772,8 +28858,6 @@ in nixops = callPackage ../tools/package-management/nixops { }; - nixops_1_6_1 = callPackage ../tools/package-management/nixops/nixops-v1_6_1.nix {}; - nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; @@ -29315,6 +29399,8 @@ in ssh-audit = callPackage ../tools/security/ssh-audit { }; + ssh-tools = callPackage ../applications/misc/ssh-tools { }; + auto-cpufreq = callPackage ../tools/system/auto-cpufreq { }; thermald = callPackage ../tools/system/thermald { }; @@ -29651,7 +29737,9 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - sccache = callPackage ../development/tools/misc/sccache { }; + sccache = callPackage ../development/tools/misc/sccache { + inherit (darwin.apple_sdk.frameworks) Security; + }; sequeler = callPackage ../applications/misc/sequeler { }; diff --git a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix index fb331b85eb..aae127fd04 100644 --- a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, wxGTK30, openssl_1_0_2, buildPackages }: +{ callPackage, wxGTK30, openssl_1_0_2, buildPackages, wxSupport ? true }: rec { lib = callPackage ../development/beam-modules/lib.nix { }; @@ -11,7 +11,6 @@ rec { erlang_odbc = erlangR23_odbc; erlang_javac = erlangR23_javac; erlang_odbc_javac = erlangR23_odbc_javac; - erlang_nox = erlangR23_nox; # Standard Erlang versions, using the generic builder. @@ -21,6 +20,7 @@ rec { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; @@ -28,7 +28,6 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR23_nox = erlangR23.override { wxSupport = false; }; # R22 erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { @@ -36,6 +35,7 @@ rec { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; @@ -43,12 +43,12 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR22_nox = erlangR22.override { wxSupport = false; }; # R21 erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; }; @@ -56,12 +56,12 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR21_nox = erlangR21.override { wxSupport = false; }; # R20 erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { wxGTK = wxGTK30; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR20_odbc = erlangR20.override { odbcSupport = true; }; erlangR20_javac = erlangR20.override { javacSupport = true; }; @@ -69,13 +69,13 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR20_nox = erlangR20.override { wxSupport = false; }; # R19 erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; }; @@ -83,13 +83,13 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR19_nox = erlangR19.override { wxSupport = false; }; # R18 erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; }; @@ -97,12 +97,12 @@ rec { javacSupport = true; odbcSupport = true; }; - erlangR18_nox = erlangR18.override { wxSupport = false; }; # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { autoconf = buildPackages.autoconf269; + inherit wxSupport; }; erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; }; diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index 46e222261f..6c8e3e7d85 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -114,6 +114,16 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { bootPkgs = packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; @@ -221,6 +231,11 @@ in { ghc = bh.compiler.ghc8103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc8104 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8104; + ghc = bh.compiler.ghc8104; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghc901 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc901; ghc = bh.compiler.ghc901; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index b979599e63..c0faba640a 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -506,6 +506,8 @@ let kafka = callPackage ../development/ocaml-modules/kafka { }; + kafka_lwt = callPackage ../development/ocaml-modules/kafka/lwt.nix { }; + ke = callPackage ../development/ocaml-modules/ke { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index f11bd450ef..f0ca4bdbae 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -8480,10 +8480,10 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.47"; + version = "0.48"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "1ja85hzzl36sjikcyavjqy4m41f2yyrsr1ipypzi5mlw7clhmdi3"; + sha256 = "077jnf5a07x0p30iqcw3kh53xh3dplhb0jyyyq9b4c79ira3ds6r"; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseSublike ]; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 932c2a867f..3df697d3d5 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -134,6 +134,8 @@ lib.makeScope pkgs.newScope (self: with self; { redis = callPackage ../development/php-packages/redis { }; + smbclient = callPackage ../development/php-packages/smbclient { }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; v8 = buildPecl { @@ -508,6 +510,8 @@ lib.makeScope pkgs.newScope (self: with self; { ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } { name = "xmlrpc"; buildInputs = [ libxml2 libiconv ]; + # xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc + enable = lib.versionOlder php.version "8.0"; configureFlags = [ "--with-xmlrpc" ] # Required to build on darwin. ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } @@ -518,7 +522,7 @@ lib.makeScope pkgs.newScope (self: with self; { ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } { name = "xsl"; buildInputs = [ libxslt libxml2 ]; - doCheck = !(lib.versionOlder php.version "7.4"); + doCheck = lib.versionOlder php.version "8.0"; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } { name = "zend_test"; } { name = "zip"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 87b6736a62..cc0ab7e8c8 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -204,6 +204,8 @@ in { aioamqp = callPackage ../development/python-modules/aioamqp { }; + ailment = callPackage ../development/python-modules/ailment { }; + aiocoap = callPackage ../development/python-modules/aiocoap { }; aioconsole = callPackage ../development/python-modules/aioconsole { }; @@ -276,6 +278,8 @@ in { aiopulse = callPackage ../development/python-modules/aiopulse { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; + aioredis = callPackage ../development/python-modules/aioredis { }; aioresponses = callPackage ../development/python-modules/aioresponses { }; @@ -457,8 +461,12 @@ in { asn1crypto = callPackage ../development/python-modules/asn1crypto { }; + aspell-python = callPackage ../development/python-modules/aspell-python { }; + aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + asteval = callPackage ../development/python-modules/asteval { }; + astor = callPackage ../development/python-modules/astor { }; astral = callPackage ../development/python-modules/astral { }; @@ -1281,6 +1289,8 @@ in { class-registry = callPackage ../development/python-modules/class-registry { }; + claripy = callPackage ../development/python-modules/claripy { }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -1960,6 +1970,8 @@ in { dpkt = callPackage ../development/python-modules/dpkt { }; + drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; drms = callPackage ../development/python-modules/drms { }; @@ -2087,6 +2099,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + etebase-server = callPackage ../servers/etebase { }; + etesync = callPackage ../development/python-modules/etesync { }; eth-hash = callPackage ../development/python-modules/eth-hash { }; @@ -3656,6 +3670,8 @@ in { inherit python; })).py; + libpurecool = callPackage ../development/python-modules/libpurecool { }; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -4886,6 +4902,10 @@ in { inherit (pkgs.libsForQt5) soqt; }; + pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + + pkce = callPackage ../development/python-modules/pkce { }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; }; pkginfo = callPackage ../development/python-modules/pkginfo { }; @@ -4894,8 +4914,12 @@ in { pynndescent = callPackage ../development/python-modules/pynndescent { }; + pynuki = callPackage ../development/python-modules/pynuki { }; + pysbd = callPackage ../development/python-modules/pysbd { }; + pyshark = callPackage ../development/python-modules/pyshark { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-csxcad = callPackage ../development/python-modules/python-csxcad { }; @@ -5067,6 +5091,8 @@ in { prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { }; + promise = callPackage ../development/python-modules/promise { }; prompt_toolkit = let @@ -5175,6 +5201,8 @@ in { pyahocorasick = callPackage ../development/python-modules/pyahocorasick { }; + pyairnow = callPackage ../development/python-modules/pyairnow { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; @@ -5646,6 +5674,8 @@ in { py-multibase = callPackage ../development/python-modules/py-multibase { }; + py-multicodec = callPackage ../development/python-modules/py-multicodec { }; + py-multihash = callPackage ../development/python-modules/py-multihash { }; pymumble = callPackage ../development/python-modules/pymumble { }; @@ -5715,6 +5745,8 @@ in { pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyopenuv = callPackage ../development/python-modules/pyopenuv { }; + pyopnsense = callPackage ../development/python-modules/pyopnsense { }; pyosf = callPackage ../development/python-modules/pyosf { }; @@ -5925,6 +5957,8 @@ in { pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; + pysma = callPackage ../development/python-modules/pysma { }; + pysmb = callPackage ../development/python-modules/pysmb { }; pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; @@ -5933,6 +5967,8 @@ in { pysmi = callPackage ../development/python-modules/pysmi { }; + pysmt = callPackage ../development/python-modules/pysmt { }; + pysnmp = callPackage ../development/python-modules/pysnmp { }; pysnooper = callPackage ../development/python-modules/pysnooper { }; @@ -6502,6 +6538,10 @@ in { pyvera = callPackage ../development/python-modules/pyvera { }; + pyvesync = callPackage ../development/python-modules/pyvesync { }; + + pyvex = callPackage ../development/python-modules/pyvex { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; pyvips = callPackage ../development/python-modules/pyvips { @@ -6564,6 +6604,8 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; + pyzerproc = callPackage ../development/python-modules/pyzerproc { }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; pyzufall = callPackage ../development/python-modules/pyzufall { }; @@ -7897,6 +7939,8 @@ in { twisted = callPackage ../development/python-modules/twisted { }; + twitch-python = callPackage ../development/python-modules/twitch-python { }; + twitter = callPackage ../development/python-modules/twitter { }; twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; @@ -8447,7 +8491,9 @@ in { yowsup = callPackage ../development/python-modules/yowsup { }; - yq = callPackage ../development/python-modules/yq { }; + yq = callPackage ../development/python-modules/yq { + inherit (pkgs) jq; + }; yt = callPackage ../development/python-modules/yt { };