diff options
561 files changed, 11485 insertions, 6853 deletions
diff --git a/.editorconfig b/.editorconfig index b780def5d11..532bb482434 100644 --- a/.editorconfig +++ b/.editorconfig @@ -67,10 +67,6 @@ indent_style = unset insert_final_newline = unset trim_trailing_whitespace = unset -[pkgs/build-support/upstream-updater/**] -indent_style = unset -trim_trailing_whitespace = unset - [pkgs/development/compilers/elm/registry.dat] end_of_line = unset insert_final_newline = unset diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 61786ae676e..8a827855d7e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -513,12 +513,6 @@ githubId = 38869148; name = "Alex Eyre"; }; - algorith = { - email = "dries_van_daele@telenet.be"; - github = "DriesVanDaele"; - githubId = 1141488; - name = "Dries Van Daele"; - }; alibabzo = { email = "alistair.bill@gmail.com"; github = "alibabzo"; @@ -6536,6 +6530,12 @@ githubId = 787421; name = "Kevin Quick"; }; + kradalby = { + name = "Kristoffer Dalby"; + email = "kristoffer@dalby.cc"; + github = "kradalby"; + githubId = 98431; + }; kraem = { email = "me@kraem.xyz"; github = "kraem"; @@ -12163,6 +12163,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; + matrix = "@toastal:matrix.org"; github = "toastal"; githubId = 561087; name = "toastal"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 19f0a783520..42db2d060be 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -81,6 +81,12 @@ </listitem> <listitem> <para> + <link xlink:href="https://github.com/linux-apfs/linux-apfs-rw">apfs</link>, + a kernel module for mounting the Apple File System (APFS). + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://frrouting.org/">FRRouting</link>, a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as @@ -171,6 +177,13 @@ </listitem> <listitem> <para> + <link xlink:href="https://github.com/audreyt/ethercalc">ethercalc</link>, + an online collaborative spreadsheet. Available as + <link xlink:href="options.html#opt-services.ethercalc.enable">services.ethercalc</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://timetagger.app">timetagger</link>, an open source time-tracker with an intuitive user experience and powerful reporting. @@ -185,6 +198,15 @@ <link xlink:href="options.html#opt-services.rstudio-server.enable">services.rstudio-server</link>. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/juanfont/headscale">headscale</link>, + an Open Source implementation of the + <link xlink:href="https://tailscale.io">Tailscale</link> + Control Server. Available as + <link xlink:href="options.html#opt-services.headscale.enable">services.headscale</link> + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-incompatibilities"> @@ -230,6 +252,23 @@ </listitem> <listitem> <para> + The DHCP server (<literal>services.dhcpd4</literal>, + <literal>services.dhcpd6</literal>) has been hardened. The + service is now using the systemd’s + <literal>DynamicUser</literal> mechanism to run as an + unprivileged dynamically-allocated user with limited + capabilities. The dhcpd state files are now always stored in + <literal>/var/lib/dhcpd{4,6}</literal> and the + <literal>services.dhcpd4.stateDir</literal> and + <literal>service.dhcpd6.stateDir</literal> options have been + removed. If you were depending on root privileges or + set{uid,gid,cap} binaries in dhcpd shell hooks, you may give + dhcpd more capabilities with e.g. + <literal>systemd.services.dhcpd6.serviceConfig.AmbientCapabilities</literal>. + </para> + </listitem> + <listitem> + <para> The <literal>mailpile</literal> email webclient (<literal>services.mailpile</literal>) has been removed due to its reliance on python2. @@ -435,6 +474,20 @@ </listitem> <listitem> <para> + The existing <literal>pkgs.opentelemetry-collector</literal> + has been moved to + <literal>pkgs.opentelemetry-collector-contrib</literal> to + match the actual source being the <quote>contrib</quote> + edition. <literal>pkgs.opentelemetry-collector</literal> is + now the actual core release of opentelemetry-collector. If you + use the community contributions you should change the package + you refer to. If you don’t need them update your commands from + <literal>otelcontribcol</literal> to + <literal>otelcorecol</literal> and enjoy a 7x smaller binary. + </para> + </listitem> + <listitem> + <para> <literal>pkgs.noto-fonts-cjk</literal> is now deprecated in favor of <literal>pkgs.noto-fonts-cjk-sans</literal> and <literal>pkgs.noto-fonts-cjk-serif</literal> because they each @@ -520,6 +573,14 @@ wrapper for <literal>assert</literal> conditions. </para> </listitem> + <listitem> + <para> + <literal>pkgs.vimPlugins.onedark-nvim</literal> now refers to + <link xlink:href="https://github.com/navarasu/onedark.nvim">navarasu/onedark.nvim</link> + (formerly refers to + <link xlink:href="https://github.com/olimorris/onedarkpro.nvim">olimorris/onedarkpro.nvim</link>). + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 5461df4c3ab..7bb7b1c33b1 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -27,6 +27,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable). +- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS). + - [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.ffr.babel.enable) - [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable). @@ -51,10 +53,15 @@ In addition to numerous new and upgraded packages, this release has the followin - [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable). +- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative + spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable). + - [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable). - [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable). +- [headscale](https://github.com/juanfont/headscale), an Open Source implementation of the [Tailscale](https://tailscale.io) Control Server. Available as [services.headscale](options.html#opt-services.headscale.enable) + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} @@ -78,6 +85,11 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. +- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened. + The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities. + The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed. + If you were depending on root privileges or set{uid,gid,cap} binaries in dhcpd shell hooks, you may give dhcpd more capabilities with e.g. `systemd.services.dhcpd6.serviceConfig.AmbientCapabilities`. + - The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2. - The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs. @@ -132,11 +144,20 @@ In addition to numerous new and upgraded packages, this release has the followin - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. + - The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under `$out/libexec/terraform-providers/<registry>/<owner>/<name>/<version>/<os>_<arch>/terraform-provider-<name>_v<version>` (which mkProvider does). This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly. +- The existing `pkgs.opentelemetry-collector` has been moved to + `pkgs.opentelemetry-collector-contrib` to match the actual source being the + "contrib" edition. `pkgs.opentelemetry-collector` is now the actual core + release of opentelemetry-collector. If you use the community contributions + you should change the package you refer to. If you don't need them update your + commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary. + + - `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` and `pkgs.noto-fonts-cjk-serif` because they each have different release schedules. To maintain compatibility with prior releases of Nixpkgs, @@ -159,6 +180,9 @@ In addition to numerous new and upgraded packages, this release has the followin - `lib.assertMsg` and `lib.assertOneOf` no longer return `false` if the passed condition is `false`, `throw`ing the given error message instead (which makes the resulting error message less cluttered). This will not impact the behaviour of code using these functions as intended, namely as top-level wrapper for `assert` conditions. +- `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim) + (formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)). + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> ## Other Notable Changes {#sec-release-22.05-notable-changes} diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index db4c3551187..ab166d7327c 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -11,6 +11,9 @@ in rec { mkPathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""]; + # a type for options that take a unit name + unitNameType = types.strMatching "[a-zA-Z0-9@%:_.\\-]+[.](service|socket|device|mount|automount|swap|target|path|timer|scope|slice)"; + makeUnit = name: unit: if unit.enable then pkgs.runCommand "unit-${mkPathSafeName name}" diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 832a33d6429..520f2e982a2 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -45,7 +45,7 @@ in rec { requiredBy = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Units that require (i.e. depend on and need to go down with) this unit. The discussion under <literal>wantedBy</literal> @@ -56,7 +56,7 @@ in rec { wantedBy = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Units that want (i.e. depend on) this unit. The standard way to make a unit start by default at boot is to set this option @@ -73,7 +73,7 @@ in rec { aliases = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = "Aliases of that unit."; }; @@ -110,7 +110,7 @@ in rec { requires = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Start the specified units when this unit is started, and stop this unit when the specified units are stopped or fail. @@ -119,7 +119,7 @@ in rec { wants = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Start the specified units when this unit is started. ''; @@ -127,7 +127,7 @@ in rec { after = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are started at the same time as this unit, delay this unit until they have started. @@ -136,7 +136,7 @@ in rec { before = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are started at the same time as this unit, delay them until this unit has started. @@ -145,7 +145,7 @@ in rec { bindsTo = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Like ‘requires’, but in addition, if the specified units unexpectedly disappear, this unit will be stopped as well. @@ -154,7 +154,7 @@ in rec { partOf = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are stopped or restarted, then this unit is stopped or restarted as well. @@ -163,7 +163,7 @@ in rec { conflicts = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are started, then this unit is stopped and vice versa. @@ -172,7 +172,7 @@ in rec { requisite = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Similar to requires. However if the units listed are not started, they will not be started and the transaction will fail. @@ -203,7 +203,7 @@ in rec { onFailure = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' A list of one or more units that are activated when this unit enters the "failed" state. diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 24d5b7bc2b2..99bdb11b011 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -57,7 +57,6 @@ in { rtl8723bs-firmware rtl8761b-firmware rtw88-firmware - rtw89-firmware zd1211fw alsa-firmware sof-firmware @@ -65,6 +64,8 @@ in { ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware + ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [ + rtw89-firmware ]; hardware.wirelessRegulatoryDatabase = true; }) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 065cea470fb..31aeaad80d6 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/hapw7q1fkjxvprnkcgw9ppczavg4daj2-nix-2.4"; - i686-linux = "/nix/store/8qlvh8pp5j8wgrzj3is2jlbhgrwgsiy9-nix-2.4"; - aarch64-linux = "/nix/store/h48lkygcqj4hdibbdnpl67q7ks6vkrd6-nix-2.4"; - x86_64-darwin = "/nix/store/c3mvzszvyzakvcp9spnjvsb8m2bpjk7m-nix-2.4"; - aarch64-darwin = "/nix/store/hbfqs62r0hga2yr4zi5kc7fzhf71bq9n-nix-2.4"; + x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0"; + i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0"; + aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0"; + x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0"; + aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0"; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 103cb075309..1e3b8f3099b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -763,6 +763,7 @@ ./services/networking/gvpe.nix ./services/networking/hans.nix ./services/networking/haproxy.nix + ./services/networking/headscale.nix ./services/networking/hostapd.nix ./services/networking/htpdate.nix ./services/networking/hylafax/default.nix @@ -1004,6 +1005,7 @@ ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix ./services/web-apps/engelsystem.nix + ./services/web-apps/ethercalc.nix ./services/web-apps/fluidd.nix ./services/web-apps/galene.nix ./services/web-apps/gerrit.nix @@ -1161,6 +1163,7 @@ ./tasks/cpu-freq.nix ./tasks/encrypted-devices.nix ./tasks/filesystems.nix + ./tasks/filesystems/apfs.nix ./tasks/filesystems/bcachefs.nix ./tasks/filesystems/btrfs.nix ./tasks/filesystems/cifs.nix diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 02485091d3a..ea57292fc4b 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -69,7 +69,8 @@ let set -e set +o pipefail NIX_CONF_DIR=$PWD \ - ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net --option experimental-features nix-command"} \ + ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \ + ${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \ |& sed -e 's/^warning:/error:/' \ | (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}') set -o pipefail diff --git a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix index 9e49601ce1a..bac98364538 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix @@ -42,11 +42,11 @@ in { serviceOpts = { serviceConfig = { AmbientCapabilities = [ - "CAP_RAW_SYSIO" + "CAP_SYS_RAWIO" "CAP_SYS_ADMIN" ]; CapabilityBoundingSet = [ - "CAP_RAW_SYSIO" + "CAP_SYS_RAWIO" "CAP_SYS_ADMIN" ]; DevicePolicy = "closed"; diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 54e4f900285..3c4c0069dfd 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -28,38 +28,45 @@ let } ''; - dhcpdService = postfix: cfg: optionalAttrs cfg.enable { - "dhcpd${postfix}" = { - description = "DHCPv${postfix} server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - preStart = '' - mkdir -m 755 -p ${cfg.stateDir} - chown dhcpd:nogroup ${cfg.stateDir} - touch ${cfg.stateDir}/dhcpd.leases - ''; - - serviceConfig = - let - configFile = if cfg.configFile != null then cfg.configFile else writeConfig cfg; - args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" - "-pf" "/run/dhcpd${postfix}/dhcpd.pid" - "-cf" "${configFile}" - "-lf" "${cfg.stateDir}/dhcpd.leases" - "-user" "dhcpd" "-group" "nogroup" - ] ++ cfg.extraFlags - ++ cfg.interfaces; - - in { - ExecStart = concatMapStringsSep " " escapeShellArg args; - Type = "forking"; - Restart = "always"; - RuntimeDirectory = [ "dhcpd${postfix}" ]; - PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; + dhcpdService = postfix: cfg: + let + configFile = + if cfg.configFile != null + then cfg.configFile + else writeConfig cfg; + leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases"; + args = [ + "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" + "-pf" "/run/dhcpd${postfix}/dhcpd.pid" + "-cf" configFile + "-lf" leaseFile + ] ++ cfg.extraFlags + ++ cfg.interfaces; + in + optionalAttrs cfg.enable { + "dhcpd${postfix}" = { + description = "DHCPv${postfix} server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = "touch ${leaseFile}"; + serviceConfig = { + ExecStart = concatMapStringsSep " " escapeShellArg args; + Type = "forking"; + Restart = "always"; + DynamicUser = true; + User = "dhcpd"; + Group = "dhcpd"; + AmbientCapabilities = [ + "CAP_NET_RAW" # to send ICMP messages + "CAP_NET_BIND_SERVICE" # to bind on DHCP port (67) + ]; + StateDirectory = "dhcpd${postfix}"; + RuntimeDirectory = "dhcpd${postfix}"; + PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; + }; }; - }; - }; + }; machineOpts = { ... }: { @@ -102,15 +109,6 @@ let ''; }; - stateDir = mkOption { - type = types.path; - # We use /var/lib/dhcp for DHCPv4 to save backwards compatibility. - default = "/var/lib/dhcp${if postfix == "4" then "" else postfix}"; - description = '' - State directory for the DHCP server. - ''; - }; - extraConfig = mkOption { type = types.lines; default = ""; @@ -194,7 +192,13 @@ in imports = [ (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ]) - ]; + ] ++ flip map [ "4" "6" ] (postfix: + mkRemovedOptionModule [ "services" "dhcpd${postfix}" "stateDir" ] '' + The DHCP server state directory is now managed with the systemd's DynamicUser mechanism. + This means the directory is named after the service (dhcpd${postfix}), created under + /var/lib/private/ and symlinked to /var/lib/. + '' + ); ###### interface @@ -210,15 +214,6 @@ in config = mkIf (cfg4.enable || cfg6.enable) { - users = { - users.dhcpd = { - isSystemUser = true; - group = "dhcpd"; - description = "DHCP daemon user"; - }; - groups.dhcpd = {}; - }; - systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6; }; diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix new file mode 100644 index 00000000000..091d2a938cd --- /dev/null +++ b/nixos/modules/services/networking/headscale.nix @@ -0,0 +1,490 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.headscale; + + dataDir = "/var/lib/headscale"; + runDir = "/run/headscale"; + + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "headscale.yaml" cfg.settings; +in +{ + options = { + services.headscale = { + enable = mkEnableOption "headscale, Open Source coordination server for Tailscale"; + + package = mkOption { + type = types.package; + default = pkgs.headscale; + defaultText = literalExpression "pkgs.headscale"; + description = '' + Which headscale package to use for the running server. + ''; + }; + + user = mkOption { + default = "headscale"; + type = types.str; + description = '' + User account under which headscale runs. + <note><para> + If left as the default value this user will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the headscale service starts. + </para></note> + ''; + }; + + group = mkOption { + default = "headscale"; + type = types.str; + description = '' + Group under which headscale runs. + <note><para> + If left as the default value this group will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the headscale service starts. + </para></note> + ''; + }; + + serverUrl = mkOption { + type = types.str; + default = "http://127.0.0.1:8080"; + description = '' + The url clients will connect to. + ''; + example = "https://myheadscale.example.com:443"; + }; + + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Listening address of headscale. + ''; + example = "0.0.0.0"; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = '' + Listening port of headscale. + ''; + example = 443; + }; + + privateKeyFile = mkOption { + type = types.path; + default = "${dataDir}/private.key"; + description = '' + Path to private key file, generated automatically if it does not exist. + ''; + }; + + derp = { + urls = mkOption { + type = types.listOf types.str; + default = [ "https://controlplane.tailscale.com/derpmap/default" ]; + description = '' + List of urls containing DERP maps. + See <link xlink:href="https://tailscale.com/blog/how-tailscale-works/">How Tailscale works</link> for more information on DERP maps. + ''; + }; + + paths = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + List of file paths containing DERP maps. + See <link xlink:href="https://tailscale.com/blog/how-tailscale-works/">How Tailscale works</link> for more information on DERP maps. + ''; + }; + + + autoUpdate = mkOption { + type = types.bool; + default = true; + description = '' + Whether to automatically update DERP maps on a set frequency. + ''; + example = false; + }; + + updateFrequency = mkOption { + type = types.str; + default = "24h"; + description = '' + Frequency to update DERP maps. + ''; + example = "5m"; + }; + + }; + + ephemeralNodeInactivityTimeout = mkOption { + type = types.str; + default = "30m"; + description = '' + Time before an inactive ephemeral node is deleted. + ''; + example = "5m"; + }; + + database = { + type = mkOption { + type = types.enum [ "sqlite3" "postgres" ]; + example = "postgres"; + default = "sqlite3"; + description = "Database engine to use."; + }; + + host = mkOption { + type = types.nullOr types.str; + default = null; + example = "127.0.0.1"; + description = "Database host address."; + }; + + port = mkOption { + type = types.nullOr types.port; + default = null; + example = 3306; + description = "Database host port."; + }; + + name = mkOption { + type = types.nullOr types.str; + default = null; + example = "headscale"; + description = "Database name."; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + example = "headscale"; + description = "Database user."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/headscale-dbpassword"; + description = '' + A file containing the password corresponding to + <option>database.user</option>. + ''; + }; + + path = mkOption { + type = types.nullOr types.str; + default = "${dataDir}/db.sqlite"; + description = "Path to the sqlite3 database file."; + }; + }; + + logLevel = mkOption { + type = types.str; + default = "info"; + description = '' + headscale log level. + ''; + example = "debug"; + }; + + dns = { + nameservers = mkOption { + type = types.listOf types.str; + default = [ "1.1.1.1" ]; + description = '' + List of nameservers to pass to Tailscale clients. + ''; + }; + + domains = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Search domains to inject to Tailscale clients. + ''; + example = [ "mydomain.internal" ]; + }; + + magicDns = mkOption { + type = types.bool; + default = true; + description = '' + Whether to use [MagicDNS](https://tailscale.com/kb/1081/magicdns/). + Only works if there is at least a nameserver defined. + ''; + example = false; + }; + + baseDomain = mkOption { + type = types.str; + default = ""; + description = '' + Defines the base domain to create the hostnames for MagicDNS. + <option>baseDomain</option> must be a FQDNs, without the trailing dot. + The FQDN of the hosts will be + <literal>hostname.namespace.base_domain</literal> (e.g. + <literal>myhost.mynamespace.example.com</literal>). + ''; + }; + }; + + openIdConnect = { + issuer = mkOption { + type = types.str; + default = ""; + description = '' + URL to OpenID issuer. + ''; + example = "https://openid.example.com"; + }; + + clientId = mkOption { + type = types.str; + default = ""; + description = '' + OpenID Connect client ID. + ''; + }; + + clientSecretFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to OpenID Connect client secret file. + ''; + }; + + domainMap = mkOption { + type = types.attrsOf types.str; + default = { }; + description = '' + Domain map is used to map incomming users (by their email) to + a namespace. The key can be a string, or regex. + ''; + example = { + ".*" = "default-namespace"; + }; + }; + + }; + + tls = { + letsencrypt = { + hostname = mkOption { + type = types.nullOr types.str; + default = ""; + description = '' + Domain name to request a TLS certificate for. + ''; + }; + challengeType = mkOption { + type = types.enum [ "TLS_ALPN-01" "HTTP-01" ]; + default = "HTTP-01"; + description = '' + Type of ACME challenge to use, currently supported types: + <literal>HTTP-01</literal> or <literal>TLS_ALPN-01</literal>. + ''; + }; + httpListen = mkOption { + type = types.nullOr types.str; + default = ":http"; + description = '' + When HTTP-01 challenge is chosen, letsencrypt must set up a + verification endpoint, and it will be listening on: + <literal>:http = port 80</literal>. + ''; + }; + }; + + certFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to already created certificate. + ''; + }; + keyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to key for already created certificate. + ''; + }; + }; + + aclPolicyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a file containg ACL policies. + ''; + }; + + settings = mkOption { + type = settingsFormat.type; + default = { }; + description = '' + Overrides to <filename>config.yaml</filename> as a Nix attribute set. + This option is ideal for overriding settings not exposed as Nix options. + Check the <link xlink:href="https://github.com/juanfont/headscale/blob/main/config-example.yaml">example config</link> + for possible options. + ''; + }; + + + }; + + }; + config = mkIf cfg.enable { + + services.headscale.settings = { + server_url = mkDefault cfg.serverUrl; + listen_addr = mkDefault "${cfg.address}:${toString cfg.port}"; + + private_key_path = mkDefault cfg.privateKeyFile; + + derp = { + urls = mkDefault cfg.derp.urls; + paths = mkDefault cfg.derp.paths; + auto_update_enable = mkDefault cfg.derp.autoUpdate; + update_frequency = mkDefault cfg.derp.updateFrequency; + }; + + # Turn off update checks since the origin of our package + # is nixpkgs and not Github. + disable_check_updates = true; + + ephemeral_node_inactivity_timeout = mkDefault cfg.ephemeralNodeInactivityTimeout; + + db_type = mkDefault cfg.database.type; + db_path = mkDefault cfg.database.path; + + log_level = mkDefault cfg.logLevel; + + dns_config = { + nameservers = mkDefault cfg.dns.nameservers; + domains = mkDefault cfg.dns.domains; + magic_dns = mkDefault cfg.dns.magicDns; + base_domain = mkDefault cfg.dns.baseDomain; + }; + + unix_socket = "${runDir}/headscale.sock"; + + # OpenID Connect + oidc = { + issuer = mkDefault cfg.openIdConnect.issuer; + client_id = mkDefault cfg.openIdConnect.clientId; + domain_map = mkDefault cfg.openIdConnect.domainMap; + }; + + tls_letsencrypt_cache_dir = "${dataDir}/.cache"; + + } // optionalAttrs (cfg.database.host != null) { + db_host = mkDefault cfg.database.host; + } // optionalAttrs (cfg.database.port != null) { + db_port = mkDefault cfg.database.port; + } // optionalAttrs (cfg.database.name != null) { + db_name = mkDefault cfg.database.name; + } // optionalAttrs (cfg.database.user != null) { + db_user = mkDefault cfg.database.user; + } // optionalAttrs (cfg.tls.letsencrypt.hostname != null) { + tls_letsencrypt_hostname = mkDefault cfg.tls.letsencrypt.hostname; + } // optionalAttrs (cfg.tls.letsencrypt.challengeType != null) { + tls_letsencrypt_challenge_type = mkDefault cfg.tls.letsencrypt.challengeType; + } // optionalAttrs (cfg.tls.letsencrypt.httpListen != null) { + tls_letsencrypt_listen = mkDefault cfg.tls.letsencrypt.httpListen; + } // optionalAttrs (cfg.tls.certFile != null) { + tls_cert_path = mkDefault cfg.tls.certFile; + } // optionalAttrs (cfg.tls.keyFile != null) { + tls_key_path = mkDefault cfg.tls.keyFile; + } // optionalAttrs (cfg.aclPolicyFile != null) { + acl_policy_path = mkDefault cfg.aclPolicyFile; + }; + + # Setup the headscale configuration in a known path in /etc to + # allow both the Server and the Client use it to find the socket + # for communication. + environment.etc."headscale/config.yaml".source = configFile; + + users.groups.headscale = mkIf (cfg.group == "headscale") { }; + + users.users.headscale = mkIf (cfg.user == "headscale") { + description = "headscale user"; + home = dataDir; + group = cfg.group; + isSystemUser = true; + }; + + systemd.services.headscale = { + description = "headscale coordination server for Tailscale"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; + + script = '' + ${optionalString (cfg.database.passwordFile != null) '' + export HEADSCALE_DB_PASS="$(head -n1 ${escapeShellArg cfg.database.passwordFile})" + ''} + + export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.openIdConnect.clientSecretFile})" + exec ${cfg.package}/bin/headscale serve + ''; + + serviceConfig = + let + capabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024) "CAP_NET_BIND_SERVICE"; + in + { + Restart = "always"; + Type = "simple"; + User = cfg.user; + Group = cfg.group; + + # Hardening options + RuntimeDirectory = "headscale"; + # Allow headscale group access so users can be added and use the CLI. + RuntimeDirectoryMode = "0750"; + + StateDirectory = "headscale"; + StateDirectoryMode = "0750"; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectHostname = true; + ProtectClock = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RestrictNamespaces = true; + RemoveIPC = true; + UMask = "0077"; + + CapabilityBoundingSet = capabilityBoundingSet; + AmbientCapabilities = capabilityBoundingSet; + NoNewPrivileges = true; + LockPersonality = true; + RestrictRealtime = true; + SystemCallFilter = [ "@system-service" "~@priviledged" "@chown" ]; + SystemCallArchitectures = "native"; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; + }; + }; + }; + + meta.maintainers = with maintainers; [ kradalby ]; +} diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index e1a31a0c2ee..34fda57b23d 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -222,14 +222,12 @@ let in concatStringsSep "\n" inTunOpts))]; in pkgs.writeText "i2pd-tunnels.conf" opts; - i2pdSh = pkgs.writeScriptBin "i2pd" '' - #!/bin/sh - exec ${cfg.package}/bin/i2pd \ - ${if cfg.address == null then "" else "--host="+cfg.address} \ - --service \ - --conf=${i2pdConf} \ - --tunconf=${tunnelConf} - ''; + i2pdFlags = concatStringsSep " " ( + optional (cfg.address != null) ("--host=" + cfg.address) ++ [ + "--service" + ("--conf=" + i2pdConf) + ("--tunconf=" + tunnelConf) + ]); in @@ -686,7 +684,7 @@ in User = "i2pd"; WorkingDirectory = homeDir; Restart = "on-abort"; - ExecStart = "${i2pdSh}/bin/i2pd"; + ExecStart = "${cfg.package}/bin/i2pd ${i2pdFlags}"; }; }; }; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index bbbe1e181bb..992678c43eb 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -294,7 +294,7 @@ in systemd.services.murmur = { description = "Murmur Chat Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target "]; + after = [ "network-online.target" ]; preStart = '' ${pkgs.envsubst}/bin/envsubst \ -o /run/murmur/murmurd.ini \ diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index eb74d373b0a..b911f97491e 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -25,9 +25,10 @@ in for more information. There are other programs that use iptables internally too, such as - libvirt. + libvirt. For information on how the two firewalls interact, see [2]. [1]: https://github.com/NixOS/nixpkgs/issues/24318#issuecomment-289216273 + [2]: https://wiki.nftables.org/wiki-nftables/index.php/Troubleshooting#Question_4._How_do_nftables_and_iptables_interact_when_used_on_the_same_system.3F ''; }; networking.nftables.ruleset = mkOption { @@ -118,20 +119,11 @@ in flush ruleset include "${cfg.rulesetFile}" ''; - checkScript = pkgs.writeScript "nftables-check" '' - #! ${pkgs.runtimeShell} -e - if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then - echo "Unload ip_tables before using nftables!" 1>&2 - exit 1 - else - ${rulesScript} - fi - ''; in { Type = "oneshot"; RemainAfterExit = true; - ExecStart = checkScript; - ExecReload = checkScript; + ExecStart = rulesScript; + ExecReload = rulesScript; ExecStop = "${pkgs.nftables}/bin/nft flush ruleset"; }; }; diff --git a/nixos/modules/services/networking/seafile.nix b/nixos/modules/services/networking/seafile.nix index d7fb22edebe..2839ffb60a1 100644 --- a/nixos/modules/services/networking/seafile.nix +++ b/nixos/modules/services/networking/seafile.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: with lib; let - python = pkgs.python3Packages.python; cfg = config.services.seafile; settingsFormat = pkgs.formats.ini { }; @@ -221,9 +220,7 @@ in { ''; }; - seahub = let - penv = (pkgs.python3.withPackages (ps: with ps; [ gunicorn seahub ])); - in { + seahub = { description = "Seafile Server Web Frontend"; wantedBy = [ "seafile.target" ]; partOf = [ "seafile.target" ]; @@ -231,8 +228,7 @@ in { requires = [ "seaf-server.service" ]; restartTriggers = [ seahubSettings ]; environment = { - PYTHONPATH = - "${pkgs.python3Packages.seahub}/thirdpart:${pkgs.python3Packages.seahub}:${penv}/${python.sitePackages}"; + PYTHONPATH = "${pkgs.seahub.pythonPath}:${pkgs.seahub}/thirdpart:${pkgs.seahub}"; DJANGO_SETTINGS_MODULE = "seahub.settings"; CCNET_CONF_DIR = ccnetDir; SEAFILE_CONF_DIR = dataDir; @@ -249,7 +245,7 @@ in { LogsDirectory = "seafile"; ConfigurationDirectory = "seafile"; ExecStart = '' - ${penv}/bin/gunicorn seahub.wsgi:application \ + ${pkgs.seahub.python.pkgs.gunicorn}/bin/gunicorn seahub.wsgi:application \ --name seahub \ --workers ${toString cfg.workers} \ --log-level=info \ @@ -262,27 +258,27 @@ in { preStart = '' mkdir -p ${seahubDir}/media # Link all media except avatars - for m in `find ${pkgs.python3Packages.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do + for m in `find ${pkgs.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do ln -sf $m ${seahubDir}/media/ done if [ ! -e "${seafRoot}/.seahubSecret" ]; then - ${penv}/bin/python ${pkgs.python3Packages.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret + ${pkgs.seahub.python}/bin/python ${pkgs.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret chmod 400 ${seafRoot}/.seahubSecret fi if [ ! -f "${seafRoot}/seahub-setup" ]; then # avatars directory should be writable - install -D -t ${seahubDir}/media/avatars/ ${pkgs.python3Packages.seahub}/media/avatars/default.png - install -D -t ${seahubDir}/media/avatars/groups ${pkgs.python3Packages.seahub}/media/avatars/groups/default.png + install -D -t ${seahubDir}/media/avatars/ ${pkgs.seahub}/media/avatars/default.png + install -D -t ${seahubDir}/media/avatars/groups ${pkgs.seahub}/media/avatars/groups/default.png # init database - ${pkgs.python3Packages.seahub}/manage.py migrate + ${pkgs.seahub}/manage.py migrate # create admin account - ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.python3Packages.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' - echo "${pkgs.python3Packages.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' + echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" fi - if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.python3Packages.seahub.version}" ]; then + if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.seahub.version}" ]; then # update database - ${pkgs.python3Packages.seahub}/manage.py migrate - echo "${pkgs.python3Packages.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + ${pkgs.seahub}/manage.py migrate + echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" fi ''; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 07dec8ea718..9989b6df659 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -10,14 +10,41 @@ let cfg = config.networking.wireless; opt = options.networking.wireless; + wpa3Protocols = [ "SAE" "FT-SAE" ]; + hasWPA3 = opts: !mutuallyExclusive opts.authProtocols wpa3Protocols; + + # Gives a WPA3 network higher priority + increaseWPA3Priority = opts: + opts // optionalAttrs (hasWPA3 opts) + { priority = if opts.priority == null + then 1 + else opts.priority + 1; + }; + + # Creates a WPA2 fallback network + mkWPA2Fallback = opts: + opts // { authProtocols = subtractLists wpa3Protocols opts.authProtocols; }; + + # Networks attrset as a list + networkList = mapAttrsToList (ssid: opts: opts // { inherit ssid; }) + cfg.networks; + + # List of all networks (normal + generated fallbacks) + allNetworks = + if cfg.fallbackToWPA2 + then map increaseWPA3Priority networkList + ++ map mkWPA2Fallback (filter hasWPA3 networkList) + else networkList; + # Content of wpa_supplicant.conf generatedConfig = concatStringsSep "\n" ( - (mapAttrsToList mkNetwork cfg.networks) + (map mkNetwork allNetworks) ++ optional cfg.userControlled.enable (concatStringsSep "\n" [ "ctrl_interface=/run/wpa_supplicant" "ctrl_interface_group=${cfg.userControlled.group}" "update_config=1" ]) + ++ [ "pmf=1" ] ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' ++ optional (cfg.extraConfig != "") cfg.extraConfig); @@ -33,7 +60,7 @@ let finalConfig = ''"$RUNTIME_DIRECTORY"/wpa_supplicant.conf''; # Creates a network block for wpa_supplicant.conf - mkNetwork = ssid: opts: + mkNetwork = opts: let quote = x: ''"${x}"''; indent = x: " " + x; @@ -43,7 +70,7 @@ let else opts.pskRaw; options = [ - "ssid=${quote ssid}" + "ssid=${quote opts.ssid}" (if pskString != null || opts.auth != null then "key_mgmt=${concatStringsSep " " opts.authProtocols}" else "key_mgmt=NONE") @@ -175,6 +202,18 @@ in { ''; }; + fallbackToWPA2 = mkOption { + type = types.bool; + default = true; + description = '' + Whether to fall back to WPA2 authentication protocols if WPA3 failed. + This allows old wireless cards (that lack recent features required by + WPA3) to connect to mixed WPA2/WPA3 access points. + + To avoid possible downgrade attacks, disable this options. + ''; + }; + environmentFile = mkOption { type = types.nullOr types.path; default = null; diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 98c35a7ec84..041d0b3c43f 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -143,6 +143,17 @@ in example = lib.literalExpression "[ pkgs.elasticsearchPlugins.discovery-ec2 ]"; }; + restartIfChanged = mkOption { + type = types.bool; + description = '' + Automatically restart the service on config change. + This can be set to false to defer restarts on a server or cluster. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = true; + }; + }; ###### implementation @@ -153,6 +164,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ pkgs.inetutils ]; + inherit (cfg) restartIfChanged; environment = { ES_HOME = cfg.dataDir; ES_JAVA_OPTS = toString cfg.extraJavaOptions; @@ -163,6 +175,8 @@ in User = "elasticsearch"; PermissionsStartOnly = true; LimitNOFILE = "1024000"; + Restart = "always"; + TimeoutStartSec = "infinity"; }; preStart = '' ${optionalString (!config.boot.isContainer) '' diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 71088fc4dcd..fd459f70ccd 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -131,7 +131,7 @@ in { users.groups.vaultwarden = { }; systemd.services.vaultwarden = { - aliases = [ "bitwarden_rs" ]; + aliases = [ "bitwarden_rs.service" ]; after = [ "network.target" ]; path = with pkgs; [ openssl ]; serviceConfig = { diff --git a/nixos/modules/services/web-apps/ethercalc.nix b/nixos/modules/services/web-apps/ethercalc.nix new file mode 100644 index 00000000000..d74def59c6c --- /dev/null +++ b/nixos/modules/services/web-apps/ethercalc.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ethercalc; +in { + options = { + services.ethercalc = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + ethercalc, an online collaborative spreadsheet server. + + Persistent state will be maintained under + <filename>/var/lib/ethercalc</filename>. Upstream supports using a + redis server for storage and recommends the redis backend for + intensive use; however, the Nix module doesn't currently support + redis. + + Note that while ethercalc is a good and robust project with an active + issue tracker, there haven't been new commits since the end of 2020. + ''; + }; + + package = mkOption { + default = pkgs.ethercalc; + defaultText = literalExpression "pkgs.ethercalc"; + type = types.package; + description = "Ethercalc package to use."; + }; + + host = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "Address to listen on (use 0.0.0.0 to allow access from any address)."; + }; + + port = mkOption { + type = types.port; + default = 8000; + description = "Port to bind to."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.ethercalc = { + description = "Ethercalc service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + ExecStart = "${cfg.package}/bin/ethercalc --host ${cfg.host} --port ${toString cfg.port}"; + Restart = "always"; + StateDirectory = "ethercalc"; + WorkingDirectory = "/var/lib/ethercalc"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 026bde2a92d..14cbfb39540 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.miniflux; + defaultAddress = "localhost:8080"; + dbUser = "miniflux"; dbPassword = "miniflux"; dbHost = "localhost"; @@ -31,7 +33,7 @@ in { options = { services.miniflux = { - enable = mkEnableOption "miniflux"; + enable = mkEnableOption "miniflux and creates a local postgres database for it"; config = mkOption { type = types.attrsOf types.str; @@ -45,6 +47,9 @@ in Configuration for Miniflux, refer to <link xlink:href="https://miniflux.app/docs/configuration.html"/> for documentation on the supported values. + + Correct configuration for the database is already provided. + By default, listens on ${defaultAddress}. ''; }; @@ -64,7 +69,7 @@ in config = mkIf cfg.enable { services.miniflux.config = { - LISTEN_ADDR = mkDefault "localhost:8080"; + LISTEN_ADDR = mkDefault defaultAddress; DATABASE_URL = "postgresql://${dbUser}:${dbPassword}@${dbHost}/${dbName}?sslmode=disable"; RUN_MIGRATIONS = "1"; CREATE_ADMIN = "1"; diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index b6c48186a1d..5d550ae5ca8 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -10,8 +10,7 @@ in { enable = mkEnableOption "plausible"; releaseCookiePath = mkOption { - default = null; - type = with types; nullOr (either str path); + type = with types; either str path; description = '' The path to the file with release cookie. (used for remote connection to the running node). ''; @@ -235,6 +234,8 @@ in { script = '' export CONFIG_DIR=$CREDENTIALS_DIRECTORY + export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" + # setup ${pkgs.plausible}/createdb.sh ${pkgs.plausible}/migrate.sh @@ -243,10 +244,8 @@ in { psql -d plausible <<< "UPDATE users SET email_verified=true;" fi ''} - ${optionalString (cfg.releaseCookiePath != null) '' - export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" - ''} - plausible start + + exec plausible start ''; serviceConfig = { @@ -257,8 +256,8 @@ in { LoadCredential = [ "ADMIN_USER_PWD:${cfg.adminUser.passwordFile}" "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}" - ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"] - ++ lib.optionals (cfg.releaseCookiePath != null) [ "RELEASE_COOKIE:${cfg.releaseCookiePath}"]; + "RELEASE_COOKIE:${cfg.releaseCookiePath}" + ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]; }; }; } diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index a8610047f5f..6876dbf39d8 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -924,7 +924,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid @mincore" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ]; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ]; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.xml b/nixos/modules/services/x11/desktop-managers/gnome.xml index e5da7740196..807c9d64e20 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.xml +++ b/nixos/modules/services/x11/desktop-managers/gnome.xml @@ -249,14 +249,5 @@ services.xserver.desktopManager.gnome = { See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/56342">this issue.</link> </para> </section> - - <section xml:id="sec-gnome-faq-nixos-rebuild-switch-kills-session"> - <title>Why does <literal>nixos-rebuild switch</literal> sometimes kill my session?</title> - - <para> - This is a known <link xlink:href="https://github.com/NixOS/nixpkgs/issues/44344">issue</link> without any workarounds. - If you are doing a fairly large upgrade, it is probably safer to use <literal>nixos-rebuild boot</literal>. - </para> - </section> </section> </chapter> diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index f86d4641228..8fcc1f02972 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -282,6 +282,9 @@ checkFS() { # Don't check resilient COWs as they validate the fs structures at mount time if [ "$fsType" = btrfs -o "$fsType" = zfs -o "$fsType" = bcachefs ]; then return 0; fi + # Skip fsck for apfs as the fsck utility does not support repairing the filesystem (no -a option) + if [ "$fsType" = apfs ]; then return 0; fi + # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem. if [ "$fsType" = nilfs2 ]; then return 0; fi diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 76c59c047e0..9dcf9eb769f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -25,9 +25,11 @@ let "nss-lookup.target" "nss-user-lookup.target" "time-sync.target" + ] ++ (optionals cfg.package.withCryptsetup [ "cryptsetup.target" "cryptsetup-pre.target" "remote-cryptsetup.target" + ]) ++ [ "sigpwr.target" "timers.target" "paths.target" diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 225bcbe58e0..f3da6771197 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -250,7 +250,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; + fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; diff --git a/nixos/modules/tasks/filesystems/apfs.nix b/nixos/modules/tasks/filesystems/apfs.nix new file mode 100644 index 00000000000..2f2be351df6 --- /dev/null +++ b/nixos/modules/tasks/filesystems/apfs.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inInitrd = any (fs: fs == "apfs") config.boot.initrd.supportedFilesystems; + +in + +{ + config = mkIf (any (fs: fs == "apfs") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.apfsprogs ]; + + boot.extraModulePackages = [ config.boot.kernelPackages.apfs ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "apfs" ]; + + # Don't copy apfsck into the initramfs since it does not support repairing the filesystem + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b0e7702e9b8..b75cbf4d10b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -35,6 +35,7 @@ in agda = handleTest ./agda.nix {}; airsonic = handleTest ./airsonic.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + apfs = handleTest ./apfs.nix {}; apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; @@ -355,6 +356,7 @@ in nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; + noto-fonts = handleTest ./noto-fonts.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; nsd = handleTest ./nsd.nix {}; nzbget = handleTest ./nzbget.nix {}; diff --git a/nixos/tests/apfs.nix b/nixos/tests/apfs.nix new file mode 100644 index 00000000000..a82886cbe73 --- /dev/null +++ b/nixos/tests/apfs.nix @@ -0,0 +1,54 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "apfs"; + meta.maintainers = with pkgs.lib.maintainers; [ Luflosi ]; + + machine = { pkgs, ... }: { + virtualisation.emptyDiskImages = [ 1024 ]; + + boot.supportedFilesystems = [ "apfs" ]; + }; + + testScript = '' + machine.wait_for_unit("basic.target") + machine.succeed("mkdir /tmp/mnt") + + with subtest("mkapfs refuses to work with a label that is too long"): + machine.fail( "mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F' /dev/vdb") + + with subtest("mkapfs works with the maximum label length"): + machine.succeed("mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7' /dev/vdb") + + with subtest("Enable case sensitivity and normalization sensitivity"): + machine.succeed( + "mkapfs -s -z /dev/vdb", + # Triggers a bug, see https://github.com/linux-apfs/linux-apfs-rw/issues/15 + # "mount -o cknodes,readwrite /dev/vdb /tmp/mnt", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'Hello World 1' > /tmp/mnt/test.txt", + "[ ! -f /tmp/mnt/TeSt.TxT ] || false", # Test case sensitivity + "echo 'Hello World 1' | diff - /tmp/mnt/test.txt", + "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt", + "[ ! -f /tmp/mnt/\u00e1.txt ] || false", # Test Unicode normalization sensitivity + "umount /tmp/mnt", + "apfsck /dev/vdb", + ) + with subtest("Disable case sensitivity and normalization sensitivity"): + machine.succeed( + "mkapfs /dev/vdb", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'bla bla bla' > /tmp/mnt/Test.txt", + "echo -n 'Hello World' > /tmp/mnt/test.txt", + "echo ' 1' >> /tmp/mnt/TEST.TXT", + "umount /tmp/mnt", + "apfsck /dev/vdb", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'Hello World 1' | diff - /tmp/mnt/TeSt.TxT", # Test case insensitivity + "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u00e1.txt", # Test Unicode normalization + "umount /tmp/mnt", + "apfsck /dev/vdb", + ) + ''; +}) diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix index 968253d109c..040d360b6d9 100644 --- a/nixos/tests/mysql/common.nix +++ b/nixos/tests/mysql/common.nix @@ -3,7 +3,7 @@ inherit (pkgs.darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }); - mysqlPackage = { + mysqlPackages = { inherit (pkgs) mysql57 mysql80; }; mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}"; diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index a5e42f85a7f..197e6da80e2 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -142,7 +142,7 @@ let in lib.mapAttrs (_: package: makeMySQLTest { inherit package; - hasRocksDB = false; hasMroonga = false; + hasRocksDB = false; hasMroonga = false; useSocketAuth = false; }) mysqlPackages // (lib.mapAttrs (_: package: makeMySQLTest { inherit package; diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix new file mode 100644 index 00000000000..049dc766bd3 --- /dev/null +++ b/nixos/tests/noto-fonts.nix @@ -0,0 +1,44 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "noto-fonts"; + meta = { + maintainers = with lib.maintainers; [ nickcao midchildan ]; + }; + + machine = { + imports = [ ./common/x11.nix ]; + environment.systemPackages = [ pkgs.gnome.gedit ]; + fonts = { + enableDefaultFonts = false; + fonts = with pkgs;[ + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + ]; + fontconfig.defaultFonts = { + serif = [ "Noto Serif" "Noto Serif CJK SC" ]; + sansSerif = [ "Noto Sans" "Noto Sans CJK SC" ]; + monospace = [ "Noto Sans Mono" "Noto Sans Mono CJK SC" ]; + emoji = [ "Noto Color Emoji" ]; + }; + }; + }; + + testScript = + # extracted from http://www.clagnut.com/blog/2380/ + let testText = builtins.toFile "test.txt" '' + the quick brown fox jumps over the lazy dog + 視野無限廣，窗外有藍天 + Eĥoŝanĝo ĉiuĵaŭde. + いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす + 다람쥐 헌 쳇바퀴에 타고파 + 中国智造，慧及全球 + ''; in + '' + machine.wait_for_x() + machine.succeed("gedit ${testText} >&2 &") + machine.wait_for_window(".* - gedit") + machine.sleep(10) + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix index 45e11f0270e..58c1dd5cf4a 100644 --- a/nixos/tests/plausible.nix +++ b/nixos/tests/plausible.nix @@ -8,6 +8,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { virtualisation.memorySize = 4096; services.plausible = { enable = true; + releaseCookiePath = "${pkgs.runCommand "cookie" { } '' + ${pkgs.openssl}/bin/openssl rand -base64 64 >"$out" + ''}"; adminUser = { email = "admin@example.org"; passwordFile = "${pkgs.writeText "pwd" "foobar"}"; diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 68836c73072..37a89fc21e4 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -36,19 +36,10 @@ import ./make-test-python.nix ({pkgs, ...}: { }; # Since we want to program the routes that we delegate to the "customer" - # into our routing table we must have a way to gain the required privs. - # This security wrapper will do in our test setup. - # - # DO NOT COPY THIS TO PRODUCTION AS IS. Think about it at least twice. - # Everyone on the "isp" machine will be able to add routes to the kernel. - security.wrappers.add-dhcpd-lease = { - owner = "root"; - group = "root"; - source = pkgs.writeShellScript "add-dhcpd-lease" '' - exec ${pkgs.iproute2}/bin/ip -6 route replace "$1" via "$2" - ''; - capabilities = "cap_net_admin+ep"; - }; + # into our routing table we must give dhcpd the required privs. + systemd.services.dhcpd6.serviceConfig.AmbientCapabilities = + [ "CAP_NET_ADMIN" ]; + services = { # Configure the DHCPv6 server # @@ -80,7 +71,7 @@ import ./make-test-python.nix ({pkgs, ...}: { set Prefix = pick-first-value(binary-to-ascii(16, 16, ":", suffix(option dhcp6.ia-pd, 16)), "n/a"); set PrefixLength = pick-first-value(binary-to-ascii(10, 8, ":", substring(suffix(option dhcp6.ia-pd, 17), 0, 1)), "n/a"); log(concat(IP, " ", Prefix, " ", PrefixLength)); - execute("/run/wrappers/bin/add-dhcpd-lease", concat(Prefix,"/",PrefixLength), IP); + execute("${pkgs.iproute2}/bin/ip", "-6", "route", "replace", concat(Prefix,"/",PrefixLength), "via", IP); } ''; }; diff --git a/pkgs/applications/audio/ChowCentaur/default.nix b/pkgs/applications/audio/ChowCentaur/default.nix new file mode 100644 index 00000000000..80f5768dc15 --- /dev/null +++ b/pkgs/applications/audio/ChowCentaur/default.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon +, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor +, alsa-lib, libjack2, lv2, gcc-unwrapped }: + +stdenv.mkDerivation rec { + pname = "ChowCentaur"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "jatinchowdhury18"; + repo = "KlonCentaur"; + rev = "v${version}"; + sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + cairo + libxkbcommon + xcbutilcursor + xcbutilkeysyms + xcbutil + libXrandr + libXinerama + libXcursor + alsa-lib + libjack2 + lv2 + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 + cd ChowCentaur/ChowCentaur_artefacts/Release + cp -r LV2/ChowCentaur.lv2 $out/lib/lv2 + cp -r VST3/ChowCentaur.vst3 $out/lib/vst3 + ''; + + meta = with lib; { + description = + "Digital emulation of the Klon Centaur guitar pedal using RNNs, Wave Digital Filters, and more"; + homepage = "https://github.com/jatinchowdhury18/KlonCentaur"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index afceca2a54b..9fe86550f0d 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { format = "other"; # no setup.py pname = "cozy"; - version = "1.1.2"; + version = "1.2.0"; # Temporary fix # See https://github.com/NixOS/nixpkgs/issues/57029 @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { owner = "geigi"; repo = pname; rev = version; - sha256 = "sha256-QENn8mFMk06/Uj8QJo0mJQ7frJNcv5RVNJwDB+H/LkI="; + sha256 = "0igqf9b77i13sxlk4ziw549h379hmz1slrb3vvf8irk94gxabsaw"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/cyanrip/default.nix b/pkgs/applications/audio/cyanrip/default.nix index d03b7836f2a..4f3a5a08af2 100644 --- a/pkgs/applications/audio/cyanrip/default.nix +++ b/pkgs/applications/audio/cyanrip/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "cyanrip"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "cyanreg"; repo = pname; rev = "v${version}"; - sha256 = "1aip52bwkq8cb1d8ifyv2m6m5dz7jk6qmbhyb97yyf4nhxv445ky"; + sha256 = "17bi2xhjv3f3i870whkyqckvjlg32wqkspash87zi0jw7m7jm229"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 75e44d8c4fa..b7afb0d57a0 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype, fluidsynth , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsa-lib, libjack2, libvorbis , libSM, libsndfile, libogg, libtool }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook libtool ]; buildInputs = [ - freetype SDL SDL_gfx SDL_ttf + freetype fluidsynth SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsa-lib libvorbis libsndfile libogg libSM (gnutls.overrideAttrs (oldAttrs: { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 93a9ce25854..6a308ba74c4 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,50 +1,52 @@ { lib -, mkDerivation , stdenv +, mkDerivation , fetchFromGitHub -, makeDesktopItem +, alsa-lib , cmake +, glib , pkg-config , qtbase -, glib -, alsa-lib , withJack ? stdenv.hostPlatform.isUnix, jack }: -let - mainProgram = "mt32emu-qt"; -in mkDerivation rec { pname = "munt"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "munt_${lib.replaceChars [ "." ] [ "_" ] version}"; - sha256 = "1lknq2a72gv1ddhzr7f967wpa12lh805jj4gjacdnamgrc1h22yn"; + rev = "libmt32emu_${lib.replaceChars [ "." ] [ "_" ] version}"; + hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4="; }; dontFixCmake = true; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ qtbase glib ] - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optional withJack jack; + buildInputs = [ + glib + qtbase + ] + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optional withJack jack; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications - mv $out/bin/${mainProgram}.app $out/Applications/ - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} + mv $out/bin/${meta.mainProgram}.app $out/Applications/ + ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram} ''; meta = with lib; { - inherit mainProgram; - description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; homepage = "http://munt.sourceforge.net/"; + description = "An emulator of Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; license = with licenses; [ lgpl21 gpl3 ]; - platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + mainProgram = "mt32emu-qt"; }; } diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index ce55516a40d..7439e566da2 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20211116"; + version = "20220125"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1kcw4rwphyqh0hwwjsydzwg484xj17rb5lc8pfsixsg77z50ayzz"; + sha256 = "sha256-Hqbm5+YyCde/6QuyIy4NE/jG4xNDzeNjEefMr60GEZM="; }; configureFlags = [ "--enable-dependency-tracking" ] diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 4a7f819e290..1d3bb0e0bee 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -1,22 +1,34 @@ -{ lib, stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses +{ lib, stdenv, autoreconfHook, fetchFromGitLab, fetchpatch, flac, libao, libvorbis, ncurses , opusfile, pkg-config }: stdenv.mkDerivation rec { - name = "squishyball-${rev}"; - rev = "19580"; - - src = fetchsvn { - url = "https://svn.xiph.org/trunk/squishyball"; - rev = rev; - sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp"; + pname = "squishyball"; + version = "unstable-2020-11-23"; + + src = fetchFromGitLab { + domain = "gitlab.xiph.org"; + owner = "xiph"; + repo = "squishyball"; + rev = "27590fe6bac545e2dd3eacf048edbd969682263a"; + sha256 = "07zs8wx1ahf3q505fk9b6cgzlkhnayfsscch46yy9s1wgxgphj7s"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ flac libao libvorbis ncurses opusfile ]; - patches = [ ./gnu-screen.patch ]; + patches = [ + ./gnu-screen.patch + + # Patch pending upstream inclusion for ncurses-6.3 support: + # https://gitlab.xiph.org/xiph/squishyball/-/issues/1 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://gitlab.xiph.org/xiph/squishyball/uploads/5609ceaf85ebb6dc297c0efe61b9a1b7/0001-mincurses.c-use-ncurses-API-to-enter-raw-mode-ncurse.patch"; + sha256 = "06llp7cd77f4vvhz8qdld551dnlpjxf98j7rmp3i1x1kng4f0iy3"; + }) + ]; postInstall = '' # Why doesn’t this happen automagically? @@ -40,7 +52,7 @@ stdenv.mkDerivation rec { comparisons of groups of up to ten samples; this is the default mode of operation. ''; - homepage = "https://svn.xiph.org/trunk/squishyball"; + homepage = "https://gitlab.xiph.org/xiph/squishyball"; license = licenses.gpl2Plus; maintainers = with maintainers; [ michalrus ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index e3200d8e43f..6527b90b89e 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -72,6 +72,7 @@ mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good + gst-plugins-bad gst-plugins-ugly ]) ++ lib.optional withVlc libvlc; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 96ca870b79f..f4b26c5f2ea 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.16.2"; + version = "4.0.20.1"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-nAaNT5Rt/oLBA2pSJSinoLKMYJ0VZmuC0zoMYbMSAJQ="; + sha256 = "sha256-uKt0TNKcqiXiT5MnsguU5fTdUyFgV7Km5KjrFS/7tws="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 41eb1b9ca5e..56114ed72a8 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0l0w1badhvlh1rgqzvlmy5k7xhb1nf4f5dmhkl935a5ila08aak3"; }; - vendorSha256 = "sha256-kA7pOSP4wkzKuFmUqhZmjXJ0ao64cIgZMrQtQ0bQ++U="; + vendorSha256 = "sha256-i8BaT9C39tmHU3GGgd0hUB1PHXnoAdNYRIqZA1ggbjQ="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ec4f9b59e91..268f3174b44 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.26"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "NE2FgjXtXTCVrCWRakqPhzAGn3blpf0OugJSKviPVBs="; + version = "2021.1.1.20"; # "Android Studio Bumblebee (2021.1.1)" + sha256Hash = "LwG5IDJBFpdlspDoTNpbi1togri2fvEOEDbkkiYvrJE="; }; betaVersion = { version = "2021.1.1.18"; # "Android Studio Bumblebee (2021.1.1) Beta 5" diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 06876d37eee..67f1f7e6048 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "sha256-L3r71srvdSsCc1HZcu6lsH+oTJQ7TatVd2Oy3meAVYk="; + sha256 = "sha256-EUcYQKc/vxOg6E5ZIpWJezLEppOru79s+slO7e/+kAU="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 72c75374516..45a86a73d02 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -161,12 +161,9 @@ let krb5 ]) ++ additionalPkgs pkgs; - # restore desktop item icons + # symlink shared assets, including icons and desktop entries extraInstallCommands = '' - mkdir -p "$out/share/applications" - for item in ${unwrapped}/share/applications/*.desktop; do - ln -s "$item" "$out/share/applications/" - done + ln -s "${unwrapped}/share" "$out/" ''; runScript = "${unwrapped}/bin/${executableName}"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 76490682477..0ceeb899f08 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif -, ApplicationServices +, potrace, ApplicationServices , Foundation , testVersion, imagemagick }: @@ -18,23 +18,15 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-20"; + version = "7.1.0-22"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "0r8zmk2cfmf09l94hqzfz4aspnzn178ggdbgm7w4hr0p864cbvc3"; + sha256 = "sha256-Pd/b3lmFpOis8z+ITFScBUNALIKJY4ZOx2VOBwM0Bh4="; }; - patches = [ - # fix a type confusion bug introduced in 7.1.0-20 with commit 075565e93c71bcaaabf0ce70b7d1060bccdf0020 - (fetchpatch { - url = "https://github.com/ImageMagick/ImageMagick/commit/62845d5672eca4446b952dd0ab2e3e0dab0309d4.patch"; - sha256 = "1kni5i8b5hl69niypidm90mhir8cafi6r9i857fxdlv045h3dg4p"; - }) - ]; - outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny @@ -59,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libtool ]; buildInputs = - [ zlib fontconfig freetype ghostscript + [ zlib fontconfig freetype ghostscript potrace liblqr1 libpng libraw libtiff libxml2 libheif djvulibre ] # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index f2ffa143aeb..4952ecf84f2 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-CFKo8YEAXAniX+jL2A0naJUOn3KAWwcrPsabdiZevhI="; }; - vendorSha256 = "sha256-p/2Bu5h2P3ebgvSC12jdR2Zpd27xCFwtB/KZV0AULAM="; + vendorSha256 = "sha256-3y42rbhurGhCI9PuSayxmLem0tv/nTjBwYxF3Dk6/yM="; # No tests doCheck = false; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix new file mode 100644 index 00000000000..7133c914b66 --- /dev/null +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -0,0 +1,132 @@ +{ stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot +, mime-types, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig +, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim +# Qt 5 subpackages +, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt +}: + +stdenv.mkDerivation rec { + pname = "pixinsight"; + version = "1.8.8-12"; + + src = requireFile rec { + name = "PI-linux-x64-${version}-20211229-c.tar.xz"; + url = "https://pixinsight.com/"; + sha256 = "7095b83a276f8000c9fe50caadab4bf22a248a880e77b63e0463ad8d5469f617"; + message = '' + PixInsight is available from ${url} and requires a commercial (or trial) license. + After a license has been obtained, PixInsight can be downloaded from the software distribution + (choose Linux 64bit). + The PixInsight tarball must be added to the nix-store, i.e. via + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + }; + sourceRoot = "."; + + nativeBuildInputs = [ + unixtools.script + fakeroot + wrapQtAppsHook + autoPatchelfHook + mime-types + libudev0-shim + ]; + + buildInputs = [ + stdenv.cc.cc.lib + stdenv.cc + libGL + libpulseaudio + alsa-lib + nss + gd + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + nspr + expat + fontconfig + dbus + glib + zlib + openssl + libdrm + wayland + cups + avahi-compat + # Qt stuff + qt3d + mlt + qtbase + qtgamepad + qtserialport + qtserialbus + qtvirtualkeyboard + qtmultimedia + qtwebkit + ] ++ (with xorg; [ + libX11 + libXdamage + xrandr + libXtst + libXcomposite + libXext + libXfixes + libXrandr + ]); + + postPatch = '' + patchelf ./installer \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.cc.cc.lib}/lib + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/opt/PixInsight $out/share/{applications,mime/packages,icons/hicolor} + + fakeroot script -ec "./installer \ + --yes \ + --install-dir=$out/opt/PixInsight \ + --install-desktop-dir=$out/share/applications \ + --install-mime-dir=$out/share/mime \ + --install-icons-dir=$out/share/icons/hicolor \ + --no-bin-launcher \ + --no-remove" + + rm -rf $out/opt/PixInsight-old-0 + ln -s $out/opt/PixInsight/bin/PixInsight $out/bin/. + ''; + + # Some very exotic Qt libraries are not available in nixpkgs + autoPatchelfIgnoreMissingDeps = true; + + # This mimics what is happening in PixInsight.sh and adds on top the libudev0-shim, which + # without PixInsight crashes at startup. + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${libudev0-shim}/lib" + "--set LC_ALL en_US.utf8" + "--set AVAHI_COMPAT_NOWARN 1" + "--set QT_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins" + "--set QT_QPA_PLATFORM_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins/platforms" + "--set QT_AUTO_SCREEN_SCALE_FACTOR 0" + "--set QT_ENABLE_HIGHDPI_SCALING 0" + "--set QT_SCALE_FACTOR 1" + "--set QT_LOGGING_RULES '*=false'" + "--set QTWEBENGINEPROCESS_PATH $out/opt/PixInsight/bin/libexec/QtWebEngineProcess" + ]; + dontWrapQtApps = true; + postFixup = '' + wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString qtWrapperArgs} + ''; + + meta = with lib; { + description = "Scientific image processing program for astrophotography"; + homepage = "https://pixinsight.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.sheepforce ]; + mainProgram = "PixInsight"; + }; +} diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 9dd439fe8e9..360bfbf1b94 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -10,12 +10,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"; + "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm64_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { "i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg="; "x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4="; - "aarch64-linux" = "vWoA/0ZfdwVniHmxC4nH1QIc6bjdb00+SwlkIWc9BPs="; + "aarch64-linux" = "12h1s9c97w0gb6bia3hy7773mwpfnyrn40sbjm1zc37y4zyi5dyp"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 204a090136d..5f0c09303ff 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-5WNkD+YfmQHGAWWfD9/ZEHnHPT0Ejm9Nz+/mn8xvU4U="; }; - vendorSha256 = "sha256-TncVMDeZ8+Wuv1o0Cjks3Ve1OsO+WXH9mClC6GNaSas="; + vendorSha256 = "sha256-r0mYrtWllKOvKQJmW0ie4l+1nsCwU8O+CV6ESXNoETk="; doCheck = false; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index 7b52145f794..582295a2bc8 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.4"; + version = "5.5"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-ppaxfnZB3+aOzvc/wk1f8D2mFYngQspEOl9XArNMdBE="; + sha256 = "sha256-uygMc4SPYBk+G+ENp+KsgDhkm+oq9ZMvWX4wF6iohPM="; }; # dbus-1.pc has datadir=/etc diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix index 7b250184126..7c362961b4b 100644 --- a/pkgs/applications/misc/cloak/default.nix +++ b/pkgs/applications/misc/cloak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cloak"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "evansmurithi"; repo = pname; rev = "v${version}"; - sha256 = "139z2ga0q7a0vwfnn5hpzsz5yrrrr7rgyd32yvfj5sxiywkmczs7"; + hash = "sha256-Pd2aorsXdHB1bs609+S5s+WV5M1ql48yIKaoN8SEvsg="; }; - cargoSha256 = "0af38wgwmsamnx63dwfm2nrkd8wmky3ai7zwy0knmifgkn4b7yyj"; + cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 870d3cceb0b..1741e908669 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "091s3hyz9p892garanm9zmkbsn6hn3bnnrz7h3dqsyi58806d5yr"; }; - vendorSha256 = "1psyx8nqzpx3p1ya9y3q9h0hhfx4iqmix089b2h6bp9lgqbj5zn8"; + vendorSha256 = "1y0k03lg9dh3bpi10xzv03h7gq7h0hgggs304p78p3jkr8pmkqss"; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 3f62ffe7dfb..8e7716c98bb 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.3.2"; # When updating also update fetchedMavenDeps.sha256 + version = "21.3.3"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "SifnnzuETFKtnEwLjJtB7CV2QZaToex3MjKGuiShlwo="; + sha256 = "sha256-WycjNxPa4hkxBtT8Pq7ayUu8pNV0DvaJ+29GDKNJNWE="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "grSFtkohTlLtK8qE4A4wVppC6UHcyaXRQlGnrOmQDC4="; + outputHash = "sha256-pfYNHue7tZKYgU16kypZEfr2bXuDoPc4KorIAVjSylo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix new file mode 100644 index 00000000000..4dfb5b6422f --- /dev/null +++ b/pkgs/applications/misc/edgetx/default.nix @@ -0,0 +1,47 @@ +{ lib, mkDerivation, fetchFromGitHub +, cmake, gcc-arm-embedded, python3Packages +, qtbase, qtmultimedia, qttranslations, SDL, gtest +, dfu-util +}: + +mkDerivation rec { + pname = "edgetx"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "EdgeTX"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-TffHFgr3g7v4VnNSSlLITz4cYjHM6wE0aI85W1g4IFA="; + }; + + nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; + + buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; + + postPatch = '' + sed -i companion/src/burnconfigdialog.cpp \ + -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' + ''; + + cmakeFlags = [ + "-DGTEST_ROOT=${gtest.src}/googletest" + "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" + "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" + ]; + + meta = with lib; { + description = "EdgeTX Companion transmitter support software"; + longDescription = '' + EdgeTX Companion is used for many different tasks like loading EdgeTX + firmware to the radio, backing up model settings, editing settings and + running radio simulators. + ''; + homepage = "https://edgetx.org/"; + license = licenses.gpl2Only; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ elitak lopsided98 wucke13 ]; + }; + +} diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 3acb493c1c0..aa290632748 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,20 +1,36 @@ -{ lib, stdenv, python3Packages, radicale3 }: +{ lib +, stdenv +, python3 +, radicale3 +}: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + flask_wtf = super.flask_wtf.overridePythonAttrs (old: rec { + version = "0.15.1"; + src = old.src.override { + inherit version; + sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc"; + }; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.30.8"; + version = "0.32.1"; - src = python3Packages.fetchPypi { + src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-HBLQsq3B6TMdcnUt8ukbk3+S0Ed44+gePkpuGZ2AyC4="; + sha256 = "a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ etebase etesync flask flask_wtf - radicale3 + (python.pkgs.toPythonModule (radicale3.override { python3 = python; })) ]; doCheck = false; diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index 2c31f24b6b1..e838bd3eda2 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0="; }; - vendorSha256 = "sha256-Ac3f17Ws3Ne8Zo0vT+qlaMm/rhak9ua2jh5jlT6jF2Y="; + vendorSha256 = "sha256-rIcwZUOi6bdfiWZEsRF4kl1reNPPQNuBPHDOo7RQgYo="; # package does not contain any tests as of v0.2.3 doCheck = false; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 264b4ba53dd..5bb7dcae614 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-rzAt6jGj1MJ5AvkEKjAH91mKnUcLOPgHgiDkzkdibks="; }; - vendorSha256 = "sha256-ftA7ktZ6dEownEwJC4tK5/V3fl8toACiFiq9xTa7NE4="; + vendorSha256 = "sha256-ar5ctfKjqUuEM0mSygoQQFMgj0RURlvQu10dsCtGu3o="; doCheck = false; diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index e8bfa00406e..0fd6e72a57e 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inherd-quake"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "phodal"; repo = "quake"; rev = "v${version}"; - sha256 = "UujcsvjbXda1DdV4hevUP4PbdbOKHQ3O/FBDlhAjfq0="; + sha256 = "sha256-OkgrkjO6IS6P2ZyFFbOprROPzDfQcHYCwaTKFsjjVo8="; }; - cargoSha256 = "HkdF7hLgThOWExociNgxvTxF4qL3F5CPK/j/ZKLg/m4="; + cargoSha256 = "sha256-EMRaChFwjMYZKSX5OvXYLSiwWo1m1H/tHVqc8RXX52A="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 05d5f93162c..54ed6c10f42 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,6 +1,7 @@ { lib , boost , fetchFromGitHub +, fetchpatch , installShellFiles , mkDerivation , muparser @@ -23,6 +24,14 @@ mkDerivation rec { sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/LibreCAD/LibreCAD/pull/1465/commits/4edcbe72679f95cb60979c77a348c1522a20b0f4.patch"; + sha256 = "sha256-P0G2O5sL7Ip860ByxFQ87TfV/lq06wCQnzPxADGqFPs="; + name = "CVE-2021-45342.patch"; + }) + ]; + postPatch = '' substituteInPlace scripts/postprocess-unix.sh \ --replace /bin/sh ${runtimeShell} diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index d7f0624ad3f..eadd6c8db55 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-E6LwNiCykBqjkifUSi6oBWqCEhkRO+03HSKn4p45kh0="; }; - vendorSha256 = "sha256-9MlymY5gM9/K2+7/yTa3WaSIfDJ4gRf33vSCwdIpNqw="; + vendorSha256 = "sha256-SzgiWqPuDZuSH8I9im8r+06E085PWyHwLjwxcaoJgQo="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/llama/default.nix b/pkgs/applications/misc/llama/default.nix index 60598afcc4e..f1822c67411 100644 --- a/pkgs/applications/misc/llama/default.nix +++ b/pkgs/applications/misc/llama/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6Xuwl4IpzbVfJ2MhHeImPFWxL/Y6rhnBExlh64PeGdk="; }; - vendorSha256 = "sha256-J/2R3XhGNmejc3jstJ0NWmJm/a1Re6UK6AuQb5gzh4E="; + vendorSha256 = "sha256-zbfQtTDbVWFVGQyjqlkv3mTvEPkKImzXAIXcmkh4wqk="; meta = with lib; { description = "Terminal file manager"; diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/applications/misc/mepo/default.nix index e65a5219ab7..72e05d19bbd 100644 --- a/pkgs/applications/misc/mepo/default.nix +++ b/pkgs/applications/misc/mepo/default.nix @@ -5,32 +5,28 @@ , zig , curl , SDL2 +, SDL2_gfx , SDL2_image , SDL2_ttf }: stdenv.mkDerivation rec { pname = "mepo"; - version = "0.2"; + version = "0.3"; src = fetchFromSourcehut { owner = "~mil"; repo = pname; rev = version; - hash = "sha256-ECq748GpjOjvchzAWlGA7H7HBvKNxY9d43+PTOWopiM="; + hash = "sha256-B7BOAFhiOTILUdzh49hTMrNNHZpCNRDLW2uekXyptqQ="; }; nativeBuildInputs = [ pkg-config zig ]; - buildInputs = [ curl SDL2 SDL2_image SDL2_ttf ]; - - buildPhase = '' - runHook preBuild + buildInputs = [ curl SDL2 SDL2_gfx SDL2_image SDL2_ttf ]; + preBuild = '' export HOME=$TMPDIR - zig build -Drelease-safe=true -Dcpu=baseline - - runHook postBuild ''; doCheck = true; @@ -45,8 +41,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 zig-out/bin/mepo -t $out/bin - install -Dm755 scripts/mepo_* $out/bin + zig build -Drelease-safe=true -Dcpu=baseline --prefix $out install runHook postInstall ''; diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index 967c3db4c65..dbc57794eee 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -1,12 +1,12 @@ { appimageTools, lib, fetchurl }: let pname = "neo4j-desktop"; - version = "1.4.7"; + version = "1.4.12"; name = "${pname}-${version}"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; - hash = "sha256-oEcSW7UIeiGY2fCPJQ5EtDBRtd73Q04HaSk+7ObLKJc="; + hash = "sha256-CfdXus9Zj6Tx6wAXpV2tRdqvJqowgE+NIL04v3fwtJE="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/applications/misc/nwg-menu/default.nix index 61e7f5ad54f..98609665c4f 100644 --- a/pkgs/applications/misc/nwg-menu/default.nix +++ b/pkgs/applications/misc/nwg-menu/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-M948RGU9/PwUtFRmf1Po7KlrGxqRPiOZKfS1Vv3vqW8="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk"; + vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; doCheck = false; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 6798e73c931..488f5cd997d 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -13,13 +13,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.5.4"; + version = "0.5.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - sha256 = "0vl9vfgpa1byf9vxn03j58h9zcbjd1y83b0kgv97cxm2mhqz12dg"; + sha256 = "1d3qh42cwayb5d9ymhfs2vrbg5x5x6x73hw77m3xb9y4vyhji85x"; }; # No tests diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 18e8136eb7b..c91f6f64cf7 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -4,6 +4,10 @@ , callPackage }: +let makeurl = { pname, year, version }: "https://download.qoppa.com/${pname}/v${year}/${ + builtins.replaceStrings [ "pdfstudio" "viewer" "." ] [ "PDFStudio" "Viewer" "_" ] "${pname}_v${version}" + }_linux64.deb"; +in { pdfstudio = callPackage ./common.nix rec { pname = program; @@ -17,9 +21,7 @@ libgccjit #for libstdc++.so.6 and libgomp.so.1 ]; src = fetchurl { - url = "https://download.qoppa.com/${pname}/v${year}/PDFStudio_v${ - builtins.replaceStrings [ "." ] [ "_" ] version - }_linux64.deb"; + url = makeurl { inherit pname year version; }; sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45"; }; }; @@ -33,9 +35,7 @@ PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { - url = "https://download.qoppa.com/${pname}/v${year}/PDFStudioViewer_v${ - builtins.replaceStrings [ "." ] [ "_" ] version - }_linux64.deb"; + url = makeurl { inherit pname year version; }; sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6"; }; }; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index d3449da97f3..f557a8bf994 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, qttools, libX11, libXtst, openssl, libscrypt }: mkDerivation rec { - name = "qMasterPassword"; - version = "1.2.2"; + pname = "qMasterPassword-unstable"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "bkueng"; - repo = name; - rev = "v${version}"; - sha256 = "0l0jarvfdc69rcjl2wa0ixq8gp3fmjsy9n84m38sxf3n9j2bh13c"; + repo = "qMasterPassword"; + rev = "7ade33952531731c266c2597f4212c93aca68c59"; + sha256 = "sha256-MdV6AkRh072++sKoeuwvhgqLEfUkTF34xt6OH9n59Q0="; }; buildInputs = [ qtbase libX11 libXtst openssl libscrypt ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake qttools ]; # Upstream install is mostly defunct. It hardcodes target.path and doesn't # install anything but the binary. @@ -22,12 +22,16 @@ mkDerivation rec { ln -s ../Applications/qMasterPassword.app/Contents/MacOS/qMasterPassword "$out"/bin/qMasterPassword '' else '' mkdir -p $out/bin - mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps} + mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps,qMasterPassword/translations} mv qMasterPassword $out/bin mv data/qMasterPassword.desktop $out/share/applications mv LICENSE README.md $out/share/doc/qMasterPassword mv data/icons/app_icon.png $out/share/icons/hicolor/512x512/apps/qmasterpassword.png mv data/icons/* $out/share/icons/qmasterpassword + lrelease ./data/translations/translation_de.ts + lrelease ./data/translations/translation_pl.ts + mv ./data/translations/translation_de.qm $out/share/qMasterPassword/translations/translation_de.qm + mv ./data/translations/translation_pl.qm $out/share/qMasterPassword/translations/translation_pl.qm ''; meta = with lib; { diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/applications/misc/ratt/default.nix index a7583dabd73..8b49232051d 100644 --- a/pkgs/applications/misc/ratt/default.nix +++ b/pkgs/applications/misc/ratt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-NW5B9oO/LJqPigvOcMeL4hQLKmAL01I2Ff41y169BTQ="; + vendorSha256 = "sha256-4TEdnJ7lCuBka6rtoKowf5X3VqCgfwvGHeJ5B5Q5C20="; # tests try to access the internet to scrape websites doCheck = false; diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 6a4beec6a5e..0c1d9cf20e9 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.18"; + version = "0.0.19"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-Yrq21eiyNem9P219FxuQMHpagKQDaNsASwi2REaDAgk="; + sha256 = "sha256-HXWE6688jhRQQEiZuPfuJStSQeueqoWwwa+PfneHprw="; }; vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU="; diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index f7d3173b0f2..1c5dcc7be54 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-rUOFx0ebZs3xmsSz9oFvjINaHp9gIe7E/5UoJJ47aZc="; }; - vendorSha256 = "sha256-3+KXirGwZvPhqCeglPqHJ9wEt6naJiRE3TAX7/jxJpk="; + vendorSha256 = "sha256-2jyhDSPO/Xg3xBCA93SMSlm7D+ze0MGbNtRpL82IAsk="; doCheck = false; diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index a7c0f6f7047..336271b6cb1 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { go ]; - vendorSha256 = "06vb5xnss6ibgbsny6cadphfkzw8z3np5qgn3hp2wpf3hxgcnnvs"; + vendorSha256 = "11gxr22a24icryvglx9pjmqn5bjy8adfhh1nmjnd21nvy0nh4im7"; ldflags = [ "-s" diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index b8f8684e420..6f2b43785c7 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "sha256-GXpM5dJ3JPf2HgrgTONyeCG6JjK4JhbcGP5ck7v4cqk="; + sha256 = "sha256-hbqIwX6YCrUQAjvKKWFAUjHvcZycnIA6v6l6qmAMuUI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 3035f74cacd..539cebedcb6 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WsNiMlqr9ya06Urvw/m3yPsGLCTOvYFaO0oNHuVKNTs="; + sha256 = "sha256-cCIlKTHo+LyhIZkN6ncggBvZMwDBgXqDJVAfGWbUtj8="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix new file mode 100644 index 00000000000..a93436362ad --- /dev/null +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, vala +, gtk3 +, glib +, gtk-layer-shell +, dbus +, dbus-glib +, json-glib +, librsvg +, libhandy +, gobject-introspection +, gdk-pixbuf +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "SwayNotificationCenter"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "ErikReider"; + repo = "SwayNotificationCenter"; + rev = "v${version}"; + hash = "sha256-gXo/V2FHkHZBRmaimqJCzi0BqS4tP9IniIlubBmK5u0="; + }; + + nativeBuildInputs = [ gobject-introspection meson ninja pkg-config vala wrapGAppsHook ]; + + buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 json-glib libhandy librsvg ]; + + meta = with lib; { + description = "Simple notification daemon with a GUI built for Sway"; + homepage = "https://github.com/ErikReider/SwayNotificationCenter"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 62a4151010a..e345c344f90 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-KICxcfZLBwCo12p5R9wt7Tk440wkUIE7G6lGfWIdxR8="; }; - vendorSha256 = "sha256-aPL3npryiCv+SiSyEUNhdPCDmM/hJDMspCbSNy+SuoA="; + vendorSha256 = "sha256-1FnewgsKlOnBAdm7vyBngrFsDHNCzpZA3IDccxALeJ8="; ldflags = [ "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index bcd277cad4a..fa77f3b5299 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_15, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage"; - sha256 = "1c4qmfyfi4hm3fs5bkxjbq1hxs5sgyp531xi5z5vpnzzi5z7dw0k"; + sha256 = "sha256-bHX/RWDfe+ht66U7xg4HBZxeWlNBu4gYlIVd+9OuMNU="; }; appimageContents = appimageTools.extractType2 { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_15}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" ''; diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 6ccaa8ff2e2..690f2148e5f 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "sha256-KQXEiDg5KRCMFFyDlR8D6CQTxRdIZx4/U1csTFCr0sU="; + sha256 = "sha256-ZJdmsb+2ElgLFWsicc0S8EQAZhF+gnn+ARgdAyaFDgc="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 4c5c5e3a840..6149c52e775 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages, installShellFiles }: +{ lib, stdenv, fetchurl, python3, installShellFiles }: stdenv.mkDerivation rec { version = "2.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles - python2Packages.wrapPython + python3.pkgs.wrapPython ]; dontConfigure = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Upstream doesn't provide a setup.py or alike, so we follow: # http://fungi.yuggoth.org/weather/doc/install.rst#id3 installPhase = '' - site_packages=$out/${python2Packages.python.sitePackages} + site_packages=$out/${python3.sitePackages} install -Dt $out/bin -m 755 weather install -Dt $site_packages weather.py install -Dt $out/share/weather-util \ diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 6fdfe92da25..e29d58039a0 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0hd5gnydxfncsmm7c58lvhkpnyxknvicc8f58xfh74azf363wcvm"; + sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y="; }; - vendorSha256 = "1pkdfg042kg3b6m5rf044gz5yg6vp3bbsay1mrrbaysnb3gs51dq"; + vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0="; doCheck = false; diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/applications/misc/xdg-launch/default.nix index 973acbbf65a..bf5b0484c86 100644 --- a/pkgs/applications/misc/xdg-launch/default.nix +++ b/pkgs/applications/misc/xdg-launch/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { pname = "xdg-launch"; - version = "1.11"; + version = "1.12"; postPatch = '' # fix gettext configuration @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-qrBxyJ3dUNdnE1nANLKKL0cXw/Hc4qxDoY1anIRN+VA="; + sha256 = "sha256-S/0Wn1T5MSOPN6QXkzfmygHL6XTAnnMJr5Z3fBzsHEw="; }; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index dc3415ac769..3f3c7932a5b 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.16.2"; + version = "6.16.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-RbpvEPjRwwGbjt4+A4tbnvEdLc+hH1VszE36xXnIxPE="; + sha256 = "sha256-YR/8ApkuZtO2vJA/VlZ06JdQnGDbTzQ5fNqHgBpFZjQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix index ddb137137cf..5682091237b 100644 --- a/pkgs/applications/networking/aether/default.nix +++ b/pkgs/applications/networking/aether/default.nix @@ -9,31 +9,27 @@ let binaryName = "AetherP2P"; + aether-app-git = fetchFromGitHub { + owner = "aethereans"; + repo = "aether-app"; + rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; + sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; + }; in stdenv.mkDerivation rec { pname = "aether"; version = "2.0.0-dev.15"; - srcs = [ - (fetchurl { - url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; - sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; - # % in the url / canonical filename causes an error - name = "aether-tarball.tar.gz"; - }) - (fetchFromGitHub { - owner = "aethereans"; - repo = "aether-app"; - rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; - sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; - }) - ]; - - sourceRoot = "Aether-${version}+2011262249.19338c93"; + src = fetchurl { + url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; + sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; + # % in the url / canonical filename causes an error + name = "aether-tarball.tar.gz"; + }; # there is no logo in the tarball so we grab it from github and convert it in the build phase buildPhase = '' - convert ../source/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png + convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png ''; dontWrapGApps = true; diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 64658d6442f..482914ace0a 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.10.1"; + version = "1.10.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-HwrIdQv4LDVLLuvukzp28AuKKbEMQeHSb0ZW+a9q4ug="; + sha256 = "sha256-4Xjm4P4uK0aZxUT0WzcSDdY6rEeh5YFwsMfVtFB14No="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 5243c4130f1..36b3141b31f 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.18.3"; + version = "0.18.5"; src = fetchFromGitHub { owner = "cloudskiff"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-JD3T0dCRg0UQlG0pWnI8RJZuRrIFfSMVHMoaEIymdWE="; + sha256 = "sha256-Qz/yObF1Df62Hqwl6fPHGkWcsifvgO5EfeiyU3aql3Q="; }; - vendorSha256 = "sha256-g3+g+mPXEO2ZcVraKuVYZCMBD5zEr1l8ogcYt3r4UjU="; + vendorSha256 = "sha256-wOk4IXD9qHG8R4iddlc4TLH39jVSof9bwTDU1kyAmuA="; postUnpack = '' # Without this, tests fail to locate aws/3.19.0.json diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 55f3e23ad6c..8b93b88be55 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.14.0"; + version = "1.14.2"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; - sha256 = "149b9ae774022acc0109dced893ca2d73430627a612be17ff12de8734464aff8"; + sha256 = "1rm2x66179ybfyc8v3va3svjxrnkslqn3dc84qkglqjaiqciadnr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 4f9de00dcf2..b209a5c5bca 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-KZrv447Yz4WxtkmQkGLsnZC0ok0rWCM2Fs+m8LVTGfM="; }; - vendorSha256 = "sha256-4imZrZfpR/5tw9ZFSTr7Gx4G9O1iHNE9YRYMOJFKvHU="; + vendorSha256 = "sha256-F+b4EXAxa4+O6yepx+9eRrdq294ZcQ+sODFUCKYpSuo="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 689922515de..256d7e64225 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-Fk1aYSa3LqzxiHtlzH5pcNtodOprjfnCFh4UMqCa6Rc="; }; - vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc="; + vendorSha256 = "sha256-21C6wZ8lKQnbUg3aD0ZFVOgopblXyWk4WP/ubZVk3Yk="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 27514303a15..a844f221675 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/k9s/cmd.commit=${src.rev}" ]; - vendorSha256 = "sha256-jWZ1N1A8VECBQvkXyuzMUkI4u2NLr5/gSvJUfK5VgzM="; + vendorSha256 = "sha256-mMob7M9RQlqaVK0DgHpaAK9d1btzfQetnliUqFTvjJQ="; preCheck = "export HOME=$(mktemp -d)"; diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 596a71251b2..0a2386d37ce 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-jop1dn+D0A6BkR1UCMrU9qcbZ1AHVth430cTd+kUYJw="; }; - vendorSha256 = "sha256-1D+nQ6WrHwJwcszCvoZ08SHX0anksdI69Jra5b9jPCY="; + vendorSha256 = "sha256-PkCUwe3S1bq37ME2WyTUnwEcbnFcNI0eaI9yW/HZ1uw="; meta = with lib; { description = diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index d7a58f09b4e..b8fada3966c 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGoModule +, buildGo117Module , coredns , installShellFiles , isFull ? false @@ -14,11 +14,11 @@ ] }: -buildGoModule rec { +buildGo117Module rec { inherit pname ; version = "1.4.0"; tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "1fc5psvbd9bpc6c3y2cpx5dx8cgr2fcp7nln3kwfgbryahq2y8wl"; + vendorSha256 = "19rd450gmc51gmwa13991lbkva7r80d2camikkxmmgywyhrd06sf"; src = fetchFromGitHub { owner = "kumahq"; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 0af651246e5..8c8a6d92930 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "21.10.3"; - sha256 = "09k4c0dgn9vvgp6xb20x0vylk6bbd03srk3sra8vnpywwi591mcv"; - vendorSha256 = "sha256-J/+YFXHC6UTyhln2ZDEq/EyqMEP9XcNC4GRuJjGEY3g="; + version = "22.1.4"; + sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n"; + vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc="; } diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index 7722a7109c2..5601bad7104 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -1,8 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ lib, fetchFromGitHub, buildGo117Module, installShellFiles }: { channel, version, sha256, vendorSha256 }: -buildGoModule rec { +# Fix-Me: Unlock buildGoModule version when #154059 is merged. +buildGo117Module rec { pname = "linkerd-${channel}"; inherit version vendorSha256; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 14a3675797e..bcbc8439c2f 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZnSDL1a4I3e7z2w5MdG6tFZH0PT4jCYX34f+mOmO0oA="; + sha256 = "sha256-s116SwgOj5xzfoz/iw17xubEKzPUx912QHk1+C6YhE8="; }; - vendorSha256 = "sha256-S0WRLln80pdGWCe6ub3bMZ6G2PbXwvCEGDDzez+nF9E="; + vendorSha256 = "sha256-VvK4pHmV1WkIzQDHiFVzjurigP3F4xYl0DJCnImSx3s="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index cfa86ea2dca..8eab4d793e6 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -28,7 +28,7 @@ let sha256 = "sha256-SmlcQH+K/axl6Gj+bX0Quk6K/usP0c1hWnIdFjS1dn8="; }; - vendorSha256 = "sha256-tO8vi9jBV6rVcGk/OoaXzpnQi4yPdozYZZwAMFCz2+c="; + vendorSha256 = "sha256-g3INNvAQ124kBJSe5cnsIq1y8sWpPYKLwJONgbIUaoM="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 67db6edd989..30ca2ee1cde 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/k9lQS3oPOYxhaaXuaDwPnai7byDkge4yBu7/9g4RUE="; + sha256 = "sha256-sB7C0IKadgpQ2h6HuH4D6ku/GXnFfFS+fGCW/RBSc10="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-7SVEyyJRE7oYIhuENraZy0aieIAoFFWtq4mrSXxURlQ="; + vendorSha256 = "sha256-R7tF724y5WNIByE+9nRoNSZDZzfLtPfK/9tSBkARaN0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 959c40637fb..3040b0f7b1b 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-JredVk2hjnhoaJ9bT7D5k35skBNjcEBLa6GgO8dB2+U="; }; - vendorSha256 = "sha256-ybsDB54kkbONi3b9URtNUusHIdUfzymOpYlNHJz4i2A="; + vendorSha256 = "sha256-GMAYu/BCmDrCUfc0x9TVw6HXJu+eE8eigZoPqPodM3Q="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 8bdbf63a9ff..6b0f1ea2e2d 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-SMPStxqzoeooBoqUJdFK6Zg3dzbNHrB/tv8iwa8GdbM="; }; - vendorSha256 = "sha256-pqwdxFFcATfxGmz6quIH8OL4U2DZKmuVyOLEct2nBlE="; + vendorSha256 = "sha256-1zdXc+Osqy17APcG5ou/UL/3Hcalmb1OZ2kZnWLSVIg="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 0db134bdb21..d29888aee06 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg="; + sha256 = "sha256-VGdYnynEm0ShG96W0uKiWBbUy/EitX3od5Nnho6T0pg="; }; vendorSha256 = null; @@ -22,10 +22,14 @@ buildGoModule rec { excludedPackages = "\\(third_party\\|cmd/docs\\)"; preCheck = '' - # Some tests try to write to the home dir + # some tests try to write to the home dir export HOME="$TMPDIR" - # Change the golden files to match our desired version - sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden + + # the tests expect the clientVersion ldflag not to be set + unset ldflags + + # remove tests with networking + rm pkg/cmd/version/version_test.go ''; postInstall = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8612e898d91..3a80e788c49 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -956,10 +956,10 @@ "owner": "selectel", "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", - "rev": "v3.7.1", - "sha256": "02sfzrs3k907djcyjz7qn42b21wccykw0fw65ms34h5vz5ld73mx", - "vendorSha256": null, - "version": "3.7.1" + "rev": "v3.8.0", + "sha256": "0qc08v217cv2i43cxcx854rvhihrlhlakfark37vcdrh9z6swf1n", + "vendorSha256": "1mjp5yqwl1nya82yf5v6l3sq7iv0m94xy5w7y5avn8h40dl1wfnf", + "version": "3.8.0" }, "sentry": { "owner": "jianyuan", diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index dbdf06771b4..d58a319f724 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/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.23.4"; + version = "0.23.5"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SWofXsbkuirPvqgU639W8IQklafLKbThoZUzOzfYwdQ="; + sha256 = "sha256-qVybS+gRuTezX89NMWYQVWtUH6wnjB11HImejrzVHAc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/feedreaders/photon/default.nix b/pkgs/applications/networking/feedreaders/photon/default.nix index 8e4c85cebea..0a02c1db181 100644 --- a/pkgs/applications/networking/feedreaders/photon/default.nix +++ b/pkgs/applications/networking/feedreaders/photon/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { proxyVendor = true; - vendorSha256 = "sha256-MLNgaxxvPGRzBEWRuKTDskl0J2IVushW11E5prpYsE4="; + vendorSha256 = "sha256-1vlgnY4kZJfoAtbv+r8onxL03Ak32zKLJgtrBYZX09g="; meta = with lib; { description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy"; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index ff620989f9d..f024de8d55e 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { --zsh <($out/bin/gmailctl completion zsh) ''; - vendorSha256 = "sha256-zEWEcv6G/9tmM6/+lhMFkyew3r/pvQRjvh74BENTYI4="; + vendorSha256 = "sha256-nAczO439tRiQU9f9LbJVENJiURVRnBAInwUp699RxOY="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 97530b722fd..ad57e2c6623 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.25.0.78"; + version = "2.26.0.136"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-Xk9iU7mNm3YlXKsmf6yPqd1YAklsFOWu+04Llb+2yWQ="; + sha256 = "sha256-9QiE7CjCepDXQCzduqGzNUGqUgYS+PWBS71ouzHa83o="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index abcdf617352..7e2f2422573 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -23,5 +23,6 @@ buildGoPackage rec { homepage = "https://coy.im/"; license = licenses.gpl3; platforms = platforms.linux; + broken = true; #fails to build with go >= 1.16 }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2f58ec414ab..0672cb72425 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,11 +7,16 @@ let canary = "0.0.132"; } else { stable = "0.0.264"; - ptb = "0.0.58"; + ptb = "0.0.59"; canary = "0.0.280"; }; version = versions.${branch}; - srcs = { + srcs = let + darwin-ptb = fetchurl { + url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; + sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8="; + }; + in { x86_64-linux = { stable = fetchurl { url = @@ -34,11 +39,7 @@ let url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p"; }; - ptb = fetchurl { - url = - "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0="; - }; + ptb = darwin-ptb; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; @@ -46,13 +47,7 @@ let }; }; # Only PTB bundles a MachO Universal binary with ARM support. - aarch64-darwin = { - ptb = fetchurl { - url = - "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0="; - }; - }; + aarch64-darwin = { ptb = darwin-ptb; }; }; src = srcs.${stdenv.hostPlatform.system}.${branch}; diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh index 0bb0d784167..46306488714 100755 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -22,7 +22,7 @@ if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_versi exit 0 fi -linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb" +linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb" mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" linux_sha256=$(nix-prefetch-url ${linux_url}) mac_sha256=$(nix-prefetch-url ${mac_url}) diff --git a/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch b/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch deleted file mode 100644 index 6c40dc8dd89..00000000000 --- a/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ac9387271b2420a71f7d172f44354fc35adac504 Mon Sep 17 00:00:00 2001 -From: Manuel Nickschas <sputnick@quassel-irc.org> -Date: Tue, 7 Jan 2020 18:34:54 +0100 -Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14 - -Starting from version 5.14, Qt provides stream operators for enum -types, which collide with the ones we ship in types.h. Disable -Quassel's stream operators when compiling against Qt 5.14 or later. - -(cherry-picked from 579e559a6322209df7cd51c34801fecff5fe734b) ---- - src/common/types.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/common/types.h b/src/common/types.h -index 467d9fb2..c4b9f364 100644 ---- a/src/common/types.h -+++ b/src/common/types.h -@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) - typedef QList<MsgId> MsgIdList; - typedef QList<BufferId> BufferIdList; - -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - /** - * Catch-all stream serialization operator for enum types. - * -@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { - value = static_cast<T>(v); - return in; - } -+#endif - - // Exceptions - --- -2.26.2 - diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 44e7fb85360..d218f114143 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -5,7 +5,7 @@ , static ? false # link statically , lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf -, mkDerivation, qtbase, qtscript +, mkDerivation, qtbase, boost, zlib, qtscript , phonon, libdbusmenu, qca-qt5 , withKDE ? true # enable KDE integration @@ -33,27 +33,21 @@ let in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { pname = "quassel${tag}"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "quassel"; repo = "quassel"; rev = version; - sha256 = "0z8p7iv90yrrjbh31cyxhpr6hsynfmi23rlayn7p2f6ki5az7yc3"; + sha256 = "sha256-eulhNcyCmy9ryietOhT2yVJeJH+MMZRbTUo2XuTy9qU="; }; - patches = [ - # fixes build with Qt 5.14 - # source: https://github.com/quassel/quassel/pull/518/commits/8a46d983fc99204711cdff1e4c542e272fef45b9 - ./0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch - ]; - # Prevent ``undefined reference to `qt_version_tag''' in SSL check NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ qtbase ] - ++ lib.optionals buildCore [qtscript qca-qt5] + buildInputs = [ qtbase boost zlib ] + ++ lib.optionals buildCore [qtscript qca-qt5 ] ++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals (buildClient && withKDE) [ extra-cmake-modules kconfigwidgets kcoreaddons diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 244e4893933..172cea3d061 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-3BbKf2xSzXznCB5UU/cThVg329GSeJG9KwjaS+tN3Rs="; + vendorSha256 = "sha256-hpGd78PWk3tIwB+TPmPy0gKkU8+t5NTm9RzPuLae+Fk="; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index b2ec2a743f3..c039febb6d7 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; }; - vendorSha256 = "0sblgjmn3i3k31jfq5zy3bx7bv5z2cg6rjzr7aj87c57yhzzcmk7"; + vendorSha256 = "129hvr8qh5mxj6mzg7793p5jsi4jmsm96f63j7r8wn544yq8sqci"; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 893473ff15f..494f371016c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.5.0"; + version = "91.5.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/af/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/af/thunderbird-91.5.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "20272a9fbf08651ca804f324aca1c0c7b6b04351b0a773790510a69d56ef19fb"; + sha256 = "90a7b62161c8e4bd0dfcb0c69995e80b1733b86513d5786559eefd0ee19ca6ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ar/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ar/thunderbird-91.5.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "208937e2b22db6a159b2c744d9ad6d9e96fddf21f753673d9006b2576e5ddd24"; + sha256 = "f7167cdff08c42f0a067e8631f8ae85ea12f301a7d49ba8919fa90cdf5ac1aaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ast/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ast/thunderbird-91.5.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a8b078c5699d174db89c4adbcce45c4add38d88561d1154dcaff56be4731b29d"; + sha256 = "74ffcdac8a170ba700d2c58066c66143129a7f21f8123c174dfd598240f2271d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/be/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/be/thunderbird-91.5.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "91be973a0658dc7a284cde429b537bc70db88143abe42fd6ce6c4a0a450353ca"; + sha256 = "aabe3dce7ddcfcaad6212549f7ce709c6832c01aa7cfaa15fad82d75259fa8ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/bg/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/bg/thunderbird-91.5.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "bdb25d9c1e3ed725d667b9b613a425a3f1c18bd6ff78417a32f04fc6257c7b66"; + sha256 = "f0fa8e63643e1a44ab6997caf148812e749004a450825b0b77f1ac0cc52c6ec3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/br/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/br/thunderbird-91.5.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b8cf6f6f490a3f7a06a036bf84d71cdcdfb21e4e253190d2c8c648df8f7af931"; + sha256 = "8391eb495214140878bba1f658cb1dbab4a93187f32bb99e65613b09db70269c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ca/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ca/thunderbird-91.5.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5a55055b5eb29e209e02b2980895719883bfc9929910d0f336e431ebea870856"; + sha256 = "82b1498ee1745b087b58f44ca57f1d355b61aa42ec2787302e6a59dfb5391a3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cak/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cak/thunderbird-91.5.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fe192c81dd6f04d37c4f603c3e0367d462c5dc6effe7c8a07a030d5584118c58"; + sha256 = "52761eec2ef3327ea5f435bfcb73dd4a5c378e78d57f9849283460ed39318af8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cs/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cs/thunderbird-91.5.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "bce9c7bd093631e2f0096ac3c8c2cdb19d9567d5233d912169c238e33372da1e"; + sha256 = "406bff52470379be7d6b8315909067e1a1f7623a7d4415a23b6f53ea4f896064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cy/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cy/thunderbird-91.5.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4128f704289b9267316eb373a3142305096897b37a2daa79a84f4448aea54b14"; + sha256 = "4fa869d8592709da2ddba8657424475377aea9617ad411abb25c8ae8e55612fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/da/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/da/thunderbird-91.5.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "39e5239860b450079cc10179e215bef63d77957c47bc3690c16c086a30e01317"; + sha256 = "1ed471dab670fe7ba58ccb4fe39bec2f3ee6625a6713c3b1f3fe9703e0a703cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/de/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/de/thunderbird-91.5.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "0bc2cabac439734fdddfcfc1426696559ac1ee3e9a7bad1182329d83fb47d8cb"; + sha256 = "16b6e291489f37699587b62cafb3caa3e09ae21b160c9739afb35ae450dcffbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/dsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/dsb/thunderbird-91.5.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2c4d8fc6ae4c9a2adabe0a1593d7289596b97dd7b9e39b44da926f925f754ef2"; + sha256 = "3872f1263a7ba9f6a31f1fcd26440ab3ec231efca678cd75459bd71a4b0637f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/el/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/el/thunderbird-91.5.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "07e10b923d0829e6cddc35bd56fe51afd07b35664b4feb725dfedbd51e99029a"; + sha256 = "aaab178dc1f6d9f1818f63b98091113546bdf36e823efc0c252979b570406ef0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-CA/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-CA/thunderbird-91.5.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7f583ea36dc9d8a1a2136343773a8e7434d466f31ddf50f5f7da7675a08dbd03"; + sha256 = "d2e98a42a5de6793f34725f989b645a0531dfca95e014e58bcb951fd5a4f9681"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-GB/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-GB/thunderbird-91.5.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "46bd4e13d215bd9be875ebe3f999da3927a480401aa4a2e51f0388d3cf28a3a0"; + sha256 = "4459fb379c2299be6915a5a54ad6963dbd80dd5a9838baf1d2edcf63ef0354bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-US/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-US/thunderbird-91.5.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f6d62b3161d1b7cf665fdb965526632fc4eefcaf1727ece7986e956c7575cf0d"; + sha256 = "a88c57cb36623d18a53c1940ccfa5874c222b6a2e44aab7760ccd6c70518f748"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/es-AR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-AR/thunderbird-91.5.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4f190b4d64db8fe9accafe1941e3f949ba21488b4411a506f6f61d437f17d61e"; + sha256 = "979514cb958a4626d07379099c3fc77ed4208cecd3b0af9c059a04064e60df43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/es-ES/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-ES/thunderbird-91.5.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "61065d0c72451cebbf5d83c92e460e240e7f477322531a3f4d082b3c0e6c213e"; + sha256 = "745d0865606c238512e01e414305f83664b1395ff9d02b36f9df37b1bcca0e2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/et/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/et/thunderbird-91.5.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cba4afe259ccd7c6619f4ee0adf167659eb4f80e9355b25138d9f370ecbcf932"; + sha256 = "1a009c0ec4ad94819de0eb006c6f0919080271e8d5c6c5b324c6624657ef8440"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/eu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/eu/thunderbird-91.5.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4e8569190b2702ad6e10156b434100cdf879dfb3a5ee798c876fc46871e1abf3"; + sha256 = "3beab0dd08c2089dabf99d246d9a06bb0339b88945e012fadc53a9420b105eb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fi/thunderbird-91.5.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "93e3b7624d6de0b77f87bb192384437e006530abd03bdc5589dc0dc47e0af304"; + sha256 = "d0006d6b5a2fdeb69171452c9eee4f7e54d18cf0a42bbccc056144af127109c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fr/thunderbird-91.5.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a35c370b69a977160a83ffc4d24f5a9a9f1000e1012c71fcd1e7adc6c16c68b8"; + sha256 = "4345711b2199bd5f0cc89e34cd7a65bb22290268c872c990fb32ee49c174d58e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fy-NL/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fy-NL/thunderbird-91.5.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c392fb2f59d13f912e757be716a4bfc464a0cb2f69f8af780bbaec8e6bbcdf0f"; + sha256 = "7f90afe3e04e1a7db5236d12d2133c3552e0d6744262f5107522dc1b88b9d26d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ga-IE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ga-IE/thunderbird-91.5.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "210aeb0fe2c3214f82948ef39205416e4c50750be0226fa56b2c5548ed06a182"; + sha256 = "ecf987ec7a479fcd1aeec4a680fe7b785f3273914be7bc5ea34a1160024bca30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/gd/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gd/thunderbird-91.5.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c02818558da950caa540cc73597bb2ba1cbfcf02240b085856776df5155b59eb"; + sha256 = "e688777e2ca5a0964bdb295c17de71f0b3e7ce8ed3a81a027cb58d65f0b13843"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/gl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gl/thunderbird-91.5.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5704fa5d4efb470e516c23a6f15d238ebaeaa7ad1ce14f49b7a5a3bd19524f92"; + sha256 = "b7e37320a6f29312851d814713522c0edaf3ad10bb6096e08e60ad9d6eae3c34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/he/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/he/thunderbird-91.5.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c366556e481757da8f48b89f1ef54492e5d5e41a45d9ec55f5e81081de4d8b58"; + sha256 = "9e317e22ca0e8e6d809437efee263fb3e0b6418696282f8670b7f8f92ec6c56a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hr/thunderbird-91.5.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "47a713172ea17582ec988fdef33cab24f3245274badefbefee7f665af7e9e917"; + sha256 = "51f6eec36a08b766bc9567ae7dbac5b015890c0792dd4a37f9654345bd34f9be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hsb/thunderbird-91.5.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "019271fd8d9343581783dcd6a59698de726fdeca39e4e71226b7361a42e7478b"; + sha256 = "1f91258f84978b313d2ced008ef0e760e5e425dde3116d1e6adfd7d87895a043"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hu/thunderbird-91.5.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "bbdd56ba0a2f1079d2dfe63f2cbf56dc98f5f0675c73413880aba147d797d1c2"; + sha256 = "d5665c6b1415493f18085c1606b12e4ff52f02ac9d932f5e14c6794685b7c68e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hy-AM/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hy-AM/thunderbird-91.5.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8393fdba3c2d7024c1ad5d017853c1a13fec47a29e31db4ba0f38c5ee49843ec"; + sha256 = "2100b04070066d8ce65d7bb3bf25d4f3dcdec4c14dce3f9c5455923de84e6c84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/id/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/id/thunderbird-91.5.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "51ff83923eda81e69d5c74bd49878c17eb3552072b196e2fc933b3dbf89a7513"; + sha256 = "7e9e2f1d5ee6db5f72a46a5345c6d4bd4e6cfa76c2637609dab0e415b93e1975"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/is/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/is/thunderbird-91.5.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9f6bdf8f9a97788137e698464e391f6942e3cbff5870e8b4f534597f0b582f5d"; + sha256 = "089acd20ab3894dc04ecec3cb85317d40ff9f86a2fef381429f06a70b92f4785"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/it/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/it/thunderbird-91.5.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "33b0169fec2ba8822c086837fce0ed59d77676f6fe804948dfd0ad0c328e1cc7"; + sha256 = "22efeb3bdf740d1b0dfe1850589403758fea11b443ad6099c630e7cab866fbe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ja/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ja/thunderbird-91.5.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "bf93f1e234aa13edb416912377a23ffb370de5a249cc66ec13587632493f0efc"; + sha256 = "5e950fb7dae9573d877b783eb12f36cb801f0299fe360e2538aab9a86ffb5911"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ka/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ka/thunderbird-91.5.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "dee6e5c984c0dafa66476bd4342385beedeb826a947991b2b4bc3a0e1d7bafd4"; + sha256 = "24cb7fb080728903c118a31e56a7d1e02e554b2a03ca272ee0e8f14d58e1b1cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/kab/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kab/thunderbird-91.5.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "fcf175d175327f8a6c76d0e81062a967813f486e8005aafa7998fa682542e5db"; + sha256 = "0bfd4b98c2659b7541cdaf2fe4be33f71463d6eaeb14b5722f2916abe82411d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/kk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kk/thunderbird-91.5.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "22e2bff84795a512eaa486acb11440afa51afddd5feb6828c025bfdd796cc5e8"; + sha256 = "62d530819b0bc304416db7e470a8856afb8d41813165a8b3ebc417957d5447fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ko/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ko/thunderbird-91.5.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a3c8fb1b1cfc7e68ad177fce78a8751c86cb4d95965d05abeff384c19f470bce"; + sha256 = "f081bbe2756b4ea78dbbe1a18377eb64ac729329a5bf2c97489dfb03ab1c2949"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/lt/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lt/thunderbird-91.5.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "5aaa95d61662a69d3d92cad9d5cbf24a348a7c6d7db1440412a324799167bd7d"; + sha256 = "26f2cca527fee03e4b7747dceaa0ce1ee0c3f6efb2adc670ec6c1f19d2118d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/lv/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lv/thunderbird-91.5.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ec61d867216b50649e2900e8922603f38ebd4c67596b29984c60c1933f1f00a6"; + sha256 = "f39fb8ddd6e246643750c5f23fa1d5993437c78f4062acc4c3db22d8b1dc3b56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ms/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ms/thunderbird-91.5.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "27bf8b301dc1c05a22c413559f833d522fb42934c136be126de90d3519df7c1d"; + sha256 = "07835a7669f3595f20d7d41db4e799c968d30166f0db764d47b2fb1a8d8e6f0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nb-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nb-NO/thunderbird-91.5.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "587b27872162ac8e7580183b362192f7c2439a4a7a783aa4fc6ae81e87e7b4bd"; + sha256 = "2dda693d9dcd5602cdde27d54871cf5b2b06afceaa0133a77632637a81a4bd69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nl/thunderbird-91.5.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "be970367d664bcc2a5e6a0805d0b63fc991221c41497ccfa1a1ce5102b20450a"; + sha256 = "05a884da304dd5c8692ced6b5d974f14e1b0007ae683f3511285b7432828b71c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nn-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nn-NO/thunderbird-91.5.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "92e168f3db1bef0c2fd33dd8da8f2ba8732e63c1b36aeb0e01f3478e67dafba2"; + sha256 = "8250f8d18feb596ed758b07933d590d7f3de016c5ce08eedb6024a4d116acb63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pa-IN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pa-IN/thunderbird-91.5.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "485d231b5153fde23d9a35154c713b97dbcf96a8f1058399b09796210c831391"; + sha256 = "5a510109f30fed267a61d8586714e2554b74866de8b1948c80a39ad7db42e460"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pl/thunderbird-91.5.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "112240a352a3d833de9df127ab0118841b88e67c4496a17c8cc63abbd19f1166"; + sha256 = "d3fad496d1aac376fe9557ba039a916a7527a1a120e102724fd35c469adeb8eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pt-BR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-BR/thunderbird-91.5.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7388f54dc99de6498af19f0a6e7b80bf2c7465c68d94c4e04ca5038a2e087960"; + sha256 = "bfd0685dae994a75a284220358b1ebf4d0a71d151b2b674215b5d1c4566784de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pt-PT/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-PT/thunderbird-91.5.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1ca7c9a460e8603d0daadbc07fd12fe6d0d07ef288144ba5da389fdbb5ccf4e2"; + sha256 = "d4cded9e8e065c312573931b4e60a5a62a154763fdf859a5fc53d120209520f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/rm/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/rm/thunderbird-91.5.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "954516da6b44ad4dfc56f3b837e45bc0816498fe426ae3aa4d3363621cb2c289"; + sha256 = "5761e7778adc41e69351c49db232792096a3d69994f79ce556cd4dbb1a356530"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ro/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ro/thunderbird-91.5.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e5d83482c7381d89445d49b5c85b5645533dae173010f2ebfcf706c01337f4e2"; + sha256 = "63bd9a8c5035d8964e609159d301ca52e68fef0f136ad378a8016fd1dc7a1ea4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ru/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ru/thunderbird-91.5.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "51db5bfaca6c9404eddb71cc6559c7c83534fbe57bf27da14c35b4b268cdfc98"; + sha256 = "a0d3731c3a6f207e8549d3d5e2e143c0b4620eda6902e9636d8c37558a78d09e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sk/thunderbird-91.5.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5803d8547bddaffa6a9532eb6abd2f66f6936c6614a1c322a8065a01e6c831c9"; + sha256 = "22635dd9abad4690c52932afd8b9b8cdad03270ef87c18ae3061308c62932064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sl/thunderbird-91.5.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2837b957b89184978c0ead48e7a2d58a7ee140ed280be8d744fac929d66cfd0a"; + sha256 = "e2c395a8483115801b34c8de7a34bea1ce219e1cd0012c7d27af4b11e11577f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sq/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sq/thunderbird-91.5.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fd98ce5bb9bccfc8c9ae022cdf0416848e3564b59ccaf3ce8888eb7d4d02f0ce"; + sha256 = "aeb72ddfb97fa6fad9f4295f00bd01eccc78f919c34b899925383d7877d10454"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sr/thunderbird-91.5.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d9c1ec7df7e66e1b4e28a68c9ed74e8ea17a166dee2d2aaf7c9be616bfde97a0"; + sha256 = "ce9b6671b7d138bbad4ccb4a2dd660d8f2ba452f5f331dc8b630005e4a64ff91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sv-SE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sv-SE/thunderbird-91.5.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e9e8ea82bf5fdb900c36ef22afda90d518ac52a4fadff5a3f1afbb09b4d1ebe4"; + sha256 = "59bdd6acf2aecdddb2f31a0e6305ac5eb59d8d8c3ffd6fbaded92d97a8deff4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/th/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/th/thunderbird-91.5.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "4a58f3d88283cbe83bc6f9ff26c5b621bde3a52a8e5cda283f9bac6fa329e2a1"; + sha256 = "62c76e4291580ec271f36737cb6dd621c6e30ddf02a070b008d312afed0cc727"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/tr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/tr/thunderbird-91.5.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "489e5d4448c25310ae14c6a74405d582b50113a73c394aa51776c2c3b37104ec"; + sha256 = "4c59cb186ea76ee79b123d29e3cc8a9c75e58a5f8c46e3b71a7a0b1937d99e42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/uk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uk/thunderbird-91.5.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "cefeaf9df2e5fab13cf131d597393b83c1101d83b6dda04207c4428abbb62d15"; + sha256 = "19df95c2001aee2a6ed00df011caaa5be03062a559619971897640511848856f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/uz/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uz/thunderbird-91.5.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a330fa612f09f1337c3c775d0c0447dd2878e79c2555c7e1a13f611e2712720"; + sha256 = "d773684ed49309e642436b40012b52980286fd07c508d8a9ee92c6210063fa13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/vi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/vi/thunderbird-91.5.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c1c11ce007f1e8cdfd039c8b9dbc73e879adafc40d6ef11dbf82134ff76c8d48"; + sha256 = "8bda4d3c6a9ceda51fcccfeadb9942c595acffb8a14823a59523468871332651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/zh-CN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-CN/thunderbird-91.5.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "041aa19e78aad8be563bf4466572deb8bbd16f3a74c24f297da0667dfc65739f"; + sha256 = "4ffa3da9d6c9f45fa90527621af47e67e1c76f09c325a1176be2f14f52ea9362"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/zh-TW/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-TW/thunderbird-91.5.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dee8d2dea78128f250054d5f8aaf948b19d3e43acc228a0c751df84d601ce76c"; + sha256 = "e3c053b3835566481e1207cc1da3922ce4949c0215553bc2dce5a62715a7a919"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/af/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/af/thunderbird-91.5.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6e19fa5338b63c3aa163cbb9d84953a0f1bc4bb593cbc685cf4e59249425f948"; + sha256 = "f131f7266ae90708a4f5a544d5b6b656488e676e79e91e998ac4dacd969effe4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ar/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ar/thunderbird-91.5.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2b35a83198c30bc9838849260477b4846dbd35b82607261534e05336911129c5"; + sha256 = "8dbb28b438d1f72d314b32ad8b884829a9bda3bb3a8d4a677e3abcb0f7edc005"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ast/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ast/thunderbird-91.5.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "01712e869983cb089f9e98449ae215c95aa59e70ad2a7e61a17788f74c50c905"; + sha256 = "0c1dfbb7b8d001e28ba6fb5648af5d993b3a89e19381cb9bdee898ea7134ec64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/be/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/be/thunderbird-91.5.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e7cfd5b52f0a809c514ac17f29bf30d2aa1959193020f742b8e907fc4772eb8b"; + sha256 = "dc4888c238652ff13e66ada3d21e129f3bc01f663dec38bed1f200426c5ec8af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/bg/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/bg/thunderbird-91.5.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e74a5073ec17e2ac75c81e9dbe418167932d53d47fb1449a919b7a6824f7ace3"; + sha256 = "77c370a1f1e9e0683baf5a6a6abe937f198be08cf6ed3a6f29c59c3be64080ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/br/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/br/thunderbird-91.5.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a8b13e933e1767d6f42fa4e02892d99ef5d8da14c9aad51e2089d16c2b935c6b"; + sha256 = "bce47698480a1c38d5b0d397c3e69c3c5ac99a0937885abbd633284614daea6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ca/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ca/thunderbird-91.5.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "047e158f5b81c5c5837c583e63f1852e94ab65365e7551dc14dee4e91711ee89"; + sha256 = "bf288be4f977ebaffcd2e16c691a3223924fec7f39ec3e7368fb9b88f9c1156b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cak/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cak/thunderbird-91.5.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1175e2c893f720fd128de26ff7832367e2e8792d1a0fb968c23cf0c2971d87a5"; + sha256 = "fcfb6268df5aba758dcefae6e6c0469648d56663789d32175a8e52068d48aaf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cs/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cs/thunderbird-91.5.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9c80c6afa31ed73ccb2e1c813acabc3be484e00f6c498dece19e095d5fc7e1ab"; + sha256 = "529b31c7cd03b0c199a8acab13dfb684db5c2bd9fa10f96e8da748bcaa5e0a04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cy/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cy/thunderbird-91.5.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "79418720066cdeca5abee231952b3b26f1209eaf59ceab0882f798ba86305aee"; + sha256 = "c4b22b81608421ff5c6ce74ea7b145a6ad09ae506ae25af9ad93ac0434ad1734"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/da/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/da/thunderbird-91.5.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "4797af3b1d72199565fafe269d5514042420d3ffd276fb94b3bdda5cea2191f2"; + sha256 = "cf28d1a77ac2acf26fc314628fe21e5c9ddfcbe85a76d28070d15d78a6b73360"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/de/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/de/thunderbird-91.5.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c15470c0a61190749d88c857d1a4490e331fc0046cd7aa18fffa5d23b33c1460"; + sha256 = "a752cd04414a80ed92e42bf95b6460714b500e1d466d5663a64c9dcc7a678e66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/dsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/dsb/thunderbird-91.5.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "64c176f0c64d877a505006b03eb0d685042b7120293b733de029868a3ae562ec"; + sha256 = "31ef88cc4cc2892fd501df71a751aa3c3ee8acc61fdb437897172de8e75de9c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/el/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/el/thunderbird-91.5.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b220e7f82cbd674b5e98d082766b06a52bc69e18c7d1c91bb0a9dc6d2f129c99"; + sha256 = "5edf4e1008b3d8d19d623a8f3cf2d8fb1f7a1030de9db686bfb8c09c61e740d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-CA/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-CA/thunderbird-91.5.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0cc5344d19e62fc86843d71792a59b310be9604ba2bc1ea633d71d6f54ea7eae"; + sha256 = "60e91f33b0b5e75e4a18f1fac688e4c249be77874103d1a44ad2cbd1188afc6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-GB/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-GB/thunderbird-91.5.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "04285f839530ce6917a1918d557cc86448debbd8910d54ca051b9f1b63749b7d"; + sha256 = "b08d2650702304409b19967d5ff6883881d37577c8e3ed0d545e36e81306cc96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-US/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-US/thunderbird-91.5.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "fa96eb80909cc7f485abda8fdc093f0ef1e2e5fe69f4919bdeeea27651fa264c"; + sha256 = "347dfd3d8bf993e2fdc7c844c8b1a94925ab637acad9e07a1616f8657e8574b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/es-AR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-AR/thunderbird-91.5.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5affd961efe6b8d6b7616ef1103095c068627f6d3c571aaf71924bc8f8bc58ec"; + sha256 = "e2c23ea75312f53201e02079063c946ae76fd11acb75cafed8d643ad49e5d484"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/es-ES/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-ES/thunderbird-91.5.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1dae610383b6dd35e4d6e7d0f8a757b98ab98c6b587940818c239c95f7829e24"; + sha256 = "205d541dc22a3961b1aaaafd617743d1a25b52ee5bdf8b9add6ca56fbcd6861e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/et/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/et/thunderbird-91.5.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3b2979496032f3f140460295fcae7ff6b08b7970c18eff6bd83df6f582c20651"; + sha256 = "4967717f2b6c21d9868e4fdb812e999f3002bb197b3a111a479d97fabc70d2c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/eu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/eu/thunderbird-91.5.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a10fddb7405cb311d0a8c69dafca4dce66084c64f68fc7dabbdd7292d265d528"; + sha256 = "ea5ad491a38b4fd3b78f0741b7545ea7a9d11c3cd82f992fe7b6f38acd4f1a36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fi/thunderbird-91.5.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "edc8f3c7368126e3678f8ea6c22e8e575cd34054a94e21b1eac0a44f44689790"; + sha256 = "45884d2b6d7af2a2f9f4195d5ddc9eadbd34a0d6cae039193b4eba4da49e3909"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fr/thunderbird-91.5.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bae7f4e7cd6d72c3e8270f12483f382c939f3012df6597bb3233af9a3d0bab03"; + sha256 = "1d2153eb9e903a37e03596e11d2bc0a869260421ac07b3787d05a163c9c5b32d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fy-NL/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fy-NL/thunderbird-91.5.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "dd38566e30d30d1a15283ef1c4382d350cfd4afe8cdaeefc38b995cc82045964"; + sha256 = "6ad87450cbb8a98fbd55d7399ef73f5668c1f8e288cb6d36b426fc8c373837bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ga-IE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ga-IE/thunderbird-91.5.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "7b16826113f3c46601465dbc3b44a24b5e62d9a6a0639d4f74b6314250f24224"; + sha256 = "4b268107debcde5a45fc69c5ce4881b0bc8b9809a2cfcf877fe655339ec5890d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/gd/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gd/thunderbird-91.5.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4287667e5ff7a6ff39c74066a7c22229736ce503fad749293710a25cf74b5836"; + sha256 = "3a6f0b431d5301a9cdf1499b186580bfbf468aad4e7123175a9defa04e68e6ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/gl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gl/thunderbird-91.5.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bcca84aaab4c48e8842f1c921ac398f56eaa569cda6ffa6b5aa3cd0ec709e42e"; + sha256 = "e79001ca8b96cc9c5cb1a9ada3362e5365b68c05b4324ff2d36e1421faee691a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/he/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/he/thunderbird-91.5.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "fd9be0e774dde17d5c2b5d1887c9e9ab75fcb7c797f5b6d59c991679eeb870a7"; + sha256 = "d246a1b5a9d03e656392df6fdd4a6dda9e035551d0498519fbf53d44ec033a34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hr/thunderbird-91.5.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4dbc9d9a2d9409688c2f67f5c73fbb31fd1027ee787527f437f95582103c728a"; + sha256 = "f3d4604bea32362a4ee9ca41d3ef98e910ff448b32e37d0c59dc33d92366ab1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hsb/thunderbird-91.5.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5cf4fc68d7d9464d55686dbac2dba4a38ca50bb36e6661ed4d58b91726f0b312"; + sha256 = "8ca969121ab8fc69dc598415a7d5ece9fd86e51c3b90f48f9c51d01157a3a14e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hu/thunderbird-91.5.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "dd1b4a5f2498eb2e3a3956fdf6379cdde04f0eb60efc201c86237f07dfc01a2f"; + sha256 = "8b76452c8aa27409237d592fa386f8fa257bf44151e77f5cbf990b1c7580689f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hy-AM/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hy-AM/thunderbird-91.5.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4e717d157784d865f4de4dd8b14718d39103ce24be1d72c5720629c74d74ae94"; + sha256 = "7855e8b013d16365fcbf883646ac83f8c094b3efc4ab9c6ada1eccf211c53d2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/id/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/id/thunderbird-91.5.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a705929998084e28016cc60df3b7ae6a1f70929270be16307e9be89f1324de2c"; + sha256 = "b41b74af5f85a56e0ffe6345f78f39190b22a867110ef043f24300f68e845324"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/is/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/is/thunderbird-91.5.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "48d7eb8c949e9590699031c45bcdd746d1e86ed8dd893bb3afa7025f7bc4c247"; + sha256 = "963c23e640536d88fc486b654e69584587cdc39d2acff9f64372faf7fd73f8db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/it/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/it/thunderbird-91.5.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0278a174914da7f874a974847a30bc52851496e79690a8ccde2c3a0a24e9aa39"; + sha256 = "4835f22538eaf2da8913d79ae575c7401fcc7fb3b7c0d21d386906c055ed7912"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ja/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ja/thunderbird-91.5.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "243e610020c892cf44de3d76b27539e57c5c9eeaef6c5d8298af59ee4be8b448"; + sha256 = "edd3a047d63172f5f42fa31b4b89a8d07c6d9eccb3d53d19f4f7ad8cc1cea539"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ka/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ka/thunderbird-91.5.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c641e2f92c87a7454603d059dc34dd2719aefe9b10548dba9e4b95e728583181"; + sha256 = "06b55cb6215cece0d95827eeb196bd5f1255d348a7d906a0515667a71050ef85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/kab/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kab/thunderbird-91.5.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a47675e0ec44e8bb94dd950e5282f26f0ee878be90a87c0cffe50fe74adc754a"; + sha256 = "36de72132e0311c4428182c5795249e37042f1eb05d1c05aeff9f1e46b602656"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/kk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kk/thunderbird-91.5.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1a4cc1087fd9fd0f9cb303c1a0de438d95ec9a665360d9c9915af4269af6f5e9"; + sha256 = "e3462a463f867b4645bc77739e275deae77bf64068a6ddd1522ac281cfbfbd3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ko/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ko/thunderbird-91.5.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f45540f54fab28b107c2938b91191a65f2051fbf435e00530d343f076cb84373"; + sha256 = "e90f011e920958ea853dd426f57a1e5cb0593ce117d5a9e19a90c6df69d729c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/lt/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lt/thunderbird-91.5.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be4d02c3b07aab05e82de8d167ae22269ca5c5ee020a6d8cad0e53a433135160"; + sha256 = "4e3eaffa505b5f8a37b0534a754ab89c2f7b4dc65ead78ca266d4fa8cb5aa841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/lv/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lv/thunderbird-91.5.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "76e3c3c943d4f3598f6f49b51ab9c8625322ad78b6809418905e8d0c7d586ee7"; + sha256 = "0dd8c818bd60cd6e67df751933c0aeb89bf10fa64235edc639955c86a0e51168"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ms/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ms/thunderbird-91.5.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e125a89ea9d9f013ddd2f816ab10c6916b514ff329011f54e517e2d6e5edb865"; + sha256 = "b0b9f303014a1b90a52ec39f36f2e2029562ef70fcc9b77c0f7048558f1ad7bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nb-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nb-NO/thunderbird-91.5.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f1645ab9430323efefff6751696e1fe601063eef5c5ac70b90889620f6bd9680"; + sha256 = "89f787643d5d2451a0f7095f69805d4c0d0e05c62fbe0468c78b6bcc9dfc0dcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nl/thunderbird-91.5.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2c1cc1a8ed006e45d4649fa89d5446a9df2e95e2656e9a18130556c42ee0db78"; + sha256 = "9ebf8a5cd8df953078dc634ac17325c8e0fdd01cce3dbb8561fb29e8b8a4e6cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nn-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nn-NO/thunderbird-91.5.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "089e6cb230da93b30aac8a81d22f6ac97233d20f6a0e50e96ef8675acfcc407c"; + sha256 = "ec702407e9dfd14de776a5409413b8ddf3c32cf6aa17e8a37ba349e8fa7ba1db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pa-IN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pa-IN/thunderbird-91.5.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "6ca6b68ac5ab40966b8bc13d6a8f1ef26730d8065cad27f93bd3139295b5fcbc"; + sha256 = "f26de0a71646669f07ba23c8e181700b1569ce41049f62215c19ca746a4ca38d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pl/thunderbird-91.5.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "93f94b83a17569b5b626277af71651a607d74c32fa17fc35896ac42556075d2d"; + sha256 = "d497057a71cfe867f53a5dadf3b1b8fdf30db8470cbfedd416b39acef3d61163"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pt-BR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-BR/thunderbird-91.5.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9c7e02da587136eebf6111fe4e25687f904b8db7629be251c84ab25b6adfd2e5"; + sha256 = "90367905fe8dd83f9c6acb093e9ba6583124171037755ef2f3a6771c94e1cb44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pt-PT/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-PT/thunderbird-91.5.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8666b71ac2fa83da6175c8c26ab73a957f19dcc6b36cca7f980407aa7a42111d"; + sha256 = "b611af59f7f88efa10aef43f8ac464b5c514412b534cff39eb2844ae1ca18077"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/rm/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/rm/thunderbird-91.5.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f278f045fe7c941b4545ea452152859960d952704f2d666d39bb6a91175c7027"; + sha256 = "5d75ac9e6c0c27b0faf436d69305f206e09867c306264a4de30cd3b1f879c1d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ro/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ro/thunderbird-91.5.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "2c43f39a8fcd557efde852eb7f859eff048672806ec23620037a28d4d98da99a"; + sha256 = "aa64e96ad2d1a361c8cd96b5b0e88cdd51eba2c3c036ac453ff9225320d08f6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ru/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ru/thunderbird-91.5.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "63041d68d0072699dfc7e3fa448ac9a3bf065795c455dd3f5671cae97d5d121a"; + sha256 = "6d293d0ee9eebd01c6e36e085333c4da15f0ce2ece73dc99015545255a435538"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sk/thunderbird-91.5.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "be1cdf0cd47f788d736c9bfae340b6cf9edd661293e5ce5b5bca6b2aa169438c"; + sha256 = "37436cda08659abd49108f7e9a8ee5645d2ee1ed0086a7b4158279342d0cbdfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sl/thunderbird-91.5.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "128a46d7df356375536a432d7bd13bdea8d4932b105cdf4b8288af3dfa878b7d"; + sha256 = "fc8e6fed968e6312f69545479b5b3230390d41490a2a5b6385f046a2a3709018"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sq/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sq/thunderbird-91.5.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6a8fa0c4806240a886393c51f63992e567524264c821ccf4f12e202f4f30e7ce"; + sha256 = "ce68e8f855d6d366b1490cc3b7e044a84fba63bcfa11453afc4b98ec665450c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sr/thunderbird-91.5.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "e2639022166d0be0d30846a269c08940652475e77ef114089e22c9d5ddf61f98"; + sha256 = "128843650ddfa57493c8691e7c591685cca4b1ab6c118949ef1580318954f110"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sv-SE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sv-SE/thunderbird-91.5.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d8a419a6c8105fbf6ee29a38cba3e40729ef8f12743d87ce2a623e8707ba0414"; + sha256 = "7180055d5184c38f3fb893538b0c270d3d125da4434debe6fffdcd3288d8ea53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/th/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/th/thunderbird-91.5.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ac2926a73937c0789ba63d6ecce8a17dcf5a65a7fca5dd439618384588c0dce5"; + sha256 = "4b964b7517b941622f18328f73813aca740a4da1799805a0a267b510704308e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/tr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/tr/thunderbird-91.5.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "efcf840a32ab0264484c7f1fa2b3a0961cdd1e8ff37f4f83126ab0626c19834b"; + sha256 = "71d551988a6ff2bd96900bf4ce72e05ac47bcb36af9a25af4e3b76d16da37d50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/uk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uk/thunderbird-91.5.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e1fabb41564ebd683cf298bb3bc13e3478dfef6522f6524a7c2ab69c64d59251"; + sha256 = "e62b6fce0bb1175c9c6acb37ff9454509766d4953fb0d4494023143fd70650a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/uz/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uz/thunderbird-91.5.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2dac221764006b5db352416159311849cfa62c67894ec40a2914caf3191c79d9"; + sha256 = "c5c9e10e82ab793d9a82d95bcb20eb288395e32c27dcf5ca2a91fc937e479aba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/vi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/vi/thunderbird-91.5.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fb482c3579b6bde18214ca68fa731d50ac254152dc51c5d13e283f16559f0886"; + sha256 = "081895dc1684360c0859d5084ece871c7539e91b858392dbaa3ddf8ee0f38ea9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/zh-CN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-CN/thunderbird-91.5.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4e596742711f72eae50621fbc0b329bdf736267c753c51ab8dd1713cc0860285"; + sha256 = "b5fadde23bd94f3ab2fbe6b8070040d9e89a506a399d9c1348b80a8639b8220b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/zh-TW/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-TW/thunderbird-91.5.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "c97873b840540297f08ad866479789f2f7cc8baa48de6bdf9eb4b945a5c135c4"; + sha256 = "4d31d6a8d4f94486e4ebec3c98d2d535fd5485b3b73dfa0a52760300608c7eac"; } ]; } diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 9d9e1a7c8df..00289e5c628 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.25.5"; + version = "15.26.4"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-LtITPS0bLy85dv/zdOo8JcsEZ0ZgtVmM+CcggaYJxXA="; + sha256 = "sha256-2CprtdKHHTLxS8jA4bRVoHvj/8zyVUV0aGPzU7mNxM8="; }; unpackPhase = '' diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix new file mode 100644 index 00000000000..8c26b729083 --- /dev/null +++ b/pkgs/applications/networking/seahub/default.nix @@ -0,0 +1,74 @@ +{ lib, fetchFromGitHub, python3, makeWrapper }: +let + # Seahub 8.x.x does not support django-webpack-loader >=1.x.x + python = python3.override { + packageOverrides = self: super: { + django-webpack-loader = super.django-webpack-loader.overridePythonAttrs (old: rec { + version = "0.7.0"; + src = old.src.override { + inherit version; + sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s"; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "seahub"; + version = "8.0.8"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seahub"; + rev = "c51346155b2f31e038c3a2a12e69dcc6665502e2"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "0dagiifxllfk73xdzfw2g378jccpzplhdrmkwbaakbhgbvvkg92k"; + }; + + dontBuild = true; + doCheck = false; # disabled because it requires a ccnet environment + + nativeBuildInputs = [ makeWrapper ]; + + propagatedBuildInputs = with python.pkgs; [ + django + future + django-statici18n + django-webpack-loader + django-simple-captcha + django-picklefield + django-formtools + mysqlclient + pillow + python-dateutil + django_compressor + djangorestframework + openpyxl + requests + requests_oauthlib + pyjwt + pycryptodome + qrcode + pysearpc + seaserv + gunicorn + ]; + + installPhase = '' + cp -dr --no-preserve='ownership' . $out/ + wrapProgram $out/manage.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" + ''; + + passthru = { + inherit python; + pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; + }; + + meta = with lib; { + homepage = "https://github.com/haiwen/seahub"; + description = "The web end of seafile server"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ greizgh schmittlauch ]; + }; +} diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 2254b4f3415..19409bde09d 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-MsPvda+VaqO3tXH26nVukNWcJ1n+/n5Qk7BMr/DAVUk="; }; - vendorSha256 = "sha256-TYVBfjwaoEBKJmIHdwvj/5g4jYmnmJPE1mCL/yET1GQ="; + vendorSha256 = "sha256-gK4uHLNcperpG2OVdk7XKCUWCC87cyDBf8qigj/z3jA="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix index bcd42b361b9..7eff0ac9097 100644 --- a/pkgs/applications/office/foliate/default.nix +++ b/pkgs/applications/office/foliate/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "foliate"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "johnfactotum"; repo = pname; rev = version; - sha256 = "0ribqaxl8g1i83fxbn288afwbzzls48ni57xqi07d19p9ka892mr"; + sha256 = "sha256-Pr2YA2MHXD4W7lyCxGAVLKyoZarZ8t92RSkWle3LNuc="; }; nativeBuildInputs = [ meson ninja python3 wrapGAppsHook ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 0b4ce74cdfa..964d17587a4 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -2,12 +2,12 @@ , zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsa-lib, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { - version = "5.1"; + version = "5.5"; pname = "jabref"; src = fetchurl { url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}-portable_linux.tar.gz"; - sha256 = "04f612byrq3agzy26byg1sgrjyhcpa8xfj0ssh8dl8d8vnhx9742"; + sha256 = "sha256-9MHNehyAmu7CiBp1rgb4zTkSqmjXm2tcmiGKFBFapKI="; }; preferLocalBuild = true; diff --git a/pkgs/applications/office/libreoffice/darwin.nix b/pkgs/applications/office/libreoffice/darwin.nix new file mode 100644 index 00000000000..765cbcd4302 --- /dev/null +++ b/pkgs/applications/office/libreoffice/darwin.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchurl +, undmg +}: + +let + appName = "LibreOffice.app"; + version = "7.2.5"; + dist = { + aarch64-darwin = { + arch = "aarch64"; + sha256 = "bdbcb9a98211f866ca089d440aebcd1d313aa99e8ab4104aae4e65ea3cee74ca"; + }; + + x86_64-darwin = { + arch = "x86_64"; + sha256 = "0b7ef18ed08341ac6c15339fe9a161ad17f6b469009d987cfc7d50c628d12a4e"; + }; + }."${stdenv.hostPlatform.system}"; +in +stdenv.mkDerivation { + inherit version; + pname = "libreoffice"; + src = fetchurl { + url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${dist.arch}/LibreOffice_${version}_MacOS_${dist.arch}.dmg"; + inherit (dist) sha256; + }; + + nativeBuildInputs = [ undmg ]; + sourceRoot = "${appName}"; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstallPhase + mkdir -p $out/{Applications/${appName},bin} + cp -R . $out/Applications/${appName} + ln -s $out/Applications/${appName}/Contents/MacOS/soffice $out/bin + runHook postInstallPhase + ''; + + meta = with lib; { + description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; + homepage = "https://libreoffice.org/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ tricktron ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix new file mode 100644 index 00000000000..bfe72a7115a --- /dev/null +++ b/pkgs/applications/office/morgen/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: + +stdenv.mkDerivation rec { + pname = "morgen"; + version = "2.4.3"; + + src = fetchurl { + url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; + sha256 = "sha256-IWGeb0+IiFNYJ+jQAzGYfQ5FnrbR6HIpynS9jgd5/mY="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + nodePackages.asar + ]; + + buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + + dontBuild = true; + dontConfigure = true; + + unpackCmd = '' + dpkg-deb -x ${src} ./morgen-${pname} + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + asar extract $out/opt/Morgen/resources/app.asar "$TMP/work" + # 1. Fixes path for todesktop-runtime-config.json + # 2. Fixes startup script + substituteInPlace $TMP/work/dist/main.js \ + --replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \ + --replace "Exec=\"+process.execPath+\"" "Exec=$out/bin/morgen" + asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar + + substituteInPlace $out/share/applications/morgen.desktop \ + --replace '/opt/Morgen' $out/bin + + makeWrapper ${electron}/bin/electron $out/bin/morgen \ + --add-flags $out/opt/Morgen/resources/app.asar + + runHook postInstall + ''; + + meta = with lib; { + description = "All-in-one Calendars, Tasks and Scheduler"; + homepage = "https://morgen.so/download"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 2f244616989..50f74330ecc 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.1.10.1"; + version = "22.1.11"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "sha256-uXDkLDDIRGSxXCczG9TQxtcLFjjOjKtyl/LRMax7JX4="; + sha256 = "7fa21ca9b8b0df6f1bda7a7dc21d53642eccf8de6a31a9a29a251e0a17c00c83"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 506a2f99f60..3958d287094 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.26.1"; + version = "2.27.0"; src = fetchurl { url = "https://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; - sha256 = "sha256-66hoA+FDTeMbNAInr9TlTSnwUywJQjTRz87MkdNYn5Q="; + sha256 = "sha256-xkl0UyJEDOeYOqqXf3woCDMb8ZyC2c5ChQdDFFERZxE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index d9f77cb560f..ccb4cea95ec 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.10.0"; + version = "7.10.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-Aa0orJpsin7XntUVpW6VLcbGiTSeyySDCGNFOERtgvg="; + sha256 = "sha256-jhCsC5G8epyclp2+DYpot1UMjo5mkMa0UO0bQZ1T0Ug="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 435474fbdce..f548cf01fcd 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -8,14 +8,14 @@ mkDerivation rec { pname = "vnote"; - version = "3.12.0"; + version = "3.12.888"; src = fetchFromGitHub { owner = "vnotex"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-hlB/G7qFYbkdIk9f2N+q1Do3V1ON8UUQZ6AUmBfK8x0="; + sha256 = "sha256-l9oFixyEM0aAfvrC5rrQMzv7n8rUHECRzhuIQJ/szjc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 57947e23baa..047d64c411e 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "zanshin"; - version = "21.12.0"; + version = "21.12.1"; src = fetchurl { url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz"; - sha256 = "sha256-l8W47tS7q747fkSAH3HJdwPsqjMfCyxzl3xJEeAXeh0="; + sha256 = "sha256-hYbJwmnD9i/SL5ET2t9YgPxJHJUpAbMZ4a62WljhpHw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 3e1366547ee..2865e8b70a1 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "0"; + minor = "1"; patch = "0"; } }: let - sourceSha256 = "sha256-1K8nlNiirks3MJ+9cH9bkILVFtu5OxhKkNhetGqojn4="; + sourceSha256 = "sha256-bU6z7H08G8QIToogAMI2P5tHBtVZezlBDqSbnEsqAjE="; featuresInfo = { # Needed always basic = { diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix index 203d0520660..156f5516129 100644 --- a/pkgs/applications/science/biology/kallisto/default.nix +++ b/pkgs/applications/science/biology/kallisto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kallisto"; - version = "0.46.2"; + version = "0.48.0"; src = fetchFromGitHub { repo = "kallisto"; owner = "pachterlab"; rev = "v${version}"; - sha256 = "0m0r2820ca3rch99md1zzbgkilmlfkhdkpys2lfnb87qxmf1jnmb"; + sha256 = "sha256-r0cdR0jTRa1wu/LDKW6NdxI3XaKj6wcIVbIlct0fFvI="; }; nativeBuildInputs = [ autoconf cmake ]; diff --git a/pkgs/applications/science/biology/repseek/default.nix b/pkgs/applications/science/biology/repseek/default.nix new file mode 100644 index 00000000000..5966c83b7a5 --- /dev/null +++ b/pkgs/applications/science/biology/repseek/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "repseek"; + version = "9Sep2014"; + src = fetchurl { + url = "https://bioinfo.mnhn.fr/abi/public/RepSeek/RepSeek.${version}.tgz"; + sha256 = "1jiknji3ivrv7zmrfbf2mccfpdwhin3lfxfsciaqwf69b3sda8nf"; + }; + + preConfigure = '' + mkdir -p $out/bin + substituteInPlace Makefile \ + --replace "INSTALLDIR = \$\$HOME/bin" "INSTALLDIR = $out/bin/" \ + --replace "CC= gcc" "CC = $CC" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace Makefile --replace "MACHINE = MACOSX" "MACHINE = LINUX" + ''; + + meta = { + description = "Tool to retrieve approximate repeats from large DNA sequences"; + homepage = "https://bioinfo.mnhn.fr/abi/public/RepSeek"; + maintainers = [ lib.maintainers.bzizou ]; + license = lib.licenses.lgpl21; + }; + +} diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index e9b0cc7540b..769fe6aff23 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -1,62 +1,105 @@ { lib, stdenv , fetchurl -, unzip , jdk -, ant +, gradle_7 +, perl , jre , makeWrapper +, makeDesktopItem +, copyDesktopItems , testVersion , key }: -# get this from the download URL when changing version -let gitRevision = "7d3deab0763c88edee4f7a08e604661e0dbdd450"; - -in stdenv.mkDerivation rec { +let pname = "key"; - version = "2.6.3"; - + version = "2.10.0"; src = fetchurl { - url = "https://formal.iti.kit.edu/key/releases/${version}/key-src-${version}_${gitRevision}.zip"; - sha256 = "1dr5jmrqs0iy76wdsfiv5hx929i24yzm1xypzqqvx7afc7apyawy"; + url = "https://www.key-project.org/dist/${version}/key-${version}-sources.tgz"; + sha256 = "1f201cbcflqd1z6ysrkh3mff5agspw3v74ybdc3s2lfdyz3b858w"; }; + sourceRoot = "key-${version}/key"; - sourceRoot = "key"; + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit version src sourceRoot; + nativeBuildInputs = [ gradle_7 perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + gradle --no-daemon classes testClasses + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + outputHashMode = "recursive"; + outputHash = "sha256-1TWySkS8w7L6Q+V946kcLOnM4hL3fieFvLrF5BZAlh4="; + }; +in stdenv.mkDerivation rec { + inherit pname version src sourceRoot; nativeBuildInputs = [ - unzip jdk - ant + gradle_7 makeWrapper + copyDesktopItems ]; + executable-name = "KeY"; + + desktopItems = [ + (makeDesktopItem { + name = "KeY"; + exec = executable-name; + icon = "key"; + comment = meta.description; + desktopName = "KeY"; + genericName = "KeY"; + categories = "Science;"; + }) + ]; + + # disable tests (broken on darwin) + gradleAction = if stdenv.isDarwin then "assemble" else "build"; + buildPhase = '' - ant -buildfile scripts/build.xml \ - -Dgit.revision=${gitRevision} \ - compileAll deployAll - ''; + runHook preBuild - postCheck = '' - ant -buildfile scripts/build.xml \ - -Dgit.revision=${gitRevision} \ - compileAllTests runAllTests test-deploy-all + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + # point to offline repo + sed -ie "s#repositories {#repositories { maven { url '${deps}' }#g" build.gradle + cat <(echo "pluginManagement { repositories { maven { url '${deps}' } } }") settings.gradle > settings_new.gradle + mv settings_new.gradle settings.gradle + gradle --offline --no-daemon ${gradleAction} + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/java - # Wrong version in the code. On next version change 2.5 to ${version}: - unzip deployment/key-2.5_${gitRevision}.zip -d $out/share/java + cp key.ui/build/libs/key-*-exe.jar $out/share/java/KeY.jar mkdir -p $out/bin + mkdir -p $out/share/icons/hicolor/256x256/apps + cp key.ui/src/main/resources/de/uka/ilkd/key/gui/images/key-color-icon-square.png $out/share/icons/hicolor/256x256/apps/key.png makeWrapper ${jre}/bin/java $out/bin/KeY \ --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main" + + runHook postInstall ''; passthru.tests.version = testVersion { package = key; command = "KeY --help"; - # Wrong '2.5' version in the code. On next version change to ${version} - version = "2.5"; }; meta = with lib; { diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index e9dae55fbae..2066087692a 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -14,13 +14,17 @@ let # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { inherit flint arb; - inherit sage-src env-locations pynac singular; + inherit sage-src env-locations singular; inherit (maxima) lisp-compiler; linbox = pkgs.linbox.override { withSage = true; }; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; - sage_docbuild = self.callPackage ./sage_docbuild.nix { + sage-docbuild = self.callPackage ./python-modules/sage-docbuild.nix { + inherit sage-src; + }; + + sage-setup = self.callPackage ./python-modules/sage-setup.nix { inherit sage-src; }; }; @@ -58,9 +62,9 @@ let # the env-locations file. sage-env = callPackage ./sage-env.nix { sagelib = python3.pkgs.sagelib; - sage_docbuild = python3.pkgs.sage_docbuild; + sage-docbuild = python3.pkgs.sage-docbuild; inherit env-locations; - inherit python3 singular palp flint pynac pythonEnv maxima; + inherit python3 singular palp flint pythonEnv maxima; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -74,7 +78,7 @@ let sage-with-env = callPackage ./sage-with-env.nix { inherit python3 pythonEnv; inherit sage-env; - inherit pynac singular maxima; + inherit singular maxima; inherit three; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -91,7 +95,7 @@ let pythonRuntimeDeps = with python3.pkgs; [ sagelib - sage_docbuild + sage-docbuild cvxopt networkx service-identity @@ -132,9 +136,6 @@ let }; }; - # *not* to confuse with the python package "pynac" - pynac = pkgs.pynac.override { inherit singular flint; }; - # With openblas (64 bit), the tests fail the same way as when sage is build with # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use diff --git a/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch new file mode 100644 index 00000000000..a478f50d92e --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch @@ -0,0 +1,46 @@ +diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py +index 01f32fb8e4..4d83dc7b47 100644 +--- a/src/sage/doctest/control.py ++++ b/src/sage/doctest/control.py +@@ -1253,6 +1253,7 @@ class DocTestController(SageObject): + + self.log("Using --optional=" + self._optional_tags_string()) + available_software._allow_external = self.options.optional is True or 'external' in self.options.optional ++ available_software._autodetect_safe = self.options.optional is True or 'sage' in self.options.optional + self.log("Features to be detected: " + ','.join(available_software.detectable())) + self.add_files() + self.expand_files_into_sources() +diff --git a/src/sage/doctest/external.py b/src/sage/doctest/external.py +index 84dae19ea5..badc61466e 100644 +--- a/src/sage/doctest/external.py ++++ b/src/sage/doctest/external.py +@@ -409,6 +409,7 @@ class AvailableSoftware(object): + [] + """ + self._allow_external = True ++ self._autodetect_safe = True + # For multiprocessing of doctests, the data self._seen should be + # shared among subprocesses. Thus we use Array class from the + # multiprocessing module. +@@ -430,6 +431,8 @@ class AvailableSoftware(object): + sage: 'internet' in available_software # random, optional - internet + True + """ ++ if not self._autodetect_safe: ++ return False + try: + idx = self._indices[item] + except KeyError: +diff --git a/src/sage/features/sagemath.py b/src/sage/features/sagemath.py +index 433338766d..233623b14a 100644 +--- a/src/sage/features/sagemath.py ++++ b/src/sage/features/sagemath.py +@@ -12,7 +12,7 @@ class sagemath_doc_html(StaticFile): + + EXAMPLES:: + +- sage: from sage.features.sagemath import sagemath_doc_html ++ sage: from sage.features.sagemath import sagemath_doc_html # optional - sagemath_doc_html + sage: sagemath_doc_html().is_present() # optional - sagemath_doc_html + FeatureTestResult('sagemath_doc_html', True) + """ diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch deleted file mode 100644 index d5c19a54fd9..00000000000 --- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f5ea42a7aaed7611fb55b65897b9fcf2b7bcf97e Mon Sep 17 00:00:00 2001 -From: Timo Kaufmann <timokau@zoho.com> -Date: Sun, 21 Oct 2018 17:52:40 +0200 -Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested - ---- - src/sage/doctest/control.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py -index 2d93841e50..6d156e29a1 100644 ---- a/src/sage/doctest/control.py -+++ b/src/sage/doctest/control.py -@@ -375,7 +375,8 @@ class DocTestController(SageObject): - if not optionaltag_regex.search(o): - raise ValueError('invalid optional tag {!r}'.format(o)) - -- options.optional |= auto_optional_tags -+ if "sage" in options.optional: -+ options.optional |= auto_optional_tags - - self.options = options - --- -2.28.0 - diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch index 178cef3e54e..90a23f94cb5 100644 --- a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch +++ b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch @@ -1,8 +1,8 @@ diff --git a/src/sage/env.py b/src/sage/env.py -index 95980cc2df..37107a30e1 100644 +index c4953cfa65..47b880f9ad 100644 --- a/src/sage/env.py +++ b/src/sage/env.py -@@ -227,93 +227,12 @@ OPENMP_CXXFLAGS = var("OPENMP_CXXFLAGS", "") +@@ -244,81 +244,8 @@ os.environ['MPMATH_SAGE'] = '1' SAGE_BANNER = var("SAGE_BANNER", "") SAGE_IMPORTALL = var("SAGE_IMPORTALL", "yes") @@ -29,20 +29,12 @@ index 95980cc2df..37107a30e1 100644 - - EXAMPLES:: - -- sage: import sys -- sage: from fnmatch import fnmatch - sage: from sage.env import _get_shared_lib_path -- sage: lib_filename = _get_shared_lib_path("Singular", "singular-Singular") -- sage: if sys.platform == 'cygwin': -- ....: pattern = "*/cygSingular-*.dll" -- ....: elif sys.platform == 'darwin': -- ....: pattern = "*/libSingular-*.dylib" -- ....: else: -- ....: pattern = "*/lib*Singular-*.so" -- sage: fnmatch(str(lib_filename), pattern) +- sage: "gap" in _get_shared_lib_path("gap") - True - sage: _get_shared_lib_path("an_absurd_lib") is None - True +- - """ - - for libname in libnames: @@ -87,11 +79,6 @@ index 95980cc2df..37107a30e1 100644 - # Just return None if no files were found - return None - - # locate singular shared object - # On Debian it's libsingular-Singular so try that as well --SINGULAR_SO = var("SINGULAR_SO", _get_shared_lib_path("Singular", "singular-Singular")) -+SINGULAR_SO = var("SINGULAR_SO", '/default') - # locate libgap shared object -GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", "")) +GAP_SO = var("GAP_SO", '/default') diff --git a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch b/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch new file mode 100644 index 00000000000..91e080aa294 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch @@ -0,0 +1,58 @@ +diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd +index 7794c9edc3..1753277b1f 100644 +--- a/src/sage/libs/linbox/conversion.pxd ++++ b/src/sage/libs/linbox/conversion.pxd +@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in + - v -- linbox vector + """ + cdef Vector_integer_dense res = P() +- cdef cppvector[Integer] * vec = &v.refRep() + cdef size_t i + for i in range(<size_t> res._degree): +- mpz_set(res._entries[i], vec[0][i].get_mpz_const()) ++ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const()) + + return res +diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd +index 9112d151f8..dcc482960c 100644 +--- a/src/sage/libs/linbox/linbox.pxd ++++ b/src/sage/libs/linbox/linbox.pxd +@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": + ctypedef Modular_double Field + ctypedef double Element + DenseMatrix_Modular_double(Field F, size_t m, size_t n) +- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n) ++ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*) + void setEntry(size_t i, size_t j, Element& a) + Element &getEntry(size_t i, size_t j) + +@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": + ctypedef Modular_float Field + ctypedef float Element + DenseMatrix_Modular_float(Field F, size_t m, size_t n) +- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n) ++ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*) + void setEntry(size_t i, size_t j, Element& a) + Element &getEntry(size_t i, size_t j) + +@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h": + DenseVector_integer (Field &F) + DenseVector_integer (Field &F, long& m) + DenseVector_integer (Field &F, cppvector[Integer]&) +- cppvector[Element]& refRep() + size_t size() + void resize(size_t) + void resize(size_t n, const Element&) +diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi +index 010365d76f..3d60726ff9 100644 +--- a/src/sage/matrix/matrix_modn_dense_template.pxi ++++ b/src/sage/matrix/matrix_modn_dense_template.pxi +@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_ + return 0,[] + + cdef ModField *F = new ModField(<long>modulus) +- cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols) ++ cdef DenseMatrix *A = new DenseMatrix(F[0], <Py_ssize_t>nrows, <Py_ssize_t>ncols, <ModField.Element*>entries) + cdef Py_ssize_t r = reducedRowEchelonize(A[0]) + cdef Py_ssize_t i,j + for i in range(nrows): diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 3c64be100d2..1ff081b25e0 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,8 +1,8 @@ diff --git a/src/sage_docbuild/__init__.py b/src/sage_docbuild/__init__.py -index 79005b903a..fbe6fe2595 100644 +index 8a5c1a19d2..21fd192642 100644 --- a/src/sage_docbuild/__init__.py +++ b/src/sage_docbuild/__init__.py -@@ -85,27 +85,6 @@ def builder_helper(type): +@@ -89,27 +89,6 @@ def builder_helper(type): """ Returns a function which builds the documentation for output type ``type``. @@ -12,7 +12,7 @@ index 79005b903a..fbe6fe2595 100644 - Check that :trac:`25161` has been resolved:: - - sage: from sage_docbuild import DocBuilder, setup_parser -- sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set +- sage: DocBuilder._options = setup_parser().parse_args([]) # builder_helper needs _options to be set - - sage: import sage_docbuild.sphinxbuild - sage: def raiseBaseException(): @@ -30,7 +30,7 @@ index 79005b903a..fbe6fe2595 100644 """ def f(self, *args, **kwds): output_dir = self._output_dir(type) -@@ -127,10 +106,9 @@ def builder_helper(type): +@@ -131,10 +110,9 @@ def builder_helper(type): logger.debug(build_command) # Run Sphinx with Sage's special logger @@ -44,10 +44,10 @@ index 79005b903a..fbe6fe2595 100644 if ABORT_ON_ERROR: raise diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py -index f58f6c61d7..ef51a55411 100644 +index d917c3e9d4..551cc8028a 100644 --- a/src/sage_docbuild/sphinxbuild.py +++ b/src/sage_docbuild/sphinxbuild.py -@@ -326,3 +326,8 @@ def runsphinx(): +@@ -327,3 +327,8 @@ def runsphinx(): sys.stderr = saved_stderr sys.stdout.flush() sys.stderr.flush() diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix new file mode 100644 index 00000000000..1766cec3e35 --- /dev/null +++ b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, sage-src +, sphinx +}: + +buildPythonPackage rec { + version = src.version; + pname = "sage-docbuild"; + src = sage-src; + + propagatedBuildInputs = [ + sphinx + ]; + + preBuild = '' + cd pkgs/sage-docbuild + ''; + + doCheck = false; # we will run tests in sagedoc.nix + + meta = with lib; { + description = "Build system of the Sage documentation"; + homepage = "https://www.sagemath.org"; + license = licenses.gpl2Plus; + maintainers = teams.sage.members; + }; +} diff --git a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix new file mode 100644 index 00000000000..50346153123 --- /dev/null +++ b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, sage-src +, pkgconfig # the python module, not the pkg-config alias +}: + +buildPythonPackage rec { + version = src.version; + pname = "sage-setup"; + src = sage-src; + + buildInputs = [ + pkgconfig + ]; + + preBuild = '' + cd pkgs/sage-setup + ''; + + doCheck = false; # sagelib depends on sage-setup, but sage-setup's tests depend on sagelib + + meta = with lib; { + description = "Build system of the Sage library"; + homepage = "https://www.sagemath.org"; + license = licenses.gpl2Plus; + maintainers = teams.sage.members; + }; +} diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index ae0b9f7453b..e680c0c3b22 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -2,7 +2,7 @@ , lib , writeTextFile , sagelib -, sage_docbuild +, sage-docbuild , env-locations , gfortran , bash @@ -45,11 +45,10 @@ , flint , gmp , mpfr -, pynac , zlib , gsl , ntl -, jdk8 +, jdk , less }: @@ -60,8 +59,6 @@ assert (!blas.isILP64) && (!lapack.isILP64); # dependencies. let - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - runtimepath = (lib.makeBinPath ([ "@sage-local@" "@sage-local@/build" @@ -163,7 +160,6 @@ writeTextFile rec { gmp mpfr pari - pynac zlib eclib gsl @@ -179,7 +175,6 @@ writeTextFile rec { glpk flint gap - pynac mpfr.dev ]) }' @@ -193,5 +188,5 @@ writeTextFile rec { ''; } // { # equivalent of `passthru`, which `writeTextFile` doesn't support lib = sagelib; - docbuild = sage_docbuild; + docbuild = sage-docbuild; } diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index eb07434b4cc..a51e92cde52 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -57,24 +57,29 @@ let ); in stdenv.mkDerivation rec { - version = "9.4"; + version = "9.5"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-jqkr4meG02KbTCMsGvyr1UbosS4ZuUJhPXU/InuS+9A="; + sha256 = "sha256-uOsLpsGpcIGs8Xr82X82MElnTB2E908gytyNJ8WVD5w="; }; # Patches needed because of particularities of nix or the way this is packaged. # The goal is to upstream all of them and get rid of this list. nixPatches = [ - # Make sure py2/py3 tests are only run when their expected context (all "sage" - # tests) are also run. That is necessary to test dochtml individually. See - # https://trac.sagemath.org/ticket/26110 for an upstream discussion. - # TODO: Determine if it is still necessary. - ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch + # Since https://trac.sagemath.org/ticket/32174, some external features are + # marked as "safe" and get auto-detected, in which case the corresponding + # optional tests are executed. We disable auto-detection of safe features if + # we are doctesting with an "--optional" argument which does not include + # "sage", because tests from autodetected features expect context provided + # by running basic sage tests. This is necessary to test sagemath_doc_html + # separately. See https://trac.sagemath.org/ticket/26110 for a related + # upstream discussion (from the time when Sage still had optional py2/py3 + # tags). + ./patches/Only-test-external-software-when-all-of-sage-is.patch # Fixes a potential race condition which can lead to transient doctest failures. ./patches/fix-ecl-race.patch @@ -117,46 +122,6 @@ stdenv.mkDerivation rec { # Let's just assume warnings are expected until we update to 4.27.0. ./patches/fonttools-deprecation-warnings.patch - # https://trac.sagemath.org/ticket/32305 - (fetchSageDiff { - base = "9.4"; - name = "networkx-2.6-upgrade.patch"; - rev = "9808325853ba9eb035115e5b056305a1c9d362a0"; - sha256 = "sha256-gJSqycCtbAVr5qnVEbHFUvIuTOvaxFIeffpzd6nH4DE="; - }) - - # https://trac.sagemath.org/ticket/32420 - (fetchSageDiff { - base = "9.5.beta2"; - name = "sympy-1.9-update.patch"; - rev = "beed4e16aff32e47d0c3b1c58cb1e2f4c38590f8"; - sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE="; - }) - - # https://trac.sagemath.org/ticket/32567 - (fetchSageDiff { - base = "9.5.beta2"; - name = "arb-2.21.0-update.patch"; - rev = "eb3304dd521a3d5a9334e747a08e234bbf16b4eb"; - sha256 = "sha256-XDkaY4VQGyESXI6zuD7nCNzyQOl/fmBFvAESH9+RRvk="; - }) - - # https://trac.sagemath.org/ticket/32797 - (fetchSageDiff { - base = "9.5.beta7"; - name = "pari-2.13.3-update.patch"; - rev = "f5f7a86908daf60b25e66e6a189c51ada7e0a732"; - sha256 = "sha256-H/caGx3q4KcdsyGe+ojV9bUTQ5y0siqM+QHgDbeEnbw="; - }) - - # https://trac.sagemath.org/ticket/32909 - (fetchSageDiff { - base = "9.5.beta7"; - name = "matplotlib-3.5-deprecation-warnings.patch"; - rev = "a5127dc56fdf5c2e82f6bc781cfe78dbd04e97b7"; - sha256 = "sha256-p23qUu9mgEUbdbX6cy7ArxZAtpcFjCKbgyxN4jWvj1o="; - }) - # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { base = "9.5.beta8"; @@ -164,6 +129,11 @@ stdenv.mkDerivation rec { rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841"; sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q="; }) + + # Upstream has not upgraded to linbox 1.7 yet because it conflicts with + # pre-4.2.1p3 versions of Singular, but we don't have this problem. + # https://trac.sagemath.org/ticket/32959 + ./patches/linbox-1.7-upgrade.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index b74ec4007e6..df3a1467d53 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -18,7 +18,6 @@ , eclib , ntl , ecm -, pynac , pythonEnv }: @@ -36,7 +35,6 @@ let blas lapack singular three - pynac giac gap pari @@ -126,6 +124,10 @@ stdenv.mkDerivation rec { cp -r src/bin "$out/bin" cp -r build/bin "$out/build/bin" + # sage assumes the existence of sage-src-env-config.in means it's being executed in-tree. in this case, it + # adds SAGE_SRC/bin to PATH, breaking our wrappers + rm "$out/bin"/*.in "$out/build/bin"/*.in + cp -f '${sage-env}/sage-env' "$out/bin/sage-env" substituteInPlace "$out/bin/sage-env" \ --subst-var-by sage-local "$out" diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 106f9eea309..5805a5c7b0c 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"; - license = licenses.gpl2; + homepage = "https://www.sagemath.org"; + license = licenses.gpl2Plus; maintainers = teams.sage.members; }; } diff --git a/pkgs/applications/science/math/sage/sage_docbuild.nix b/pkgs/applications/science/math/sage/sage_docbuild.nix deleted file mode 100644 index ed78d46b445..00000000000 --- a/pkgs/applications/science/math/sage/sage_docbuild.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ buildPythonPackage -, sage-src -, sphinx -}: - -buildPythonPackage rec { - version = src.version; - pname = "sage_docbuild"; - src = sage-src; - - propagatedBuildInputs = [ - sphinx - ]; - - preBuild = '' - cd build/pkgs/sage_docbuild/src - ''; - - doCheck = false; # we will run tests in sagedoc.nix -} diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index 6016b3baeb4..489fc2edfe5 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { jmol cddlib ] ++ (with python3.pkgs; [ - sage_docbuild + sage-docbuild psutil future sphinx @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - ${sage-with-env}/bin/sage -t --optional=dochtml --all + ${sage-with-env}/bin/sage -t --optional=sagemath_doc_html --all ''; } diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index a884ad8899d..8d685c8da60 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -2,6 +2,7 @@ , env-locations , perl , buildPythonPackage +, m4 , arb , blas , lapack @@ -37,7 +38,7 @@ , pkg-config , planarity , ppl -, pynac +, primecountpy , python , ratpoints , readline @@ -49,11 +50,24 @@ , singular , pip , jupyter_core +, sage-setup , libhomfly , libbraiding , gmpy2 , pplpy , sqlite +, jupyter-client +, ipywidgets +, mpmath +, rpy2 +, fpylll +, scipy +, sympy +, matplotlib +, pillow +, ipykernel +, networkx +, sphinx # TODO: this is in setup.cfg, bug should we override it? }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -73,8 +87,10 @@ buildPythonPackage rec { perl jupyter_core pkg-config + sage-setup pip # needed to query installed packages lisp-compiler + m4 ]; buildInputs = [ @@ -116,7 +132,7 @@ buildPythonPackage rec { pari planarity ppl - pynac + primecountpy rankwidth ratpoints singular @@ -130,6 +146,18 @@ buildPythonPackage rec { gmpy2 pplpy sqlite + mpmath + rpy2 + scipy + sympy + matplotlib + pillow + ipykernel + fpylll + networkx + jupyter-client + ipywidgets + sphinx ]; preBuild = '' @@ -148,8 +176,24 @@ buildPythonPackage rec { mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython" mkdir -p "var/lib/sage/installed" - # src/setup.py should not be used, see https://trac.sagemath.org/ticket/31377#comment:124 - cd build/pkgs/sagelib/src + cd build/pkgs/sagelib + + # some files, like Pipfile, pyproject.toml, requirements.txt and setup.cfg + # are generated by the bootstrap script using m4. these can fetch data from + # build/pkgs, either directly or via sage-get-system-packages. + sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt + sed -i 's/, <3.4//' ../rpy2/install-requires.txt + sed -i 's/, <4.3//' ../sphinx/install-requires.txt + sed -i '/sage_conf/d' src/setup.cfg.m4 + sed -i '/sage_conf/d' src/requirements.txt.m4 + for infile in src/*.m4; do + if [ -f "$infile" ]; then + outfile="src/$(basename $infile .m4)" + m4 "$infile" > "$outfile" + fi + done + + cd src ''; postInstall = '' diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index b543252e871..23712061160 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gmp, bison, perl, ncurses, readline, coreutils, pkg-config , lib -, fetchpatch , autoreconfHook +, buildPackages , sharutils , file , flint @@ -11,6 +11,7 @@ , lrcalc , doxygen , graphviz +, latex2html # upstream generates docs with texinfo 4. later versions of texinfo # use letters instead of numbers for post-appendix chapters, and we # want it to match the upstream format because sage depends on it. @@ -22,66 +23,25 @@ stdenv.mkDerivation rec { pname = "singular"; - version = "4.2.0p2"; + version = "4.3.0"; - # since the tarball does not contain tests or documentation (and - # there is no separate tests tarball for 4.2.0), we fetch from - # GitHub. + # since the tarball does not contain tests, we fetch from GitHub. src = fetchFromGitHub { owner = "Singular"; repo = "Singular"; - # 4.2.0p2 is not tagged, but the tarball matches the commit below. - rev = "6f68939ddf612d96e3caaaaa8275f77613ac1da8"; - sha256 = "sha256-BJNzYylzDqD/5YjzjxPRb/c96tYiuGy9Y+A7qf3ZSG8="; - - # if a release is tagged it will be in the format below. - # rev = "Release${lib.replaceStrings ["."] ["-"] version}"; + # if a release is tagged (which sometimes does not happen), it will + # be in the format below. + # rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; + rev = "d895b0f1f543c61eb03adddad20f08655a419d4e"; + sha256 = "sha256-c5Qr6VUuPKjfw8fowjJJz3oGAyUwo/K0WeMvU5djzVA="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are - # not included in the tarball downloaded by fetchzip. setting - # fetchSubmodules works around this by using fetchgit instead of - # fetchzip. - fetchSubmodules = true; + # not included in the tarball downloaded by fetchzip. + forceFetchGit = true; }; - patches = [ - # fix timeouts when docbuilding with >= 64 cpus - # https://github.com/Singular/Singular/issues/1117 - ./vspace-MAX_PROCESS.patch - - # add aarch64 support to cpu-check.m4. copied from redhat. - ./redhat-aarch64.patch - - # the newest version of ax-prog-cc-for-build.m4 seems to trigger - # linker errors. see - # https://github.com/alsa-project/alsa-firmware/issues/3 for a - # related issue. - ./use-older-ax-prog-cc-for-build.patch - - # https://github.com/Singular/Singular/issues/1086 - (fetchpatch { - name = "schubert-lib-fails-with-too-many-cpus.patch"; - url = "https://github.com/Singular/Singular/commit/3cda50c00a849455efa2502e56596955491a353a.patch"; - sha256 = "sha256-fgYd+2vT32w5Ki8kKx6PfZn2e4QSJcYWOwEFXtc+lSA="; - }) - ] ++ lib.optionals enableDocs [ - # singular supports building without 4ti2, bertini, normaliz or - # topcom just fine, but the docbuilding does not skip manual pages - # tagged as depending on those binaries (probably a bug in - # doc2tex.pl::HandleLib, since it seems to ignore "-exclude" - # argumens). skip them manually. - ./disable-docs-for-optional-unpackaged-deps.patch - - # fix some non-ascii characters in doc/decodegb.doc - (fetchpatch { - name = "decodegb-ascii.patch"; - url = "https://github.com/Singular/Singular/commit/36966d9009de572ee4dbc487f3e5744098fe91be.patch"; - sha256 = "sha256-9WcEov/oOQRC584ag6WVHFwY2aCjbM75HWyvZoEwppw="; - }) - ]; - configureFlags = [ "--with-ntl=${ntl}" "--disable-pyobject-module" @@ -114,6 +74,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableGfanlib [ cddlib ]; + nativeBuildInputs = [ bison perl @@ -123,9 +84,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableDocs [ doxygen graphviz + latex2html texinfo4 texlive.combined.scheme-small ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; preAutoreconf = '' find . -type f -readable -writable -exec sed \ @@ -137,21 +100,14 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; - # The Makefile actually defaults to `make install` anyway - buildPhase = '' - # do nothing - ''; - doCheck = true; # very basic checks, does not test any libraries installPhase = '' - mkdir -p "$out" - cp -r Singular/LIB "$out/lib" make install '' + lib.optionalString enableDocs '' - # Sage uses singular.hlp (which is not in the tarball) + # Sage uses singular.info, which is not installed by default mkdir -p $out/share/info - cp doc/singular.hlp $out/share/info + cp doc/singular.info $out/share/info '' + '' # Make sure patchelf picks up the right libraries rm -rf libpolys factory resources omalloc Singular @@ -211,5 +167,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; + mainProgram = "Singular"; }; } diff --git a/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch b/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch deleted file mode 100644 index 46d92922f3c..00000000000 --- a/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch +++ /dev/null @@ -1,112 +0,0 @@ -commit 9e8b044d982e132cf35a106a1cc0cf7e77b27f7c -Author: Mauricio Collares <mauricio@collares.org> -Date: Thu Apr 15 20:33:21 2021 -0300 - - Disable manual sections using optional packages not yet in Nixpkgs - - * normaliz.lib depends on normaliz. - * polymake.lib depends on topcom. - * recover.lib depends on bertini. - * sing4ti2.lib depends on 4ti2. - * tateProdCplxNegGrad.lib uses multigrading.lib, which depends on 4ti2. - -diff --git a/doc/singular.doc b/doc/singular.doc -index 64b969d39..e704f95f0 100644 ---- a/doc/singular.doc -+++ b/doc/singular.doc -@@ -407,7 +407,6 @@ LIB "all.lib"; - * nfmodsyz_lib:: Syzygy modules of submodules of free modules over algebraic number fields - * noether_lib:: Noether normalization of an ideal - * normal_lib:: procedure for normalization --* normaliz_lib:: integral closure, normalization for monomial ideals, toric ideals - * pointid_lib:: factorized lex GB of the vanishing ideal of a set of points - * primdec_lib:: procedures for primary decomposition - * primdecint_lib:: primary decomposition over the integers -@@ -416,7 +415,6 @@ LIB "all.lib"; - * reesclos_lib:: Rees Algebra and integral closure of an ideal - * rstandard_lib:: Janet bases and border bases for ideals - * sagbi_lib:: Subalgebras bases Analogous to Groebner bases for ideals --* sing4ti2_lib:: interface to program 4ti2 - * symodstd_lib:: Groebner bases for symmetric ideals - * toric_lib:: toric ideals - @end menu -@@ -521,10 +519,6 @@ LIB "all.lib"; - @node normal_lib - @subsection normal_lib - @c lib normal.lib --@c --------------------------------------------------------- --@node normaliz_lib --@subsection normaliz_lib --@c lib normaliz.lib tag:normaliz - @c ---------------------------------------------------------- - @node pointid_lib - @subsection pointid_lib -@@ -558,10 +552,6 @@ LIB "all.lib"; - @subsection sagbi_lib - @c lib sagbi.lib - @c --------------------------------------------------------- --@node sing4ti2_lib --@subsection sing4ti2_lib --@c lib sing4ti2.lib tag:sing4ti2 --@c ---------------------------------------------------------- - @node symodstd_lib - @subsection symodstd_lib - @c lib symodstd.lib -@@ -873,7 +863,6 @@ iniD, reslist, sumlist, dividelist, createlist - * solve_lib:: procedures to solve polynomial systems - * triang_lib:: procedures for decomposing zero-dimensional ideals - * ntsolve_lib:: one real solution of polynomial systems (Newton iteration) --* recover_lib:: Hybrid numerical/symbolical algorithms - * rootisolation_lib:: real root isolation with intervals - * signcond_lib:: computing realizable sign conditions - * zeroset_lib:: procedures for roots and factorization -@@ -904,10 +893,6 @@ iniD, reslist, sumlist, dividelist, createlist - @subsection ntsolve_lib - @c lib ntsolve.lib - @c --------------------------------------------------------- --@node recover_lib --@subsection recover_lib --@c lib recover.lib tag:bertini --@c ---------------------------------------------------------- - @node rootisolation_lib - @subsection rootisolation_lib - @c lib rootisolation.lib -@@ -1108,7 +1093,6 @@ but not for serious computations. - * cimonom_lib:: complete intersection for toric ideals - * gfan_lib:: A gfanlib interface for Singular - * gitfan_lib:: Compute GIT-fans --* polymake_lib:: interface to TOPCOM - * realizationMatroids_lib:: Realizability for Tropical Fan Curves - * tropical_lib:: interface to gfan - * tropicalNewton_lib:: Newton polygons in tropical geometry -@@ -1125,10 +1109,7 @@ but not for serious computations. - @node gitfan_lib - @subsection gitfan_lib - @c lib gitfan.lib --@c ---------------------------------------------------------- --@node polymake_lib --@subsection polymake_lib --@c lib polymake.lib tag:topcom -+ - @c ---------------------------------------------------------- - @node realizationMatroids_lib - @subsection realizationMatroids_lib -@@ -1219,7 +1200,6 @@ Comments should be send to the author of the library directly. - * stanleyreisner_lib:: T1 and T2 for a general Stanley-Reiser ring - * swalk_lib:: Sagbi Walk Conversion Algorithm - * systhreads_lib:: multi-threaded objects --* tateProdCplxNegGrad_lib:: sheaf cohomology on product of projective spaces - * VecField_lib:: vector fields - @end menu - @c ---------------------------------------------------------- -@@ -1310,10 +1290,6 @@ Todos/Issues: - @subsection systhreads_lib - @c lib systhreads.lib - @c --------------------------------------------------------- --@node tateProdCplxNegGrad_lib --@subsection tateProdCplxNegGrad_lib --@c lib tateProdCplxNegGrad.lib --@c --------------------------------------------------------- - @node VecField_lib - @subsection VecField_lib - @c lib VecField.lib diff --git a/pkgs/applications/science/math/singular/redhat-aarch64.patch b/pkgs/applications/science/math/singular/redhat-aarch64.patch deleted file mode 100644 index e0db6e87f99..00000000000 --- a/pkgs/applications/science/math/singular/redhat-aarch64.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/m4/cpu-check.m4 b/m4/cpu-check.m4 -index 3cf0a7f08..12bb926ac 100644 ---- a/m4/cpu-check.m4 -+++ b/m4/cpu-check.m4 -@@ -37,6 +37,18 @@ if test "$ac_cv_singcpuname" = ppc; then - AC_DEFINE(SI_CPU_PPC,1,"PPC") - AC_SUBST(SI_CPU_PPC) - fi -+if test "$ac_cv_singcpuname" = arm -o "$ac_cv_singcpuname" = armel; then -+ AC_DEFINE(SI_CPU_ARM,1,"ARM") -+ AC_SUBST(SI_CPU_ARM) -+fi -+if test "$ac_cv_singcpuname" = aarch64; then -+ AC_DEFINE(SI_CPU_AARCH64,1,"AARCH64") -+ AC_SUBST(SI_CPU_AARCH64) -+fi -+if test "$ac_cv_singcpuname" = s390; then -+ AC_DEFINE(SI_CPU_S390,1,"S390") -+ AC_SUBST(SI_CPU_S390) -+fi - - # UNAME and PATH - AC_MSG_CHECKING(uname for Singular) -@@ -65,6 +77,14 @@ dnl testet on: ppc_Linux, 740/750 PowerMac G3, 512k L2 cache - [powerpc*|ppc*], [AC_DEFINE(HAVE_GENERIC_MULT,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)], - dnl the following settings seems to be better on arm processors - [arm*], [], -+dnl FIXME: need to run some tests -+ [aarch64*], [ -+ AC_DEFINE(HAVE_MULT_MOD,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms) -+ AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add) -+ AC_DEFINE(HAVE_DIV_MOD,1,division using extend euclidian algorithm otherwise using tables of logartihms) -+ ], -+dnl FIXME: need to run some tests -+ [s390*], [AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add)], - [] - ) - diff --git a/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch b/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch deleted file mode 100644 index f664378617c..00000000000 --- a/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch +++ /dev/null @@ -1,194 +0,0 @@ -diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 -index f7410d74b..12cb005a5 100644 ---- a/m4/ax_prog_cc_for_build.m4 -+++ b/m4/ax_prog_cc_for_build.m4 -@@ -32,35 +32,31 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 18 -+#serial 9 - - AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) - AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_CPP])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl - - dnl Use the standard macros, but make them use other variable names - dnl - pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl --pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl - pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl - pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl - pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl - pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl --pushdef([ac_cv_c_compiler_gnu], ac_cv_build_c_compiler_gnu)dnl - pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl - pushdef([ac_cv_objext], ac_cv_build_objext)dnl - pushdef([ac_exeext], ac_build_exeext)dnl - pushdef([ac_objext], ac_build_objext)dnl - pushdef([CC], CC_FOR_BUILD)dnl - pushdef([CPP], CPP_FOR_BUILD)dnl --pushdef([GCC], GCC_FOR_BUILD)dnl - pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl - pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl --pushdef([EXEEXT], BUILD_EXEEXT)dnl - pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl --pushdef([OBJEXT], BUILD_OBJEXT)dnl - pushdef([host], build)dnl - pushdef([host_alias], build_alias)dnl - pushdef([host_cpu], build_cpu)dnl -@@ -71,29 +67,27 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl - pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl - pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl - pushdef([ac_cv_host_os], ac_cv_build_os)dnl --pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl --pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl --pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl --pushdef([cross_compiling], cross_compiling_build)dnl -+pushdef([ac_cpp], ac_build_cpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl - --cross_compiling_build=no -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= - --ac_build_tool_prefix= --AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], -- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) -- --AC_LANG_PUSH([C]) - AC_PROG_CC --_AC_COMPILER_EXEEXT --_AC_COMPILER_OBJEXT - AC_PROG_CPP -+AC_EXEEXT -+ -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling - - dnl Restore the old definitions - dnl --popdef([cross_compiling])dnl --popdef([am_cv_prog_cc_c_o])dnl --popdef([am_cv_CC_dependencies_compiler_type])dnl --popdef([ac_tool_prefix])dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cpp])dnl - popdef([ac_cv_host_os])dnl - popdef([ac_cv_host_vendor])dnl - popdef([ac_cv_host_cpu])dnl -@@ -104,33 +98,25 @@ popdef([host_vendor])dnl - popdef([host_cpu])dnl - popdef([host_alias])dnl - popdef([host])dnl --popdef([OBJEXT])dnl - popdef([LDFLAGS])dnl --popdef([EXEEXT])dnl - popdef([CPPFLAGS])dnl - popdef([CFLAGS])dnl --popdef([GCC])dnl - popdef([CPP])dnl - popdef([CC])dnl - popdef([ac_objext])dnl - popdef([ac_exeext])dnl - popdef([ac_cv_objext])dnl - popdef([ac_cv_exeext])dnl --popdef([ac_cv_c_compiler_gnu])dnl - popdef([ac_cv_prog_cc_g])dnl - popdef([ac_cv_prog_cc_cross])dnl - popdef([ac_cv_prog_cc_works])dnl --popdef([ac_cv_prog_cc_c89])dnl - popdef([ac_cv_prog_gcc])dnl - popdef([ac_cv_prog_CPP])dnl - --dnl restore global variables ac_ext, ac_cpp, ac_compile, --dnl ac_link, ac_compiler_gnu (dependant on the current --dnl language after popping): --AC_LANG_POP([C]) -- - dnl Finally, set Makefile variables - dnl -+BUILD_EXEEXT=$ac_build_exeext -+BUILD_OBJEXT=$ac_build_objext - AC_SUBST(BUILD_EXEEXT)dnl - AC_SUBST(BUILD_OBJEXT)dnl - AC_SUBST([CFLAGS_FOR_BUILD])dnl -diff --git a/m4/ax_prog_cxx_for_build.m4 b/m4/ax_prog_cxx_for_build.m4 -index 4d976769f..17c19a89f 100644 ---- a/m4/ax_prog_cxx_for_build.m4 -+++ b/m4/ax_prog_cxx_for_build.m4 -@@ -31,7 +31,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 4 -+#serial 3 - - AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD]) - AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl -@@ -49,7 +49,6 @@ pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl - pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl - pushdef([CXX], CXX_FOR_BUILD)dnl - pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl --pushdef([GXX], GXX_FOR_BUILD)dnl - pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl - pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl - pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl -@@ -63,25 +62,26 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl - pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl - pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl - pushdef([ac_cv_host_os], ac_cv_build_os)dnl --pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl --pushdef([am_cv_CXX_dependencies_compiler_type], am_cv_build_CXX_dependencies_compiler_type)dnl --pushdef([cross_compiling], cross_compiling_build)dnl -+pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl - --cross_compiling_build=no -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= - --ac_build_tool_prefix= --AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], -- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) -- --AC_LANG_PUSH([C++]) - AC_PROG_CXX - AC_PROG_CXXCPP - -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling -+ - dnl Restore the old definitions - dnl --popdef([cross_compiling])dnl --popdef([am_cv_CXX_dependencies_compiler_type])dnl --popdef([ac_tool_prefix])dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cxxcpp])dnl - popdef([ac_cv_host_os])dnl - popdef([ac_cv_host_vendor])dnl - popdef([ac_cv_host_cpu])dnl -@@ -103,10 +103,6 @@ popdef([ac_cv_prog_cxx_works])dnl - popdef([ac_cv_prog_gxx])dnl - popdef([ac_cv_prog_CXXCPP])dnl - --dnl restore global variables (dependant on the current --dnl language after popping): --AC_LANG_POP([C++]) -- - dnl Finally, set Makefile variables - dnl - AC_SUBST([CXXFLAGS_FOR_BUILD])dnl diff --git a/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch b/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch deleted file mode 100644 index 78d658f926e..00000000000 --- a/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/kernel/GBEngine/kChinese.cc b/kernel/GBEngine/kChinese.cc -index 829a66609..84655caf2 100644 ---- a/kernel/GBEngine/kChinese.cc -+++ b/kernel/GBEngine/kChinese.cc -@@ -209,6 +209,8 @@ ideal id_ChineseRemainder_0(ideal *xx, number *q, int rl, const ring r) - return NULL; - } - int cpus=(int)(long)feOptValue(FE_OPT_CPUS); -+ if (cpus>=vspace::internals::MAX_PROCESS) -+ cpus=vspace::internals::MAX_PROCESS-1; - if ((cpus==1) || (2*cpus>=cnt)) - /* at least 2 polys for each process, or switch to seriell version */ - return id_ChineseRemainder(xx,q,rl,r); -@@ -295,6 +297,8 @@ ideal id_Farey_0(ideal x, number N, const ring r) - { - int cnt=IDELEMS(x)*x->nrows; - int cpus=(int)(long)feOptValue(FE_OPT_CPUS); -+ if (cpus>=vspace::internals::MAX_PROCESS) -+ cpus=vspace::internals::MAX_PROCESS-1; - if (2*cpus>=cnt) /* at least 2 polys for each process, - or switch to seriell version */ - return id_Farey(x,N,r); -diff --git a/kernel/GBEngine/kverify.cc b/kernel/GBEngine/kverify.cc -index 909d84994..aa06d6624 100644 ---- a/kernel/GBEngine/kverify.cc -+++ b/kernel/GBEngine/kverify.cc -@@ -176,6 +176,8 @@ BOOLEAN kVerify2(ideal F, ideal Q) - /*---------------------------------------------------------------------*/ - BOOLEAN all_okay=TRUE; - int cpus=(int)(long)feOptValue(FE_OPT_CPUS); -+ if (cpus>=vspace::internals::MAX_PROCESS) -+ cpus=vspace::internals::MAX_PROCESS-1; - int parent_pid=getpid(); - using namespace vspace; - vmem_init(); diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index d12f9454ce7..51dea275578 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -1,70 +1,57 @@ -{ lib, fetchFromGitHub, gcc, python2 }: +{ lib +, python3 +, fetchFromGitHub +, which +, wrapQtAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sasview"; + version = "5.0.4"; -let - xhtml2pdf = import ./xhtml2pdf.nix { - inherit lib; - fetchPypi = python2.pkgs.fetchPypi; - buildPythonPackage = python2.pkgs.buildPythonPackage; - html5lib = python2.pkgs.html5lib; - httplib2 = python2.pkgs.httplib2; - nose = python2.pkgs.nose; - pillow = python2.pkgs.pillow; - pypdf2 = python2.pkgs.pypdf2; - reportlab = python2.pkgs.reportlab; + src = fetchFromGitHub { + owner = "SasView"; + repo = "sasview"; + rev = "v${version}"; + hash = "sha256-TjcchqA6GCvkr59ZgDuGglan2RxLp+aMjJk28XhvoiY="; }; -in - -python2.pkgs.buildPythonApplication rec { - pname = "sasview"; - version = "4.2.0"; - - checkInputs = with python2.pkgs; [ - pytest - unittest-xml-reporting + nativeBuildInputs = [ + python3.pkgs.pyqt5 + wrapQtAppsHook ]; - checkPhase = '' - # fix the following error: - # imported module 'sas.sascalc.data_util.uncertainty' has this __file__ attribute: - # /build/source/build/lib.linux-x86_64-2.7/sas/sascalc/data_util/uncertainty.py - # which is not the same as the test file we want to collect: - # /build/source/dist/tmpbuild/sasview/sas/sascalc/data_util/uncertainty.py - rm -r dist/tmpbuild - - HOME=$(mktemp -d) py.test - ''; - - propagatedBuildInputs = with python2.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ bumps - gcc h5py - libxslt lxml - matplotlib - numpy - pyparsing periodictable pillow - pylint - pyopencl - reportlab + pyparsing + pyqt5 + qt5reactor sasmodels scipy - six - sphinx - wxPython + setuptools xhtml2pdf ]; - src = fetchFromGitHub { - owner = "SasView"; - repo = "sasview"; - rev = "v${version}"; - sha256 = "0k3486h46k6406h0vla8h68fd78wh3dcaq5w6f12jh6g4cjxv9qa"; - }; + postBuild = '' + ${python3.interpreter} src/sas/qtgui/convertUI.py + ''; + + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + unittest-xml-reporting + ]; - patches = [ ./pyparsing-fix.patch ./local_config.patch ]; + pytestFlagsArray = [ "test" ]; meta = with lib; { homepage = "https://www.sasview.org"; diff --git a/pkgs/applications/science/misc/sasview/local_config.patch b/pkgs/applications/science/misc/sasview/local_config.patch deleted file mode 100644 index 5b6c3436494..00000000000 --- a/pkgs/applications/science/misc/sasview/local_config.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/sas/_config.py b/src/sas/_config.py -index ece08fd4c..926768593 100644 ---- a/src/sas/_config.py -+++ b/src/sas/_config.py -@@ -67,8 +67,8 @@ def load_local_config(app_dir): - logger.info("GuiManager loaded %s", path) - return module - except Exception as exc: -- logger.critical("Error loading %s: %s", path, exc) -- sys.exit() -+ import sas.sasview.local_config -+ return sas.sasview.local_config - - def make_custom_config_path(user_dir): - """ -@@ -116,4 +116,4 @@ def load_custom_config(path): - - from sas.sasview import custom_config - logger.info("GuiManager custom_config defaults to sas.sasview.custom_config") -- return custom_config -\ No newline at end of file -+ return custom_config diff --git a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch deleted file mode 100644 index c3cd164a899..00000000000 --- a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 866ab7e36..78727b276 100755 ---- a/setup.py -+++ b/setup.py -@@ -401,7 +401,7 @@ package_data['sas.sasview'] = ['images/*', - packages.append("sas.sasview") - - required = [ -- 'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing>=2.0.0', -+ 'bumps>=0.7.5.9', 'periodictable>=1.5.0', - - # 'lxml>=2.2.2', - 'lxml', 'h5py', diff --git a/pkgs/applications/science/physics/shtns/default.nix b/pkgs/applications/science/physics/shtns/default.nix new file mode 100644 index 00000000000..a720213b391 --- /dev/null +++ b/pkgs/applications/science/physics/shtns/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchgit, fftw }: + +stdenv.mkDerivation rec { + pname = "shtns"; + version = "3.5.1"; + + src = fetchgit { + url = "https://bitbucket.org/nschaeff/shtns"; + rev = "v${version}"; + sha256 = "1ajrplhv7a2dvb3cn3n638281w0bzdcydvvwbg64awbjg622mdpd"; + }; + + buildInputs = [ fftw ]; + + meta = with lib; { + description = "High performance library for Spherical Harmonic Transform"; + homepage = "https://nschaeff.bitbucket.io/shtns/"; + license = licenses.cecill21; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 59aba526c3f..21781c423b2 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-RFKS6fHh+rX5S31MvAQpJUNgaI6loiUw0FNkdsMFqlQ="; + sha256 = "sha256-zQHFLXcsIFMqMCJp7+3Abc0WbSWKJyfAAE+TTJGRRmY="; }; - vendorSha256 = "sha256-6owFzn+NAhlHjTJEur1H5oZY87ZoptvAnF2w6kafix8="; + vendorSha256 = "sha256-yMc3Czo7gTb2ZSWjj0yyId+qyro4mU1C+FOgEjZEhBY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 7cefd485d14..69e95086763 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE="; }; - vendorSha256 = "sha256-P7gHCyFafjWOYLEtK9Eh2S2KA0e2hzc1G/ZqVaEWWB0="; + vendorSha256 = "sha256-hGpJXCs5lZ6QQHr6LW1fCT+CVtOaUpYXJPchDPDdbaM="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index 626e3db5ca5..30516aca4fe 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.5.12"; + version = "1.5.13"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XQ3HLmT3sWjoHTxnOU9FSHbnCwitFH0tOOpT7WwTEPE="; + sha256 = "sha256-arHwIQXZYxwnFbyLoKQiv3gYHEN80DxbdaO4dM9ZBs8="; }; - cargoSha256 = "sha256-V54Itj7/zUO1bp0y30TjV1mSo/oNJOxEofpSqrYz6xk="; + cargoSha256 = "sha256-d+DERHE8Nzre1MXNj4Cp9fcRkLPEC8hzh0SeTpS2C5A="; # tests require it to be in a git repository preCheck = '' diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 1337c18692a..e8ec855ff1a 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.10"; + version = "1.16.0"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "1rrxkpahgzxgs4mckdsrss19mdjdicjgskw689hvhc063slb9vlx"; + sha256 = "sha256-gvhfdA5JBFY81f0UmVodJMWBYeFSDaDdoV723MSYeB4="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index f7b7305b109..3f9d8442ea4 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -8,16 +8,16 @@ with lib; buildGoModule rec { pname = "gogs"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "0ix3mxy8cpqbx24qffbzyf5z88x7605icm7rk5n54r8bdsr7cckd"; + sha256 = "sha256-t2aXRYCr54sqXwv6cJHDf1z1z94SqJM0WQRd2ejc7XY="; }; - vendorSha256 = "0m0g4dsiq8p2ngsbjxfi3wff7x4xpm67qlhgcgf8b48mqai4d2gc"; + vendorSha256 = "sha256-3dT5D+oDd0mpJp/cP53TQcRUkmqh6g3sRBWWAUqhaAo="; subPackages = [ "." ]; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 61e938b093b..7464dcfb73a 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.64"; + version = "0.66"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "1qigv8fnmiynrx6qrg28n2981a30n56nh3xbhmlpihl7fqxmg1sq"; + sha256 = "13xrwndj80jix210fxkadivxyd1f5qavdrhxyl32n68xyv5xmkgg"; }; nativeBuildInputs = [ pkg-config ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gameoftrees.org"; license = licenses.isc; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ abbe ]; }; } diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 3e1b6e4cd8c..66f3b9a0aaf 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,45 +1,59 @@ -{ lib, fetchurl, python3Packages -, mercurial, qt5 +{ lib +, fetchurl +, python3Packages +, mercurial +, qt5 }: python3Packages.buildPythonApplication rec { - pname = "tortoisehg"; - version = "5.9"; - - src = fetchurl { - url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "1y8nb2b9j9qx11k1wrb9hydc94dgbsqx4yf2bv8y878hqmk1z57a"; - }; - - # Extension point for when thg's mercurial is lagging behind mainline. - tortoiseMercurial = mercurial; - - propagatedBuildInputs = with python3Packages; [ - tortoiseMercurial qscintilla-qt5 iniparse - ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - - doCheck = false; # tests fail with "thg: cannot connect to X server" - postInstall = '' - mkdir -p $out/share/doc/tortoisehg - cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt - # convenient alias - ln -s $out/bin/thg $out/bin/tortoisehg - wrapQtApp $out/bin/thg - ''; - - checkPhase = '' - echo "test: thg version" - $out/bin/thg version - ''; - - passthru.mercurial = tortoiseMercurial; - - meta = { - description = "Qt based graphical tool for working with Mercurial"; - homepage = "https://tortoisehg.bitbucket.io/"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ danbst ]; - }; + pname = "tortoisehg"; + version = "6.0"; + + src = fetchurl { + url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; + sha256 = "sha256-25uQ2llF/+wqdGpun/nzlvAf286OIRmlZUISZ0szH6Y="; + }; + + # Extension point for when thg's mercurial is lagging behind mainline. + tortoiseMercurial = mercurial; + + propagatedBuildInputs = with python3Packages; [ + tortoiseMercurial + qscintilla-qt5 + iniparse + ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + doCheck = true; + postInstall = '' + mkdir -p $out/share/doc/tortoisehg + cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt + # convenient alias + ln -s $out/bin/thg $out/bin/tortoisehg + wrapQtApp $out/bin/thg + ''; + + checkPhase = '' + export QT_QPA_PLATFORM=offscreen + echo "test: thg smoke test" + $out/bin/thg -h > help.txt & + sleep 1s + if grep "list of commands" help.txt; then + echo "thg help output was captured. Seems like package in a working state." + exit 0 + else + echo "thg help output was not captured. Seems like package is broken." + exit 1 + fi + ''; + + passthru.mercurial = tortoiseMercurial; + + meta = { + description = "Qt based graphical tool for working with Mercurial"; + homepage = "https://tortoisehg.bitbucket.io/"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ danbst ]; + }; } diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 81b354fe1ff..34b6eb9c286 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -36,12 +36,16 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + # plexmediaplayer currently segfaults under wayland + qtWrapperArgs = [ "--set" "QT_QPA_PLATFORM" "xcb" ]; + passthru.updateScript = ./update.sh; meta = with lib; { description = "Streaming media player for Plex"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ b4dm4n ]; homepage = "https://plex.tv"; + mainProgram = "plexmediaplayer"; }; } diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 4c2a21fd4c2..955d609d7a2 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "20.2"; + version = "21.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yIp1p8GyBojWKmvFRZ/OeyF2bjlqYsuXUrYTVunYV8Y="; + sha256 = "00b0ij9sfv7zsrgwrcj2rzpy1z8bp0m0lmzjp433xzpcgcnzw3w5"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-s2u6e2JbukPo3pXYzQJXP5d2G213u1+1ke9gZFnB+5g="; + cargoSha256 = "0lf7bb468s2ic9vabx954i46605gf7c6064vvwqvz7djk30z0y0d"; + + # Integration tests require root. + cargoTestFlags = [ "--bins" ]; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f60e203d7fb..9424628d287 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -229,5 +229,6 @@ in stdenv.mkDerivation { homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander ]; platforms = [ "x86_64-linux" ]; + mainProgram = "VirtualBox"; }; } diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 04944a1e909..bfc360e81bb 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,19 +1,18 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub -, pkg-config , libinput , libxcb , libxkbcommon , pixman +, pkg-config , wayland , wayland-protocols , wlroots +, writeText , enable-xwayland ? true, xwayland, libX11 -, patches ? [ ] , conf ? null -, writeText -, fetchpatch +, patches ? [ ] }: let @@ -22,16 +21,17 @@ in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs="; + hash = "sha256-T2GqDehBNO8eublqZUmA5WADjnwElzT+bp9Dp1bqSgg="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libinput libxcb @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + NIX_CFLAGS_COMPILE = [ + # https://github.com/djpohly/dwl/issues/186 + "-Wno-error=unused-result" + ]; + dontConfigure = true; installPhase = '' @@ -85,8 +90,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + inherit (wayland.meta) platforms; }; } # TODO: custom patches from upstream website -# TODO: investigate the modifications in the upstream unstable version diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 3bbe0816464..d34099be67c 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -1,33 +1,33 @@ { lib , stdenv , fetchFromGitHub -, pkg-config -, meson -, ninja , cairo , glib +, libdrm , libinput +, libxcb +, libxkbcommon , libxml2 +, meson +, ninja , pango +, pkg-config +, scdoc , wayland , wayland-protocols , wlroots -, libxcb -, libxkbcommon , xwayland -, libdrm -, scdoc }: stdenv.mkDerivation rec { pname = "labwc"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { - owner = "johanmalm"; + owner = "labwc"; repo = pname; rev = version; - sha256 = "sha256-v8LGiQG/n1IXeVMPWyiP9MgZzZLW78JftvxnRVTswaM="; + hash = "sha256-O9jVDR7UROt5u8inUsZjbzB3dQTosiLYqXkeOyGrbaM="; }; nativeBuildInputs = [ @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { pkg-config scdoc ]; + buildInputs = [ cairo glib @@ -54,8 +55,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dxwayland=enabled" ]; meta = with lib; { - homepage = "https://github.com/johanmalm/labwc"; - description = "Openbox alternative for Wayland"; + homepage = "https://github.com/labwc/labwc"; + description = "A Wayland stacking compositor, similar to Openbox"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index be2c5bc3d6e..11ef2979afe 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { xcbutilwm ]; - sourceRoot = let + prePatch = let subdir = if stdenv.isDarwin then "osx" else "linux"; - in "source/${subdir}"; + in "cd ${subdir}"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 1b6c340f7f0..5718cadd4ff 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -827,6 +827,8 @@ rec { # this on, but tooling may disable this to insert the store paths more # efficiently via other means, such as bind mounting the host store. includeStorePaths ? true + , # Passthru arguments for the underlying derivation. + passthru ? {} , }: assert @@ -987,7 +989,7 @@ rec { result = runCommand "stream-${baseName}" { inherit (conf) imageName; - passthru = { + passthru = passthru // { inherit (conf) imageTag; # Distinguish tarballs and exes at the Nix level so functions that diff --git a/pkgs/build-support/go/garble.nix b/pkgs/build-support/go/garble.nix index 62fd931643d..c9bcf2cec15 100644 --- a/pkgs/build-support/go/garble.nix +++ b/pkgs/build-support/go/garble.nix @@ -2,25 +2,25 @@ , buildGoModule , fetchFromGitHub , lib +, git }: buildGoModule rec { pname = "garble"; - version = "20200107"; + version = "0.5.1"; src = fetchFromGitHub { owner = "burrowers"; repo = pname; - rev = "835f4aadf321521acf06aac4d5068473dc4b2ac1"; - sha256 = "sha256-NodsVHRll2YZoxrhmniJvelQOStG82u3kJyc0t8OXD8="; + rev = "v${version}"; + sha256 = "sha256-F8O/33o//yGnum9sZo1dzcvf3ifRalva6SDC36iPbDA=="; }; - vendorSha256 = "sha256-x2fk2QmZDK2yjyfYdK7x+sQjvt7tuggmm8ieVjsNKek="; + vendorSha256 = "sha256-iNH/iBEOTkIhVlDGfI66ZYyVjyH6WrLbUSMyONPjUc4="; - preBuild = '' - # https://github.com/burrowers/garble/issues/184 - substituteInPlace testdata/scripts/tiny.txt \ - --replace "{6,8}" "{4,8}" - '' + lib.optionalString (!stdenv.isx86_64) '' + # Used for some of the tests. + checkInputs = [git]; + + preBuild = lib.optionalString (!stdenv.isx86_64) '' # The test assumex amd64 assembly rm testdata/scripts/asm.txt ''; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 70884741af3..0a87d643546 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -31,7 +31,7 @@ storePaths=$(perl $pathsFromGraph closure-*) # Paths in cpio archives *must* be relative, otherwise the kernel # won't unpack 'em. -(cd root && cp -prd --parents $storePaths .) +(cd root && cp -prP --parents $storePaths .) # Put the closure in a gzipped cpio archive. diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 3550facfc11..1b0b0338366 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.8.3"; + version = "1.13.0"; in fetchzip rec { name = "Cozette-${version}"; url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - sha256 = "1nc4zk6n7cbv9vwlhpm3ady5lc4d4ic1klyywwfg27w8j0jv57hx"; + sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; postFetch = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index a0d3b34c85c..9c9996db39e 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , fetchurl , cairo +, nixosTests , python3 , pkg-config , pngquant @@ -70,12 +71,15 @@ let owner = "googlefonts"; repo = "noto-cjk"; inherit rev sha256; + sparseCheckout = "${typeface}/OTC"; }; installPhase = '' install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc ''; + passthru.tests.noto-fonts = nixosTests.noto-fonts; + meta = with lib; { description = "Beautiful and free fonts for CJK languages"; homepage = "https://www.google.com/get/noto/help/cjk/"; @@ -113,14 +117,14 @@ in typeface = "Sans"; version = "2.004"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + sha256 = "sha256-pNC/WJCYHSlU28E/CSFsrEMbyCe/6tjevDlOvDK9RwU="; }; noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; version = "2.000"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + sha256 = "sha256-Iy4lmWj5l+/Us/dJJ/Jl4MEojE9mrFnhNQxX2zhVngY="; }; noto-fonts-emoji = let diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix new file mode 100644 index 00000000000..4252136cf46 --- /dev/null +++ b/pkgs/data/icons/phinger-cursors/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { + pname = "phinger-cursors"; + version = "1.1"; + + src = fetchurl { + url = "https://github.com/phisch/phinger-cursors/releases/download/v${version}/phinger-cursors-variants.tar.bz2"; + sha256 = "sha256-II+1x+rcjGRRVB8GYkVwkKVHNHcNaBKRb6C613901oc="; + }; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -r ./ $out/share/icons + runHook postInstall + ''; + + meta = with lib; { + description = "The most over-engineered cursor theme"; + homepage = "https://github.com/phisch/phinger-cursors"; + platforms = platforms.unix; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index c8a76b98367..2ffb05e2eb9 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20210812"; + version = "20220119"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "sha256-dRqyjDC9yNkNOnYQ9fkWPlnyzSqIZ4zxZ2T7t8Bu9FE="; + sha256 = "sha256-8JJ6RG7yA1ssoYsvgDYp3/r+h1+rKnOwwoDhRx2brY8="; }; preConfigure = '' diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index c695ea26888..8b940fc851f 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3034b8f1052c41d5b3c571cb2bedb5f62bbede65", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3034b8f1052c41d5b3c571cb2bedb5f62bbede65.tar.gz", - "sha256": "0kqga1mf7vr292jcaqw8qk4s1bjwc2z1wwjih5xwli3hkk584l20", - "msg": "Update from Hackage at 2022-01-24T10:21:35Z" + "commit": "b233c8c0ee187788a69d929293a953cf89ffc012", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b233c8c0ee187788a69d929293a953cf89ffc012.tar.gz", + "sha256": "00mi9jxjbd9mk2pghj1ks9mjy9i0x50kcgi28iajq0kvxc97c9sp", + "msg": "Update from Hackage at 2022-01-27T16:52:24Z" } diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix new file mode 100644 index 00000000000..06b0e32d1b7 --- /dev/null +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, wrapQtAppsHook +, kwin +, kdelibs4support +, libepoxy +, libXdmcp +, lib +}: + +stdenv.mkDerivation rec { + pname = "kde-rounded-corners"; + version = "unstable-2021-11-06"; + + src = fetchFromGitHub { + owner = "matinlotfali"; + repo = "KDE-Rounded-Corners"; + rev = "8ad8f5f5eff9d1625abc57cb24dc484d51f0e1bd"; + sha256 = "0xbskf7jd03d2invfz1nnfc82klzvc784snw539n4kn6c6rc381p"; + }; + + postConfigure = '' + substituteInPlace cmake_install.cmake \ + --replace "${kdelibs4support}" "$out" + ''; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + buildInputs = [ kwin kdelibs4support libepoxy libXdmcp ]; + + meta = with lib; { + description = "Rounds the corners of your windows"; + homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ flexagoon ]; + }; +} diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index a940a6f2cd6..936fe62c259 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.4"; + version = "40.5"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AsrMdvTuQjD2eqAK2hlOnFSPidJ6DnLyANi9U67nGhc="; + sha256 = "Y6CcVeRqGhl1a/XglXyvmUMA+tq9umvaYC5mjfzfcSI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index e379f5369f5..5fedc9d9ca1 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "mate-tweak"; - version = "21.10.0"; + version = "22.04.0"; src = fetchFromGitHub { owner = "ubuntu-mate"; repo = pname; rev = version; - sha256 = "0m61p6idajsrrbjps7s1pnl6nfzwpy7j6l9bdhqi9gaaij687shn"; + sha256 = "yCML+RdN7/dCCx5x1m8fUIkBrnfKztwqplpu1wXwDvY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index bdc2fbca591..c0c1513e784 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -5,7 +5,6 @@ , appstream-glib , dbus , desktop-file-utils -, elementary-gtk-theme , elementary-icon-theme , fetchFromGitHub , flatpak @@ -61,7 +60,6 @@ stdenv.mkDerivation rec { buildInputs = [ appstream - elementary-gtk-theme elementary-icon-theme flatpak glib diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 115622e8143..2356d362f6b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 8cb9dcd18c6..70b092d3f2c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -2,28 +2,26 @@ , stdenv , fetchFromGitHub , nix-update-script -, pkg-config +, appstream-glib +, desktop-file-utils , meson , ninja +, pkg-config +, python3 , vala -, desktop-file-utils -, gtk3 -, granite -, libgee -, libhandy -, geoclue2 -, libchamplain +, wrapGAppsHook , clutter +, elementary-icon-theme +, evolution-data-server , folks +, geoclue2 , geocode-glib -, python3 -, libnotify +, granite +, gtk3 +, libchamplain +, libgee +, libhandy , libical -, libgdata -, evolution-data-server -, appstream-glib -, elementary-icon-theme -, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -61,7 +59,6 @@ stdenv.mkDerivation rec { libgee libhandy libical - libnotify ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 7135795914d..94bbc69047d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -3,25 +3,24 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config -, meson -, ninja -, vala +, appstream , desktop-file-utils -, python3 , gettext , libxml2 -, gtk3 +, meson +, ninja +, pkg-config +, python3 +, vala +, wrapGAppsHook +, elementary-icon-theme +, glib , granite -, libgee -, libhandy , gst_all_1 +, gtk3 , libcanberra -, clutter-gtk -, clutter-gst -, elementary-icon-theme -, appstream -, wrapGAppsHook +, libgee +, libhandy }: stdenv.mkDerivation rec { @@ -58,19 +57,22 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter-gst - clutter-gtk elementary-icon-theme + glib granite - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) - gst_all_1.gstreamer gtk3 libcanberra libgee libhandy - ]; + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + # gtkSupport needed for gtksink + # https://github.com/elementary/camera/issues/181 + (gst-plugins-good.override { gtkSupport = true; }) + gst-plugins-ugly + gstreamer + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 073ea45cbc9..4087168feb0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -3,29 +3,28 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config +, appstream +, desktop-file-utils , meson , ninja -, vala +, pkg-config +, polkit , python3 -, desktop-file-utils -, gtk3 +, vala +, wrapGAppsHook +, editorconfig-core-c +, elementary-icon-theme , granite +, gtk3 +, gtksourceview4 +, gtkspell3 , libgee +, libgit2-glib , libhandy -, elementary-icon-theme -, appstream , libpeas -, editorconfig-core-c -, gtksourceview4 -, gtkspell3 , libsoup , vte -, webkitgtk , ctags -, libgit2-glib -, wrapGAppsHook -, polkit }: stdenv.mkDerivation rec { @@ -61,7 +60,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - ctags editorconfig-core-c elementary-icon-theme granite @@ -74,7 +72,6 @@ stdenv.mkDerivation rec { libpeas libsoup vte - webkitgtk ]; # ctags needed in path by outline plugin diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 9b760515ff8..6d9fe808d8d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -14,7 +14,6 @@ , libgee , libhandy , elementary-icon-theme -, elementary-gtk-theme , gettext , wrapGAppsHook , appstream @@ -55,7 +54,6 @@ stdenv.mkDerivation rec { elementary-icon-theme granite gtk3 - elementary-gtk-theme libgee libhandy glib diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 5f1d0e9e71f..4314e74d5af 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -20,7 +20,6 @@ , elementary-dock , bamf , sqlite -, libdbusmenu-gtk3 , zeitgeist , glib-networking , elementary-icon-theme @@ -64,7 +63,6 @@ stdenv.mkDerivation rec { gtk3 libcanberra libcloudproviders - libdbusmenu-gtk3 libgee libgit2-glib libhandy diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index d71835a6531..84383042776 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -3,31 +3,25 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config +, desktop-file-utils , meson , ninja +, pkg-config +, python3 , vala -, desktop-file-utils -, gtk3 +, wrapGAppsHook +, elementary-icon-theme +, glib , granite -, python3 -, libgee -, clutter-gtk -, json-glib +, gst_all_1 +, gtk3 , libgda +, libgee , libgpod , libhandy -, libnotify , libpeas -, libsoup -, zeitgeist -, gst_all_1 , taglib -, libdbusmenu -, libsignon-glib -, libaccounts-glib -, elementary-icon-theme -, wrapGAppsHook +, zeitgeist }: stdenv.mkDerivation rec { @@ -66,34 +60,25 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ - clutter-gtk + buildInputs = [ elementary-icon-theme + glib granite - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer gtk3 - json-glib - libaccounts-glib - libdbusmenu libgda libgee libgpod libhandy - libnotify libpeas - libsignon-glib - libsoup taglib zeitgeist - ]; - - mesonFlags = [ - "-Dplugins=audioplayer,cdrom,ipod" - ]; + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 12f6242eaaf..55a42f80644 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -8,7 +8,6 @@ , vala , desktop-file-utils , gtk3 -, libaccounts-glib , libexif , libgee , libhandy @@ -24,7 +23,6 @@ , libsoup , sqlite , python3 -, scour , webkitgtk , libwebp , appstream @@ -54,19 +52,13 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ + buildInputs = [ elementary-icon-theme geocode-glib gexiv2 granite - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer gtk3 json-glib - libaccounts-glib libexif libgee libgphoto2 @@ -76,10 +68,15 @@ stdenv.mkDerivation rec { librest libsoup libwebp - scour sqlite webkitgtk - ]; + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]); mesonFlags = [ "-Dplugins=false" diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 9e65a562875..7629da0f734 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screenshot tool designed for elementary OS"; homepage = "https://github.com/elementary/screenshot"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.screenshot"; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index f3402299ff7..e796a2a344a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { smart copy/paste, and little to no configuration. ''; homepage = "https://github.com/elementary/terminal"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.terminal"; diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index d93b158168f..6069fb85478 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -2,7 +2,6 @@ , stdenv , desktop-file-utils , nix-update-script -, elementary-gtk-theme , elementary-icon-theme , fetchFromGitHub , flatpak @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-gtk-theme elementary-icon-theme flatpak glib diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch new file mode 100644 index 00000000000..657ea7a260c --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch @@ -0,0 +1,82 @@ +From cc47fa33893e6840463ef8d59f9f4de4b7563726 Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Sat, 4 Dec 2021 22:00:38 +0800 +Subject: [PATCH] Add meson option for overlaying logo on wallpaper + +--- + meson.build | 8 ++++++++ + meson_options.txt | 1 + + src/Views/OperatingSystemView.vala | 8 ++++++++ + 3 files changed, 17 insertions(+) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index 2125de6e..cbe3cadd 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,6 +20,14 @@ add_project_arguments( + vapi_dir = join_paths(meson.current_source_dir(), 'vapi') + add_project_arguments(['--vapidir', vapi_dir], language: 'vala') + ++vala_flags = [] ++ ++if get_option('wallpaper') ++ vala_flags += ['--define', 'WALLPAPER'] ++endif ++ ++add_project_arguments(vala_flags, language: 'vala') ++ + subdir('data') + subdir('src') + subdir('po') +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 00000000..8cef0bb3 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1 @@ ++option('wallpaper', type : 'boolean', value : true, description : 'Overlay logo on default wallpaper') +diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala +index fdb92e7e..6110d1aa 100644 +--- a/src/Views/OperatingSystemView.vala ++++ b/src/Views/OperatingSystemView.vala +@@ -39,6 +39,7 @@ public class About.OperatingSystemView : Gtk.Grid { + logo_icon_name = "distributor-logo"; + } + ++#if WALLPAPER + var logo = new Hdy.Avatar (128, "", false) { + // In case the wallpaper can't be loaded, we don't want an icon or text + icon_name = "invalid-icon-name", +@@ -53,6 +54,7 @@ public class About.OperatingSystemView : Gtk.Grid { + } + }); + logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++#endif + + var icon = new Gtk.Image () { + icon_name = logo_icon_name + "-symbolic", +@@ -64,9 +66,11 @@ public class About.OperatingSystemView : Gtk.Grid { + icon_style_context.add_class ("logo"); + icon_style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + ++#if WALLPAPER + var logo_overlay = new Gtk.Overlay (); + logo_overlay.add (logo); + logo_overlay.add_overlay (icon); ++#endif + + // Intentionally not using GLib.OsInfoKey.PRETTY_NAME here because we + // want more granular control over text formatting +@@ -145,7 +149,11 @@ public class About.OperatingSystemView : Gtk.Grid { + valign = Gtk.Align.CENTER, + vexpand = true + }; ++#if WALLPAPER + software_grid.attach (logo_overlay, 0, 0, 1, 4); ++#else ++ software_grid.attach (icon, 0, 0, 1, 4); ++#endif + software_grid.attach (title, 1, 0, 3); + + software_grid.attach (kernel_version_label, 1, 2, 3); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 03964284ed7..82eece370dd 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, substituteAll , meson , ninja , pkg-config @@ -15,7 +14,6 @@ , switchboard , fwupd , appstream -, nixos-artwork }: stdenv.mkDerivation rec { @@ -30,11 +28,10 @@ stdenv.mkDerivation rec { }; patches = [ - # Use NixOS's default wallpaper - (substituteAll { - src = ./fix-background-path.patch; - default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; - }) + # Introduces a wallpaper meson flag. + # The wallpapaper path does not exist on NixOS, let's just remove the wallpaper. + # https://github.com/elementary/switchboard-plug-about/pull/236 + ./add-wallpaper-option.patch ]; nativeBuildInputs = [ @@ -55,6 +52,11 @@ stdenv.mkDerivation rec { switchboard ]; + mesonFlags = [ + # This option is introduced in add-wallpaper-option.patch + "-Dwallpaper=false" + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch deleted file mode 100644 index 6fea8869133..00000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala -index fdb92e7e..4161538e 100644 ---- a/src/Views/OperatingSystemView.vala -+++ b/src/Views/OperatingSystemView.vala -@@ -47,7 +47,7 @@ public class About.OperatingSystemView : Gtk.Grid { - }; - logo.set_image_load_func ((size) => { - try { -- return new Gdk.Pixbuf.from_file_at_scale ("/usr/share/backgrounds/elementaryos-default", -1, size, true); -+ return new Gdk.Pixbuf.from_file_at_scale ("@default_wallpaper@", -1, size, true); - } catch (Error e) { - critical (e.message); - } diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 304e07749c8..558c61d986a 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK theme designed to be smooth, attractive, fast, and usable"; homepage = "https://github.com/elementary/stylesheet"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 40522bbf02a..046f1fbdc97 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon. ''; homepage = "https://github.com/elementary/icons"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 1f8c811d9d1..dd6b10f5c83 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -2,7 +2,6 @@ , runCommand , mutter , elementary-default-settings -, nixos-artwork , glib , gala , epiphany diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index c5c8810c6c5..3355ee09299 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -14,7 +14,6 @@ , granite , libgee , elementary-icon-theme -, elementary-gtk-theme , elementary-settings-daemon , gettext , libhandy @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-gtk-theme elementary-icon-theme elementary-settings-daemon # settings schema glib diff --git a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix index 9f4d275f246..c9a24b4906c 100644 --- a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix +++ b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , substituteAll , file-roller }: stdenv.mkDerivation rec { pname = "file-roller-contract"; - version = "unstable-2021-02-23"; + version = "unstable-2021-02-22"; src = fetchFromGitHub { owner = "elementary"; @@ -36,6 +37,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = unstableGitUpdater { + url = "https://github.com/elementary/file-roller-contract.git"; + }; + }; + meta = with lib; { description = "Contractor extension for File Roller"; homepage = "https://github.com/elementary/file-roller-contract"; diff --git a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix index 36f4d3e539f..e1a25eea4a6 100644 --- a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix +++ b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , substituteAll , gnome-bluetooth }: stdenv.mkDerivation rec { pname = "gnome-bluetooth-contract"; - version = "unstable-2021-02-23"; + version = "unstable-2021-02-22"; src = fetchFromGitHub { owner = "elementary"; @@ -36,6 +37,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = unstableGitUpdater { + url = "https://github.com/elementary/gnome-bluetooth-contract.git"; + }; + }; + meta = with lib; { description = "Contractor extension for GNOME Bluetooth"; homepage = "https://github.com/elementary/gnome-bluetooth-contract"; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index ec2255bbbc1..f817a3017b7 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, nix-update-script , python3 , meson , ninja @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "6.2.0"; + version = "6.2.0"; # nixpkgs-update: no auto update outputs = [ "out" "dev" ]; @@ -52,12 +51,6 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - meta = with lib; { description = "An extension to GTK used by elementary OS"; longDescription = '' diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix index 6e3fbf5777b..7e153293bbc 100644 --- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , substituteAll , meson , ninja @@ -45,6 +46,12 @@ stdenv.mkDerivation rec { pantheon.wingpanel ]; + passthru = { + updateScript = unstableGitUpdater { + url = "https://github.com/Lafydev/wingpanel-indicator-ayatana.git"; + }; + }; + meta = with lib; { description = "Ayatana Compatibility Indicator for Wingpanel"; homepage = "https://github.com/Lafydev/wingpanel-indicator-ayatana"; diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index d21ac4411f1..a8f05d6f15c 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -212,6 +212,15 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; }) + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + + # Prevent the paths module from emitting symbols that we don't use + # when building with separate outputs. + # + # These cause problems as they're not eliminated by GHC's dead code + # elimination on aarch64-darwin. (see + # https://github.com/NixOS/nixpkgs/issues/140774 for details). + ./cabal-paths.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 8ca5df08515..56b16c5d48c 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -20,9 +20,10 @@ # build-time dependency too. buildTargetLlvmPackages, llvmPackages -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -61,7 +62,7 @@ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: -assert !enableIntegerSimple -> gmp != null; +assert !enableNativeBignum -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. @@ -98,7 +99,7 @@ let '' HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} @@ -114,7 +115,7 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (!enableNativeBignum) gmp ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; # TODO(@sternenseemann): is buildTarget LLVM unnecessary? @@ -152,7 +153,7 @@ let # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. variantSuffix = lib.concatStrings [ (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableIntegerSimple "-integer-simple") + (lib.optionalString enableNativeBignum "-native-bignum") ]; in @@ -251,7 +252,7 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 4714a19a535..75c728510eb 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -21,9 +21,10 @@ # build-time dependency too. buildTargetLlvmPackages, llvmPackages -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -62,7 +63,7 @@ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: -assert !enableIntegerSimple -> gmp != null; +assert !enableNativeBignum -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. @@ -99,7 +100,7 @@ let '' HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} @@ -115,7 +116,7 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (!enableNativeBignum) gmp ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; # TODO(@sternenseemann): is buildTarget LLVM unnecessary? @@ -153,7 +154,7 @@ let # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. variantSuffix = lib.concatStrings [ (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableIntegerSimple "-integer-simple") + (lib.optionalString enableNativeBignum "-native-bignum") ]; in @@ -252,7 +253,7 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ diff --git a/pkgs/development/compilers/ghc/cabal-paths.patch b/pkgs/development/compilers/ghc/cabal-paths.patch new file mode 100644 index 00000000000..19adcf5388b --- /dev/null +++ b/pkgs/development/compilers/ghc/cabal-paths.patch @@ -0,0 +1,99 @@ +diff --git a/Cabal/Distribution/Simple/Build/PathsModule.hs b/Cabal/Distribution/Simple/Build/PathsModule.hs +index 5e660e8d6..1ae603c94 100644 +--- a/libraries/Cabal/Cabal/Distribution/Simple/Build/PathsModule.hs ++++ b/libraries/Cabal/Cabal/Distribution/Simple/Build/PathsModule.hs +@@ -37,6 +37,9 @@ import System.FilePath ( pathSeparator ) + -- * Building Paths_<pkg>.hs + -- ------------------------------------------------------------ + ++splitPath :: FilePath -> [ String ] ++splitPath = unintersperse pathSeparator ++ + generatePathsModule :: PackageDescription -> LocalBuildInfo -> ComponentLocalBuildInfo -> String + generatePathsModule pkg_descr lbi clbi = + let pragmas = +@@ -78,12 +81,44 @@ generatePathsModule pkg_descr lbi clbi = + "import System.Environment (getExecutablePath)\n" + | otherwise = "" + ++ dirs = [ (flat_libdir, "LibDir") ++ , (flat_dynlibdir, "DynLibDir") ++ , (flat_datadir, "DataDir") ++ , (flat_libexecdir, "LibexecDir") ++ , (flat_sysconfdir, "SysconfDir") ]; ++ ++ shouldEmitPath p ++ | (splitPath flat_prefix) `isPrefixOf` (splitPath flat_bindir) = True ++ | (splitPath flat_prefix) `isPrefixOf` (splitPath p) = False ++ | otherwise = True ++ ++ shouldEmitDataDir = shouldEmitPath flat_datadir ++ ++ nixEmitPathFn (path, name) = let ++ varName = toLower <$> name ++ fnName = "get"++name ++ in if shouldEmitPath path then ++ varName ++ " :: FilePath\n"++ ++ varName ++ " = " ++ show path ++ ++ "\n" ++ fnName ++ " :: IO FilePath" ++ ++ "\n" ++ fnName ++ " = " ++ mkGetEnvOr varName ("return " ++ varName)++"\n" ++ else "" ++ ++ absBody = intercalate "\n" $ nixEmitPathFn <$> dirs ++ ++ warnPragma = case filter (not . shouldEmitPath . fst) dirs of ++ [] -> "" ++ omittedDirs -> "{-# WARNING \"The functions: "++omittedFns++" Have been omitted by the Nix build system.\" #-}" ++ where omittedFns = intercalate ", " $ map snd omittedDirs ++ ++ importList = intercalate ", " $ ("get" ++) . snd <$> filter (shouldEmitPath . fst) dirs ++ + header = + pragmas++ +- "module " ++ prettyShow paths_modulename ++ " (\n"++ +- " version,\n"++ +- " getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir,\n"++ +- " getDataFileName, getSysconfDir\n"++ ++ "module " ++ prettyShow paths_modulename ++ " " ++ warnPragma ++ " (\n"++ ++ " version, getBinDir,\n"++ ++ (if shouldEmitDataDir then " getDataFileName, \n" else "\n")++ ++ " " ++ importList ++"\n"++ + " ) where\n"++ + "\n"++ + foreign_imports++ +@@ -136,26 +171,18 @@ generatePathsModule pkg_descr lbi clbi = + "\n"++ + filename_stuff + | absolute = +- "\nbindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath\n"++ ++ "\nbindir :: FilePath\n"++ + "\nbindir = " ++ show flat_bindir ++ +- "\nlibdir = " ++ show flat_libdir ++ +- "\ndynlibdir = " ++ show flat_dynlibdir ++ +- "\ndatadir = " ++ show flat_datadir ++ +- "\nlibexecdir = " ++ show flat_libexecdir ++ +- "\nsysconfdir = " ++ show flat_sysconfdir ++ + "\n"++ +- "\ngetBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath\n"++ ++ "\ngetBinDir :: IO FilePath\n"++ + "getBinDir = "++mkGetEnvOr "bindir" "return bindir"++"\n"++ +- "getLibDir = "++mkGetEnvOr "libdir" "return libdir"++"\n"++ +- "getDynLibDir = "++mkGetEnvOr "dynlibdir" "return dynlibdir"++"\n"++ +- "getDataDir = "++mkGetEnvOr "datadir" "return datadir"++"\n"++ +- "getLibexecDir = "++mkGetEnvOr "libexecdir" "return libexecdir"++"\n"++ +- "getSysconfDir = "++mkGetEnvOr "sysconfdir" "return sysconfdir"++"\n"++ +- "\n"++ +- "getDataFileName :: FilePath -> IO FilePath\n"++ +- "getDataFileName name = do\n"++ +- " dir <- getDataDir\n"++ +- " return (dir ++ "++path_sep++" ++ name)\n" ++ absBody ++ "\n"++ ++ (if shouldEmitDataDir then ++ "getDataFileName :: FilePath -> IO FilePath\n"++ ++ "getDataFileName name = do\n"++ ++ " dir <- getDataDir\n"++ ++ " return (dir ++ "++path_sep++" ++ name)\n" ++ else "\n") + | otherwise = + "\nprefix, bindirrel :: FilePath" ++ + "\nprefix = " ++ show flat_prefix ++ diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix deleted file mode 100644 index 5cba6be8899..00000000000 --- a/pkgs/development/compilers/go/1.15.nix +++ /dev/null @@ -1,284 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, iana-etc -, runCommand -, perl -, which -, pkg-config -, patch -, procps -, pcre -, cacert -, Security -, Foundation -, mailcap -, runtimeShell -, buildPackages -, pkgsBuildTarget -, fetchpatch -, callPackage -}: - -let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; - - goBootstrap = runCommand "go-bootstrap" { } '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "powerpc64le" = "ppc64le"; - "mips" = "mips"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.15.15"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-BmKuOBMzAoDV8al6LuI7vb46Wnz6YAGySphzoZoNx+w="; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkg-config patch procps ]; - buildInputs = [ cacert pcre ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Fails on aarch64 - sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go - # Skip this test since ssl patches mess it up. - sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # Disable another PIE test which breaks. - sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go - # Disable the BuildModePie test - sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - '' + lib.optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.15.patch - ./remove-test-pie-1.15.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests-1.15.patch - ./skip-nohup-tests.patch - ./skip-cgo-tests-1.15.patch - ./go_no_vendor_checks.patch - - # support TZ environment variable starting with colon - (fetchpatch { - name = "tz-support-colon.patch"; - url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch"; - sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f"; - }) - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32-1.14.patch - else ./skip-test-extra-files-on-386-1.14.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/obj - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - meta = with lib; { - homepage = "https://go.dev/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; - badPlatforms = [ "aarch64-darwin" ]; - }; -} diff --git a/pkgs/development/compilers/go/go_no_vendor_checks.patch b/pkgs/development/compilers/go/go_no_vendor_checks.patch deleted file mode 100644 index 45ff4360f0d..00000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index 71f68efbcc..3c566d04dd 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -133,7 +133,7 @@ func checkVendorConsistency() { - readVendorList() - - pre114 := false -- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { -+ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch b/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch deleted file mode 100644 index 0ea1050cd8e..00000000000 --- a/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/net/dial_test.go b/src/net/dial_test.go -index 01582489de..5b5faa5424 100644 ---- a/src/net/dial_test.go -+++ b/src/net/dial_test.go -@@ -990,6 +990,8 @@ func TestDialerControl(t *testing.T) { - // except that it won't skip testing on non-mobile builders. - func mustHaveExternalNetwork(t *testing.T) { - t.Helper() -+ t.Skipf("Nix sandbox does not have networking") -+ - mobile := runtime.GOOS == "android" || runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" - if testenv.Builder() == "" || mobile { - testenv.MustHaveExternalNetwork(t) diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch deleted file mode 100644 index 1884c681ca3..00000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go -index ce88de025e..258ecc45d1 100644 ---- a/src/crypto/x509/root_darwin_amd64.go -+++ b/src/crypto/x509/root_darwin_amd64.go -@@ -10,6 +10,7 @@ import ( - "bytes" - macOS "crypto/x509/internal/macos" - "fmt" -+ "io/ioutil" - "os" - "strings" - ) -@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - var loadSystemRootsWithCgo func() (*CertPool, error) - - func loadSystemRoots() (*CertPool, error) { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - var trustedRoots []*Certificate - untrustedRoots := make(map[string]bool) - -diff --git a/src/crypto/x509/root_darwin_ios.go b/src/crypto/x509/root_darwin_ios.go -index 5ecc4911b3..14b4205c00 100644 ---- a/src/crypto/x509/root_darwin_ios.go -+++ b/src/crypto/x509/root_darwin_ios.go -@@ -6,6 +6,11 @@ - - package x509 - -+import ( -+ "io/ioutil" -+ "os" -+) -+ - func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { - return nil, nil - } -@@ -14,6 +19,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - var loadSystemRootsWithCgo func() (*CertPool, error) - - func loadSystemRoots() (*CertPool, error) { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - p := NewCertPool() - p.AppendCertsFromPEM([]byte(systemRootsPEM)) - return p, nil -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index b48e618a65..195c1ff25a 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - files := certFiles - if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/development/compilers/llvm/12/libcxx/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix index 30dc3f4f206..3ddcb799750 100644 --- a/pkgs/development/compilers/llvm/12/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -23,12 +23,6 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index ddf51d9a2fa..0ce73ed97af 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { ../../libcxx-0001-musl-hacks.patch ]; - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index bedfd5afee1..0ddf28909b8 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { ../../libcxx-0001-musl-hacks.patch ]; - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 7ebdaa474ad..a3597e9febf 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -20,10 +20,6 @@ rustPlatform.buildRustPackage { # (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm) doCheck = false; - preBuild = '' - export CARGO_TARGET_DIR="$(pwd)/target" - ''; - preFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver ''; diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix new file mode 100644 index 00000000000..f440208e947 --- /dev/null +++ b/pkgs/development/compilers/uasm/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "uasm"; + version = "2.53"; + + src = fetchFromGitHub { + owner = "Terraspace"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Aohwrcb/KTKUFFpfmqVDPNjJh1dMYSNnBJ2eFaP20pM="; + }; + + # https://github.com/Terraspace/UASM/pull/154 + patches = [ + # fix `invalid operands to binary - (have 'char *' and 'uint_8 *' {aka 'unsigned char *'})` + (fetchpatch { + name = "fix_pointers_compare.patch"; + url = "https://github.com/clouds56/UASM/commit/9cd3a400990e230571e06d4c758bd3bd35f90ab6.patch"; + sha256 = "sha256-8mY36dn+g2QNJ1JbWt/y4p0Ha9RSABnOE3vlWANuhsA="; + }) + # fix `dbgcv.c:*:*: fatal error: direct.h: No such file or directory` + (fetchpatch { + name = "fix_build_dbgcv_c_on_unix.patch"; + url = "https://github.com/clouds56/UASM/commit/806d54cf778246c96dcbe61a4649bf0aebcb0eba.patch"; + sha256 = "sha256-uc1LaizdYEh1Ry55Cq+6wrCa1OeBPFo74H5iBpmteAE="; + }) + ]; + + enableParallelBuilding = true; + + makefile = "gccLinux64.mak"; + + installPhase = '' + runHook preInstall + + install -Dt "$out/bin" -m0755 GccUnixR/uasm + install -Dt "$out/share/doc/${pname}" -m0644 {Readme,History}.txt Doc/* + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.terraspace.co.uk/uasm.html"; + description = "A free MASM-compatible assembler based on JWasm"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ thiagokokada ]; + license = licenses.watcom; + }; +} diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 6b2c6203a39..71f3c884868 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -79,33 +79,33 @@ let in stdenv.mkDerivation rec { pname = (if withTeensyduino then "teensyduino" else "arduino") + lib.optionalString (!withGui) "-core"; - version = "1.8.16"; + version = "1.8.19"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = version; - sha256 = "sha256-6d+y0Lgr+h0qYpCsa/ihvSMNuAdRMNQRuxZFpkWLDvg="; + sha256 = "sha256-I+PvfGc5F8H/NJOGRa18z7dKyKcO8I8Cg7Tj5yxkYAQ="; }; - teensyduino_version = "155"; + teensyduino_version = "156"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = { - linux64 = "sha256-DypCbCm4RKYgnFJRwoHyPht6dFG48YvWM4RzEDdJE6U="; - linux32 = "sha256-MJ4xsTAZPO8BhO/VWSjBAjBVLrKM+3PNi1fiF8dsuVQ="; - linuxarm = "sha256-x5JdYflLThohos9RTAWt4XrzvksB7VWfXTKqgXZ1d6Q="; - linuxaarch64 = "sha256-N18nvavEMhvt2jOrdI+tsXtbWIdsj1n4aMVeaaBlcT4="; + linux64 = "sha256-4DbhmmYrx+rCBpDrYFaC0A88Qv9UEeNlQAkFi3zAstk="; + linux32 = "sha256-DlRPOtDxmMPv2Qzhib7vNZdKNZCxmm9YmVNnwUKXK/E="; + linuxarm = "sha256-d+DbpER/4lFPcPDFeMG5f3WaUGn8pFchdIDo7Hm0XWs="; + linuxaarch64 = "sha256-8keQzhWq7QlAGIbfHEe3lfxpJleMMvBORuPaNrLmM6Y="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = { - linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po="; - linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE="; - linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM="; - linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ="; + linux64 = "sha256-62i93B0cASC+L8oTUKA+40Uxzzf1GEeyEhC25wVFvJs="; + linux32 = "sha256-wSxtx3BqXMQCeWQDK8PHkWLlQqQM1Csao8bIk98FrFg="; + linuxarm = "sha256-lJ/R1ePq7YtDk3bvloFcn8jswrJH+L63tvH5QpTqfXs="; + linuxaarch64 = "sha256-gm8cDjLKNfpcaeO7fw6Kyv1TnWV/ZmH4u++nun9X6jo="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a46ff40c954..e7dcdcc9222 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -201,6 +201,7 @@ broken-packages: - arrow-list - arrowp - arrowp-qq + - arrow-utils - ArrowVHDL - artery - artifact @@ -5379,6 +5380,7 @@ broken-packages: - wavefront-obj - weak-bag - weather-api + - web3-polkadot - webapi - webapp - webauthn diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e037891b80a..db22584d9e5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -752,6 +752,7 @@ dont-distribute-packages: - clckwrks-theme-clckwrks - clckwrks-theme-geo-bootstrap - cless + - cleveland - click-clack - clifford - clippings @@ -1771,6 +1772,7 @@ dont-distribute-packages: - indentation-trifecta - indexation - indieweb-algorithms + - indigo - infernu - inline-java - inspector-wrecker @@ -2161,6 +2163,8 @@ dont-distribute-packages: - moo - moo-nad - morley + - morley-client + - morley-upgradeable - morloc - morpheus-graphql-client_0_18_0 - morpheus-graphql_0_18_0 @@ -3221,6 +3225,7 @@ dont-distribute-packages: - web-routes-regular - web-routing - web3 + - web3-ethereum - webcrank-wai - webdriver-w3c - webserver diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8822a77d5fa..392b7a3b647 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -30117,6 +30117,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "amqp_0_22_1" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, connection + , containers, data-binary-ieee754, hspec, hspec-expectations + , monad-control, network, network-uri, split, stm, text, vector + , xml + }: + mkDerivation { + pname = "amqp"; + version = "0.22.1"; + sha256 = "0z1w35ar0bswbjzgana52nh4ilxbidnfkvli29w2zr7cak9dgzg1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 monad-control network network-uri split stm + text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 hspec hspec-expectations network network-uri + split stm text vector + ]; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -33694,16 +33722,16 @@ self: { }: mkDerivation { pname = "arrow-utils"; - version = "0.1.0.0"; - sha256 = "1l8njh623a00hvfd3cczvb4ngh7c39z6f0kfhr8hr6xhbkrgwqnc"; - revision = "1"; - editedCabalFile = "1jdl1jmr8hbjiybrjnfr8rraqdf95l4qia3nna3nh9pvh8c69jln"; + version = "0.1.1"; + sha256 = "112g74g844lnqfphkxqmp8ysnvi11iii9gcn70ml1ag6m5bdr7lc"; libraryHaskellDepends = [ base vector-sized ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; description = "functions for working with arrows"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "arrowapply-utils" = callPackage @@ -36190,6 +36218,26 @@ self: { license = lib.licenses.mit; }) {}; + "authenticate_1_3_5_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, containers, html-conduit, http-conduit + , http-types, network-uri, resourcet, text, transformers + , unordered-containers, xml-conduit + }: + mkDerivation { + pname = "authenticate"; + version = "1.3.5.1"; + sha256 = "1rhbvdgwdr68gp13p5piddfdqf3l9lmx4w7k249lc98y23780c3x"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring case-insensitive + conduit containers html-conduit http-conduit http-types network-uri + resourcet text transformers unordered-containers xml-conduit + ]; + description = "Authentication methods for Haskell web applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "authenticate-kerberos" = callPackage ({ mkDerivation, base, process, text }: mkDerivation { @@ -36903,7 +36951,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "avro_0_6_0_0" = callPackage + "avro_0_6_0_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, doctest, doctest-discover, extra, fail, gauge @@ -36915,8 +36963,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.6.0.0"; - sha256 = "056nd6cgl9lqv0ij8a2s0rca1f0qcxr2mfr0i8pkh84h9y84nzv9"; + version = "0.6.0.1"; + sha256 = "1kl7dp0vm2klvijszjhwj2x9m4bmw044s085fyq86cszqrsrrn6w"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -40181,6 +40229,8 @@ self: { pname = "beam-core"; version = "0.9.2.0"; sha256 = "1b1xk4pi9j49fmh9lywgqcg61gbd6i7905gv5prnf0799iqz68g9"; + revision = "1"; + editedCabalFile = "1wfvfgram4sy9lw6l5xizhdmfaxq7gyv4ygph6r46c47abzv3ha0"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -57744,6 +57794,51 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "cleveland" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base-noprelude + , bimap, bytestring, constraints, containers, criterion, cryptonite + , data-default, directory, either, exceptions, file-embed, filepath + , first-class-families, fmt, gauge, hedgehog, hex-text, hspec + , hspec-expectations, HUnit, lens, lorentz, megaparsec, MonadRandom + , morley, morley-client, morley-prelude, mtl, named, o-clock + , optparse-applicative, safe-exceptions, servant-client + , servant-client-core, silently, singletons, spoon, statistics, syb + , tagged, tasty, tasty-ant-xml, tasty-discover, tasty-hedgehog + , tasty-hspec, tasty-hunit-compat, template-haskell, text, time + , type-spec, unordered-containers, vinyl, with-utf8 + }: + mkDerivation { + pname = "cleveland"; + version = "0.1.0"; + sha256 = "0px16j08fakmxzsf6rgx9gs91g61ygxzkf7sngj06a76yzfj4hlw"; + libraryHaskellDepends = [ + aeson base-noprelude constraints containers criterion cryptonite + data-default directory either exceptions file-embed fmt hedgehog + hex-text hspec hspec-expectations HUnit lens lorentz MonadRandom + morley morley-client morley-prelude mtl named o-clock + optparse-applicative safe-exceptions servant-client-core singletons + statistics tagged tasty tasty-ant-xml tasty-hedgehog + tasty-hunit-compat template-haskell text time with-utf8 + ]; + testHaskellDepends = [ + aeson aeson-pretty aeson-qq base-noprelude bimap bytestring + constraints containers data-default directory either filepath + first-class-families fmt hedgehog hex-text hspec hspec-expectations + HUnit lens lorentz megaparsec morley morley-client morley-prelude + mtl named o-clock servant-client silently singletons spoon syb + tasty tasty-hedgehog tasty-hspec tasty-hunit-compat text time + type-spec unordered-containers vinyl with-utf8 + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base-noprelude data-default gauge megaparsec morley morley-prelude + with-utf8 + ]; + description = "Testing framework for Morley"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "clevercss" = callPackage ({ mkDerivation, base, containers, mtl, parsec }: mkDerivation { @@ -65938,15 +66033,15 @@ self: { license = lib.licenses.mit; }) {}; - "core-data_0_3_0_2" = callPackage + "core-data_0_3_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, core-text , hashable, prettyprinter, scientific, text, unordered-containers , vector }: mkDerivation { pname = "core-data"; - version = "0.3.0.2"; - sha256 = "0rfx7086ilv2rld2nnq96jkygvxxsnfs81mh4b4nmb4drdw02jl0"; + version = "0.3.1.1"; + sha256 = "0i11m2k1xb97f0plvp9g7l4zhp9d1njn9z7xfhcmghbvlkk82vx2"; libraryHaskellDepends = [ aeson base bytestring containers core-text hashable prettyprinter scientific text unordered-containers vector @@ -65994,7 +66089,7 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_4_2_0" = callPackage + "core-program_0_4_4_0" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-text, directory, exceptions, filepath, fsnotify, hashable , hourglass, mtl, prettyprinter, safe-exceptions, stm @@ -66003,8 +66098,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.4.2.0"; - sha256 = "1xbfshfy6h7afpnlaafyq4mj3x0q4i83sxk6720k0dd0hhszb6b0"; + version = "0.4.4.0"; + sha256 = "1mp694llk3b04yqv8gr7i2rwcld99xmx1m55f5fhk1vgks816kih"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -66019,17 +66114,17 @@ self: { "core-telemetry" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-program, core-text, exceptions, http-streams, io-streams - , locators, mtl, random, safe-exceptions, scientific, stm - , template-haskell, text, unix, uuid + , mtl, network-info, random, safe-exceptions, scientific, stm + , template-haskell, text, unix }: mkDerivation { pname = "core-telemetry"; - version = "0.1.8.1"; - sha256 = "024npp0cm5f3v1h70iw03hv2lj0r2ylsp7w2pm1iv6zr8j63k1iy"; + version = "0.1.9.1"; + sha256 = "11b106gs96l20zb0lyr0qw49bnm8wxfc4wcncjaip6mdvgcc8cza"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-program - core-text exceptions http-streams io-streams locators mtl random - safe-exceptions scientific stm template-haskell text unix uuid + core-text exceptions http-streams io-streams mtl network-info + random safe-exceptions scientific stm template-haskell text unix ]; description = "Advanced telemetry"; license = lib.licenses.mit; @@ -75534,17 +75629,17 @@ self: { }) {}; "deriving-trans" = callPackage - ({ mkDerivation, base, lifted-base, monad-control, mtl - , transformers, transformers-base + ({ mkDerivation, base, monad-control, mtl, transformers + , transformers-base }: mkDerivation { pname = "deriving-trans"; - version = "0.1.0.0"; - sha256 = "1yphl0wjp67b7hc3ys6snlvzk67by070p5vfmwcv7ic688vh1dw4"; + version = "0.2.1.0"; + sha256 = "114npy6rb24gsblncsgzdr1mfhnh8r2pblazvjz5l444h5im0ln2"; libraryHaskellDepends = [ - base lifted-base monad-control mtl transformers transformers-base + base monad-control mtl transformers transformers-base ]; - description = "Derive transformer type classes with DerivingVia"; + description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; }) {}; @@ -76990,8 +77085,8 @@ self: { }: mkDerivation { pname = "diagrams-braille"; - version = "0.1.0.2"; - sha256 = "1jrhc8k0n9jabhg6rz22js9k3nj3v6r6klxskiksf6ajbqbzqg69"; + version = "0.1.1"; + sha256 = "1h9j1hrhpzl5rqhjnwp92sv0shc9i7yhnzpbs1dxfpyn8baws7mc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77048,10 +77143,8 @@ self: { }: mkDerivation { pname = "diagrams-cairo"; - version = "1.4.1.1"; - sha256 = "0vyd2yr55n7x71194i18lnbcshdjpnqw4qyq7vj5zx377rsz711k"; - revision = "3"; - editedCabalFile = "16jm9g9rfc7d1dy2kwq3n9wfgcj8l6c0d54lym1r6b0arc7yjqlb"; + version = "1.4.2"; + sha256 = "094vavgsfn7hxn2h7phvmx82wdhw51vqqv29p8hsvmijf1gxa7c1"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -78626,20 +78719,22 @@ self: { }) {}; "directory-contents" = callPackage - ({ mkDerivation, base, containers, directory, filepath, text - , transformers, witherable + ({ mkDerivation, base, containers, coquina, directory, filepath + , here, process, text, transformers, witherable }: mkDerivation { pname = "directory-contents"; - version = "0.2.0.0"; - sha256 = "15irmkg3ll6s3dqwl4hn7mmr5kygcl11slba3mzkdhlyg567is6x"; + version = "0.2.0.1"; + sha256 = "12c157lxqn910x7x3jwzv70fhb01bszxp0r00107igddrd6dqffv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory filepath text transformers witherable ]; executableHaskellDepends = [ base filepath text ]; - testHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base coquina directory filepath here process text + ]; description = "Recursively build, navigate, and operate on a tree of directory contents"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -84848,10 +84943,8 @@ self: { }: mkDerivation { pname = "eflint"; - version = "3.0.0.1"; - sha256 = "1cij1g1mrw41dn4c63bzkahya3li9v7pkzisj0v129p6ckypv7cc"; - revision = "1"; - editedCabalFile = "10bi07ilvvmglbgsc1xf2fq4vsndrqh9d6c823d897s4didcv8rk"; + version = "3.0.0.2"; + sha256 = "14rhc9kmsb9krf5h8a8041pirp8mnlfc6kxidmdz2d4r4pd8yd8k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91965,36 +92058,36 @@ self: { license = lib.licenses.bsd3; }) {}; - "fakedata_1_0_1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , directory, exceptions, fakedata-parser, filepath, gauge, hashable - , hspec, hspec-discover, QuickCheck, random, regex-tdfa + "fakedata_1_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , deepseq, directory, exceptions, fakedata-parser, filepath, gauge + , hashable, hspec, hspec-discover, QuickCheck, random, regex-tdfa , string-random, template-haskell, text, time, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "fakedata"; - version = "1.0.1"; - sha256 = "08z3qhj93smpd2ksix3i7wcxqkz5533pkx9xf4xjq60qm99scmw6"; + version = "1.0.2"; + sha256 = "1xbp0wif3dfk4880f8lr8zj07jdqhbxalqm7bfpw6r0cv354w3l8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - attoparsec base bytestring containers directory exceptions + aeson attoparsec base bytestring containers directory exceptions fakedata-parser filepath hashable random string-random template-haskell text time transformers unordered-containers vector yaml ]; testHaskellDepends = [ - attoparsec base bytestring containers directory exceptions + aeson attoparsec base bytestring containers directory exceptions fakedata-parser filepath hashable hspec QuickCheck random regex-tdfa string-random template-haskell text time transformers unordered-containers vector yaml ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - attoparsec base bytestring containers deepseq directory exceptions - fakedata-parser filepath gauge hashable random string-random - template-haskell text time transformers unordered-containers vector - yaml + aeson attoparsec base bytestring containers deepseq directory + exceptions fakedata-parser filepath gauge hashable random + string-random template-haskell text time transformers + unordered-containers vector yaml ]; description = "Library for producing fake data"; license = lib.licenses.bsd3; @@ -106815,6 +106908,8 @@ self: { pname = "ghc-typelits-extra"; version = "0.4.3"; sha256 = "06g40q0n2d10c2zksx5rrjkvm5ywi3rh41hbiwy4zs28x9idsv18"; + revision = "1"; + editedCabalFile = "0m6z24zmi169zifz1jg4zri0izr5z37qx33c9mphy74vd6ds3zzz"; libraryHaskellDepends = [ base containers ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp @@ -116073,10 +116168,8 @@ self: { }: mkDerivation { pname = "graph-trace-dot"; - version = "0.1.1.1"; - sha256 = "11hwxccy7yaz3mwixp1gjlpdfi9525ydqlbmpgyasg9ndg7dvl8i"; - revision = "1"; - editedCabalFile = "0caa9xcxwrqzqwsl76kmwv3fq9klsnm7wamrwjs8lrliyxcriwl6"; + version = "0.1.1.2"; + sha256 = "0wq6addzcigp21f5caljszzwcr8rhws49s93yr156c35nlcw98jl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123133,8 +123226,8 @@ self: { }: mkDerivation { pname = "has-transformers"; - version = "0.1.0.3"; - sha256 = "0mrz11hxm7nyxyirfz8f63w1mxf3snprrxvh2vvhmmi8p3wlay6n"; + version = "0.1.0.4"; + sha256 = "1wm8dwgcg1m2104lzgk3vdvng5mvh4xcn736nyarb9q6p99i0bq3"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec operational ]; testToolDepends = [ hspec-discover ]; @@ -130667,8 +130760,8 @@ self: { pname = "hedgehog"; version = "1.0.5"; sha256 = "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6"; - revision = "1"; - editedCabalFile = "0vqjjjvnbb601f6lwm90x80wb6rxhnvi4p8g04g15bfs3kxqw44z"; + revision = "2"; + editedCabalFile = "1p6vixwflgz2y1fc94kqxiv8s5jvq63xhp56cqwpw2s7d7g5chx1"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph monad-control @@ -130683,6 +130776,35 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "hedgehog_1_1" = callPackage + ({ mkDerivation, ansi-terminal, async, barbies, base, bytestring + , concurrent-output, containers, deepseq, directory, erf + , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show + , primitive, random, resourcet, stm, template-haskell, text, time + , transformers, transformers-base, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.1"; + sha256 = "1g05jw568lv02ikqhp2wyx52218b6rm7rxyh93cwrmbmgd2sxhsc"; + revision = "1"; + editedCabalFile = "19r528rsfzyfaz3xcwbi2zmf6sgzls2x61z24j3wfiicch30qk69"; + libraryHaskellDepends = [ + ansi-terminal async barbies base bytestring concurrent-output + containers deepseq directory erf exceptions lifted-async mmorph + monad-control mtl pretty-show primitive random resourcet stm + template-haskell text time transformers transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show text transformers + ]; + description = "Release with confidence"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -130859,8 +130981,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1.1"; sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; - revision = "1"; - editedCabalFile = "0ddmwz3ngamij2k4paf7508dnzqn4qjpgwypbpr8d6s2y95jbvfh"; + revision = "2"; + editedCabalFile = "1n7icqychb94j7s8msmih3h573vf17pn1sq79nkqric3wwf74rdp"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = lib.licenses.bsd3; @@ -148522,6 +148644,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_3_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filepath, gauge, Glob, heaps, hspec + , hspec-discover, http-types, mwc-random, network + , network-byte-order, network-run, psqueues, stm, text + , time-manager, typed-process, unix-time, unordered-containers + , vector + }: + mkDerivation { + pname = "http2"; + version = "3.0.3"; + sha256 = "1kv99i3pnnx31xndlkaczrpd2j5mvzbqlfz1kaw6cwlwkdnl5bhv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager unix-time + ]; + testHaskellDepends = [ + aeson aeson-pretty async base base16-bytestring bytestring + cryptonite directory filepath Glob hspec http-types network + network-byte-order network-run text typed-process + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -154718,8 +154875,7 @@ self: { description = "Convenient imperative eDSL over Lorentz"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; - }) {cleveland = null;}; + }) {}; "inf-interval" = callPackage ({ mkDerivation, array, base, deepseq, QuickCheck, text, vector }: @@ -157253,6 +157409,8 @@ self: { pname = "ipynb"; version = "0.2"; sha256 = "1iwia4sxg40m4d290gys72wabqmkqx24ywsaranwzk2wx5s3sx4s"; + revision = "1"; + editedCabalFile = "0fl9x5amq0g5dg57dcgc0g4ir0r1fdbx06aldsqdwzdc9zs97v6k"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers text unordered-containers @@ -158790,26 +158948,30 @@ self: { }) {}; "jacinda" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, happy - , microlens, microlens-mtl, mtl, optparse-applicative - , prettyprinter, recursion, regex-rure, tasty, tasty-hunit, text + ({ mkDerivation, alex, array, base, bytestring, containers + , criterion, deepseq, directory, filepath, happy, microlens + , microlens-mtl, mtl, optparse-applicative, prettyprinter + , recursion, regex-rure, split, tasty, tasty-hunit, text , transformers, vector }: mkDerivation { pname = "jacinda"; - version = "0.2.1.0"; - sha256 = "0p7ng81dfilj277lq6sy6xb89jd8a0kr20wcndsqjg7pgp4rxpy2"; + version = "0.3.0.0"; + sha256 = "16m9gqswwqm66w1wynrivis51vhr6xh40gv12z6nf5w2dry8kljx"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring containers microlens microlens-mtl mtl - prettyprinter recursion regex-rure text transformers vector + array base bytestring containers directory filepath microlens + microlens-mtl mtl prettyprinter recursion regex-rure split text + transformers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring optparse-applicative ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; doHaddock = false; description = "Functional, expression-oriented data processing language"; license = lib.licenses.agpl3Only; @@ -164365,8 +164527,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.6.1"; - sha256 = "1l2w0dcy4fcv865z27661j7jmfy3blf8q321mv18dn44f3wr0xax"; + version = "0.7"; + sha256 = "1gyg76fajs7qc7mr86i0hiz5m4a0y2lqmqk67cb0glgbg53z47b7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164641,20 +164803,15 @@ self: { }) {egl = null; inherit (pkgs) glew;}; "ktx-codec" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, shower, text, vector + ({ mkDerivation, base, binary, bytestring, containers, text, vector }: mkDerivation { pname = "ktx-codec"; - version = "0.0.1.3"; - sha256 = "0mm6lf8fm8zmi33s4zg8c3ar42aghdqmb3g7hv6qpcm1vc5krld4"; + version = "0.0.1.4"; + sha256 = "1n9vh7la5c359nczlla7jpf6qwbs6dx7n3fd9bnb4s2i6fpb5k0a"; libraryHaskellDepends = [ base binary bytestring containers text vector ]; - testHaskellDepends = [ - base binary bytestring containers directory filepath shower text - vector - ]; description = "Khronos texture format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -175898,8 +176055,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.13.1"; - sha256 = "1cg2y15nz193s1mwm0c6x1z8nmdwv9n8qljl1a2irh3z3nb33sd2"; + version = "0.13.2"; + sha256 = "1kb611xj1rl8jbx3bibcqdklv8kls3xkis77vix2vdf6y6fhjhfr"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers cryptonite data-default first-class-families fmt lens morley @@ -178873,8 +179030,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.5.0"; - sha256 = "1zq7kfs513zh7v5y4hafh5d6ly4jhmxsl3rfjavh2faw4i19fy3n"; + version = "0.5.6.0"; + sha256 = "1p58c83dqbpsl0a41s6xnnwbygk04gmsg51gfqprjkvzbgl2h7zq"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types microlens-th @@ -182064,6 +182221,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "memory-hexstring" = callPackage + ({ mkDerivation, aeson, base, bytestring, memory, scale + , template-haskell, text + }: + mkDerivation { + pname = "memory-hexstring"; + version = "1.0.0.0"; + sha256 = "1sm7jj75mv8p7f33h619zm10xbzyjg1jds87cg36mrj8hfb32q48"; + libraryHaskellDepends = [ + aeson base bytestring memory scale template-haskell text + ]; + description = "Hex-string type for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -188311,8 +188483,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.16.1"; - sha256 = "0kb4v5fwlxy80swqvjbrdc2qafiqrzw5zhihfjz4hc3vp5pcfizs"; + version = "1.16.2"; + sha256 = "1b236yp37pahx3njn0cwdbnkr7yj62ckhfsicgm2crb4l6sjkyas"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188336,6 +188508,50 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "morley-client" = callPackage + ({ mkDerivation, aeson, aeson-casing, base-noprelude, binary + , bytestring, co-log, co-log-core, colourista, constraints + , containers, data-default, exceptions, fmt, hex-text + , hspec-expectations, http-client, http-client-tls, http-types + , HUnit, lens, lorentz, megaparsec, memory, morley, morley-prelude + , mtl, named, optparse-applicative, process, random + , safe-exceptions, scientific, servant, servant-client + , servant-client-core, singletons, syb, tasty, tasty-ant-xml + , tasty-discover, tasty-hunit-compat, template-haskell, text + , th-reify-many, time, universum, unliftio, vector + }: + mkDerivation { + pname = "morley-client"; + version = "0.1.0"; + sha256 = "1xhmksv745dvf8axbihbdn9r9402na381czckab844whkdmnag0y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base-noprelude binary bytestring co-log + co-log-core colourista constraints containers data-default fmt + hex-text http-client http-client-tls http-types lens lorentz + megaparsec memory morley morley-prelude mtl named + optparse-applicative process random safe-exceptions scientific + servant servant-client servant-client-core singletons syb + template-haskell text th-reify-many time universum unliftio vector + ]; + executableHaskellDepends = [ + aeson base-noprelude data-default fmt morley morley-prelude + optparse-applicative safe-exceptions + ]; + testHaskellDepends = [ + aeson base-noprelude bytestring co-log co-log-core containers + exceptions fmt hex-text hspec-expectations http-types HUnit lens + lorentz memory morley morley-prelude safe-exceptions + servant-client-core singletons syb tasty tasty-ant-xml + tasty-hunit-compat template-haskell time + ]; + testToolDepends = [ tasty-discover ]; + description = "Client to interact with the Tezos blockchain"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morley-prelude" = callPackage ({ mkDerivation, base-noprelude, int-cast, lens, universum }: mkDerivation { @@ -188377,8 +188593,7 @@ self: { description = "Upgradeability infrastructure based on Morley"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; - }) {cleveland = null; morley-client = null;}; + }) {}; "morloc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory @@ -191152,6 +191367,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "multistate_0_8_0_4" = callPackage + ({ mkDerivation, base, hspec, monad-control, mtl, tagged + , transformers, transformers-base + }: + mkDerivation { + pname = "multistate"; + version = "0.8.0.4"; + sha256 = "0y42c21ha0chqhrn40a4bikdbirsw7aqg4i866frpagz1ivr915q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base monad-control mtl tagged transformers transformers-base + ]; + testHaskellDepends = [ base hspec transformers ]; + description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "multivariant" = callPackage ({ mkDerivation, base, containers, free, HUnit, invertible , MonadRandom, profunctors, QuickCheck, semigroupoids, tasty @@ -210014,6 +210248,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-lens" = callPackage + ({ mkDerivation, base, lens, persistent }: + mkDerivation { + pname = "persistent-lens"; + version = "1.0.0"; + sha256 = "1pmk79m3p71sbcnzz27ji7305v4s8pbqghphl6nmkviswdy430xl"; + libraryHaskellDepends = [ base lens persistent ]; + description = "lens helpers for persistent"; + license = lib.licenses.mit; + }) {}; + "persistent-map" = callPackage ({ mkDerivation, base, binary, containers, directory, EdisonAPI , EdisonCore, filepath, LRU, mtl, stm-io-hooks @@ -210162,6 +210407,33 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-mysql_2_13_0_3" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, http-api-data, HUnit + , monad-logger, mysql, mysql-simple, path-pieces, persistent + , persistent-qq, persistent-test, QuickCheck, quickcheck-instances + , resource-pool, resourcet, text, time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.13.0.3"; + sha256 = "0z4dpysridkssq3gmnh65mxa2acs1r7mhcbnsfgqk5gzqyzhfxr3"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec http-api-data + HUnit monad-logger mysql path-pieces persistent persistent-qq + persistent-test QuickCheck quickcheck-instances resourcet text time + transformers unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , fast-logger, hspec, HUnit, io-streams, monad-logger @@ -210284,6 +210556,40 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-postgresql_2_13_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.13.3.0"; + sha256 = "08br76dk1ilci5428z351n4ykvgazhbf9r8ny6kx95x5p7nifx0i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector + ]; + description = "Backend for the persistent library using postgresql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-postgresql-streaming" = callPackage ({ mkDerivation, base, conduit, monad-logger, mtl, persistent , persistent-postgresql, postgresql-simple, resourcet, text @@ -223039,6 +223345,77 @@ self: { license = lib.licenses.bsd3; }) {}; + "ptera" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , enummapset-th, hspec, hspec-discover, membership, ptera-core + , QuickCheck, unordered-containers + }: + mkDerivation { + pname = "ptera"; + version = "0.1.0.0"; + sha256 = "1bcbv740rvhibmkvyp097nm1f07ira8i9anq4m3vd6gp96mbin48"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers enummapset-th membership ptera-core + unordered-containers + ]; + testHaskellDepends = [ + base containers doctest enummapset-th hspec membership ptera-core + QuickCheck unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A parser generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "ptera-core" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, containers + , doctest, enummapset-th, hashable, hspec, hspec-discover + , membership, QuickCheck, transformers, unordered-containers + }: + mkDerivation { + pname = "ptera-core"; + version = "0.1.0.0"; + sha256 = "1bpgnd68c070i1azig6r0ck843hvxjcg17yhmy3nizm1bx4nppk1"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers enummapset-th hashable membership + transformers unordered-containers + ]; + testHaskellDepends = [ + array base containers doctest enummapset-th hashable hspec + membership QuickCheck transformers unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A parser generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "ptera-th" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, containers + , doctest, enummapset-th, ghc-prim, hspec, hspec-discover + , membership, ptera, ptera-core, QuickCheck, template-haskell + , unordered-containers + }: + mkDerivation { + pname = "ptera-th"; + version = "0.1.0.0"; + sha256 = "1sbgyq5gf9fyam0gazjr1gc49fv8s9rsd8rkb9pbpfi258yzj7pr"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers enummapset-th ghc-prim membership ptera + ptera-core template-haskell unordered-containers + ]; + testHaskellDepends = [ + array base containers doctest enummapset-th ghc-prim hspec + membership ptera ptera-core QuickCheck template-haskell + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A parser generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + "pthread" = callPackage ({ mkDerivation, base, generic-deriving, hspec, hspec-discover }: mkDerivation { @@ -231780,8 +232157,8 @@ self: { }: mkDerivation { pname = "regex-rure"; - version = "0.1.1.0"; - sha256 = "1ap1cpm82dv9q9w8y6cf0rp9f5zvspnql9zr35fknaxaskr86zgj"; + version = "0.1.2.0"; + sha256 = "1my3rmj2766bd00qg25wijgvw7ffk8fq965y2b97s5v00fjds33r"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ rure ]; libraryToolDepends = [ c2hs ]; @@ -233828,8 +234205,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.2.2.1"; - sha256 = "0xc8ffz46m3hn7v9vjslh5z7yzqcbyijqfk8wl629539nishgsl9"; + version = "0.2.2.2"; + sha256 = "12p2mb215n7f0smczr5cfxkd89blchyyp5dsl6yzfij1ykf0yr9x"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -234893,15 +235270,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "retry_0_9_0_0" = callPackage + "retry_0_9_1_0" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers }: mkDerivation { pname = "retry"; - version = "0.9.0.0"; - sha256 = "0n304r6vyx238558z62kz7nii8y58h2z4iyx54gbkxmz9dsck4ff"; + version = "0.9.1.0"; + sha256 = "1scrkd6bd061h8s4d7sjs21m2ydz2mxiw95gs72rliikh2k3cj7v"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -240335,6 +240712,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "scale" = callPackage + ({ mkDerivation, base, bitvec, bytestring, cereal, data-default + , generics-sop, hspec, hspec-contrib, hspec-discover + , hspec-expectations, memory, template-haskell, text, vector + }: + mkDerivation { + pname = "scale"; + version = "1.0.0.0"; + sha256 = "1c1khgy83402lqfqdvq5amf9pgn5a6m4m5zmqkkw6iw0wbjw7p3a"; + libraryHaskellDepends = [ + base bitvec bytestring cereal data-default generics-sop memory + template-haskell text vector + ]; + testHaskellDepends = [ + base bitvec bytestring cereal data-default generics-sop hspec + hspec-contrib hspec-discover hspec-expectations memory + template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "SCALE v2.0 codec for Haskell Web3 library."; + license = lib.licenses.asl20; + }) {}; + "scaleimage" = callPackage ({ mkDerivation, base, filepath, gd }: mkDerivation { @@ -256813,8 +257213,8 @@ self: { pname = "special-values"; version = "0.1.0.0"; sha256 = "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w"; - revision = "1"; - editedCabalFile = "10pbx4px4kmg6nwb78bayi26dlzbzvji5zv9fa6f45rk19p2sdlc"; + revision = "2"; + editedCabalFile = "1vv5gydjd65jniifl3mnch8bzvpvdahi913gsa3kv5zijwhad699"; libraryHaskellDepends = [ base bytestring ieee754 scientific text ]; @@ -262407,8 +262807,8 @@ self: { }: mkDerivation { pname = "streamly-examples"; - version = "0.1.0"; - sha256 = "0ny22z33wwkg9bbziwcj77k6gb8lwj1v0y5z6mw8sw20k4ca93q3"; + version = "0.1.1"; + sha256 = "174283sarx0ccjzzxill9l06hi7g9jz76sxwlb4fyc03db5q027i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -262457,14 +262857,14 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) lmdb;}; - "streamly-lmdb_0_3_0" = callPackage + "streamly-lmdb_0_4_0" = callPackage ({ mkDerivation, async, base, bytestring, directory, lmdb , QuickCheck, streamly, tasty, tasty-quickcheck, temporary }: mkDerivation { pname = "streamly-lmdb"; - version = "0.3.0"; - sha256 = "1da87rbmh9sgffjy5367pzy1d80f7zlxhszi9sq87jfws4i20pk7"; + version = "0.4.0"; + sha256 = "10749fl4dgm89z1d6sas1ngwxkkfl385465yxnrhxcc63wz53p5d"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -269338,8 +269738,8 @@ self: { pname = "tasty-hedgehog"; version = "1.1.0.0"; sha256 = "0cy49z8n124xh2ra2482vfy5if1n6d9lbdjma2zg1mxfj0k0zyfb"; - revision = "1"; - editedCabalFile = "0zn29qgsb5v4y7s4lrrhav9wqaz6pm97rcj1gl88qvvvi000jjbx"; + revision = "2"; + editedCabalFile = "08in0mli87szyx9lz2lcz3m1q0d3sxzzk5srzkkx4d10fgr6g6xv"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -286119,6 +286519,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_20_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.20.1"; + sha256 = "13fv7wfq7g1pilpk1vprbf2mbdj7qfm2y9v8glwr6dqyswv8z9dn"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -294499,43 +294925,183 @@ self: { }) {}; "web3" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, base58string - , basement, bitvec, bytestring, cereal, cryptonite, data-default - , errors, exceptions, generics-sop, hspec, hspec-contrib - , hspec-discover, hspec-expectations, http-client, http-client-tls - , http-media, http-types, machines, memory, microlens - , microlens-aeson, microlens-mtl, microlens-th, mtl, network - , OneTuple, parsec, random, relapse, servant, servant-client, split - , stm, tagged, tar, template-haskell, text, time, transformers - , unordered-containers, uuid-types, vector, vinyl, websockets + ({ mkDerivation, base, web3-ethereum, web3-polkadot, web3-provider }: mkDerivation { pname = "web3"; - version = "0.9.1.0"; - sha256 = "12nx9hgwx61yj44iym7na9jxf05jry3aa82j2s8l5rpw3qdv7dis"; + version = "1.0.0.0"; + sha256 = "0bnamwvdxl3i1p8bflnhaxxpn0bqcnf174gwplqjkxdc9pzfhiig"; libraryHaskellDepends = [ - aeson async attoparsec base base58string basement bitvec bytestring - cereal cryptonite data-default errors exceptions generics-sop hspec - http-client http-client-tls http-media http-types machines memory - microlens microlens-aeson microlens-mtl microlens-th mtl network - OneTuple parsec relapse servant servant-client tagged tar - template-haskell text transformers unordered-containers uuid-types - vector vinyl websockets + base web3-ethereum web3-polkadot web3-provider + ]; + description = "Haskell Web3 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "web3-bignum" = callPackage + ({ mkDerivation, base, cereal, hspec, hspec-contrib, hspec-discover + , hspec-expectations, memory, memory-hexstring, scale, wide-word + }: + mkDerivation { + pname = "web3-bignum"; + version = "1.0.0.0"; + sha256 = "140qv8y6b63by81z0k5by8vqr7x0gc106a67r35qbhdfmbhv71n0"; + libraryHaskellDepends = [ + base cereal memory memory-hexstring scale wide-word ]; testHaskellDepends = [ - aeson async attoparsec base base58string basement bitvec bytestring - cereal cryptonite data-default errors exceptions generics-sop hspec - hspec-contrib hspec-discover hspec-expectations http-client - http-client-tls http-media http-types machines memory microlens - microlens-aeson microlens-mtl microlens-th mtl network OneTuple - parsec random relapse servant servant-client split stm tagged tar - template-haskell text time transformers unordered-containers - uuid-types vector vinyl websockets + base cereal hspec hspec-contrib hspec-discover hspec-expectations + memory memory-hexstring scale wide-word ]; testToolDepends = [ hspec-discover ]; - description = "Web3 API for Haskell"; - license = lib.licenses.bsd3; + description = "Fixed size big integers for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-crypto" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + , hspec, hspec-contrib, hspec-discover, hspec-expectations, memory + , memory-hexstring, text, uuid-types, vector + }: + mkDerivation { + pname = "web3-crypto"; + version = "1.0.0.0"; + sha256 = "16ygvnkxcalh7a0h7l1bj5gyir79gihcwzzqk31qibvd1r17mwd6"; + libraryHaskellDepends = [ + aeson base bytestring containers cryptonite memory memory-hexstring + text uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers cryptonite hspec hspec-contrib + hspec-discover hspec-expectations memory memory-hexstring text + uuid-types vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Cryptograhical primitives for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-ethereum" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, exceptions + , generics-sop, hspec, hspec-contrib, hspec-discover + , hspec-expectations, jsonrpc-tinyclient, machines, memory + , memory-hexstring, microlens, microlens-aeson, mtl, OneTuple + , relapse, tagged, template-haskell, text, transformers, vinyl + , web3-crypto, web3-solidity + }: + mkDerivation { + pname = "web3-ethereum"; + version = "1.0.0.0"; + sha256 = "1vsvxhl6w6hjiv6b61sn8f2bnj6p55b4qyvblrfpk60k7pqq774c"; + libraryHaskellDepends = [ + aeson base bytestring data-default exceptions generics-sop + jsonrpc-tinyclient machines memory memory-hexstring microlens + microlens-aeson mtl OneTuple relapse tagged template-haskell text + transformers vinyl web3-crypto web3-solidity + ]; + testHaskellDepends = [ + aeson base bytestring data-default exceptions generics-sop hspec + hspec-contrib hspec-discover hspec-expectations jsonrpc-tinyclient + machines memory memory-hexstring microlens microlens-aeson mtl + OneTuple relapse tagged template-haskell text transformers vinyl + web3-crypto web3-solidity + ]; + testToolDepends = [ hspec-discover ]; + description = "Ethereum support for Haskell Web3 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "web3-ipfs" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client, http-media + , http-types, mtl, servant, servant-client, tar, text + , unordered-containers + }: + mkDerivation { + pname = "web3-ipfs"; + version = "1.0.0.0"; + sha256 = "0m6rqk5vd53gl7mykwzzqblhgdqrjzjyqb5mqkagb1z0llwqxafg"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-media http-types mtl servant + servant-client tar text unordered-containers + ]; + description = "IPFS support for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-polkadot" = callPackage + ({ mkDerivation, aeson, animalcase, base, base58-bytestring + , bytestring, containers, cryptonite, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations + , hspec-expectations-json, jsonrpc-tinyclient, memory + , memory-hexstring, microlens, microlens-mtl, microlens-th, mtl + , parsec, scale, text, web3-bignum, web3-crypto + }: + mkDerivation { + pname = "web3-polkadot"; + version = "1.0.0.0"; + sha256 = "0sx9lj7px6m5ag4bk4imllh4bmy7kfgkfy1zb9hqjkdmjwn2i2w5"; + libraryHaskellDepends = [ + aeson animalcase base base58-bytestring bytestring containers + cryptonite generics-sop jsonrpc-tinyclient memory memory-hexstring + microlens microlens-mtl microlens-th mtl parsec scale text + web3-bignum web3-crypto + ]; + testHaskellDepends = [ + aeson animalcase base base58-bytestring bytestring containers + cryptonite generics-sop hspec hspec-contrib hspec-discover + hspec-expectations hspec-expectations-json jsonrpc-tinyclient + memory memory-hexstring microlens microlens-mtl microlens-th mtl + parsec scale text web3-bignum web3-crypto + ]; + testToolDepends = [ hspec-discover ]; + description = "Polkadot support for Haskell Web3 library"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "web3-provider" = callPackage + ({ mkDerivation, async, base, data-default, exceptions, http-client + , jsonrpc-tinyclient, mtl, network, text, transformers, websockets + }: + mkDerivation { + pname = "web3-provider"; + version = "1.0.0.0"; + sha256 = "03c892xj7yxwbb4r1vpqzwgsf4fyk9389rqivpr6bwklnx9230ic"; + libraryHaskellDepends = [ + async base data-default exceptions http-client jsonrpc-tinyclient + mtl network text transformers websockets + ]; + description = "Node connection provider for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-solidity" = callPackage + ({ mkDerivation, aeson, base, basement, bytestring, cereal + , data-default, generics-sop, hspec, hspec-contrib, hspec-discover + , hspec-expectations, memory, memory-hexstring, microlens, OneTuple + , parsec, tagged, template-haskell, text, web3-crypto + }: + mkDerivation { + pname = "web3-solidity"; + version = "1.0.0.0"; + sha256 = "1n5jf9vdxps8sxcaa3k2a4m3qn5w3kphvvn7f4jy0dh0zkr7i5nm"; + libraryHaskellDepends = [ + aeson base basement bytestring cereal data-default generics-sop + memory memory-hexstring microlens OneTuple parsec tagged + template-haskell text web3-crypto + ]; + testHaskellDepends = [ + aeson base basement bytestring cereal data-default generics-sop + hspec hspec-contrib hspec-discover hspec-expectations memory + memory-hexstring microlens OneTuple parsec tagged template-haskell + text web3-crypto + ]; + testToolDepends = [ hspec-discover ]; + description = "Solidity language for Haskell Web3 library"; + license = lib.licenses.asl20; }) {}; "webapi" = callPackage diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index bf53e71a221..425060e240d 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "lunatic"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RX8JarGpY6dhPGpvOX1FuUjirEPff0wGqLkGFxOa+bc="; + sha256 = "sha256-HqDrGoyYzdx8OTanlRd95L1wAtFeew7Xs2rZ7nK2Zus="; }; - cargoSha256 = "sha256-UvrDqxaZSgUJ/a6abigTuiUOfw+C7UolBApt5kVR+yo="; + cargoSha256 = "sha256-t3EwVYrKx7dvUcSp0B1iUAklg7WdQDld/T0O1HgHw54="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index d151c6765bf..def2d7cb0c8 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.13.4"; + version = "0.13.6"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-zTgXMICuLn612bmL5e6GP5aBQ4uOcSLfce0PCRYGob0="; + sha256 = "sha256-Bios3h2bcR6PntFt6JWF7l5u6gjKaljS8HsKfTf+0X8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 6c6268011a7..d6dc01348a1 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trealla"; - version = "1.12.0"; + version = "1.20.31"; src = fetchFromGitHub { owner = "infradig"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-5gMf62WSGf46Bg8CaI9weSMRjrdGiuxtaDV9FrS2xO8="; + sha256 = "sha256-Yol+bbxC5cCtCIZxP5Sa8R3ev1LAopc/oQa6Zd1nS8A="; }; postPatch = '' diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 6022245cac7..816b854b99e 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, python2, cmake, llvmPackages, clang, stdenv, darwin }: +{ rustPlatform, fetchFromGitHub, lib, python3, cmake, llvmPackages, clang, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w"; - nativeBuildInputs = [ python2 cmake clang ]; + nativeBuildInputs = [ python3 cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index ca2f3b0e381..134d9031e97 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -6,13 +6,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "fflas-ffpack"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "linbox-team"; repo = pname; - rev = version; - sha256 = "1ynbjd72qrwp0b4kpn0p5d7gddpvj8dlb5fwdxajr5pvkvi3if74"; + rev = "v${version}"; + sha256 = "sha256-Eztc2jUyKRVUiZkYEh+IFHkDuPIy+Gx3ZW/MsuOVaMc="; }; checkInputs = [ diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 3a82b566a50..7d4ff382d8c 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch +, pkg-config , gettext , autoreconfHook , gmp @@ -9,16 +9,17 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.3.2"; + version = "5.4.1"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "00iyz218ywspizjiimrjdcqvdqmrsb2367zyy3vkmypnf9i9l680"; + sha256 = "sha256-6Zde8/bPOQQ16DqhqrQuGXDrf5HQEn5lwxauvyBr4XQ="; }; nativeBuildInputs = [ + pkg-config gettext autoreconfHook ]; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 29674118dfe..83f7854a73b 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { pname = "givaro"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "linbox-team"; repo = pname; rev = "v${version}"; - sha256 = "11wz57q6ijsvfs5r82masxgr319as92syi78lnl9lgdblpc6xigk"; + sha256 = "sha256-KR0WJc0CSvaBnPRott4hQJhWNBb/Wi6MIhcTExtVobQ="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 074dc2be01c..73b5d0d140a 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -1,17 +1,17 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.4"; pname = "commons-fileupload"; src = fetchurl { url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72"; + sha256 = "1avfv4gljp7flra767yzas54vfb6az9s1nhxfjv48jj2x0llxxkx"; }; installPhase = '' tar xf ${src} mkdir -p $out/share/java - cp lib/*.jar $out/share/java/ + cp commons-fileupload-*-bin/*.jar $out/share/java/ ''; meta = { diff --git a/pkgs/development/libraries/judy/cross.patch b/pkgs/development/libraries/judy/cross.patch new file mode 100644 index 00000000000..a4e53c08a6d --- /dev/null +++ b/pkgs/development/libraries/judy/cross.patch @@ -0,0 +1,22 @@ +--- a/src/Judy1/Makefile.am ++++ b/src/Judy1/Makefile.am +@@ -18,7 +18,7 @@ + libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE + + Judy1Tables.c: Judy1TablesGen.c +- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen ++ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen + + Judy1ByCount.c:../JudyCommon/JudyByCount.c + cp -f ../JudyCommon/JudyByCount.c Judy1ByCount.c +--- a/src/JudyL/Makefile.am ++++ b/src/JudyL/Makefile.am +@@ -18,7 +18,7 @@ + libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE + + JudyLTables.c: JudyLTablesGen.c +- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen ++ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen + + JudyLByCount.c: ../JudyCommon/JudyByCount.c + cp -f ../JudyCommon/JudyByCount.c JudyLByCount.c diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index bec72ac8020..da8e89f9356 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl, pkgsBuildBuild, autoreconfHook }: stdenv.mkDerivation rec { pname = "judy"; @@ -9,11 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; - # gcc 4.8 optimisations break judy. - # https://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = lib.optionalString stdenv.cc.isGNU '' - configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") - ''; + nativeBuildInputs = [ autoreconfHook ]; + depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; + patches = [ ./cross.patch ]; # Disable parallel builds as manpages lack some dependencies: # ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 24bec8ec350..874c567ed42 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.6"; + version = "1.12.7"; src = fetchFromGitHub { - sha256 = "sha256-k5Lt/NCSlBaTGhpR4T3Q4Ih+RR1xKROxz+RNYor7zaQ="; + sha256 = "sha256-a79/seKO6Efn6g4RWdqsP83pL5AIBAp1InjnMdOs3Qk="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 8e9a34716f2..2a1ea4f606d 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.15"; + version = "4.3.16"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-S2/ecWC78Q4ihVLtDQ6DD8/qX1cDslnTjqd5IkKCjc4="; + sha256 = "sha256-aBLNdw9LhHFwnIt70vIYlX1/j2IUTmpm5Ub+ZImF8FI="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 5a5d8b93057..a2cb4d2bd24 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Makefile is missing depepdencies on generated headers: + # main.c:4:10: fatal error: signal1.h: No such file or directory + enableParallelBuilding = false; + meta = { description = "F2c converts Fortran 77 source code to C"; homepage = "http://www.netlib.org/f2c/"; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index 52a88e2194d..470b9137f6e 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix @@ -46,5 +46,6 @@ in stdenv.mkDerivation { license = licenses.bsd3; maintainers = [ ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libtorrent-rasterbar-1_1_x.x86_64-darwin }; } diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 821edd33369..0f650e7474f 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -14,13 +14,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "linbox"; - version = "1.6.3"; # TODO: Check postPatch script on update + version = "1.7.0"; src = fetchFromGitHub { owner = "linbox-team"; repo = pname; rev = "v${version}"; - sha256 = "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571"; + sha256 = "sha256-mW84a98KPLqcHMjX3LIYTmVe0ngUdz6RJLpoDaAqKU8="; }; nativeBuildInputs = [ @@ -35,20 +35,6 @@ stdenv.mkDerivation rec { fflas-ffpack ]; - patches = [ - # Remove inappropriate `const &` qualifiers on data members that can be - # modified via member functions. - # See also: https://github.com/linbox-team/linbox/pull/256 - ./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update - ]; - - postPatch = '' - # Remove @LINBOXSAGE_LIBS@ that is actually undefined. - # See also: https://github.com/linbox-team/linbox/pull/249 - # TODO: Remove on 1.7.0 update - find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \; - ''; - configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" diff --git a/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch b/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch deleted file mode 100644 index ec8571a7d71..00000000000 --- a/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/linbox/algorithms/det-rational.h -+++ b/linbox/algorithms/det-rational.h -@@ -79,8 +79,8 @@ - struct MyRationalModularDet { - const Blackbox &A; - const MyMethod &M; -- const Integer &mul;//multiplicative prec; -- const Integer ÷ -+ Integer mul;//multiplicative prec; -+ Integer div; - - MyRationalModularDet(const Blackbox& b, const MyMethod& n, - const Integer & p1, const Integer & p2) : diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 033b9d8c619..a10434d90b4 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python2 }: +{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python3 }: stdenv.mkDerivation rec { pname = "ntrack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - nativeBuildInputs = [ pkg-config python2 ]; + nativeBuildInputs = [ pkg-config python3 ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix index 627d5bbe297..3e989561470 100644 --- a/pkgs/development/libraries/openbabel/2.nix +++ b/pkgs/development/libraries/openbabel/2.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python2, cairo, pcre, pkg-config }: +{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python3, cairo, pcre, pkg-config }: stdenv.mkDerivation rec { pname = "openbabel"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib libxml2 eigen python2 cairo pcre ]; + buildInputs = [ zlib libxml2 eigen python3 cairo pcre ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index 7d423ac0347..e364b907794 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-cKrG8f8cabuGDN1gmBYleXcBqeJksdREiEy63UK/6J0="; }; - vendorSha256 = "sha256-3kRGLZgYcbUQb6S+NrleMNNX0dXrE9Yer3vvqxiP4So="; + vendorSha256 = "sha256-2XbBiiiPvZCnlKUzGDLFnxA34N/LmHoPbvRKZckmhx4="; doCheck = false; diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 2ac1ba9536f..60f5e51ae95 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-Ik62kbOetA2vSMpnwrSiNRNJqOgmqlCB2+KNhpBo9TA="; + sha256 = "sha256-U3Q0WUEDRn0zfBIdHXFp5Zcaf+M6HrSFnpeu5aAkjks="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 3f0cf45062f..b1896917658 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -1,94 +1,38 @@ { lib, stdenv -, fetchurl -, fetchpatch +, autoreconfHook +, gengetopt +, pkg-config +, fetchFromGitLab , pari }: stdenv.mkDerivation rec { - version = "1.23"; + version = "2.0.5"; pname = "lcalc"; - src = fetchurl { - # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available - # "newer" version at google code https://code.google.com/archive/p/l-calc/source/default/source - url = "mirror://sageupstream/lcalc/lcalc-${version}.tar.bz2"; - sha256 = "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43"; + src = fetchFromGitLab { + owner = "sagemath"; + repo = pname; + rev = version; + sha256 = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc="; }; - preConfigure = "cd src"; + nativeBuildInputs = [ + autoreconfHook + gengetopt + pkg-config + ]; buildInputs = [ pari ]; - patches = [ - # Port to newer pari - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/pari-2.7.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1x3aslldm8njjm7p9g9s9w2c91kphnci2vpkxkrcxfihw3ayss6c"; - }) - - # Uncomment the definition of lcalc_to_double(const long double& x). - # (Necessary for GCC >= 4.6.0, cf. https://trac.sagemath.org/ticket/10892) - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/Lcommon.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0g4ybvsrcv48rmlh1xjnkms19jp25k58azv6ds1f2cm34hxs8fdx"; - }) - - # Include also <time.h> in Lcommandline_numbertheory.h (at least required - # on Cygwin, cf. https://trac.sagemath.org/ticket/9845) - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/time.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1brf04n11kkc43ylagf8dm32j5r2g9zv51dp5wag1mpm4p04l7cl"; - }) - - # Fix for gcc >4.6 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_1.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0i2yvxm5fx4z0v6m4srgh8rj98kijmlvyirlxf1ky0bp2si6bpka"; - }) - - # gcc 5.1 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_2.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vlh"; - }) - - # based on gentoos makefile patch -- fix paths, adhere to flags - ./makefile.patch - - # (fetchpatch { - # name = "default-double.patch"; - # url = "https://github.com/dimpase/lcalc/pull/1/commits/0500c67b6aa1f492715591669f6647c8f7a3ea59.patch"; - # sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vla"; - # }) - - (fetchpatch { - name = "c++11.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/3607b97df5a8c231191115b0cb5c62426b339e71/trunk/lcalc-c++11.patch"; - sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; - }) - ] ++ lib.optional stdenv.isDarwin - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch"; - sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18"; - }); - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/Makefile --replace g++ c++ - ''; - - installFlags = [ - "DESTDIR=$(out)" - ]; - - makeFlags = [ - "PARI_DEFINE=-DINCLUDE_PARI" - "PARI_PREFIX=${pari}" + configureFlags = [ + "--with-pari" ]; meta = with lib; { - homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"; + homepage = "https://gitlab.com/sagemath/lcalc"; description = "A program for calculating with L-functions"; license = with licenses; [ gpl2 ]; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/science/math/lcalc/makefile.patch b/pkgs/development/libraries/science/math/lcalc/makefile.patch deleted file mode 100644 index 5c22cf0b84e..00000000000 --- a/pkgs/development/libraries/science/math/lcalc/makefile.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 84e4e88..56ca676 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -58,7 +58,7 @@ ifeq ($(G5),TRUE) - #MACHINE_SPECIFIC_FLAGS = -mpowerpc -mpowerpc64 -m64 - endif - --CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) -+CCFLAGS = $(CXXFLAGS) $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) - #CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) - #CCFLAGS = -Wa,-W -O2 -fno-exceptions -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) - -@@ -68,12 +68,12 @@ CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MA - - ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) - #location of pari.h. -- LOCATION_PARI_H = /usr/local/include/pari #usual location -+ LOCATION_PARI_H = $(PARI_PREFIX)/include/pari #usual location - - #location of libpari.a or of libpari.so - #depending on whether static or dynamic libraries are being used. - #On mac os x it's the former, on linux I think usually the latter. -- LOCATION_PARI_LIBRARY = /usr/local/lib #usual location -+ LOCATION_PARI_LIBRARY = $(PARI_PREFIX)/lib #usual location - else - #supplied as a dummy so as to avoid more ifeq's below - LOCATION_PARI_H = . -@@ -89,24 +89,24 @@ INCLUDEFILES= -I../include - - ifeq ($(OS_NAME),Darwin) - LDFLAGS2 = -- DYN_OPTION=dynamiclib -+ DYN_OPTION=-dynamiclib - else -- LDFLAGS1 = -Xlinker -export-dynamic #not sure why pari calls these when linking but on the web I found -+ LDFLAGS1 = #not sure why pari calls these when linking but on the web I found - #'Libtool provides the `-export-dynamic' link flag (see section Link mode), which does this declaration. - #You need to use this flag if you are linking a shared library that will be dlopened' - #see notes below - #ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) -- LDFLAGS2 = $(LDFLAGS1) -Xlinker -rpath -Xlinker $(LOCATION_PARI_LIBRARY) -+ LDFLAGS2 = $(LDFLAGS) - #else - # LDFLAGS2 = $(LDFLAGS1) - #endif -- DYN_OPTION=shared -+ DYN_OPTION=$(LDFLAGS) -shared -Wl,-soname,libLfunction.so - endif - - ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) -- LDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari -+ MYLDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari - else -- LDFLAGS = $(LDFLAGS2) -+ MYLDFLAGS = $(LDFLAGS2) - endif - - -@@ -129,7 +129,8 @@ endif - #become clear which libraries the computer can find. - - --INSTALL_DIR= /usr/local -+INSTALL_DIR= $(DESTDIR) -+LIB_DIR ?=lib - - #object files for the libLfunction library - OBJ_L = Lglobals.o Lgamma.o Lriemannsiegel.o Lriemannsiegel_blfi.o Ldokchitser.o -@@ -141,9 +142,8 @@ OBJECTS = $(OBJ3) - - all: - # make print_vars -- make libLfunction.so -- make lcalc -- make examples -+ ${MAKE} libLfunction.so -+ ${MAKE} lcalc - # make find_L - # make test - -@@ -151,7 +151,7 @@ print_vars: - @echo OS_NAME = $(OS_NAME) - - lcalc: $(OBJECTS) -- $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(LDFLAGS) -o lcalc $(GMP_FLAGS) -+ $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(MYLDFLAGS) -o lcalc $(GMP_FLAGS) - - examples: - $(CC) $(CCFLAGS) $(INCLUDEFILES) example_programs/example.cc libLfunction.so -o example_programs/example $(GMP_FLAGS) -@@ -262,15 +262,18 @@ Lcommandline.o: ../include/Lcommandline_values_zeros.h - - - libLfunction.so: $(OBJ_L) -- g++ -$(DYN_OPTION) -o libLfunction.so $(OBJ_L) -+ g++ $(DYN_OPTION) -o libLfunction.so $(OBJ_L) - - clean: - rm -f *.o lcalc libLfunction.so example_programs/example - - install: -- cp -f lcalc $(INSTALL_DIR)/bin/. -- cp -f libLfunction.so $(INSTALL_DIR)/lib/. -- cp -rf ../include $(INSTALL_DIR)/include/Lfunction -+ install -d $(INSTALL_DIR)/bin -+ install -d $(INSTALL_DIR)/$(LIB_DIR) -+ install -d $(INSTALL_DIR)/include/Lfunction -+ install lcalc $(INSTALL_DIR)/bin -+ install libLfunction.so $(INSTALL_DIR)/$(LIB_DIR) -+ install -m 644 -t $(INSTALL_DIR)/include/Lfunction ../include/*.h - - - SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c diff --git a/pkgs/development/libraries/science/math/primecount/default.nix b/pkgs/development/libraries/science/math/primecount/default.nix index 7985b9d6dbd..e1390ce6416 100644 --- a/pkgs/development/libraries/science/math/primecount/default.nix +++ b/pkgs/development/libraries/science/math/primecount/default.nix @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo="; }; + cmakeFlags = [ + "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TESTS=ON" + "-DBUILD_PRIMECOUNT=ON" + "-DBUILD_LIBPRIMESIEVE=ON" + ]; + meta = with lib; { description = "Fast prime counting function implementations"; homepage = "https://github.com/kimwalisch/primecount"; diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index c3c4f8610c7..3bf22261f21 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smarty3"; - version = "3.1.39"; + version = "3.1.44"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "0n5hmnw66gxqikp6frgfd9ywsvr2azyg5nl7ix89digqlzcljkbg"; + sha256 = "sha256-9a9OC18jyFpmFXffYOYHZ0j01j4NCF5zwrSYr1fZwqo="; }; installPhase = '' diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 5b8f93d7bc7..b17fbe16655 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -1,5 +1,6 @@ { cmake , fetchFromGitHub +, fetchpatch , sqlite , postgresql , boost @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-NE0ApbX8HG2VAQ9cg9+kX3kJQ4PR1XvWL9BlT8NphmE="; }; + patches = [ + (fetchpatch { + name = "fix-backend-search-path.patch"; + url = "https://github.com/SOCI/soci/commit/56c93afc467bdba8ffbe68739eea76059ea62f7a.patch"; + sha256 = "sha256-nC/39pn3Cv5e65GgIfF3l64/AbCsfZHPUPIWETZFZAY="; + }) + ]; + # Do not build static libraries cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index bbee609eb26..6bb11139502 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.6"; + version = "1.13.7"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "0b1gq499ksgsi16f5nf3dzbj6s8knwkiak5j810jzdfm7vkm0vvm"; + sha256 = "sha256-gBejwt5YAkCKQh0vzN00J4y1ifcdc4TglA+SqEevaGQ="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh index f8bae899727..7959d1146f7 100755 --- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh @@ -51,7 +51,7 @@ url="${ql_src##* }" [ "$ql_src_type" = github ] && { ql_src_type=git url="https://github.com/$url"; - version="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)" + version="$("$(dirname "$0")/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)" rev="refs/tags/$version"; } @@ -62,7 +62,7 @@ url="${ql_src##* }" ) && { url="${url/git:/https:}" url="${url%.git}" - [ -z "$rev" ] && rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) + [ -z "$rev" ] && rev=$("$(dirname "$0")/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | grep . | tail -n 1) [ -z "$version" ] && version="git-$(date +%Y%m%d)"; } @@ -131,7 +131,7 @@ url="${ql_src##* }" [ "$ql_src_type" = froydware-http ] && { dirurl="http://method-combination.net/lisp/files/"; - url="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$dirurl" | + url="$("$(dirname "$0")/urls-from-page.sh" "$dirurl" | grep "/${url}_" | grep -v "[.]asc\$" | tail -n 1)" ql_src_type=http } diff --git a/pkgs/build-support/upstream-updater/urls-from-page.sh b/pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh index db39286ccb0..26724d122a7 100755 --- a/pkgs/build-support/upstream-updater/urls-from-page.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh @@ -6,7 +6,7 @@ path="${url#$protocol://}" server="${path%%/*}" basepath="${path%/*}" relpath="${path#$server}" - + echo "URL: $url" >&2 curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[^a-zA-Z][hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix new file mode 100644 index 00000000000..62001bc69e3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "float-features"; + version = "20210228-git"; + + description = "A portability library for IEEE float features not covered by the CL standard."; + + deps = [ args."documentation-utils" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz"; + sha256 = "1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd"; + }; + + packageName = "float-features"; + + asdFilesToKeep = ["float-features.asd"]; + overrides = x: x; +} +/* (SYSTEM float-features DESCRIPTION + A portability library for IEEE float features not covered by the CL standard. + SHA256 1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd URL + http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz + MD5 77223b9c85dca49d0f599e51ba95953a NAME float-features FILENAME + float-features DEPS + ((NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (documentation-utils trivial-indent) VERSION 20210228-git + SIBLINGS (float-features-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix new file mode 100644 index 00000000000..ae18bc99ef2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix @@ -0,0 +1,37 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "lisp-binary"; + version = "20210411-git"; + + description = "Declare binary formats as structs and then read and write them."; + + deps = [ args."alexandria" args."babel" args."cffi" args."closer-mop" args."flexi-streams" args."iterate" args."moptilities" args."quasiquote-2_dot_0" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz"; + sha256 = "1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb"; + }; + + packageName = "lisp-binary"; + + asdFilesToKeep = ["lisp-binary.asd"]; + overrides = x: x; +} +/* (SYSTEM lisp-binary DESCRIPTION + Declare binary formats as structs and then read and write them. SHA256 + 1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb URL + http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz + MD5 29d85f01a1cb17742164bacae940d29c NAME lisp-binary FILENAME lisp-binary + DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME closer-mop FILENAME closer-mop) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME moptilities FILENAME moptilities) + (NAME quasiquote-2.0 FILENAME quasiquote-2_dot_0) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel cffi closer-mop flexi-streams iterate moptilities + quasiquote-2.0 trivial-features trivial-gray-streams) + VERSION 20210411-git SIBLINGS (lisp-binary-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix new file mode 100644 index 00000000000..146d5cf06d1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix @@ -0,0 +1,31 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "quasiquote-2_dot_0"; + version = "20150505-git"; + + parasites = [ "quasiquote-2.0-tests" ]; + + description = "Writing macros that write macros. Effortless."; + + deps = [ args."fiveam" args."iterate" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; + sha256 = "0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974"; + }; + + packageName = "quasiquote-2.0"; + + asdFilesToKeep = ["quasiquote-2.0.asd"]; + overrides = x: x; +} +/* (SYSTEM quasiquote-2.0 DESCRIPTION + Writing macros that write macros. Effortless. SHA256 + 0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974 URL + http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz + MD5 7c557e0c10cf7608afa5a20e4a83c778 NAME quasiquote-2.0 FILENAME + quasiquote-2_dot_0 DEPS + ((NAME fiveam FILENAME fiveam) (NAME iterate FILENAME iterate)) + DEPENDENCIES (fiveam iterate) VERSION 20150505-git SIBLINGS NIL PARASITES + (quasiquote-2.0-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 51e4627cb8e..4eb9be0b972 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -137,6 +137,7 @@ fast-io file-attributes fiveam flexi-streams +float-features form-fiddle fset generic-cl @@ -162,6 +163,7 @@ lfarm-client lfarm-server lfarm-ssl lift +lisp-binary lisp-namespace lla local-time diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 018cba19c03..60338d0ea09 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -345,6 +345,16 @@ let quicklisp-to-nix-packages = rec { })); + "quasiquote-2_dot_0" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."quasiquote-2_dot_0" or (x: {})) + (import ./quicklisp-to-nix-output/quasiquote-2_dot_0.nix { + inherit fetchurl; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + "lfarm-common" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lfarm-common" or (x: {})) @@ -2836,6 +2846,24 @@ let quicklisp-to-nix-packages = rec { })); + "lisp-binary" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-binary" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-binary.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "moptilities" = quicklisp-to-nix-packages."moptilities"; + "quasiquote-2_dot_0" = quicklisp-to-nix-packages."quasiquote-2_dot_0"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "lift" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lift" or (x: {})) @@ -3257,6 +3285,16 @@ let quicklisp-to-nix-packages = rec { })); + "float-features" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."float-features" or (x: {})) + (import ./quicklisp-to-nix-output/float-features.nix { + inherit fetchurl; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "flexi-streams" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."flexi-streams" or (x: {})) diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 852a86a7b17..141d3126836 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -13,8 +13,11 @@ buildPecl { sha256 = "sha256-Dw1+pYJmZ3U2+rgSOEkx4a6HB8FebSr7YZodOjSipjI="; }; + prePatch = '' + cd ext + ''; + buildInputs = [ libmaxminddb ]; - sourceRoot = "source/ext"; meta = with lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index ab7e6e71fea..8f47a211e78 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pdo_sqlsrv"; - version = "5.9.0"; - sha256 = "0n4cnkldvyp1lrpj18ky2ii2dcaa51dsmh8cspixm7w76dxl3khg"; + version = "5.10.0"; + sha256 = "sha256-BEa7i/8egvz9mT69dl0dxWcVo+dURT9Dzo6f6EdlESo="; internalDeps = [ php.extensions.pdo ]; diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 37ff1cb187e..b70b6c3f3d9 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "sqlsrv"; - version = "5.9.0"; - sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a"; + version = "5.10.0"; + sha256 = "sha256-drPwg6Go8QNYHCG6OkbWyiV76uZyjNFYpkpGq1miJrQ="; buildInputs = [ unixODBC diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index b37c04a9177..4bc3532f5b5 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "afsapi"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wlcrs"; repo = "python-afsapi"; rev = version; - hash = "sha256-LBK32CwiYEa+R5VhcpVzMYklPAgombxl05rM/KWRyIU="; + hash = "sha256-C4rxlkylWGsDsnMPuecrC2ELj1PvP6EelZ/kzTn4Brk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 1a8bdee922e..7bd56482ed7 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "30"; + version = "31"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "v${version}"; - sha256 = "036yx1g80rc32g9mqx4khn8iqhmwl4kfch35pjslnna9kw3kb9i8"; + sha256 = "sha256-8Hm7sUkIW4rVLCL5+vHfhAvmc8+IKDXaSLtYJTf14XY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 5aa10201917..22d545f04f5 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -9,11 +9,14 @@ , numpy , pandas , pytest +, cloudpickle , scipy , setuptools -, tensorflow-probability +, typing-extensions +# , tensorflow-probability (incompatible version) , xarray -#, h5py (used by disabled tests) +, zarr +, h5py #, pymc3 (broken) #, pyro-ppl (broken) #, pystan (not packaged) @@ -45,28 +48,36 @@ buildPythonPackage rec { scipy ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "typing_extensions>=3.7.4.3,<4" "typing_extensions>=3.7.4.3" + ''; + checkInputs = [ bokeh emcee numba pytest - tensorflow-probability - #h5py (used by disabled tests) - #pymc3 (broken) - #pyro-ppl (broken) + cloudpickle + zarr + #tensorflow-probability (used by disabled tests) + h5py + #pymc3 (broken, used by disabled tests) + #pyro-ppl (broken, used by disabled tests) #pystan (not packaged) - #numpyro (not packaged) + #numpyro (not packaged, used by disabled tests) ]; # check requires pymc3 and pyro-ppl, which are currently broken, and pystan - # and numpyro, which are not yet packaged, some checks also need to make + # and numpyro, which are not yet packaged, and an incompatible (old) version + # of tensorflow-probability. some checks also need to make # directories and do not have permission to do so. So we can only check part # of the package # Additionally, there are some failures with the plots test, which revolve # around attempting to output .mp4 files through an interface that only wants # to output .html files. # The following test have been disabled as a result: data_cmdstanpy, - # data_numpyro, data_pyro, data_pystan, and plots. + # data_numpyro, data_pyro, data_pystan, data_tfp, data_pymc3 and plots. checkPhase = '' cd arviz/tests/ export HOME=$TMPDIR @@ -76,11 +87,13 @@ buildPythonPackage rec { base_tests/test_plot_utils.py \ base_tests/test_rcparams.py \ base_tests/test_stats.py \ + base_tests/test_stats_numba.py \ base_tests/test_stats_utils.py \ base_tests/test_utils.py \ + base_tests/test_utils_numba.py \ + base_tests/test_data_zarr.py \ external_tests/test_data_cmdstan.py \ - external_tests/test_data_emcee.py \ - external_tests/test_data_tfp.py + external_tests/test_data_emcee.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index 16e71a62ff4..98c087ae74f 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -1,20 +1,32 @@ { lib +, asn1crypto , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "asysocks"; - version = "0.1.2"; + version = "0.1.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1hi9hzih265qlh7x32r5pbaqm9wkhm52yrdiksnd4gl5nrdgwcwv"; + sha256 = "sha256-uXrJBc1Moeeo58KV+csiztXf0/F+iI5xy/BaHWek05M="; }; + propagatedBuildInputs = [ + asn1crypto + ]; + # Upstream hasn't release the tests yet doCheck = false; - pythonImportsCheck = [ "asysocks" ]; + + pythonImportsCheck = [ + "asysocks" + ]; meta = with lib; { description = "Python Socks4/5 client and server library"; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index c9de9f9f47b..8e7d1b20309 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "24.0.1"; + version = "25.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "283195339ef6ba1181dbc866ebede8b06ffdfe09eb86c25a04e1c8059d654f6e"; + sha256 = "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 029a1025182..ea5fbd1c102 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; + sha256 = "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 7770996f423..9d1324053b3 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,24 +1,44 @@ -{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: +{ lib +, buildPythonPackage +, docutils +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, sphinx +}: buildPythonPackage rec { - version = "4.31.0"; pname = "breathe"; - disabled = isPy27; + version = "4.32.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "925eeff96c6640cd857e4ddeae6f75464a1d5e2e08ee56dccce4043583ae2050"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "michaeljones"; + repo = pname; + rev = "v${version}"; + hash = "sha256-U85iLVS6bmA2Ty0AC4z2qODy9u4rWg6Nb42/k2Ix+kk="; }; - propagatedBuildInputs = [ docutils six sphinx ]; + propagatedBuildInputs = [ + docutils + sphinx + ]; - doCheck = !isPy3k; + checkInputs = [ + pytestCheckHook + ]; - meta = { - homepage = "https://github.com/michaeljones/breathe"; - license = lib.licenses.bsd3; + pythonImportsCheck = [ + "breathe" + ]; + + meta = with lib; { description = "Sphinx Doxygen renderer"; + homepage = "https://github.com/michaeljones/breathe"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; inherit (sphinx.meta) platforms; }; } - diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 97836b247a3..1bf4d6b4dab 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "4.0.1"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "6991f16e5d3a972912db3d56e3a714d10b07becd566ab87f85f2e9b671981339"; + sha256 = "sha256-XTO6lE2/GccDDJ5w43MSSK40Nozyr+3hDg0I+/ieb4w="; }; # tests assume the availability of a mysql/postgresql database diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index f465ac200d4..3820fdd1e36 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -86,5 +86,6 @@ in buildPythonPackage { license = licenses.asl20; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; + broken = true; # depends on older TensorFlow version than is currently packaged }; } diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index a0a4fb88e0c..4a8987b1634 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "environs"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sloria"; repo = pname; rev = version; - sha256 = "sha256-LPD46kxzQ/oTC7XjJn/SXaLQgX613ZoCrJuaRng57Gw="; + sha256 = "sha256-hucApIn7ul7+MC2W811VTxZNO8Pqb6HDXz9VRcEdmIc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 154742638b0..3550f1e1736 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.7.1"; + version = "4.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "1kwb5ixlmxg0xxm4wms5r4kym220vbncr9afi9qc25g8npkbs860"; + sha256 = "sha256-fdYc+fJEePgCzAkUWz7pmL/CI/O9zm5G9xh1f4bhrH4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index d23306be62b..d73ad8d35c0 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "2021.12.28"; + version = "2022.1.8"; src = fetchPypi { inherit pname version; - sha256 = "c722a25067d722483e24cde16ed987a822292ca758a213299e445694d2b5b587"; + sha256 = "a32996ec07ca004c45b768b0d50829728ab8f3986c0650ef538e42852c7aeba2"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index da246966c93..1bff69e460e 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , pkgconfig , gmp @@ -15,29 +14,15 @@ buildPythonPackage rec { pname = "fpylll"; - version = "0.5.1dev"; + version = "0.5.6"; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; rev = version; - sha256 = "15vdfgx448mr1nf054h7lr2j3dd35fsfhikqzrh9zsng8n12hxa5"; + sha256 = "sha256-Bxcc0941+pl2Uzam48qe+PFlcBWsJ0rDYZxrxIYQpEA="; }; - patches = [ - # two patches to fix the testsuite on aarch64 (https://github.com/fplll/fpylll/issues/162) - (fetchpatch { - url = "https://github.com/fplll/fpylll/commit/d5809a8fdb86b2693b1fa94e655bbbe4ad80e286.patch"; - name = "less-precision-in-tests.patch"; - sha256 = "0vkvi25nwwvk5r4a4xmkbf060di4hjq32bys75l2hsaysxmk93nz"; - }) - (fetchpatch { - url = "https://github.com/fplll/fpylll/commit/b5b146a010d50da219a313adc4b6f7deddcc146b.patch"; - name = "dont-hardcode-precision.patch"; - sha256 = "1rsbwh90i1j5p2rp6jd5n25v1jzw1n8728fzz1lhb91zmk0hlxc9"; - }) - ]; - buildInputs = [ gmp pari diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/development/python-modules/gigalixir/default.nix index aa5512d9913..99a878700d7 100644 --- a/pkgs/development/python-modules/gigalixir/default.nix +++ b/pkgs/development/python-modules/gigalixir/default.nix @@ -16,11 +16,11 @@ buildPythonApplication rec { pname = "gigalixir"; - version = "1.2.4"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "894b7e5bef30abc2c003e6df47f7758de5649b6f593e33926fcd398cc88d9ce2"; + sha256 = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index fac9ecba6ce..3600e173f94 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.7.2"; + version = "0.7.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "v${version}"; - sha256 = "1wigmkhn4ymfr12z9vhdaimjcma9llicwrr29q0cc8xmy23f3445"; + sha256 = "11wnhx9nfsg5lsnlgh33zngyhc2klichpfrkwajbbyq95fdqj8ri"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index c44bfda1331..5318f2fd189 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.18.1"; + version = "1.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "0xzx32fnm39w916z8wm387ry480rbf7n9qppc18bjdv4jjwgf2rw"; + sha256 = "sha256-5GGY23MDsUbSC2tYGVqwwtFi5vnSldozMR4HuY+h+l4="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 546e56f702f..a275b97310d 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.8.9"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "90d25e8f5971ebbcf56f216ff5bb65d6466572b78908c88c47ab588d4ea436c2"; + sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a"; }; checkInputs = [ pytest unicodecsv ]; diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index 23ec7c33c20..ed31228dfde 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.1.1"; + version = "0.1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bWBiM+u5wl9fWqL8k+R2IaYXSNnc4IxgWgUzyJVxkKk="; + sha256 = "sha256-oKc2x0T8KSSv9OB6U79QacBbvATDPecZFFKhFeBG39E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 73ddb17cac1..91e0303b4f0 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.0.post1"; + version = "0.4.0.post2"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "v${version}"; - sha256 = "1in9ibis91rlqmd7apbdp9c8y1mgnpm5bg6ldad8whx62nkkvwa3"; + sha256 = "sha256-BMRlEdvJJOUbsvKEoZx2qJqHSbL475dhBthUpnsXkn4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 4d578a97c78..c2278b5d79f 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.14.6"; + version = "0.14.8"; src = fetchPypi { inherit pname version; - sha256 = "46a87a8ee9e45e90c72e17ebb75190073e773f0890cfde7b81b0a36e15caec5d"; + sha256 = "sha256-0GB6LDsZlWmNS3O01nHWu20JCgSptyih7iBjbEFoZaE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 58670c49a90..a37e82a62d3 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.0"; + version = "8.1.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo="; + sha256 = "sha256-Dlqia+B7WJZlFGlIhgUWdND1qhSS/FOPoFH+uim6i8I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 6bc9635a66a..064d8a8d203 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.4.3"; + version = "0.4.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = version; - sha256 = "sha256-qff8dB8q4NS7ZYQDIzD1dXOZL/UBGACSBuPDla1okA8="; + sha256 = "sha256-bazAhCsxr8UNV51UnaGbP7kTC6mcDNM7N78f0jy26ew="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 36656281675..35ed3e06b72 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.77"; + version = "1.2.78"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-Z5YwZccyQ3LOuOf9NFuRQc8lYr6mbPp38Y4iIpD02CI="; + sha256 = "sha256-8P6K8sQ91kbd4o3mlHel12BFPFODcG/U0EnXJaxmknk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 0f2f305c97c..85e574f0b6d 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "mongomock"; - version = "3.23.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1pdh4pj5n6dsaqy98q40wig5y6imfs1p043cgkaaw8f2hxy5x56r"; + sha256 = "sha256-sYMsN0jUdETBiGc3PlzqdUwub2RKDPv9Zn8Xj2i97Pw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 9d36c73bc3c..63e795f98c8 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "bbd4831c72426757ec59674a1aad29c40bf411358a6d6e1cdd68002cbcb90d08"; + sha256 = "sha256-zoM27XRk+nubh0X0i5xi3qa+2TG5lxXKlHk2BUSZIUM="; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index 5926848b5af..da0a70aafb4 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "objax"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "google"; repo = "objax"; rev = "v${version}"; - sha256 = "09gm61ghn5mi92q5mhx22mcv6aa6z78jsrnfar1hd3nwwyn9dq42"; + sha256 = "sha256-/6tZxVDe/3C53Re14odU9VA3mKvSj9X3/xt6bHFLHwQ="; }; # Avoid propagating the dependency on `jaxlib`, see diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 83e4a9f6f73..5c30e14db74 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.3.3"; + version = "2.3.4"; src = fetchPypi { inherit pname version; - sha256 = "349aecd526c15c39f73a08df836467e2fead877c474d82c7df349f27ad272525"; + sha256 = "be12d2728989c0ae17b42fcb05b623500004e94b34f56bd153355ccebb84a59a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 44f4dda6b1b..fbd22e7f39a 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.41"; + version = "8.12.42"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "f477da623a51cba084567d6a67b1882a8aaaf3e7beadad655f8613a8f887ac62"; + sha256 = "sha256-i1SHHtZOz85JSgeOnVazY8I+JMWRbf2J6EuYWhiVW+4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index ca813354916..c02e5c5ce0d 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "4.4.0"; + version = "4.4.1"; disabled = ! isPy3k; src = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-AfHqKcb+ejEmY53irbIv9+1fPEczMgd7/VaFt01cNUs="; + hash = "sha256-8yYqyXz4ZqZxsk2Ka8S0rDsHaqO4l6cZTyNuVQuHkew="; }; patches = [ diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 2f80806c431..72f0284756a 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "0.17.0"; + version = "1.0.0"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "sha256-vR/tKV+ZB0nZaxEcB83dwoSI7kBC1rA+6fo30rizroM="; + sha256 = "1sgfrlhci2m83k436dfwfmqjpb8hij6yypm03pm3n8drmr2aaa4s"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 91902a85744..b65f8b5f84c 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.15.4"; + version = "0.16.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "0lp87vn9kh0xqng5mv5j914pgrbnhp54bisq76njijn32mgaw4qq"; + sha256 = "sha256-95b2PliBlCNHzl9oTu0Mv6e30WE8lXwlAjzwqX2dNZI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 86bbd847aa2..cde73681100 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.11.19"; + version = "0.12.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = version; - sha256 = "sha256-zYX2MMFIgts5brFb/hsgLHZbY5mncqnCmk7nGdxj/BM="; + sha256 = "sha256-zXvZpX8yKPJpmhKdPhlxYUWUadGlr4WsmfJMgE3kzyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index dda98f7a8b7..1e641d79ec0 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -7,12 +7,13 @@ , colorful , tomlkit , git +, packaging , requests }: buildPythonPackage rec { pname = "pontos"; - version = "22.1.1"; + version = "22.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p7E86McHeijsXpaByD5qLHYQLnSImLwHn15INyxWiZc="; + hash = "sha256-u/Mvk2/Wg0dB0OyTXllgV5sEV1h01HGZKLacPUxmeMA="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorful tomlkit + packaging requests ]; @@ -39,6 +41,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'packaging = "^20.3"' 'packaging = "*"' + ''; + disabledTests = [ # Signing fails "test_find_no_signing_key" @@ -48,7 +55,9 @@ buildPythonPackage rec { "test_missing_cmd" ]; - pythonImportsCheck = [ "pontos" ]; + pythonImportsCheck = [ + "pontos" + ]; meta = with lib; { description = "Collection of Python utilities, tools, classes and functions"; diff --git a/pkgs/development/python-modules/primecountpy/default.nix b/pkgs/development/python-modules/primecountpy/default.nix new file mode 100644 index 00000000000..c2ad9ca512b --- /dev/null +++ b/pkgs/development/python-modules/primecountpy/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchPypi +, buildPythonPackage +, primecount +, cython +, cysignals +}: + +buildPythonPackage rec { + pname = "primecountpy"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "78fe7cc32115f0669a45d7c90faaf39f7ce3939e39e2e7e5f14c17fe4bff0676"; + }; + + buildInputs = [ primecount ]; + + propagatedBuildInputs = [ cython cysignals ]; + + # depends on pytest-cython for "pytest --doctest-cython" + doCheck = false; + + pythonImportsCheck = [ "primecountpy" ]; + + meta = with lib; { + description = "Cython interface for C++ primecount library"; + homepage = "https://github.com/dimpase/primecountpy/"; + maintainers = teams.sage.members; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix index 4fbc259c188..6e7f71cee30 100644 --- a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix +++ b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pycryptodome-test-vectors"; - version = "1.0.4"; + version = "1.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-2+ZL8snmaB0tNxGZRbUM6SdfXZf4CM0nh3/wTOu9R50="; + hash = "sha256-GfzFM3S4yk0V2zTaQ+rkljyHdvC0ETUNSccZImqoLIU="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index 4223ce02cae..840a74f252e 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.6.5"; + version = "0.6.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "608d8e80da38070d3bb970d132bc47a55dcfd63b4dc03997d93646c5b2ad185b"; + sha256 = "sha256-9ghL8a+l+/TGHPffRDcPpROCGvGIsC4+GbXvtm2Klp8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index 145ea83abeb..f4ea169b01e 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.3.1"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "V${version}"; - sha256 = "1lvwxcr2ay8h5sr4lmjgs7xgszl1q8ciaqdn6cmrlra27jssl5ax"; + sha256 = "sha256-Gv418i2JLoovwagkZpv8PIJPW3I/0pRmXR/PJOJ2NBc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 095f3baf97a..5cf2615ed03 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -68,5 +68,8 @@ buildPythonPackage rec { homepage = "https://github.com/pymc-devs/pymc3"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ilya-kolpakov ]; + # several dependencies are not declared and in the end it requires theano-pymc3 + # instead of Theano. The former is currently not packaged. + broken = true; }; } diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix index 6d22c1fd845..262370f6109 100644 --- a/pkgs/development/python-modules/python-louvain/default.nix +++ b/pkgs/development/python-modules/python-louvain/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-louvain"; - version = "0.15"; + version = "0.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KoVu374plSpgpVOKhLt4zKGPaISoi5Ml6FoRyN1JF+s="; + sha256 = "sha256-t7ot9QAv0o0+54mklTK6rRH+ZI5PIRfPB5jnUgodpWs="; }; propagatedBuildInputs = [ networkx numpy ]; diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index bd557c402ff..dbd51166a22 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-lsp-black"; - version = "1.0.1"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-black"; rev = "v${version}"; - sha256 = "03k32m4jfqfzrawj69yxhk9kwzsdcwginip77kxdbra2xwgqfc3w"; + sha256 = "sha256-WIQf1oz3b1PLIcXfQsu4hQ58nfp7l3J7zkcWNT6RbUY="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index a1f466cfe67..ebe0825a360 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.3"; + version = "0.15.4"; src = fetchPypi { inherit pname version; - sha256 = "sCHeiD6KugHZLtxcVcLggdHC1gqCxStuHy1065TbGiY="; + sha256 = "Cyj3B9uK1RoIuStCO+z9/bq7RjTPdjTqVhfc+tCRofo="; }; # The XWayland detection uses some hard-coded FHS paths. Since we diff --git a/pkgs/development/python-modules/qt5reactor/default.nix b/pkgs/development/python-modules/qt5reactor/default.nix new file mode 100644 index 00000000000..a85f2ad6892 --- /dev/null +++ b/pkgs/development/python-modules/qt5reactor/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyqt5 +, twisted +, pytest-twisted +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "qt5reactor"; + version = "0.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "c3470a8a25d9a339f9ca6243502a9b2277f181d772b7acbff551d5bc363b7572"; + }; + + propagatedBuildInputs = [ + pyqt5 + twisted + ]; + + checkInputs = [ + pytest-twisted + pytestCheckHook + ]; + + pythonImportsCheck = [ "qt5reactor" ]; + + meta = with lib; { + description = "Twisted Qt Integration"; + homepage = "https://github.com/twisted/qt5reactor"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix index 7adef77210a..76df76ba596 100644 --- a/pkgs/development/python-modules/seatconnect/default.nix +++ b/pkgs/development/python-modules/seatconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "seatconnect"; - version = "1.1.3"; + version = "1.1.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "farfar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EOaFZch/C9N4lacZ4IqIJUVSaEn8wOFN/WN6WOL/1mo="; + sha256 = "sha256-NA/UiapJ/SyUmrj9hd2xGV5WWy1KhxwQtqGLV73TfHk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index efac8148a72..78e160058b2 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , setuptools-scm +, bashInteractive }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + bashInteractive pytest-timeout pytestCheckHook ]; @@ -37,11 +39,6 @@ buildPythonPackage rec { --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" "" ''; - disabledTests = [ - # bash tests are failing - "bash" - ]; - pythonImportsCheck = [ "shtab" ]; diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 5196651959c..fcac9d9eadd 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.12"; + version = "1.1.14"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OKNw+t8S6rRQDKNRBN/CU36OwWojuOH6mMQ5QItkkb8="; + sha256 = "sha256-aMyowz5+4Iu7bb8FSnHzx6QGp1WzzMXQZI23OZcr/kM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 1b6d1033c45..fdaf191db4d 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.16"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7waY5AOONi+u056JRH9KcoBWSB4AlMw4QcMW0uoCARc="; + sha256 = "sha256-Q7dl/HSZTUXPs/0fE/Ui5/8r2LdJzyXwPnjQhXYdSxs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 4558b3afb26..b854e09c050 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "tablib"; - version = "3.1.0"; + version = "3.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d64c9f6712918a3d90ec5d71b44b8bab1083e3609e4844ad2be80eb633e097ed"; + sha256 = "12d8686454c721de88d8ca5adf07e1f419ef6dbcecedf65e8950d4a329daf3a0"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 1daaac6ae7e..760e9a0e9d1 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,7 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch -, bazel_0_26 , buildBazelPackage , buildPythonPackage , python @@ -11,47 +9,33 @@ , tensorflow , six , numpy +, dm-tree +, keras , decorator , cloudpickle , gast , hypothesis , scipy +, pandas +, mpmath , matplotlib , mock , pytest }: let - version = "0.8.0"; + version = "0.15.0"; pname = "tensorflow_probability"; # first build all binaries and generate setup.py using bazel bazel-wheel = buildBazelPackage { - bazel = bazel_0_26; - name = "${pname}-${version}-py2.py3-none-any.whl"; - src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = version; - sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy"; + rev = "v" + version; + sha256 = "155fgmra90s08vjnp61qxdrpzq74xa3kdzhgdkavwgc25pvxn3mi"; }; - - patches = [ - (fetchpatch { - name = "gast-0.3.patch"; - url = "https://github.com/tensorflow/probability/commit/ae7a9d9771771ec1e7755a3588b9325f050a84cc.patch"; - sha256 = "0kfhx30gshm8f3945na9yjjik71r20qmjzifbigaj4l8dwd9dz1a"; - excludes = ["testing/*"]; - }) - (fetchpatch { - name = "cloudpickle-1.2.patch"; - url = "https://github.com/tensorflow/probability/commit/78ef12b5afe3f567d16c70b74015ed1ddff1b0c8.patch"; - sha256 = "12ms2xcljvvrnig0j78s3wfv4yf3bm5ps4rgfgv5lg2a8mzpc1ga"; - }) - ]; - nativeBuildInputs = [ # needed to create the output wheel in installPhase python @@ -64,7 +48,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "1qw7vkwnxy45z4vm94isq5m96xiz35sigag7vjg1xb2sklbymxh8"; + sha256 = "0sgxdlw5x3dydy53l10vbrj8smh78b7r1wff8jxcgp4w69mk8zfm"; }; buildAttrs = { @@ -98,34 +82,31 @@ in buildPythonPackage { decorator cloudpickle gast + dm-tree + keras ]; # Listed here: - # https://github.com/tensorflow/probability/blob/f01d27a6f256430f03b14beb14d37def726cb257/testing/run_tests.sh#L58 + # https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83 checkInputs = [ hypothesis pytest scipy + pandas + mpmath matplotlib mock ]; - # actual checks currently fail because for some reason - # tf.enable_eager_execution is called too late. Probably because upstream - # intents these tests to be run by bazel, not plain pytest. - # checkPhase = '' - # # tests need to import from other test files - # export PYTHONPATH="$PWD/tensorflow-probability:$PYTHONPATH" - # py.test - # ''; + # Ideally, we run unit tests with pytest, but in checkPhase, only the Bazel-build wheel is available. + # But it seems not guaranteed that running the tests with pytest will even work, see + # https://github.com/tensorflow/probability/blob/c2a10877feb2c4c06a4dc58281e69c37a11315b9/CONTRIBUTING.md?plain=1#L69 + # Ideally, tests would be run using Bazel. For now, lets's do a... # sanity check - checkPhase = '' - python -c 'import tensorflow_probability' - ''; + pythonImportsCheck = [ "tensorflow_probability" ]; meta = with lib; { - broken = true; # tf-probability 0.8.0 is not compatible with tensorflow 2.3.2 description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 123c339fea4..ceebad2a476 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , pythonOlder +, pythonAtLeast , numpy , wheel , werkzeug @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; version = "2.6.0"; format = "wheel"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { pname = "tensorboard"; diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index d8cc7a9e011..4db9297834f 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.1.3"; + version = "22.1.4"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "1x0hy9wnifi694glwv6irhnjvwh1kgl6wn6qlk5qy4x6z6bkii24"; + sha256 = "sha256-aOA/2SqvTpXtkURyJ2vf5gGqPpy5reN7/2zUUdaJvyA="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 3420773372f..0732f062b38 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -6,6 +6,8 @@ , requests , yarl , pythonOlder +, fetchFromGitHub +, poetry-core }: buildPythonPackage rec { @@ -13,11 +15,25 @@ buildPythonPackage rec { version = "3.3.0"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "ef3a931fc1f1db74edf8660e475b9295e0904ee922030ef0e45b0c73f4be65ae"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Trim21"; + repo = "transmission-rpc"; + rev = "v${version}"; + sha256 = "sha256-Ys9trQMCHqxBSaTobWt8WZwi1F8HKTUKaIxvyo6ZPP0="; }; + # remove once upstream has tagged version with dumped typing-extensions + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'typing_extensions = ">=3.7.4.2,<4.0.0.0"' 'typing_extensions = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ six typing-extensions diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 85c5e10e8cb..bdbe7180989 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "21.5.0"; + version = "22.1.0"; src = fetchPypi { inherit pname version; - sha256 = "02ea86383fc4b57539c45a965eaa1e9fd28302cdf382d21da8430050c97be9b8"; + sha256 = "sha256-d1WBYEkZo9echFQBWYoP0HDKvG3oOEBHLY6fpxXy02w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 3812a1c64f2..7e602b2d3c1 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.7"; + version = "57.4.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lnfZabAOwcFFUvW+KytHpvvqTQ7U3g/c7hir2qDMkmc="; + sha256 = "sha256-1VRfKrPa0k9cscAbp0way3QHqzGyYY1CMVj8hAhRYPE="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 5224b57d6cf..915d11b5d8d 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.7"; + version = "1.26.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-z9H7vkuppgXtFIKUAIqsinuLdHJlHRzDV9UHrlli49I="; + hash = "sha256-qg3iaJPxOFI9VVK7sCOCbAzH6ldJ2AwWk8V6q3tV9Gk="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 356a290241e..52b422c0e1d 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.4.12"; + version = "0.5.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "e668055d9c389aefd09203afb96a950a320095f225ef0a1aa611e592db92a71b"; + hash = "sha256-iXwJPe6YYG2TWiQ/dXbeIiadzGMgFzZa6Now692r+t0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 2f950ecd6c4..472e8138591 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.11.0"; + version = "9.0.0"; src = fetchPypi{ inherit pname version; - sha256 = "cfde0515a3fa4d224aad5461135372f3441ae1a64717ae6bff5e23509d70b0bd"; + sha256 = "sha256-Ah6ITMdmbVay0CL7nR4vKRTlxbPfZFlqWaaBvU9olqk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 35f470e319f..f7298f4b8c9 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.1"; + version = "1.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c7afe70e1ac8e871341d7fb15f5246aac35fd80fec10d7a96d46df2aad608bd0"; + sha256 = "sha256-PeWi1eygUSgUXZ68bUJ44IoffNDme06JNR9ns6njqMU="; }; propagatedBuildInputs = [ httpx ]; diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 92d9a4a8487..54ebc888f1f 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.6"; + version = "3.7.7"; src = fetchPypi { inherit version pname; - sha256 = "e8d8a7828e4994545bf57059bd0a0d431d387d31cc4af2eb5eeb93ef28c2d827"; + sha256 = "415f4a673009fe9a5ef67b61c4469ddf14b73857b6d40f02d6b74f02ad935147"; }; buildInputs = [ openssl bzip2 ]; diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 712f7ad1ca0..52decaeb5ae 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.27.8"; + version = "1.27.9"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - sha256 = "sha256-CVx4TDDAVIrJ3lnD2AIuxhmTV+/sIA0viX20zFkznNc="; + sha256 = "sha256-8VuCZoAV54TG8MiF6n5O8ZStGujfJ/7w95BYhe5/7dE="; }; - vendorSha256 = "sha256-dloXz1hiKAQUmSQv1rLbE5vYrZpKAcwakC71AFXWZqM="; + vendorSha256 = "sha256-u/v6RnzBU+zQEy3jjVITjUQiU7AT3wZoeeRFF+KqOvI="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 951e95b1477..869d7e464a5 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ltxFduUr+poi4tEjViQXCbe+j3fUdvBG8CTaM7VdpK0="; }; - vendorSha256 = "sha256-iZdWCSkdKG0SXcUtZ0DgDGk25vESlv2dSbcK1gUVTV8="; + vendorSha256 = "sha256-xEmDOP2DbTZ8bpK4OCabIpOwORB8EOJZkHCxL5wBeEU="; doCheck = false; diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 2177c20a972..e93dfe84543 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "v${version}"; - hash = "sha256-HCOS8/jn7BOzDwSpenVGo6QpI/1ey6L1zBucTyqsSY4="; + hash = "sha256-hRmTx0qs/QnDLl4KhGbKw5Mucq4wQCaCIkeObrZlJSI="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 9c64b4a078c..dd3b2ae2bf2 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-3ZN/SCTQ5k0X4cqnrpp8Yt1QDnYkT2RbMLKpDfdWaxk="; }; - vendorSha256 = "sha256-XBsYSA0i0q/mp8sQh9h//pjs+TbEDc7UIdNU24/Qemo="; + vendorSha256 = "sha256-UhES+jJil6+JmGH27p/LC/b5rZfHC4RIjA9nCFeB7Ao="; doCheck = false; diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 33f9811ab83..979cbae99a2 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.0.9"; + version = "0.1.0"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "sha256-1KwJuapqGhMEIMwrJp2LKlpYFtl+OP9DyaMtge9ZedI="; + sha256 = "sha256-YoMwtaif7q7Ht8fWRQRGeP03Pl5KTIUk8fGGKhelc68="; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "sha256-IDXO+MgFlnT7VPugcQr/IGLZeD/vWFqJ0D0zVIbTtk4="; + sha256 = "sha256-YjMdhuo9hQCGtq1qYFKUY8S6nz8dpZt+PsngbF6r/C8="; }; }; in diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index c10e5e7f459..ea3968c3841 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-dtDciyQyTYhgYwqRCcxV0kAbPMl3KXhDM0BelPTWymA="; }; - vendorSha256 = "sha256-mIXt3rWXQ6lVbV4hT7KRK7VZ4iFuDX6kZjgoE1WvJxI="; + vendorSha256 = "sha256-0BvZ7xLOr7htp3HVgRt3CzCxx2P62RXKhbzbWtGMLc0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index 094aa5fe026..4570faa96f2 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "sha256-wrz9+McHW2NNMsB3uOZIceykYBlSgl2WErAT8bMlkXo="; + sha256 = "sha256-rS1/LQ5R3WY9ot1pgtN+6t/ZChr9SxPzrsNio7WWNqQ="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/development/tools/checkmate/default.nix index d5aded2d8e1..98d9eb7936d 100644 --- a/pkgs/development/tools/checkmate/default.nix +++ b/pkgs/development/tools/checkmate/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-oBX1MSniVwXvq4Cy9uR3YqxaeSxeWg38oBlCiBy6z/8="; }; - vendorSha256 = "sha256-rlwph9oQXgesLHjrtD+H4zvT2ekTeqZFgRBjXoyFltM="; + vendorSha256 = "sha256-+O0EQRbqLCMBlaI2mejAId2/KFdPWkJ/i7B81tQykzk="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/development/tools/confluent-cli/default.nix new file mode 100644 index 00000000000..9664a75703a --- /dev/null +++ b/pkgs/development/tools/confluent-cli/default.nix @@ -0,0 +1,42 @@ +{ stdenv, autoPatchelfHook, fetchurl, lib }: + +stdenv.mkDerivation rec { + pname = "confluent-cli"; + version = "2.4.0"; + + # To get the latest version: + # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 + src = fetchurl (if stdenv.hostPlatform.isDarwin then { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_v${version}_darwin_amd64.tar.gz"; + sha256 = "1xkf7p9cn37k8j57cgbzxhqgnmchf86jyiza91bf6ddvm6jsm2gd"; + } else { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_v${version}_linux_amd64.tar.gz"; + sha256 = "1wvy7x56cc7imycf0d83mxcqzdvv56cc0zbp913xgghjn9dl2z7a"; + }); + + nativeBuildInputs = [ autoPatchelfHook ]; + + dontStrip = stdenv.isDarwin; + + installPhase = '' + mkdir -p $out/{bin,share/doc/confluent-cli} + cp confluent $out/bin/ + cp LICENSE $out/share/doc/confluent-cli/ + cp -r legal $out/share/doc/confluent-cli/ + ''; + + meta = with lib; { + description = "Confluent CLI"; + homepage = "https://docs.confluent.io/confluent-cli/current/overview.html"; + license = licenses.unfree; + maintainers = with maintainers; [ rguevara84 ]; + + # TODO: There's support for i686 systems but I do not have any such system + # to build it locally on, it's also unfree so I cannot rely on ofborg to + # build it. Get the list of supported system by looking at the list of + # files in the S3 bucket: + # + # https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=confluent-cli/archives/1.25.0/&delimiter=/%27 + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index a1d1453cb10..f200cd742d9 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-8/eZz5ejw5bahCYwz825HI+oZ6D1odeTpMIJh0TcGMY="; }; - vendorSha256 = "sha256-rYWo0t6iUI6DVsjHJg2fUv2tv3jovndi12prKzLaMlI="; + vendorSha256 = "sha256-wvOtBK3lRK7XwgeClywowgrZLohltSTGdoB+j3NRmkE="; ldflags = [ "-s" diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 6090bc1d75b..4ac007f0887 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ThN1uvofIvV5Dt6dqxLpekTRy9pV4xb0bkVNRcfNJ2c="; }; - vendorSha256 = "sha256-OQGpWWerUv2asjpjMLAkgeb0Q+lMAsDXjFCh0I4ze20="; + vendorSha256 = "sha256-bz21YeEONXD08HD1/8vn+NfGniXkGo7/8bQXLpRFmaM="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 5348d0be88c..ae25f265664 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-XNxy8CnhO3rQi3VHr7nikFNXvY2eM30jR0ngNc0FV3E="; + sha256 = "sha256-j7u8TidiuaA5SbXoD+p23wwTsePi6/hzNdVS5IJMEh0="; }; - vendorSha256 = "sha256-Qe3fwyEf/NiGmUSha/zZHRBR1okw2vE97u7tybqiWNI="; + vendorSha256 = "sha256-t8ga2KrahzdDBu33vv1ETB6hVoNpdxjPfiYuvLR2m5g="; doCheck = false; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index f312b522add..2d1548bd86e 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-Cg85NdbbZs0tkBy2kq5ZRKDuQwLIixdhggOBSFpUM04="; + hash = "sha256-KNYxHBtPRsxEFrBJsfz5G7ZRZpVQxOph9UUKKhbHA9Y="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 2eb11b2ffc2..d8b99eb2870 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-zoFWiqrKdTh6XDrKx2mQe3NqK03so6MqIX0sSQHQa5U="; }; - vendorSha256 = "sha256-SlU1lJcKCDkoihU19c8iky3Bj5ZZD9E9W0QQX9fBT1c="; + vendorSha256 = "sha256-HaOgRbF3gMsl6PufdB5IZ2sLunvPo4GeObLb7DRSD0o="; ldflags = [ "-s" diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 61d8ea77f3e..31174ea7a1a 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QLJB2WcnguknEMdgwJzltp++mJCL4cFOWU568aTk0sc="; }; - vendorSha256 = "sha256-TY8shTb77uFm8/yCvlIncAfq7brWgnH/63W+hj1rvqg="; + vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU="; ldflags = [ "-s -w" diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 9f31ebb0af4..a06cc0f1c41 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.68.0"; + version = "1.69.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-3W6jDMT4UUtSND9bJJEexQ9LrqxL4oZtpucdcM1McdE="; + sha256 = "sha256-Bm6Xrgp/6/NpIndCVRDamKndBbCANnW5j3vOVRVxnE4="; }; meta = with lib; { diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 3e228badbd5..3edbc57ecdb 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-0/pn+Ld7o4gBnddA+uMzBhrFnov1XoqpRGkTT/vNH3Y="; }; - vendorSha256 = "sha256-9FkRazgZlzwvimsbqWCYJLxwRRlHa0i/jPPuf+AGSOA="; + vendorSha256 = "sha256-ITg+qEdk4/mWytzBbybYEc2Tw4ibvGUOB/FMu475dSk="; subPackages = [ "cmd/dyff" diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index c6cc57e14c5..a18b3b67fdc 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-a2NNpQvbhMY66nbk4RAXFb/o1qR5OXPm93ujzS2cxp4="; + sha256 = "sha256-QrlxH9ihWAVzf9lh3CcVCqFPLmn7bM2pNZUqxnHD2WA="; }; - vendorSha256 = "sha256-0wyefhY/KR79K9DDI4/8EaA/DFI1rf6wxsBIAZo+rUI="; + vendorSha256 = "sha256-pI5aBBUJoAmeJ2Kr0eqP9O/tGhgHCBjINL3406LQ9Dc="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/development/tools/ec2-metadata-mock/default.nix index 1a2fd8ec0f7..197105ee646 100644 --- a/pkgs/development/tools/ec2-metadata-mock/default.nix +++ b/pkgs/development/tools/ec2-metadata-mock/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-k4YzG4M+r6BHc4DdAMXoUvVDTJqmzr8vIL1J6kbJBeY="; }; - vendorSha256 = "sha256-uq0gcpFzAcz1HMwI1ZjHykWU93bV2U5kxC/G+J4ob7Q="; + vendorSha256 = "sha256-bI1W6KdXIq5HsoXDOq93Le2vePAAgvqy/lXm/N1F+yU="; postInstall = '' mv $out/bin/{cmd,ec2-metadata-mock} diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index e5fdce7cf28..149b1aa5ab1 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -90,33 +90,33 @@ rec { headers = "0s253jdmfyfgb5mwslqd50g623fwj3dgsgsq4cn3pl5qfpmcm26x"; }; - electron_14 = mkElectron "14.2.4" { - armv7l-linux = "d644d2df745a9809794929762db1faa56b77f519ccc0d430dd2238235739ace3"; - aarch64-linux = "1f198a61a5f67954f568e49879e390c94ef9cb05545664e24bac513e05dea0d9"; - x86_64-linux = "faf6c0501811e3dec056f536e53f0ec087345b852e7de47ae86ea175cc070a2f"; - i686-linux = "1f9baa2f3aa1cd935cc29f67aa273c8b1b65da144af3894bd855ce02a6730fc1"; - x86_64-darwin = "4a3c146da911162c7081e280f2c311c41f132e1d3274bc3676ed71cc9392dc5d"; - aarch64-darwin = "279cc3c04c7db9f3361b09f442750f4d18c8b2c7f633bca17aa9fb3656bfb74c"; - headers = "1zkf1j82psbj9mw8zb9ghl9y6bkw77cxqzkp3q1bbn6wvj41lvyh"; + electron_14 = mkElectron "14.2.5" { + armv7l-linux = "d6f7e2fe6088f57ecd455035e0815c20dd1d84b4cbf669e5fa355b96f36eaf2e"; + aarch64-linux = "c8a1a7c5c04462bbe6e148587a72b002ab4bb90aecb9686546b22580c0f9fa52"; + x86_64-linux = "5820ea6c9cfe02096a75df43cab7cdfe5947d6d90207e98c563bd50c400f8110"; + i686-linux = "8099fc3b137e80c5e65493dea2cf3dfb923e86693f3b082429f6fd949560f540"; + x86_64-darwin = "258eb29426a5f275c49284be6818f856ffc29d04fa9cef6fafcdcd207092281d"; + aarch64-darwin = "38a19828c1d7ff5fb49c5db5a706482f4afbae9fecaedaf9ebea0a5765bf952d"; + headers = "172h9ba1s531y3s751inwsia6kr39412yivqkpdc58jmn47nmgb8"; }; - electron_15 = mkElectron "15.3.5" { - armv7l-linux = "c5540cd94711a31fe0098da982d4a25ed1b606e0d4213c9f7863826b2c8e7eaf"; - aarch64-linux = "6550387135605b64b8549b1034eae672a8f94419032dacbaff7b92934cc0508d"; - x86_64-linux = "3b61eaa48f3c5f1983a24152e6b12f39c3a29abb52d17c13891c16a25e3c209a"; - i686-linux = "30d6de074bebe985bb07f20788a8378c7fa1ded564e3c1e8183b0113ba76b282"; - x86_64-darwin = "fe2c138bb11b3db07d02c1cbf7838765036ac2552582f9ce2265ffe6609ea2e1"; - aarch64-darwin = "7c887b8ae24ad7ca9585a001f29108919bc39d27c3818012aeefb8072e23178d"; - headers = "0fkvwlnxjy8dwfnxhgk6i4qayhmg7dbqmd9nfi94a7kdbwp714r5"; + electron_15 = mkElectron "15.3.6" { + armv7l-linux = "4c105be3dc38ea8899f9fe58c05dfbf20e0d43e9b35ca815c43329d17b714d36"; + aarch64-linux = "3d06de32f02e38039c3c9deb418e3b9dbcda30f387f27e54fb1f1be068b80989"; + x86_64-linux = "5a9a3e37e92ad67d2a4ebb5ac85cb817d682fe2ca0b37b924d7f40085d246cc9"; + i686-linux = "32ff47793c8123fa6220ff9e7c524e3b89c0411e94bdb4d9391038cc58449b5f"; + x86_64-darwin = "faff636a6deedc3b7a3c900aef187baaeec2b83ccc405c56e3ea18d68894b82c"; + aarch64-darwin = "ae7350a7daa6eb2d21fa001c38217bc46a3894f843962c5cca192b837cc9d81c"; + headers = "1mbffk26kdn1id809sdg1kdhrf285zm9ls40b5zaflcljvqg3i2x"; }; - electron_16 = mkElectron "16.0.7" { - armv7l-linux = "8a8567c745ab1c2b1de19305da0a0036ba100b27e1fc4eb014aca325aff3193e"; - aarch64-linux = "6d27cc9acc3f580118cdd685d629d39c2a1fc094376b719fa0100a7446f8fede"; - x86_64-linux = "544cd6d48262f24c8a82d2e8079b20889ec5e83959404fdda9ad00c86e9efa70"; - i686-linux = "8b79ce5fbc704eb03c34d4b96765314074a687ae3165cab21f84f77fee36d755"; - x86_64-darwin = "e5c825d4cfc1dabd066986fa1cae3ee880f222b053c760b700b24899fb02d4db"; - aarch64-darwin = "9fa9dc44e5d71de7a999b3db07a583e0a04252747486c16955232eba498b259d"; - headers = "0r4gd2v9rzrg1msxw62rq1s93ifrjj4yb4gfcma5mbj88m3v5p63"; + electron_16 = mkElectron "16.0.8" { + armv7l-linux = "be3a598d5f7c677c11831b78a8a82d95132ea760bb643e526426b91fdf27aff7"; + aarch64-linux = "465cd93d69ea2e3273339d48bef58e7359b692da5535bff5882e803c22535ec5"; + x86_64-linux = "25767a94d4b0927616ed5008889cd65bb073c7005209671b34045f91d698c857"; + i686-linux = "1cedf35f501ea1512fe9ae5cae47a72e093b6eb7297f76b726551e4a33a593a5"; + x86_64-darwin = "a3c5e5368165304fc9392e3a5b59480965cf0f91f7d889257e6a622f48051cbf"; + aarch64-darwin = "dc8414d7b9a967bda530c83a81720519931aebf541cfaed142ee2042c16e683a"; + headers = "042gz036dzwbvvxvgbgkdb5nq7p8a7vcan6c35l7imgv1hd4g5v4"; }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index f70767a0591..004774334b9 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -19,7 +19,7 @@ version: hashes: let - name = "electron-${version}"; + pname = "electron"; meta = with lib; { description = "Cross platform desktop application shell"; @@ -54,7 +54,7 @@ let "Unsupported system: ${platform.system}"; common = platform: { - inherit name version meta; + inherit pname version meta; src = fetcher version (get tags platform) (get hashes platform); passthru.headers = headersFetcher version hashes.headers; }; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 4995fbe1c3d..9970fb77cbc 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.11"; + version = "0.14.13"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-hS+LJfYB+nH5z/UA6RKdqA8qc1jT9Gskt6LufHCiqv8="; + sha256 = "sha256-DBu6j8UjbRVMoT0j/WwtVlJ+k3VwVKFbX2tdUs0neDs="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix index 4648942d709..29dadf24304 100644 --- a/pkgs/development/tools/evans/default.nix +++ b/pkgs/development/tools/evans/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-bFTmr/xQ12cboH1MGvHDUpLM0dMkxMeLgwG0VbhMEnc="; + vendorSha256 = "sha256-ICGnjI9sFwt81rZCnap/rggfSs4+pZNmLouoTY7CYKw="; meta = with lib; { description = "More expressive universal gRPC client"; diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index fb6a4f49624..715c237f494 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2fXefYvcclcxMeX6JtHjoVNRwJTsUAhxet646BDPHic="; + sha256 = "sha256-apX4MFzeR7+5gWauw5HXPK0c7N4uTSqkE2vqnYB5LJs="; }; subPackages = [ "." ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 0566f0276fb..49404d05134 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-a3AZ/7UfB9qjMK9yWHSaBRnDA/5FmIGGxXAvNhcfKCc="; + sha256 = "sha256-GF96AOyQcVI01dP6yqMwyPmXMDRVxrScu1UL76jF2qA="; }; vendorSha256 = "sha256-kMQ60HdsorZU27qoOY52DpwFwP+Br2bp8mRx+ZwnQlI="; doCheck = false; diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix index 487edcde998..cba623dec79 100644 --- a/pkgs/development/tools/github/bump/default.nix +++ b/pkgs/development/tools/github/bump/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8="; }; - vendorSha256 = "sha256-2x5rQGEp6ARP2nggE+tvXDRY7AkKCEUXTLEPWDJMCnI="; + vendorSha256 = "sha256-ZeKokW6jMiKrXLfnxwEBF+wLuFQufnPUnA/EnuhvrwI="; doCheck = false; diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index 4f3a32fc399..f9668332244 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-sahInHXv1GtylsY8kpw1dDjKiENmq4myx+7mq60vJAI="; }; - vendorSha256 = "sha256-DL2eN277cXfsw1dDvIbzkJRuKThgqFOzIufPQVpUzmU="; + vendorSha256 = "sha256-KLV6ABo1K+KtAzAQ4FcFiK1LAZEsKup+BtgjRJfonAY="; doCheck = false; diff --git a/pkgs/development/tools/gokart/default.nix b/pkgs/development/tools/gokart/default.nix index 7722e0b36af..f7d0857580e 100644 --- a/pkgs/development/tools/gokart/default.nix +++ b/pkgs/development/tools/gokart/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gokart"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iXdPQkKTRE2BE2yG2KKThpj7HrxXWwBFv2TobEwGLQQ="; + sha256 = "sha256-HsjLNY5Z5UidsLDWSP+1bu3jrfn3oAERPrPV/AkTH8I="; }; - vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd"; + vendorSha256 = "sha256-S3RukCKAJnPH1KGVdnkgAJQKEDTZYpcMMdoQ4OnHZVg="; # Would need files to scan which are not shipped by the project doCheck = false; diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/development/tools/java/sawjap/default.nix index 13532c48d40..b4c682bbd22 100644 --- a/pkgs/development/tools/java/sawjap/default.nix +++ b/pkgs/development/tools/java/sawjap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (sawja) src version; - sourceRoot = "source/test"; + prePatch = "cd test"; buildInputs = [ ocaml findlib sawja ]; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index b9020f2cc0e..7f89961f9f8 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.1.1"; + version = "2.1.2"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-LXMPdzIOFPzFUx3uufx+2UeJ6mg/9kJXGews4KU3rrU="; + sha256 = "sha256-khbXzdsC0PA10HEu/dIFQ87+QbKpctmTUTt/zEuxV6c="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 79c726c2796..410660cb459 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,15 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.10.5"; + version = "0.10.7"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-PbWV8It/ubDbZooJdt/KWihnp221Pexs0U6zMa8KSMw="; + sha256 = "sha256-53dyy/jpmQCjOoZ9Wvec0iQMWKVVrt1WQDCGhXH53Mg="; }; - cargoSha256 = "sha256-VRfk6566SNmvCxtD9EdDxDdBvQuEfjPVggXzt4VoYRg="; + + cargoSha256 = "sha256-cDwuhOJ5/SFCQKJqmN6rPYahW/ctjE0hFr6SpgVzyis="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 9cd1c976162..8f0aecba34d 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; - vendorSha256 = "0whqrms5mc7v14p2h1jfvkawm30xaylivijlsghrsaq468qcgg15"; + vendorSha256 = "0zj2hls8m0l9xsfv680wiwq1g2qjdjslv2yx3yd4rzxdsv2wz09a"; doCheck = false; diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index 341df436e29..a08b10c1950 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vt8/hYsThBoAxMglF8pjdVphmkbHXsuzaHFJhnGXdU4="; + sha256 = "sha256-j1rVkI5hXYtY0jtP+i/yRw1sS3iN3KyVI4gV9fNdj/E="; }; - vendorSha256 = "sha256-3m+mN90Edb/yMgVmkokRQrDM2EdB7cb2opL0QZJ8L+U="; + vendorSha256 = "sha256-oYIUeHMEK55mCkf5cb5ECCU5y6tUZAM258sINrBl9kM="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 77fe16c442d..5e7d4e348fd 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-IsFvUWNuQsECh47M6wDpuyDYXrKKaZp2SSmEGFryzM0="; }; - vendorSha256 = "sha256-efrjHwHobML/t2lDSFx+UyAOca9dHjZHcAxkFzJqWEo="; + vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U="; doCheck = false; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 7bf32a13ce6..4841c48d0ee 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,28 +2,20 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.01.22-01.31.09"; + version = "2022.02.01-16.53.14"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-xQSOJRKKjX3AfQsYe4UNhFlLgWPkoY8NOPXCO1oc3BI="; + sha256 = "sha256-VyDnDlK40Sj/0cethclnRlKc5tOentAEUzjDOqbItpo="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "sha256-le0+ZmGyhM/UfGUV05FHyx5PlARxL/T2aC8UhiPYjxw"; + sha256 = "sha256-gIG8sjf55aRo4xI/RFrxhzLSD6RHzn/YGG9+gWrXcgE="; }; - # https://github.com/clojure-lsp/clojure-lsp/blob/2022.01.22-01.31.09/cli/graalvm/native-unix-compile.sh#L18-L27 - # Needs to be inject on `nativeImageBuildArgs` inside shell environment, - # otherwise we can't expand to the value set in `mktemp -d` call - preBuild = '' - export DTLV_LIB_EXTRACT_DIR="$(mktemp -d)" - nativeImageBuildArgs+=("-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR") - ''; - extraNativeImageBuildArgs = [ "--no-fallback" "--native-image-info" @@ -68,8 +60,5 @@ buildGraalvmNativeImage rec { homepage = "https://github.com/clojure-lsp/clojure-lsp"; license = licenses.mit; maintainers = with maintainers; [ ericdallo babariviere ]; - # Depends on datalevin that is x86_64 only - # https://github.com/juji-io/datalevin/blob/bb7d9328f4739cddea5d272b5cd6d6dcb5345da6/native/src/java/datalevin/ni/Lib.java#L86-L102 - broken = !stdenv.isx86_64; }; } diff --git a/pkgs/development/tools/misc/luarocks/default.upstream b/pkgs/development/tools/misc/luarocks/default.upstream deleted file mode 100644 index e69de1fe889..00000000000 --- a/pkgs/development/tools/misc/luarocks/default.upstream +++ /dev/null @@ -1 +0,0 @@ -url http://luarocks.org/releases/ diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index a6f195c12ac..b3fd7a54ec0 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QaJoHnuzSQXxEuGpui9lyKAjT2wdz4XmMAh5cAOKvBg="; }; - vendorSha256 = "sha256-7LRq1lG3DT1WQ0+78EEeQqCCrx6n6qTCUcYUuKSfvVE="; + vendorSha256 = "sha256-HcUH3cnaeyB2XnfcRLulsRcHaCwdLkiIb518Ucl2tv8="; doCheck = false; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 64d299db155..af10523e3b0 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,14 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, python2 }: stdenv.mkDerivation rec { - name = "${product}-${version}"; - product = "uncrustify"; + pname = "uncrustify"; version = "0.72.0"; src = fetchFromGitHub { - owner = product; - repo = product; - rev = name; + owner = "uncrustify"; + repo = "uncrustify"; + rev = "uncrustify-${version}"; sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY="; }; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index a63822428b2..8d088a6d286 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G+mVZS3ZRuBd00xfBqrTvmHOykFk63nJlucxv01nr3k="; + sha256 = "sha256-0TXk+6hS6TJHwhowYzL8ABw3iyfVwPttJWKQ9RfzMSI="; }; buildInputs = [ zlib openssl ]; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index d47d8a5cc31..58346852181 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner, re }: -let - version = "1.99.21"; -in -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ocp-build-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-ocp-build"; + version = "1.99.21"; src = fetchFromGitHub { owner = "OCamlPro"; diff --git a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh index 4e4291a5560..37fdb0d9101 100755 --- a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh +++ b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh @@ -48,7 +48,7 @@ do sha256=$(nix-prefetch-url "$url" 2>/dev/null) cat << EOL { - name = "$package"; + pname = "$package"; version = "$version"; src = fetchurl { url = "$url"; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index e2d3b236cdc..dad26f583a3 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -14,8 +14,7 @@ let dotnet-sdk = dotnetCorePackages.sdk_5_0; deps = map (package: stdenv.mkDerivation (with package; { - pname = name; - inherit version src; + inherit pname version src; buildInputs = [ unzip ]; unpackPhase = '' @@ -41,7 +40,7 @@ let installPhase = '' runHook preInstall - package=$out/lib/dotnet/${name}/${version} + package=$out/lib/dotnet/${pname}/${version} mkdir -p $package cp -r . $package echo "{}" > $package/.nupkg.metadata diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index 305246ce984..32786d32408 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -1,6 +1,6 @@ { fetchurl }: [ { - name = "cake.scripting.abstractions"; + pname = "cake.scripting.abstractions"; version = "0.6.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.6.4/cake.scripting.abstractions.0.6.4.nupkg"; @@ -8,7 +8,7 @@ }; } { - name = "cake.scripting.transport"; + pname = "cake.scripting.transport"; version = "0.6.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.6.4/cake.scripting.transport.0.6.4.nupkg"; @@ -16,7 +16,7 @@ }; } { - name = "dotnet.script.dependencymodel"; + pname = "dotnet.script.dependencymodel"; version = "1.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.1.0/dotnet.script.dependencymodel.1.1.0.nupkg"; @@ -24,7 +24,7 @@ }; } { - name = "dotnet.script.dependencymodel.nuget"; + pname = "dotnet.script.dependencymodel.nuget"; version = "1.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.1.0/dotnet.script.dependencymodel.nuget.1.1.0.nupkg"; @@ -32,7 +32,7 @@ }; } { - name = "humanizer.core"; + pname = "humanizer.core"; version = "2.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/humanizer.core/2.2.0/humanizer.core.2.2.0.nupkg"; @@ -40,7 +40,7 @@ }; } { - name = "icsharpcode.decompiler"; + pname = "icsharpcode.decompiler"; version = "7.1.0.6543"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.1.0.6543/icsharpcode.decompiler.7.1.0.6543.nupkg"; @@ -48,7 +48,7 @@ }; } { - name = "mcmaster.extensions.commandlineutils"; + pname = "mcmaster.extensions.commandlineutils"; version = "3.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/mcmaster.extensions.commandlineutils/3.1.0/mcmaster.extensions.commandlineutils.3.1.0.nupkg"; @@ -56,7 +56,7 @@ }; } { - name = "mediatr"; + pname = "mediatr"; version = "8.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/mediatr/8.1.0/mediatr.8.1.0.nupkg"; @@ -64,7 +64,7 @@ }; } { - name = "messagepack"; + pname = "messagepack"; version = "2.1.152"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/messagepack/2.1.152/messagepack.2.1.152.nupkg"; @@ -72,7 +72,7 @@ }; } { - name = "messagepackanalyzer"; + pname = "messagepackanalyzer"; version = "2.1.152"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/messagepackanalyzer/2.1.152/messagepackanalyzer.2.1.152.nupkg"; @@ -80,7 +80,7 @@ }; } { - name = "messagepack.annotations"; + pname = "messagepack.annotations"; version = "2.1.152"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/messagepack.annotations/2.1.152/messagepack.annotations.2.1.152.nupkg"; @@ -88,7 +88,7 @@ }; } { - name = "microsoft.aspnetcore.app.ref"; + pname = "microsoft.aspnetcore.app.ref"; version = "3.1.10"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; @@ -96,7 +96,7 @@ }; } { - name = "microsoft.bcl.asyncinterfaces"; + pname = "microsoft.bcl.asyncinterfaces"; version = "1.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; @@ -104,7 +104,7 @@ }; } { - name = "microsoft.bcl.asyncinterfaces"; + pname = "microsoft.bcl.asyncinterfaces"; version = "1.1.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.1/microsoft.bcl.asyncinterfaces.1.1.1.nupkg"; @@ -112,7 +112,7 @@ }; } { - name = "microsoft.bcl.asyncinterfaces"; + pname = "microsoft.bcl.asyncinterfaces"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/5.0.0/microsoft.bcl.asyncinterfaces.5.0.0.nupkg"; @@ -120,7 +120,7 @@ }; } { - name = "microsoft.build"; + pname = "microsoft.build"; version = "16.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.10.0/microsoft.build.16.10.0.nupkg"; @@ -128,7 +128,7 @@ }; } { - name = "microsoft.build.framework"; + pname = "microsoft.build.framework"; version = "16.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.10.0/microsoft.build.framework.16.10.0.nupkg"; @@ -136,7 +136,7 @@ }; } { - name = "microsoft.build.locator"; + pname = "microsoft.build.locator"; version = "1.4.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.locator/1.4.1/microsoft.build.locator.1.4.1.nupkg"; @@ -144,7 +144,7 @@ }; } { - name = "microsoft.build.tasks.core"; + pname = "microsoft.build.tasks.core"; version = "16.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.10.0/microsoft.build.tasks.core.16.10.0.nupkg"; @@ -152,7 +152,7 @@ }; } { - name = "microsoft.build.tasks.git"; + pname = "microsoft.build.tasks.git"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.git/1.0.0/microsoft.build.tasks.git.1.0.0.nupkg"; @@ -160,7 +160,7 @@ }; } { - name = "microsoft.build.utilities.core"; + pname = "microsoft.build.utilities.core"; version = "16.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.10.0/microsoft.build.utilities.core.16.10.0.nupkg"; @@ -168,7 +168,7 @@ }; } { - name = "microsoft.codeanalysis.analyzers"; + pname = "microsoft.codeanalysis.analyzers"; version = "3.3.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.2/microsoft.codeanalysis.analyzers.3.3.2.nupkg"; @@ -176,7 +176,7 @@ }; } { - name = "microsoft.codeanalysis.analyzerutilities"; + pname = "microsoft.codeanalysis.analyzerutilities"; version = "3.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"; @@ -184,7 +184,7 @@ }; } { - name = "microsoft.codeanalysis.common"; + pname = "microsoft.codeanalysis.common"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-4.21427.11/microsoft.codeanalysis.common.4.0.0-4.21427.11.nupkg"; @@ -192,7 +192,7 @@ }; } { - name = "microsoft.codeanalysis.csharp"; + pname = "microsoft.codeanalysis.csharp"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.4.0.0-4.21427.11.nupkg"; @@ -200,7 +200,7 @@ }; } { - name = "microsoft.codeanalysis.csharp.features"; + pname = "microsoft.codeanalysis.csharp.features"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.features.4.0.0-4.21427.11.nupkg"; @@ -208,7 +208,7 @@ }; } { - name = "microsoft.codeanalysis.csharp.scripting"; + pname = "microsoft.codeanalysis.csharp.scripting"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.scripting.4.0.0-4.21427.11.nupkg"; @@ -216,7 +216,7 @@ }; } { - name = "microsoft.codeanalysis.csharp.workspaces"; + pname = "microsoft.codeanalysis.csharp.workspaces"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.workspaces.4.0.0-4.21427.11.nupkg"; @@ -224,7 +224,7 @@ }; } { - name = "microsoft.codeanalysis.externalaccess.omnisharp"; + pname = "microsoft.codeanalysis.externalaccess.omnisharp"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-4.21427.11.nupkg"; @@ -232,7 +232,7 @@ }; } { - name = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; + pname = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-4.21427.11.nupkg"; @@ -240,7 +240,7 @@ }; } { - name = "microsoft.codeanalysis.features"; + pname = "microsoft.codeanalysis.features"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-4.21427.11/microsoft.codeanalysis.features.4.0.0-4.21427.11.nupkg"; @@ -248,7 +248,7 @@ }; } { - name = "microsoft.codeanalysis.scripting.common"; + pname = "microsoft.codeanalysis.scripting.common"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-4.21427.11/microsoft.codeanalysis.scripting.common.4.0.0-4.21427.11.nupkg"; @@ -256,7 +256,7 @@ }; } { - name = "microsoft.codeanalysis.workspaces.common"; + pname = "microsoft.codeanalysis.workspaces.common"; version = "4.0.0-4.21427.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-4.21427.11/microsoft.codeanalysis.workspaces.common.4.0.0-4.21427.11.nupkg"; @@ -264,7 +264,7 @@ }; } { - name = "microsoft.csharp"; + pname = "microsoft.csharp"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.3.0/microsoft.csharp.4.3.0.nupkg"; @@ -272,7 +272,7 @@ }; } { - name = "microsoft.diasymreader"; + pname = "microsoft.diasymreader"; version = "1.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.diasymreader/1.3.0/microsoft.diasymreader.1.3.0.nupkg"; @@ -280,7 +280,7 @@ }; } { - name = "microsoft.dotnet.platformabstractions"; + pname = "microsoft.dotnet.platformabstractions"; version = "3.1.6"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/3.1.6/microsoft.dotnet.platformabstractions.3.1.6.nupkg"; @@ -288,7 +288,7 @@ }; } { - name = "microsoft.extensions.caching.abstractions"; + pname = "microsoft.extensions.caching.abstractions"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/5.0.0/microsoft.extensions.caching.abstractions.5.0.0.nupkg"; @@ -296,7 +296,7 @@ }; } { - name = "microsoft.extensions.caching.memory"; + pname = "microsoft.extensions.caching.memory"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/5.0.0/microsoft.extensions.caching.memory.5.0.0.nupkg"; @@ -304,7 +304,7 @@ }; } { - name = "microsoft.extensions.configuration"; + pname = "microsoft.extensions.configuration"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/2.0.0/microsoft.extensions.configuration.2.0.0.nupkg"; @@ -312,7 +312,7 @@ }; } { - name = "microsoft.extensions.configuration"; + pname = "microsoft.extensions.configuration"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg"; @@ -320,7 +320,7 @@ }; } { - name = "microsoft.extensions.configuration.abstractions"; + pname = "microsoft.extensions.configuration.abstractions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/2.0.0/microsoft.extensions.configuration.abstractions.2.0.0.nupkg"; @@ -328,7 +328,7 @@ }; } { - name = "microsoft.extensions.configuration.abstractions"; + pname = "microsoft.extensions.configuration.abstractions"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg"; @@ -336,7 +336,7 @@ }; } { - name = "microsoft.extensions.configuration.binder"; + pname = "microsoft.extensions.configuration.binder"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/2.0.0/microsoft.extensions.configuration.binder.2.0.0.nupkg"; @@ -344,7 +344,7 @@ }; } { - name = "microsoft.extensions.configuration.binder"; + pname = "microsoft.extensions.configuration.binder"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg"; @@ -352,7 +352,7 @@ }; } { - name = "microsoft.extensions.configuration.commandline"; + pname = "microsoft.extensions.configuration.commandline"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg"; @@ -360,7 +360,7 @@ }; } { - name = "microsoft.extensions.configuration.environmentvariables"; + pname = "microsoft.extensions.configuration.environmentvariables"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/5.0.0/microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg"; @@ -368,7 +368,7 @@ }; } { - name = "microsoft.extensions.configuration.fileextensions"; + pname = "microsoft.extensions.configuration.fileextensions"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg"; @@ -376,7 +376,7 @@ }; } { - name = "microsoft.extensions.configuration.json"; + pname = "microsoft.extensions.configuration.json"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg"; @@ -384,7 +384,7 @@ }; } { - name = "microsoft.extensions.dependencyinjection"; + pname = "microsoft.extensions.dependencyinjection"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/2.0.0/microsoft.extensions.dependencyinjection.2.0.0.nupkg"; @@ -392,7 +392,7 @@ }; } { - name = "microsoft.extensions.dependencyinjection"; + pname = "microsoft.extensions.dependencyinjection"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg"; @@ -400,7 +400,7 @@ }; } { - name = "microsoft.extensions.dependencyinjection.abstractions"; + pname = "microsoft.extensions.dependencyinjection.abstractions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/2.0.0/microsoft.extensions.dependencyinjection.abstractions.2.0.0.nupkg"; @@ -408,7 +408,7 @@ }; } { - name = "microsoft.extensions.dependencyinjection.abstractions"; + pname = "microsoft.extensions.dependencyinjection.abstractions"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg"; @@ -416,7 +416,7 @@ }; } { - name = "microsoft.extensions.dependencymodel"; + pname = "microsoft.extensions.dependencymodel"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/5.0.0/microsoft.extensions.dependencymodel.5.0.0.nupkg"; @@ -424,7 +424,7 @@ }; } { - name = "microsoft.extensions.fileproviders.abstractions"; + pname = "microsoft.extensions.fileproviders.abstractions"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg"; @@ -432,7 +432,7 @@ }; } { - name = "microsoft.extensions.fileproviders.physical"; + pname = "microsoft.extensions.fileproviders.physical"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg"; @@ -440,7 +440,7 @@ }; } { - name = "microsoft.extensions.filesystemglobbing"; + pname = "microsoft.extensions.filesystemglobbing"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg"; @@ -448,7 +448,7 @@ }; } { - name = "microsoft.extensions.logging"; + pname = "microsoft.extensions.logging"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/2.0.0/microsoft.extensions.logging.2.0.0.nupkg"; @@ -456,7 +456,7 @@ }; } { - name = "microsoft.extensions.logging"; + pname = "microsoft.extensions.logging"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg"; @@ -464,7 +464,7 @@ }; } { - name = "microsoft.extensions.logging.abstractions"; + pname = "microsoft.extensions.logging.abstractions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.0.0/microsoft.extensions.logging.abstractions.2.0.0.nupkg"; @@ -472,7 +472,7 @@ }; } { - name = "microsoft.extensions.logging.abstractions"; + pname = "microsoft.extensions.logging.abstractions"; version = "2.1.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.1.1/microsoft.extensions.logging.abstractions.2.1.1.nupkg"; @@ -480,7 +480,7 @@ }; } { - name = "microsoft.extensions.logging.abstractions"; + pname = "microsoft.extensions.logging.abstractions"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg"; @@ -488,7 +488,7 @@ }; } { - name = "microsoft.extensions.logging.configuration"; + pname = "microsoft.extensions.logging.configuration"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg"; @@ -496,7 +496,7 @@ }; } { - name = "microsoft.extensions.logging.console"; + pname = "microsoft.extensions.logging.console"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg"; @@ -504,7 +504,7 @@ }; } { - name = "microsoft.extensions.options"; + pname = "microsoft.extensions.options"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/2.0.0/microsoft.extensions.options.2.0.0.nupkg"; @@ -512,7 +512,7 @@ }; } { - name = "microsoft.extensions.options"; + pname = "microsoft.extensions.options"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg"; @@ -520,7 +520,7 @@ }; } { - name = "microsoft.extensions.options.configurationextensions"; + pname = "microsoft.extensions.options.configurationextensions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/2.0.0/microsoft.extensions.options.configurationextensions.2.0.0.nupkg"; @@ -528,7 +528,7 @@ }; } { - name = "microsoft.extensions.options.configurationextensions"; + pname = "microsoft.extensions.options.configurationextensions"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg"; @@ -536,7 +536,7 @@ }; } { - name = "microsoft.extensions.primitives"; + pname = "microsoft.extensions.primitives"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/2.0.0/microsoft.extensions.primitives.2.0.0.nupkg"; @@ -544,7 +544,7 @@ }; } { - name = "microsoft.extensions.primitives"; + pname = "microsoft.extensions.primitives"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg"; @@ -552,7 +552,7 @@ }; } { - name = "microsoft.netcore.app.ref"; + pname = "microsoft.netcore.app.ref"; version = "3.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; @@ -560,7 +560,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "1.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; @@ -568,7 +568,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "1.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; @@ -576,7 +576,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.0.0/microsoft.netcore.platforms.2.0.0.nupkg"; @@ -584,7 +584,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.1.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg"; @@ -592,7 +592,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "3.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.1.0/microsoft.netcore.platforms.3.1.0.nupkg"; @@ -600,7 +600,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; @@ -608,7 +608,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; @@ -616,7 +616,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies"; + pname = "microsoft.netframework.referenceassemblies"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; @@ -624,7 +624,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies.net472"; + pname = "microsoft.netframework.referenceassemblies.net472"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; @@ -632,7 +632,7 @@ }; } { - name = "microsoft.net.stringtools"; + pname = "microsoft.net.stringtools"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg"; @@ -640,7 +640,7 @@ }; } { - name = "microsoft.sourcelink.common"; + pname = "microsoft.sourcelink.common"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.common/1.0.0/microsoft.sourcelink.common.1.0.0.nupkg"; @@ -648,7 +648,7 @@ }; } { - name = "microsoft.sourcelink.github"; + pname = "microsoft.sourcelink.github"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.github/1.0.0/microsoft.sourcelink.github.1.0.0.nupkg"; @@ -656,7 +656,7 @@ }; } { - name = "microsoft.testplatform.objectmodel"; + pname = "microsoft.testplatform.objectmodel"; version = "16.9.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg"; @@ -664,7 +664,7 @@ }; } { - name = "microsoft.testplatform.translationlayer"; + pname = "microsoft.testplatform.translationlayer"; version = "16.9.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.9.4/microsoft.testplatform.translationlayer.16.9.4.nupkg"; @@ -672,7 +672,7 @@ }; } { - name = "microsoft.visualstudio.debugger.contracts"; + pname = "microsoft.visualstudio.debugger.contracts"; version = "17.2.0-beta.21417.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21417.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21417.1.nupkg"; @@ -680,7 +680,7 @@ }; } { - name = "microsoft.visualstudio.sdk.embedinteroptypes"; + pname = "microsoft.visualstudio.sdk.embedinteroptypes"; version = "15.0.12"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.sdk.embedinteroptypes/15.0.12/microsoft.visualstudio.sdk.embedinteroptypes.15.0.12.nupkg"; @@ -688,7 +688,7 @@ }; } { - name = "microsoft.visualstudio.setup.configuration.interop"; + pname = "microsoft.visualstudio.setup.configuration.interop"; version = "1.14.114"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.14.114/microsoft.visualstudio.setup.configuration.interop.1.14.114.nupkg"; @@ -696,7 +696,7 @@ }; } { - name = "microsoft.visualstudio.setup.configuration.interop"; + pname = "microsoft.visualstudio.setup.configuration.interop"; version = "1.16.30"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; @@ -704,7 +704,7 @@ }; } { - name = "microsoft.visualstudio.threading"; + pname = "microsoft.visualstudio.threading"; version = "16.7.56"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading/16.7.56/microsoft.visualstudio.threading.16.7.56.nupkg"; @@ -712,7 +712,7 @@ }; } { - name = "microsoft.visualstudio.threading.analyzers"; + pname = "microsoft.visualstudio.threading.analyzers"; version = "16.7.56"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading.analyzers/16.7.56/microsoft.visualstudio.threading.analyzers.16.7.56.nupkg"; @@ -720,7 +720,7 @@ }; } { - name = "microsoft.visualstudio.validation"; + pname = "microsoft.visualstudio.validation"; version = "15.5.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.validation/15.5.31/microsoft.visualstudio.validation.15.5.31.nupkg"; @@ -728,7 +728,7 @@ }; } { - name = "microsoft.win32.primitives"; + pname = "microsoft.win32.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; @@ -736,7 +736,7 @@ }; } { - name = "microsoft.win32.registry"; + pname = "microsoft.win32.registry"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg"; @@ -744,7 +744,7 @@ }; } { - name = "microsoft.win32.registry"; + pname = "microsoft.win32.registry"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.6.0/microsoft.win32.registry.4.6.0.nupkg"; @@ -752,7 +752,7 @@ }; } { - name = "microsoft.win32.systemevents"; + pname = "microsoft.win32.systemevents"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/4.7.0/microsoft.win32.systemevents.4.7.0.nupkg"; @@ -760,7 +760,7 @@ }; } { - name = "nerdbank.streams"; + pname = "nerdbank.streams"; version = "2.6.81"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nerdbank.streams/2.6.81/nerdbank.streams.2.6.81.nupkg"; @@ -768,7 +768,7 @@ }; } { - name = "netstandard.library"; + pname = "netstandard.library"; version = "1.6.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; @@ -776,7 +776,7 @@ }; } { - name = "netstandard.library"; + pname = "netstandard.library"; version = "2.0.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; @@ -784,7 +784,7 @@ }; } { - name = "newtonsoft.json"; + pname = "newtonsoft.json"; version = "11.0.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/11.0.2/newtonsoft.json.11.0.2.nupkg"; @@ -792,7 +792,7 @@ }; } { - name = "newtonsoft.json"; + pname = "newtonsoft.json"; version = "12.0.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/12.0.3/newtonsoft.json.12.0.3.nupkg"; @@ -800,7 +800,7 @@ }; } { - name = "newtonsoft.json"; + pname = "newtonsoft.json"; version = "9.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; @@ -808,7 +808,7 @@ }; } { - name = "nuget.common"; + pname = "nuget.common"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.10.0/nuget.common.5.10.0.nupkg"; @@ -816,7 +816,7 @@ }; } { - name = "nuget.common"; + pname = "nuget.common"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.2.0/nuget.common.5.2.0.nupkg"; @@ -824,7 +824,7 @@ }; } { - name = "nuget.configuration"; + pname = "nuget.configuration"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.10.0/nuget.configuration.5.10.0.nupkg"; @@ -832,7 +832,7 @@ }; } { - name = "nuget.configuration"; + pname = "nuget.configuration"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.2.0/nuget.configuration.5.2.0.nupkg"; @@ -840,7 +840,7 @@ }; } { - name = "nuget.dependencyresolver.core"; + pname = "nuget.dependencyresolver.core"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.10.0/nuget.dependencyresolver.core.5.10.0.nupkg"; @@ -848,7 +848,7 @@ }; } { - name = "nuget.dependencyresolver.core"; + pname = "nuget.dependencyresolver.core"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.2.0/nuget.dependencyresolver.core.5.2.0.nupkg"; @@ -856,7 +856,7 @@ }; } { - name = "nuget.frameworks"; + pname = "nuget.frameworks"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.0.0/nuget.frameworks.5.0.0.nupkg"; @@ -864,7 +864,7 @@ }; } { - name = "nuget.frameworks"; + pname = "nuget.frameworks"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.10.0/nuget.frameworks.5.10.0.nupkg"; @@ -872,7 +872,7 @@ }; } { - name = "nuget.frameworks"; + pname = "nuget.frameworks"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.2.0/nuget.frameworks.5.2.0.nupkg"; @@ -880,7 +880,7 @@ }; } { - name = "nuget.librarymodel"; + pname = "nuget.librarymodel"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.10.0/nuget.librarymodel.5.10.0.nupkg"; @@ -888,7 +888,7 @@ }; } { - name = "nuget.librarymodel"; + pname = "nuget.librarymodel"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.2.0/nuget.librarymodel.5.2.0.nupkg"; @@ -896,7 +896,7 @@ }; } { - name = "nuget.packaging"; + pname = "nuget.packaging"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.10.0/nuget.packaging.5.10.0.nupkg"; @@ -904,7 +904,7 @@ }; } { - name = "nuget.packaging"; + pname = "nuget.packaging"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.2.0/nuget.packaging.5.2.0.nupkg"; @@ -912,7 +912,7 @@ }; } { - name = "nuget.packaging.core"; + pname = "nuget.packaging.core"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/5.10.0/nuget.packaging.core.5.10.0.nupkg"; @@ -920,7 +920,7 @@ }; } { - name = "nuget.projectmodel"; + pname = "nuget.projectmodel"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.10.0/nuget.projectmodel.5.10.0.nupkg"; @@ -928,7 +928,7 @@ }; } { - name = "nuget.projectmodel"; + pname = "nuget.projectmodel"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.2.0/nuget.projectmodel.5.2.0.nupkg"; @@ -936,7 +936,7 @@ }; } { - name = "nuget.protocol"; + pname = "nuget.protocol"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.10.0/nuget.protocol.5.10.0.nupkg"; @@ -944,7 +944,7 @@ }; } { - name = "nuget.protocol"; + pname = "nuget.protocol"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.2.0/nuget.protocol.5.2.0.nupkg"; @@ -952,7 +952,7 @@ }; } { - name = "nuget.versioning"; + pname = "nuget.versioning"; version = "5.10.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.10.0/nuget.versioning.5.10.0.nupkg"; @@ -960,7 +960,7 @@ }; } { - name = "nuget.versioning"; + pname = "nuget.versioning"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.2.0/nuget.versioning.5.2.0.nupkg"; @@ -968,7 +968,7 @@ }; } { - name = "omnisharp.extensions.jsonrpc"; + pname = "omnisharp.extensions.jsonrpc"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc/0.19.0/omnisharp.extensions.jsonrpc.0.19.0.nupkg"; @@ -976,7 +976,7 @@ }; } { - name = "omnisharp.extensions.jsonrpc.generators"; + pname = "omnisharp.extensions.jsonrpc.generators"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc.generators/0.19.0/omnisharp.extensions.jsonrpc.generators.0.19.0.nupkg"; @@ -984,7 +984,7 @@ }; } { - name = "omnisharp.extensions.languageprotocol"; + pname = "omnisharp.extensions.languageprotocol"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageprotocol/0.19.0/omnisharp.extensions.languageprotocol.0.19.0.nupkg"; @@ -992,7 +992,7 @@ }; } { - name = "omnisharp.extensions.languageserver"; + pname = "omnisharp.extensions.languageserver"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver/0.19.0/omnisharp.extensions.languageserver.0.19.0.nupkg"; @@ -1000,7 +1000,7 @@ }; } { - name = "omnisharp.extensions.languageserver.shared"; + pname = "omnisharp.extensions.languageserver.shared"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver.shared/0.19.0/omnisharp.extensions.languageserver.shared.0.19.0.nupkg"; @@ -1008,7 +1008,7 @@ }; } { - name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1016,7 +1016,7 @@ }; } { - name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1024,7 +1024,7 @@ }; } { - name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1032,7 +1032,7 @@ }; } { - name = "runtime.native.system"; + pname = "runtime.native.system"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; @@ -1040,7 +1040,7 @@ }; } { - name = "runtime.native.system.io.compression"; + pname = "runtime.native.system.io.compression"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; @@ -1048,7 +1048,7 @@ }; } { - name = "runtime.native.system.net.http"; + pname = "runtime.native.system.net.http"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg"; @@ -1056,7 +1056,7 @@ }; } { - name = "runtime.native.system.security.cryptography.apple"; + pname = "runtime.native.system.security.cryptography.apple"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; @@ -1064,7 +1064,7 @@ }; } { - name = "runtime.native.system.security.cryptography.openssl"; + pname = "runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1072,7 +1072,7 @@ }; } { - name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1080,7 +1080,7 @@ }; } { - name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1088,7 +1088,7 @@ }; } { - name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; + pname = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; @@ -1096,7 +1096,7 @@ }; } { - name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1104,7 +1104,7 @@ }; } { - name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1112,7 +1112,7 @@ }; } { - name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1120,7 +1120,7 @@ }; } { - name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1128,7 +1128,7 @@ }; } { - name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1136,7 +1136,7 @@ }; } { - name = "sqlitepclraw.bundle_green"; + pname = "sqlitepclraw.bundle_green"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.bundle_green/2.0.4/sqlitepclraw.bundle_green.2.0.4.nupkg"; @@ -1144,7 +1144,7 @@ }; } { - name = "sqlitepclraw.core"; + pname = "sqlitepclraw.core"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.core/2.0.4/sqlitepclraw.core.2.0.4.nupkg"; @@ -1152,7 +1152,7 @@ }; } { - name = "sqlitepclraw.lib.e_sqlite3"; + pname = "sqlitepclraw.lib.e_sqlite3"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.lib.e_sqlite3/2.0.4/sqlitepclraw.lib.e_sqlite3.2.0.4.nupkg"; @@ -1160,7 +1160,7 @@ }; } { - name = "sqlitepclraw.provider.dynamic_cdecl"; + pname = "sqlitepclraw.provider.dynamic_cdecl"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.dynamic_cdecl/2.0.4/sqlitepclraw.provider.dynamic_cdecl.2.0.4.nupkg"; @@ -1168,7 +1168,7 @@ }; } { - name = "sqlitepclraw.provider.e_sqlite3"; + pname = "sqlitepclraw.provider.e_sqlite3"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.e_sqlite3/2.0.4/sqlitepclraw.provider.e_sqlite3.2.0.4.nupkg"; @@ -1176,7 +1176,7 @@ }; } { - name = "system.appcontext"; + pname = "system.appcontext"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; @@ -1184,7 +1184,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; @@ -1192,7 +1192,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; @@ -1200,7 +1200,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; @@ -1208,7 +1208,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.5.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; @@ -1216,7 +1216,7 @@ }; } { - name = "system.codedom"; + pname = "system.codedom"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg"; @@ -1224,7 +1224,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg"; @@ -1232,7 +1232,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg"; @@ -1240,7 +1240,7 @@ }; } { - name = "system.collections.concurrent"; + pname = "system.collections.concurrent"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; @@ -1248,7 +1248,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; @@ -1256,7 +1256,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.7.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.7.1/system.collections.immutable.1.7.1.nupkg"; @@ -1264,7 +1264,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; @@ -1272,7 +1272,7 @@ }; } { - name = "system.componentmodel.composition"; + pname = "system.componentmodel.composition"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.composition/4.5.0/system.componentmodel.composition.4.5.0.nupkg"; @@ -1280,7 +1280,7 @@ }; } { - name = "system.composition"; + pname = "system.composition"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition/1.0.31/system.composition.1.0.31.nupkg"; @@ -1288,7 +1288,7 @@ }; } { - name = "system.composition.attributedmodel"; + pname = "system.composition.attributedmodel"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.attributedmodel/1.0.31/system.composition.attributedmodel.1.0.31.nupkg"; @@ -1296,7 +1296,7 @@ }; } { - name = "system.composition.convention"; + pname = "system.composition.convention"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.convention/1.0.31/system.composition.convention.1.0.31.nupkg"; @@ -1304,7 +1304,7 @@ }; } { - name = "system.composition.hosting"; + pname = "system.composition.hosting"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.hosting/1.0.31/system.composition.hosting.1.0.31.nupkg"; @@ -1312,7 +1312,7 @@ }; } { - name = "system.composition.runtime"; + pname = "system.composition.runtime"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.runtime/1.0.31/system.composition.runtime.1.0.31.nupkg"; @@ -1320,7 +1320,7 @@ }; } { - name = "system.composition.typedparts"; + pname = "system.composition.typedparts"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.typedparts/1.0.31/system.composition.typedparts.1.0.31.nupkg"; @@ -1328,7 +1328,7 @@ }; } { - name = "system.configuration.configurationmanager"; + pname = "system.configuration.configurationmanager"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg"; @@ -1336,7 +1336,7 @@ }; } { - name = "system.console"; + pname = "system.console"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg"; @@ -1344,7 +1344,7 @@ }; } { - name = "system.diagnostics.debug"; + pname = "system.diagnostics.debug"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; @@ -1352,7 +1352,7 @@ }; } { - name = "system.diagnostics.diagnosticsource"; + pname = "system.diagnostics.diagnosticsource"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; @@ -1360,7 +1360,7 @@ }; } { - name = "system.diagnostics.diagnosticsource"; + pname = "system.diagnostics.diagnosticsource"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/5.0.0/system.diagnostics.diagnosticsource.5.0.0.nupkg"; @@ -1368,7 +1368,7 @@ }; } { - name = "system.diagnostics.tools"; + pname = "system.diagnostics.tools"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; @@ -1376,7 +1376,7 @@ }; } { - name = "system.diagnostics.tracing"; + pname = "system.diagnostics.tracing"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; @@ -1384,7 +1384,7 @@ }; } { - name = "system.drawing.common"; + pname = "system.drawing.common"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.drawing.common/4.7.0/system.drawing.common.4.7.0.nupkg"; @@ -1392,7 +1392,7 @@ }; } { - name = "system.formats.asn1"; + pname = "system.formats.asn1"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.formats.asn1/5.0.0/system.formats.asn1.5.0.0.nupkg"; @@ -1400,7 +1400,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; @@ -1408,7 +1408,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; @@ -1416,7 +1416,7 @@ }; } { - name = "system.globalization.calendars"; + pname = "system.globalization.calendars"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; @@ -1424,7 +1424,7 @@ }; } { - name = "system.globalization.extensions"; + pname = "system.globalization.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg"; @@ -1432,7 +1432,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg"; @@ -1440,7 +1440,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg"; @@ -1448,7 +1448,7 @@ }; } { - name = "system.io.compression"; + pname = "system.io.compression"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; @@ -1456,7 +1456,7 @@ }; } { - name = "system.io.compression.zipfile"; + pname = "system.io.compression.zipfile"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; @@ -1464,7 +1464,7 @@ }; } { - name = "system.io.filesystem"; + pname = "system.io.filesystem"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; @@ -1472,7 +1472,7 @@ }; } { - name = "system.io.filesystem.primitives"; + pname = "system.io.filesystem.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; @@ -1480,7 +1480,7 @@ }; } { - name = "system.io.pipelines"; + pname = "system.io.pipelines"; version = "4.7.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/4.7.3/system.io.pipelines.4.7.3.nupkg"; @@ -1488,7 +1488,7 @@ }; } { - name = "system.io.pipelines"; + pname = "system.io.pipelines"; version = "5.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg"; @@ -1496,7 +1496,7 @@ }; } { - name = "system.linq"; + pname = "system.linq"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg"; @@ -1504,7 +1504,7 @@ }; } { - name = "system.linq.expressions"; + pname = "system.linq.expressions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; @@ -1512,7 +1512,7 @@ }; } { - name = "system.memory"; + pname = "system.memory"; version = "4.5.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg"; @@ -1520,7 +1520,7 @@ }; } { - name = "system.memory"; + pname = "system.memory"; version = "4.5.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg"; @@ -1528,7 +1528,7 @@ }; } { - name = "system.net.http"; + pname = "system.net.http"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; @@ -1536,7 +1536,7 @@ }; } { - name = "system.net.primitives"; + pname = "system.net.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; @@ -1544,7 +1544,7 @@ }; } { - name = "system.net.sockets"; + pname = "system.net.sockets"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; @@ -1552,7 +1552,7 @@ }; } { - name = "system.net.websockets"; + pname = "system.net.websockets"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.websockets/4.3.0/system.net.websockets.4.3.0.nupkg"; @@ -1560,7 +1560,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; @@ -1568,7 +1568,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; @@ -1576,7 +1576,7 @@ }; } { - name = "system.objectmodel"; + pname = "system.objectmodel"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; @@ -1584,7 +1584,7 @@ }; } { - name = "system.reactive"; + pname = "system.reactive"; version = "4.4.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reactive/4.4.1/system.reactive.4.4.1.nupkg"; @@ -1592,7 +1592,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; @@ -1600,7 +1600,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; @@ -1608,7 +1608,7 @@ }; } { - name = "system.reflection.dispatchproxy"; + pname = "system.reflection.dispatchproxy"; version = "4.5.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.dispatchproxy/4.5.1/system.reflection.dispatchproxy.4.5.1.nupkg"; @@ -1616,7 +1616,7 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; @@ -1624,7 +1624,7 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.6.0/system.reflection.emit.4.6.0.nupkg"; @@ -1632,7 +1632,7 @@ }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg"; @@ -1640,7 +1640,7 @@ }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.6.0/system.reflection.emit.ilgeneration.4.6.0.nupkg"; @@ -1648,7 +1648,7 @@ }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; @@ -1656,7 +1656,7 @@ }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.6.0/system.reflection.emit.lightweight.4.6.0.nupkg"; @@ -1664,7 +1664,7 @@ }; } { - name = "system.reflection.extensions"; + pname = "system.reflection.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; @@ -1672,7 +1672,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "1.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; @@ -1680,7 +1680,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; @@ -1688,7 +1688,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; @@ -1696,7 +1696,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; @@ -1704,7 +1704,7 @@ }; } { - name = "system.reflection.typeextensions"; + pname = "system.reflection.typeextensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg"; @@ -1712,7 +1712,7 @@ }; } { - name = "system.resources.extensions"; + pname = "system.resources.extensions"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; @@ -1720,7 +1720,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; @@ -1728,7 +1728,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; @@ -1736,7 +1736,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; @@ -1744,7 +1744,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; @@ -1752,7 +1752,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.4.0/system.runtime.compilerservices.unsafe.4.4.0.nupkg"; @@ -1760,7 +1760,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.5.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.2/system.runtime.compilerservices.unsafe.4.5.2.nupkg"; @@ -1768,7 +1768,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.5.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.3/system.runtime.compilerservices.unsafe.4.5.3.nupkg"; @@ -1776,7 +1776,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg"; @@ -1784,7 +1784,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.7.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; @@ -1792,7 +1792,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; @@ -1800,7 +1800,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; @@ -1808,7 +1808,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; @@ -1816,7 +1816,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; @@ -1824,7 +1824,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; @@ -1832,7 +1832,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; @@ -1840,7 +1840,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; @@ -1848,7 +1848,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; @@ -1856,7 +1856,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; @@ -1864,7 +1864,7 @@ }; } { - name = "system.runtime.interopservices.windowsruntime"; + pname = "system.runtime.interopservices.windowsruntime"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.windowsruntime/4.3.0/system.runtime.interopservices.windowsruntime.4.3.0.nupkg"; @@ -1872,7 +1872,7 @@ }; } { - name = "system.runtime.numerics"; + pname = "system.runtime.numerics"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; @@ -1880,7 +1880,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; @@ -1888,7 +1888,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.6.0/system.security.accesscontrol.4.6.0.nupkg"; @@ -1896,7 +1896,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg"; @@ -1904,7 +1904,7 @@ }; } { - name = "system.security.cryptography.algorithms"; + pname = "system.security.cryptography.algorithms"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; @@ -1912,7 +1912,7 @@ }; } { - name = "system.security.cryptography.algorithms"; + pname = "system.security.cryptography.algorithms"; version = "4.3.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.1/system.security.cryptography.algorithms.4.3.1.nupkg"; @@ -1920,7 +1920,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg"; @@ -1928,7 +1928,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.7.0/system.security.cryptography.cng.4.7.0.nupkg"; @@ -1936,7 +1936,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/5.0.0/system.security.cryptography.cng.5.0.0.nupkg"; @@ -1944,7 +1944,7 @@ }; } { - name = "system.security.cryptography.csp"; + pname = "system.security.cryptography.csp"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg"; @@ -1952,7 +1952,7 @@ }; } { - name = "system.security.cryptography.encoding"; + pname = "system.security.cryptography.encoding"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; @@ -1960,7 +1960,7 @@ }; } { - name = "system.security.cryptography.openssl"; + pname = "system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1968,7 +1968,7 @@ }; } { - name = "system.security.cryptography.pkcs"; + pname = "system.security.cryptography.pkcs"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/4.7.0/system.security.cryptography.pkcs.4.7.0.nupkg"; @@ -1976,7 +1976,7 @@ }; } { - name = "system.security.cryptography.pkcs"; + pname = "system.security.cryptography.pkcs"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/5.0.0/system.security.cryptography.pkcs.5.0.0.nupkg"; @@ -1984,7 +1984,7 @@ }; } { - name = "system.security.cryptography.primitives"; + pname = "system.security.cryptography.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; @@ -1992,7 +1992,7 @@ }; } { - name = "system.security.cryptography.protecteddata"; + pname = "system.security.cryptography.protecteddata"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.4.0/system.security.cryptography.protecteddata.4.4.0.nupkg"; @@ -2000,7 +2000,7 @@ }; } { - name = "system.security.cryptography.protecteddata"; + pname = "system.security.cryptography.protecteddata"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.7.0/system.security.cryptography.protecteddata.4.7.0.nupkg"; @@ -2008,7 +2008,7 @@ }; } { - name = "system.security.cryptography.x509certificates"; + pname = "system.security.cryptography.x509certificates"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; @@ -2016,7 +2016,7 @@ }; } { - name = "system.security.cryptography.xml"; + pname = "system.security.cryptography.xml"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.xml/4.7.0/system.security.cryptography.xml.4.7.0.nupkg"; @@ -2024,7 +2024,7 @@ }; } { - name = "system.security.permissions"; + pname = "system.security.permissions"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.5.0/system.security.permissions.4.5.0.nupkg"; @@ -2032,7 +2032,7 @@ }; } { - name = "system.security.permissions"; + pname = "system.security.permissions"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg"; @@ -2040,7 +2040,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; @@ -2048,7 +2048,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.6.0/system.security.principal.windows.4.6.0.nupkg"; @@ -2056,7 +2056,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; @@ -2064,7 +2064,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; @@ -2072,7 +2072,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; @@ -2080,7 +2080,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; @@ -2088,7 +2088,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.5.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; @@ -2096,7 +2096,7 @@ }; } { - name = "system.text.encoding.extensions"; + pname = "system.text.encoding.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; @@ -2104,7 +2104,7 @@ }; } { - name = "system.text.encodings.web"; + pname = "system.text.encodings.web"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; @@ -2112,7 +2112,7 @@ }; } { - name = "system.text.encodings.web"; + pname = "system.text.encodings.web"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.0/system.text.encodings.web.5.0.0.nupkg"; @@ -2120,7 +2120,7 @@ }; } { - name = "system.text.json"; + pname = "system.text.json"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; @@ -2128,7 +2128,7 @@ }; } { - name = "system.text.json"; + pname = "system.text.json"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.0/system.text.json.5.0.0.nupkg"; @@ -2136,7 +2136,7 @@ }; } { - name = "system.text.regularexpressions"; + pname = "system.text.regularexpressions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; @@ -2144,7 +2144,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg"; @@ -2152,7 +2152,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg"; @@ -2160,7 +2160,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; @@ -2168,7 +2168,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; @@ -2176,7 +2176,7 @@ }; } { - name = "system.threading.tasks.dataflow"; + pname = "system.threading.tasks.dataflow"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/5.0.0/system.threading.tasks.dataflow.5.0.0.nupkg"; @@ -2184,7 +2184,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; @@ -2192,7 +2192,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; @@ -2200,7 +2200,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.3/system.threading.tasks.extensions.4.5.3.nupkg"; @@ -2208,7 +2208,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; @@ -2216,7 +2216,7 @@ }; } { - name = "system.threading.timer"; + pname = "system.threading.timer"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; @@ -2224,7 +2224,7 @@ }; } { - name = "system.valuetuple"; + pname = "system.valuetuple"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; @@ -2232,7 +2232,7 @@ }; } { - name = "system.windows.extensions"; + pname = "system.windows.extensions"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.windows.extensions/4.7.0/system.windows.extensions.4.7.0.nupkg"; @@ -2240,7 +2240,7 @@ }; } { - name = "system.xml.readerwriter"; + pname = "system.xml.readerwriter"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; @@ -2248,7 +2248,7 @@ }; } { - name = "system.xml.xdocument"; + pname = "system.xml.xdocument"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index e81e5e48bdf..dfed3c91bc5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -58,7 +58,7 @@ let let change = name: grammar: callPackage ./grammar.nix { } { - language = name; + language = if grammar ? language then grammar.language else name; inherit version; source = fetchGrammar grammar; location = if grammar ? location then grammar.location else null; @@ -67,6 +67,7 @@ let grammars = grammars' // { tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "ocaml"; }; } // { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } // + { tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { language = "org"; }; } // { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } // { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; }; in diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index a001573b482..eb2275d2724 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -54,7 +54,7 @@ tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json; tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; - tree-sitter-org = lib.importJSON ./tree-sitter-org.json; + tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json; tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json; tree-sitter-php = lib.importJSON ./tree-sitter-php.json; tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json index 23df3b743c7..23df3b743c7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index eae6dd08135..166154f7481 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -304,7 +304,7 @@ let orga = "victorhqc"; repo = "tree-sitter-prisma"; }; - "tree-sitter-org" = { + "tree-sitter-org-nvim" = { orga = "milisims"; repo = "tree-sitter-org"; }; diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index 653bc8aca72..d759efb2b5b 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg="; }; - vendorSha256 = "sha256-vciiBzmqUAt5ZWn9go4B1uaz0HsBk5Z9Rbw7/MAimY4="; + vendorSha256 = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs="; doCheck = false; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 9d2d9b3962c..c7d22015d47 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -19,11 +19,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2021.11.23"; + version = "2022.1.8"; src = fetchPypi { inherit pname version; - sha256 = "1bde859e8bbd1d21d503fd995bc0170048d6da7686ab885f074592c99a16e8f3"; + sha256 = "f84d7119239b22ab2ac2b8fbc7d619d83cf41135206d72a17c4f151cda529fd0"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index 74f47f3f996..f60bfb4b724 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk"; }; - vendorSha256 = "1ivvq5ch9grdrwqq29flv9821kyb16k0cj6wgj5v0dyn63w420aw"; + vendorSha256 = "093blawprs2yf478zp9p1zc7mmimgpiwrw6nh8nqml89y5b5zldc"; doCheck = false; diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index a978c286650..df5afac2dbb 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-TaHfyYoWsA/g5xZFxIMNwE1w6Dd9Cq5bp1gpQudYLs0="; }; - vendorSha256 = "sha256-z3Yp+Yy03g2DAvWUZXaOxQWONjnYUl69eTpYIDPhsqc="; + vendorSha256 = "sha256-qQFlBviRISEnPBt0q5391RqUrPTI/QDxg3MNfwWE8MI="; subPackages = [ "protoc-gen-twirp_php" ]; diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix index 2aabe3bcce6..ead72184b7c 100644 --- a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; }; - vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; + vendorSha256 = "sha256-xZlP4rg1FMx6ddkKYlSdF6NrtY8xBZ3aEZSATgSf13M="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index f1e21641c35..ccc8e88dec8 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -1,19 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform, nix }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, nix }: rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "nix-community"; repo = "rnix-lsp"; rev = "v${version}"; - sha256 = "sha256-D2ItR8z4LqEH1IL53vq/wPh9Pfe3eB0KsA79aLM/BWM="; + sha256 = "sha256-MfD07ugYYbcRaNoLxOcH9+SPbRewNxbHJA5blCSb4EM="; }; - cargoSha256 = "sha256-71vH8oc8DmwbwM2PgxjGmWAbyC4AByx7waHxLsr2koI="; + cargoSha256 = "sha256-23TJrJyfCuoOOOjZeWQnF/Ac0Xv2k6tZduuzapKvsgg="; - checkInputs = [ nix ]; + checkInputs = lib.optional (!stdenv.isDarwin) nix; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index b895ff703e4..5b446035c2a 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-LYXwdOopQkgq7i4l8dqQFkNLB3r+CVRor4BVeoj0DPs="; + sha256 = "sha256-LsRky7hc7mgx1iRpJZICmP/ofdfD9r3D5LURTqfI9Fo="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-SdbDWw4GOvCTKN7vBjhLU5rhdVIpyO+AWaFbo06HXfU="; + cargoSha256 = "sha256-7WGNaad00MqEM/OdUaLJ3McXlUQyQwPezbMbL+4se5A="; nativeBuildInputs = [ pkg-config ]; @@ -40,6 +40,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/EmbarkStudios/cargo-deny"; changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; + maintainers = with maintainers; [ figsoda matthiasbeyer jk ]; }; } diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index da4345c0e44..24d309eb68a 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.7"; + version = "0.35.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rMeaKzCGY9jRrw8GaGtgm1rg3FIdaX/P+bOZRAtAI/s="; + sha256 = "sha256-YNPAIdN9FDUHs/5aCYJN+1/12ZYk1YJsUjjB1a09KvA="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-ZXQM2ij9Cpa5WCEHhcDc/tThfKZ7s1URmYsmqRg73m0="; + cargoSha256 = "sha256-xLFBF8fEbupLgFNdYC1NzM6p7O2gvsv0Utk4Et2oBDc="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index b029e7711a3..975a040b8bc 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -2,12 +2,12 @@ with lib; let - name = "selendroid-standalone-${version}"; + pname = "selendroid-standalone"; pluginName = "selendroid-grid-plugin-${version}"; version = "0.17.0"; srcs = { jar = fetchurl { - url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar"; + url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar"; sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw"; }; gridPlugin = fetchurl { @@ -17,9 +17,7 @@ let }; in stdenv.mkDerivation { - - inherit name; - inherit version; + inherit pname version; dontUnpack = true; @@ -28,11 +26,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/share/lib/selendroid - cp ${srcs.jar} $out/share/lib/selendroid/${name}.jar + cp ${srcs.jar} $out/share/lib/selendroid/selendroid-standalone-${version}.jar cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar makeWrapper ${jdk}/bin/java $out/bin/selendroid \ - --add-flags "-jar $out/share/lib/selendroid/${name}.jar" + --add-flags "-jar $out/share/lib/selendroid/selendroid-standalone-${version}.jar" makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ --add-flags "-Dfile.encoding=UTF-8" \ --add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \ diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index b2da64427cb..35de1de6ae3 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -3,7 +3,7 @@ buildGoModule rec { pname = "symfony-cli"; version = "5.2.2"; - vendorSha256 = "sha256-/ct1DNSCB1KzajyHWe6guF5iYm5AAEbPunn7xYLw25I="; + vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI="; src = fetchFromGitHub { owner = "symfony-cli"; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 4416ce1b6cd..3a36a00c73e 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.78"; + version = "0.2.79"; src = fetchCrate { inherit pname version; - sha256 = "sha256-5s+HidnVfDV0AXA+/YcXNGVjv/E9JeK0Ttng4mCVX8M="; + sha256 = "sha256-3kWhhzYmIo/GFieI0i7XVJIZxIaaJHHuDp38k5xcFmI="; }; - cargoSha256 = "sha256-CbtjUFwowP/QqyAMCzmUiSib4EpRhQAmO4ekX00xYGE="; + cargoSha256 = "sha256-xKYdvcrx3a9AKiRU8yJ3JNQp1Q2pEufwo+in82yTV6c="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index b0bf715e66e..087658fe551 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -76,9 +76,14 @@ in rec { workspaceDependencies ? [], # List of yarn packages }: let - extraBuildInputs = (lib.flatten (builtins.map (key: - pkgConfig.${key}.buildInputs or [] - ) (builtins.attrNames pkgConfig))); + extraNativeBuildInputs = + lib.concatMap + (key: pkgConfig.${key}.nativeBuildInputs or []) + (builtins.attrNames pkgConfig); + extraBuildInputs = + lib.concatMap + (key: pkgConfig.${key}.buildInputs or []) + (builtins.attrNames pkgConfig); postInstall = (builtins.map (key: if (pkgConfig.${key} ? postInstall) then @@ -106,7 +111,8 @@ in rec { inherit preBuild postBuild name; dontUnpack = true; dontInstall = true; - buildInputs = [ yarn nodejs git ] ++ extraBuildInputs; + nativeBuildInputs = [ yarn nodejs git ] ++ extraNativeBuildInputs; + buildInputs = extraBuildInputs; configurePhase = lib.optionalString (offlineCache ? outputHash) '' if ! cmp -s ${yarnLock} ${offlineCache}/yarn.lock; then diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 5d010808365..b8508860112 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-1jPYrZgA1Sg8Cvhfd7BULcpePHH/Buczvgu92KrkSg8="; }; - vendorSha256 = "sha256-5GPSyBWiQZ7Yb//JjPyamqvoeMdhvtuKpzOJZVjSREw="; + vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE="; doCheck = false; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index aea8ba6b19a..ec75f5854b2 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "9.2.0"; + version = "9.3.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "sha256-NxmGMHAEVuFl/3YgcHSbg+yWHB2tRpVTWlP5p5nGtPc="; + sha256 = "0626i5nxymh9hh9kf1mkky165cynsrkfw402xqmf69pnyzbzn0h7"; }; # don't remove runtime deps diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index 094330faffb..bb44d9eee0b 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "openttd-nml"; - version = "0.5.3"; + version = "0.6.1"; src = fetchFromGitHub { owner = "OpenTTD"; repo = "nml"; rev = version; - sha256 = "0kfnkshff3wrxsj1wpfbbw2mmgww2q80v63p5d2pp1f38x8j33w9"; + sha256 = "0z0n4lqvnqigfjjhmmz7mvis7iivd4a8d287ya2yscfg5hznnqh2"; }; propagatedBuildInputs = with python3Packages; [ply pillow]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 8c6724d9e3f..35564704f68 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2021.1225.0"; + version = "2022.118.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-kN5pR37b0giKGJVnJo/Mce+MWFwZiY+mZAHG/fUt0O4="; + sha256 = "sha256-/BzoLiQLiBcWqThzDOVb4Y7s6WhcKnCRRhAzUi5Jstk="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index e6ebf848301..7bf9a89e50f 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -1,12 +1,12 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "AutoMapper"; version = "10.1.1"; sha256 = "1l1p9g7f7finr8laklbm7h2c45k0swl47iq0ik68js5s6pzvd6f8"; }) + (fetchNuGet { pname = "AutoMapper"; version = "11.0.0"; sha256 = "1ni9mmrqfbspwf7xz6by5415ci5zhg15z3f7596qqpmbn8bqg7wq"; }) (fetchNuGet { pname = "DeltaCompressionDotNet"; version = "2.0.0.0"; sha256 = "0zhj7m3zaf9wcg51385in9qg1xgkvp8yyzgq3r5k4sagm7y68aqy"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.0"; sha256 = "09a8hkbx99iwikfl8war629945yv7i8llj9480dbc4kyp6qqlr00"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { pname = "Fody"; version = "6.6.0"; sha256 = "0cx708ah61cxmvpaq040mhqwrv937rvlmskwihg1w118729k9yv0"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.39"; sha256 = "05rlw9h3ps1gx4pwdxjwpx1lajyvj1b35j3536ixfmnnvjx4v2yj"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.40"; sha256 = "0k1cpkfgz4v5qigvmmvlk8lv2a731kqkmx6acf3rzr8rlj3cfnc4"; }) (fetchNuGet { pname = "Humanizer"; version = "2.13.14"; sha256 = "155g2700x6sbym2jd4dshm4rf3jjr8flx6w9xnw28zrrv7r2rdy8"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.13.14"; sha256 = "1ni4mcyhcs46ih9b8c8l3xq3iai56rdlcw0afwhji3hxwbxqbk7i"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) @@ -156,14 +156,14 @@ (fetchNuGet { pname = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.1210.0"; sha256 = "0dn6fc31yllr5nizylvkfl2b603b5m9694nsn5mmkh8w43h0rkbq"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2021.1225.0"; sha256 = "1md0zsjwi8zx2az42cch1wgvb5ygscncmpc4ysgz1pl6jn02v3by"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.118.0"; sha256 = "1c81r8s9zivj9hany0yqsza1y3nhh24zbkwwnjm0m6z4mls04l1y"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.1221.0"; sha256 = "1ffxp4nsgbqw1f6nypirmc0a3h203qikbmxm2x8w3kgcfga5dx3k"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2021.1215.0"; sha256 = "1aarb8wkzz31xa8fa6g5axwmvx89ix66ygbqq7zcyz8k9yy2ilh1"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.115.0"; sha256 = "0w2hnci93644ayfpgpsyxsifz38yklvn42fkgd860i3mn04lyl2z"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.486-alpha"; sha256 = "0hp6wfjgpwdgy1ag2bpjkyalw92k6qg9pc5mriij6a5vhxzadhk3"; }) (fetchNuGet { pname = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) - (fetchNuGet { pname = "Realm"; version = "10.7.1"; sha256 = "058jigmsxvzb7571ll9qkf0hwmgff5zddfq4pqvnzkf87i5kd2kq"; }) - (fetchNuGet { pname = "Realm.Fody"; version = "10.7.1"; sha256 = "1m3cglh39fr84pr3nr7q1hyiq83gqj0m6h8m79wl96g5xxq5v6pa"; }) + (fetchNuGet { pname = "Realm"; version = "10.8.0"; sha256 = "1ixpms8x9z5ia9yiqvhmgdlcrjvqrhbqnr8b9z6mlxwcms1z2f45"; }) + (fetchNuGet { pname = "Realm.Fody"; version = "10.8.0"; sha256 = "0hj3cqan96y01k5qgs0knkqzg3rlr2794az68xqffd2vqphvqvqq"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) @@ -185,7 +185,7 @@ (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "Sentry"; version = "3.12.1"; sha256 = "1bqldqc0bnrxdgfxh71w3vjf3cygcn6jyrhxmjvikciirlgcs3cz"; }) + (fetchNuGet { pname = "Sentry"; version = "3.13.0"; sha256 = "0wnivy7rhzghr94pdczv7kw72y1hv5kp6hw0fkmw1nfgnsh4qjfm"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.17.1"; sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.30.1"; sha256 = "1hib2hxjrlikwsczym1qn2slaapgjw8qzd8gmid8bryaz8hv044h"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) @@ -276,7 +276,6 @@ (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index fc32607adac..1ff9f9d36d1 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.1"; + version = "3.6.4"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-elcSwm7KvDpGVBF7Gs6GFreQPyVwWBxYN0NO1N6JWDM="; + sha256 = "sha256-WUEpYxzNcH9kJRn4nROoaeXTe1+D4/0VRqTwc7ac1hc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index d079b3f61ca..d0b0ae11844 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -10,7 +10,7 @@ let , ... } @ args: stdenv.mkDerivation ({ - name = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}-${version}"; + pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix index 916ac32c2e9..768256e816a 100644 --- a/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -17,7 +17,8 @@ lprdeb = fetchurl { }; in stdenv.mkDerivation { - name = "cups-brother-hl1110"; + pname = "cups-brother-hl1110"; + inherit version; srcs = [ lprdeb cupssrc cupsdeb ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/cups/drivers/hl1210w/default.nix b/pkgs/misc/cups/drivers/hl1210w/default.nix index 975e07aa6c3..abdc5b061ac 100644 --- a/pkgs/misc/cups/drivers/hl1210w/default.nix +++ b/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -12,7 +12,8 @@ let }; in stdenv.mkDerivation { - name = "cups-brother-hl1210W"; + pname = "cups-brother-hl1210W"; + inherit version; srcs = [ lprdeb cupsdeb ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix index 255fae09c7a..fc6a06535eb 100644 --- a/pkgs/misc/cups/drivers/hl3140cw/default.nix +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -17,7 +17,8 @@ let }; in stdenv.mkDerivation { - name = "cups-brother-hl3140cw"; + pname = "cups-brother-hl3140cw"; + inherit version; nativeBuildInputs = [ makeWrapper dpkg ]; buildInputs = [ cups ghostscript a2ps ]; diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix index e61d3ace5f1..5704cb6ccda 100644 --- a/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -16,7 +16,8 @@ let in stdenv.mkDerivation { - name = "cups-brother-hll2340dw"; + pname = "cups-brother-hll2340dw"; + inherit version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups ghostscript dpkg a2ps ]; diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index ba4f88dbcad..383e943ff24 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,16 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }: +{ lib +, stdenv +, fetchurl +, SDL +, SDL_net +, SDL_sound +, copyDesktopItems +, graphicsmagick +, libGL +, libGLU +, libpng +, makeDesktopItem +}: stdenv.mkDerivation rec { pname = "dosbox"; @@ -6,31 +18,40 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/dosbox/dosbox-${version}.tar.gz"; - sha256 = "02i648i50dwicv1vaql15rccv4g8h5blf5g6inv67lrfxpbkvlf0"; + hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo="; }; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ + copyDesktopItems + graphicsmagick + ]; - buildInputs = [ SDL SDL_net SDL_sound libGLU libGL libpng ]; + buildInputs = [ + SDL + SDL_net + SDL_sound + libGL + libGLU + libpng + ]; - nativeBuildInputs = [ graphicsmagick ]; + hardeningDisable = [ "format" ]; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - desktopItem = makeDesktopItem { - name = "dosbox"; - exec = "dosbox"; - icon = "dosbox"; - comment = "x86 emulator with internal DOS"; - desktopName = "DOSBox"; - genericName = "DOS emulator"; - categories = "Emulator;"; - }; + desktopItems = [ + (makeDesktopItem { + name = "dosbox"; + exec = "dosbox"; + icon = "dosbox"; + comment = "x86 dos emulator"; + desktopName = "DOSBox"; + genericName = "DOS emulator"; + categories = "Emulator;Game;"; + }) + ]; postInstall = '' - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - mkdir -p $out/share/icons/hicolor/256x256/apps gm convert src/dosbox.ico $out/share/icons/hicolor/256x256/apps/dosbox.png ''; @@ -40,8 +61,15 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.dosbox.com/"; description = "A DOS emulator"; - platforms = platforms.unix; + longDescription = '' + DOSBox is an emulator that recreates a MS-DOS compatible environment + (complete with Sound, Input, Graphics and even basic networking). This + environment is complete enough to run many classic MS-DOS games completely + unmodified. In order to utilize all of DOSBox's features you need to first + understand some basic concepts about the MS-DOS environment. + ''; + license = licenses.gpl2Plus; maintainers = with maintainers; [ matthewbauer ]; - license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index bfe2cae5120..ca0de2f8276 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "vice"; - version = "3.6"; + version = "3.6.1"; src = fetchurl { url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; - sha256 = "sha256-Zb/lXM5ifbm1oKx4dqkMCH6f6G6fVRfoCURsQGSi0/0="; + sha256 = "sha256-IN+EyFGq8vUABRCSf20xsy8mmRbTUUZcNm3Ar8ncFQw="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix deleted file mode 100644 index c09a83b92ea..00000000000 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, python2, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL -, wafHook }: - -stdenv.mkDerivation rec { - pname = "wxmupen64plus"; - version = "0.3"; - - src = fetchurl { - url = "https://bitbucket.org/auria/wxmupen64plus/get/${version}.tar.bz2"; - sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; - }; - - nativeBuildInputs = [ wafHook ]; - buildInputs = [ python2 wxGTK29 SDL libX11 libGLU libGL ]; - - preConfigure = '' - tar xf ${mupen64plus.src} - APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api) - export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" - export LDFLAGS="-lwx_gtk2u_adv-2.9" - - wafConfigureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`") - ''; - - NIX_CFLAGS_COMPILE = "-fpermissive"; - - meta = { - description = "GUI for the Mupen64Plus 2.0 emulator"; - license = lib.licenses.gpl2Plus; - homepage = "https://bitbucket.org/auria/wxmupen64plus/wiki/Home"; - }; -} diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 9f5e550d972..2cecc22cf5d 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -11,7 +11,7 @@ let beat = package: extraArgs: buildGoModule (rec { sha256 = "sha256-9Jl5Xo1iKdOY9ZE5JXKSL4ee+NdsN3KCY2dDYuxlzPI="; }; - vendorSha256 = "sha256-tyxyM7RsTHTVVxc9gagPsSvFRaWGTmobKzyv9RODXBk="; + vendorSha256 = "sha256-fiqCccS2IAnTzfPfUqY0Wy9uRUuiYNtiVvpAFZJOPVI="; subPackages = [ package ]; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 594561593e5..ef1d7b14014 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.21"; + version = "1.22"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-28zKtSPuJnluVeozZSZJ5LevSY7a6ap15NTXhpwKuEg="; + sha256 = "sha256-wF0nPux1M8DhBiguAlTPBOf16PDCkgyjlEiGX6sqQZs="; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9MzOaQj+lR1F+E/yoxbL/HMOOuKOU82zkPVq7x6AH3c="; + sha256 = "sha256-bYLvrCw6NNCZqgLWIEObnytgD74cE9pm/Z7dgB8S5x0="; }; # postPatch: diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix index 8f3308a122b..955590cafe3 100644 --- a/pkgs/misc/vim-plugins/aliases.nix +++ b/pkgs/misc/vim-plugins/aliases.nix @@ -94,7 +94,6 @@ mapAliases (with prev; { neosnippet = neosnippet-vim; The_NERD_Commenter = nerdcommenter; The_NERD_tree = nerdtree; - onedark-nvim = onedarkpro-nvim; # added 2021-10-22 open-browser = open-browser-vim; pathogen = vim-pathogen; polyglot = vim-polyglot; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ce5ffb483b7..b677df31297 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-01-26"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "95916d1b5f171eb44faf54bb414f48856ec96aa6"; - sha256 = "14a4h0h6g8rkglhn3f77s3bil63y1vz1qnd03026r8bhzcdbqn3j"; + rev = "98a33857ac1baf1b1fc656a3ca5b0318cf03c3d5"; + sha256 = "1zzl1zs4qrcjw3fskszqj62s59jggm7hbkchxkf92fqsgck323mx"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -233,12 +233,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-01-15"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "486e23f024a21c952758726497244e27aa3b9f0e"; - sha256 = "1sxg9gr329zlccm8xh8zv3n26s72mikqh4aik5l1hdx663afqc0d"; + rev = "5860ae9369c86332ec45b38ab8308b9a4afb272c"; + sha256 = "0klwbjgxqddw5apqzrx9fsqk25xy6nbaplx4fw68x6z0c63dbvsa"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -413,12 +413,12 @@ final: prev: bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-01-06"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "4d46f80734a1f6854942f78fcbf2163b959b8ab0"; - sha256 = "1hzbxpz3yz3z7fxj7imd4l3aznrxcx1fnhf39gg2xqzk8j1yspwx"; + rev = "b3a24722bea9029b4c37eb0547b87152d514c66f"; + sha256 = "14114786fkqjzpl3aqsk2lmfnlhxzdkkanv6ls6q0cwvpqdng6wc"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -497,12 +497,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-01-27"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "723d926f75680badc6cb95ba69668324833be8a3"; - sha256 = "19wxzny2xha79ajjqwya5c20nlpmn584g97i0j9y83fvcx1bljs6"; + rev = "53778b6820ef3e1b38d923c75183253caa4ffd90"; + sha256 = "1zd0x10d5frmaxgr58crldf98j48lnj5jgzd05myjni2bmaniqyn"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -917,12 +917,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-01-25"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "873b5942be70bb00541b995d501ac7c96ae5b185"; - sha256 = "181drp1dyrprfv7ljprmyh1mn1nqdqw4c2lb4kna5qh9bfg6051i"; + rev = "679b32cee056b49fbf81b9fd543ce13b2c5e03e7"; + sha256 = "15kk2ggspq9sdwaym1r46x0pkr2hvv58mxkwxpjdkcyhmhcnp3z5"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -990,12 +990,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-01-26"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "7365bfe9fc6dc004cc97b8977aa8129999d81bf5"; - sha256 = "160pd7d2n66p3nxjp80sm6qhxlcmsg6nlv79ssyi9sxh1z27qm0l"; + rev = "22e71071d9473996563464fde19b108e5504f892"; + sha256 = "0arjg84z2lly1j7r0fwj4kdl23f6w51ckjzqll463fmr4jx387ir"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1182,24 +1182,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-01-27"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "120fcb4231fb8f9852a7c366c183b300ffcf5aef"; - sha256 = "0b29qdgwglj84m4brpn3ic6pdky3xhjnw3mgb97slb7vqkpq450y"; + rev = "c254d54bf073c1875817a227fcccd502b7774b08"; + sha256 = "1rrfav3ffxyhl2fa9ygdn8y5y99nxbmcvxy4zskiaarjbv9n88jb"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-01-25"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "9d386079d0fb5598598a3bbbe62cfba96e764ce2"; - sha256 = "0rg97cqp91cj6czhs6fjk5xw1ydxazvm3dqn01n7l2bngbx44b0j"; + rev = "106f292c4f9e60044d86497096831c48039921de"; + sha256 = "0kxj9l0pby79zpm050wmqv4hv4wsgm8npvsb5flpsba1ws850vq6"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1362,12 +1362,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2022-01-03"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "10fa80481a9489be1ad38ceff84e357a5a4c416b"; - sha256 = "10nqgha8p25n79sgi5arw79pr59q6wldm6s8c876l6al3111971n"; + rev = "c3417f30029c384c73aeccb1084f21c14b4bae45"; + sha256 = "0dc0w8j4fhbh86vmibi9wx146r79sv2yvsqczp28hqinwss6j68b"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1978,12 +1978,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-01-26"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "66c5ba6ea5f9da9e6a9ef0da07ab594768d5bd39"; - sha256 = "0065rw25rw4r7bnh80z6bis543zynk961w28dqz7pp1x3i4h9lmg"; + rev = "2e91adf6667f1cafa9d0be51594fa3366534923f"; + sha256 = "0rp820akrmj83csgajdlabh4y5xh2aiv8kiz7lma32pb0rmcm2lf"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2183,26 +2183,26 @@ final: prev: fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-01-24"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "91332acb1c48e7080539c5b5cd131816341c738c"; - sha256 = "0s8695m25v2j5hpp80g3hd28g7ja17yxih5cd71jqmqvl3zwmqrg"; + rev = "70541d2ee0bfd8998ef0f252bb93b660cf94fe14"; + sha256 = "0sd3qg58nc0b5ydk2j8ypx707i405n4axm7f7h8ndj33bx2rapl1"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline.nvim"; - version = "2021-04-25"; + version = "2022-01-21"; src = fetchFromGitHub { - owner = "glepnir"; + owner = "NTBBloodbath"; repo = "galaxyline.nvim"; - rev = "d544cb9d0b56f6ef271db3b4c3cf19ef665940d5"; - sha256 = "1390lqsqdcj1q89zn6y5qrm1id7p8fnpy07vlz6mm4cki47211mb"; + rev = "4d4f5fc8e20a10824117e5beea7ec6e445466a8f"; + sha256 = "0xgk64d7dyihrjir8mxchwzi65nimm9w23r24m99w6p0f9qr56gk"; }; - meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; + meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/"; }; gen_tags-vim = buildVimPluginFrom2Nix { @@ -2267,12 +2267,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-01-26"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "d1412ddfadc845f6a98789d7583b2bd428bae14f"; - sha256 = "0r4c2a0fv8y5r97yg37p2v7v1ab6hvwrq5knn2ya29b1am6zzhi3"; + rev = "e605e848885b184aa6af451fce20f68126dc1180"; + sha256 = "19nr21mzw9bfzb2snji6idckvbahybpbsqdjlfk0a1hymvp8q9vr"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2315,24 +2315,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2022-01-10"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "e83ebb3465fb224df394477a0d68a61094d3f7b9"; - sha256 = "0442yi5j1fdzh2wmyn59z9mzyzsja0j0dkialj4gzlsglg6ndbai"; + rev = "ff33d07bb64e104b387fff7d91650a35274f81ea"; + sha256 = "1sxhcbww0f780lp0zda1iaiyp89c6cirs0ncihjxr106a47zpya4"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-01-26"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "4a2d30f5fb77750c7a42be9bb58a9cc2c6c7f31d"; - sha256 = "0w105nggv6k2b22hkhlh7j19fp6gra70i3skaq1gihhh0x0h5pav"; + rev = "e91fda815a5f7d20d7e4c89cd1f07f3497fe200d"; + sha256 = "14pwdxflkx0hcg8hhb6pr6jddy87n94hr0dwwk6zv4lxzckrjbbl"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2483,12 +2483,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-01-10"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "ba2a3592174c19d6f3231d06723606f6ca33fc23"; - sha256 = "0qcc0f4lky8if91faw6923sdpgvr67nsfgfb1mqmhriwvq02l46y"; + rev = "d4d0c6e66c1f4d5bdc0cb216c882d88d223a4187"; + sha256 = "0s12sxhpk59r8a12df0zbhbmj6djffqmh1pw2fhw392zrb1549m8"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2591,12 +2591,12 @@ final: prev: hoon-vim = buildVimPluginFrom2Nix { pname = "hoon.vim"; - version = "2020-11-09"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "urbit"; repo = "hoon.vim"; - rev = "91b1922f8627bb0a55341bb088f2526d0f43a6ac"; - sha256 = "0h87r7r74iljwvfc6mb1maa08cxwnk6k89gc6vnwqm1zx6qxw1js"; + rev = "f287adb9ce5f99a2a8b806833ab1582ba162aab0"; + sha256 = "0nlmcz79qcmrkfji5mdc66p1pxrz5i68m50013fr66zqcccnynjk"; }; meta.homepage = "https://github.com/urbit/hoon.vim/"; }; @@ -2831,12 +2831,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-01-17"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "08ad42efed82dbb7547fdebe2acc194f50e07854"; - sha256 = "16acd976d44whpkl5bypskpf15a6mjf72pijjbg6j0jjnd2mm9qw"; + rev = "32d05f7742dfb0ef84bee99e059ac3b7cb9526eb"; + sha256 = "19z9i07w3wgf939fiy6kh7mq5pvlay3w37sm0sv4bmrdi42p8b4z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -3036,12 +3036,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-01-24"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "4d613c6aea73be9b8882d5710b11f502ef8692db"; - sha256 = "16lcr9bbiq33agd9p1cwrrxmzsj3xmva1lva8ay4zrm1v2v45jn5"; + rev = "08edf8f60d9d6fea83e9ef434ff04c30e579a2e0"; + sha256 = "1xl80n1nxi0yq2hszr47apikhgf9skxldf4c9a6v78cj9wqk4dvz"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3180,12 +3180,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-01-21"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "428051b2e5212cea914510eb9eb979ec06d5b2e1"; - sha256 = "01s3v3jfmgyrmwkifnyfh0wlm1d5fdvfvya0564y76bj4sh2lpzw"; + rev = "ca8691dfd5127a4b9dfc79214b71ae31b125cdbe"; + sha256 = "0w2f0jf1ljdj97bxy7pyyfhrav55j612cr6d2kqinx6bqd0cy3p4"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3276,12 +3276,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-01-19"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "54b3bcfd70250b5a5dc1d51d0f3653a4e6892555"; - sha256 = "0z4y7iis1fkm76ibkfln70fasywwrlrf25r3si6ns0s3wq9q849v"; + rev = "d29557a4024358cf028b706d91e3a95bd8180784"; + sha256 = "0d16jms75nm2phx4hyvqlr3fbjadllgznd5dsy53cjf0gnybd6h2"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3347,12 +3347,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-01-23"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "64eb5cc8961e54b2888d363bb94d551203080b45"; - sha256 = "0v3dza9mp351715i87x75zxkm0d5i7v77a5zq8c8mlhz1v31z0vx"; + rev = "30c7cf023782f50cfa8f65d0508163d6ebfd2442"; + sha256 = "1qnzy258giqxkhmbvfv8fph5k3f2r313mj0rqsans2v8bq6ay6g0"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3371,14 +3371,14 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2021-04-25"; + version = "2022-01-19"; src = fetchFromGitHub { - owner = "glepnir"; + owner = "tami5"; repo = "lspsaga.nvim"; - rev = "cb0e35d2e594ff7a9c408d2e382945d56336c040"; - sha256 = "0ywhdgh6aqs0xlm8a4d9jhkik254ywagang12r5nyqxawjsmjnib"; + rev = "9968d7378a4bb3c13445bb6fd7937f3e757bfa0d"; + sha256 = "04p138pkix3h02710r1812r0c1lkzga6pj35k0c7yic0p040ba35"; }; - meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; + meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; lua-dev-nvim = buildVimPluginFrom2Nix { @@ -3407,24 +3407,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-01-24"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "9208bae98fd5d1ab6145868a8c48bfee53c1a499"; - sha256 = "1dz4kg3l79d128jgqs6cs8ikvr108z46ijv36wq7pw3dam4ybnaw"; + rev = "dc31077bc517ac15a828102a386108e320c226d3"; + sha256 = "1f1inhvpfy7qk8azjg6psv53g92fx5br4mlyydgijqiap8g7h33g"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-01-24"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "59576a5cf28556a393eedfe38467e998288fc905"; - sha256 = "1bwmzvsm9d6ilq616697rwk3j29i0q3nzwdyapjyxdyhp9rivgsj"; + rev = "35322c97b041542f95c85e87a8215892ea4137d5"; + sha256 = "0b6yxjsahy4ap6p9jvz2jvqg6akd8hkhd42pfz3krnwg85m7waiw"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3443,12 +3443,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2021-11-06"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "57e9f310b7ddde27664c3e1a5ec3517df235124b"; - sha256 = "0y38id1dj15snx79sazh0kvs2c3jb1h6kyzr90zhm0130m7x6nri"; + rev = "776c9381cfd80ead5c9388d59f3bc5b486e3b97d"; + sha256 = "1bda2q28aryp7pxcsnvmqzbcw0sl6sz2mnii4vd0v4iprfkf779y"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3539,24 +3539,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-01-23"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "a89d87667eec94915121d8f5caf199f63f9ff81d"; - sha256 = "0l6k5djgvhkl7y86g7wmaxs0yq5nv0g6aa46kjjc81lvycj9qg3m"; + rev = "87e480118aef3429dc8eaff8eadfa41ffeba5fbd"; + sha256 = "1hzmj42bz5lyyi1imm1pj4vk0dxin27qky4wyn5jcqdw7iyfr95a"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-01-12"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "e5707899509be893a530d44b9bed8cff4cda65e1"; - sha256 = "0kx5xdakwv9g8fhhc40rz2c0as5pjx46ymdw09bc5h1nnhwkgp8x"; + rev = "c8ea2a5550b95b007631bc83908c48a3368eb57c"; + sha256 = "08amdbn4xcdl7d09w3iqgrlyfmqnxlwmnild9q5mpqh5z372y6i0"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3971,12 +3971,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-01-26"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "c5f9957b00aa54cc66bcccb686e586859d44b484"; - sha256 = "1ml0zrrij6a1f42q35wv7ml36yngc9gszzq1nqqh7mdad5zszxk5"; + rev = "f041cab34aa2ad6ac1f60d786a81de746b953221"; + sha256 = "0rqvx8vh9fqrkl5qxa9cw7xgyhmpdh46nn9rflxl6m4diqmp6q89"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4043,12 +4043,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-01-21"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "0bca6a4382e7cc5e26da8dce49e7f69abfb0e998"; - sha256 = "0pfrmzcs4vkxg74hzrp8g4kwb33m1r503c0b1yq25z33scqwc6hp"; + rev = "1fff44e04d137c143af8f555963c90533ef9ae89"; + sha256 = "1zffm9zmai82v3fnclp2nds3yiab0893kssyg0a2xyqp70xrh2hr"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4223,24 +4223,24 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-01-25"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "5fdd8f273145f493c05eeff3d46c7538aea9f126"; - sha256 = "0fj7w8ckp8949ysxnkq9h136pkd9ddqj54rzdb2dnia59wl2i2s1"; + rev = "498b99c87a5826bfe4409883831deab91ebe296f"; + sha256 = "1bhbk87wrjyk8mvg9aqspag58sz9chhrxvkhblpy2qypgla0s9pk"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-01-27"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "a7cf7e887454b86a45243bfc3e8dbd4aa73007ba"; - sha256 = "0ri0m0l8kv78ddkf9rgh4dn2857swrnsp6lnx6svpipi38cwz3w1"; + rev = "6d0ccdb4d7e54b7ff29a626378f3c258b237d7db"; + sha256 = "1ijanw0jpwc18wfrh5mnb981a9zrwr4r67w3sq40lb68v8vzmgnp"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -4271,12 +4271,12 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-01-23"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "0d603c19171fb2e127bc128e9229d48340a6beeb"; - sha256 = "1d6j3syv86afj0cpfqy8jcwj8pxm53wa1xjl76f1j5h7y6ba1237"; + rev = "6f803e88093573f73d4ee6c0dfe0575df3f97a9f"; + sha256 = "05napd3gqhdpb2x07affs50bm8prb3rzz0w5a39iyr40y96bpjix"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -4287,8 +4287,8 @@ final: prev: src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "59067dae4bf2367eb06326e419c23353722ecbec"; - sha256 = "0337mwsvd1jjjyvfg6xnmmadjw199i35wc0aiycv22kfdn7y4ybw"; + rev = "2ae4a5e2e2b35716c44c104ef1afa35ecb40c444"; + sha256 = "1y1vn3cr1q3wkgjabjb14pb8gwc4xy2rvka2s0a2mfv6a4f5v4z7"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4343,24 +4343,24 @@ final: prev: nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-01-16"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "3720bdf0d651bb579ab0f24f889246862fdf8b00"; - sha256 = "0x9agiyh5zjsa462bw3xqx2vnmax8qpidwd7w72zjig0hmhy34hs"; + rev = "60ba8c6cac20af497f5444084993cd42f83576b4"; + sha256 = "0ag2vh3j4wlwkdjwb9017nwmqqa78181rr0csjvh22x8x91mv5mi"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-01-20"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "88ad98547aee3ac7c026c9e3654532e62cc7f1b3"; - sha256 = "0mcwzp7g631cg40gn8zy5rblqdwwrdrzgp3byaws47cgsmldb3w1"; + rev = "a289c8fcb9f56a9df638b396a7c037997ab59a9d"; + sha256 = "1d8ri9xzbryz4zi5fsl9s31racp7qs2mgih10p25rwyv6ai8sn58"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4391,12 +4391,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-01-25"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "d93104244c3834fbd8f3dd01da9729920e0b5fe7"; - sha256 = "1gn4m5ppqbhk3y5ad98kkgc72ms5xdgx6jdz3176dkd8ah6lnpf0"; + rev = "d6838996da8dc9fe4697632d2abf34086ebab427"; + sha256 = "1wzskfwz2hjjvyix8lfjzqjml66lypg8fg2fhqgn4rbr85p9lr7m"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4595,24 +4595,24 @@ final: prev: nvim-hs-vim = buildVimPluginFrom2Nix { pname = "nvim-hs.vim"; - version = "2020-08-29"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "neovimhaskell"; repo = "nvim-hs.vim"; - rev = "30baacd3c7a10625cb2d4dd64ae3bbfc4fe3f8c6"; - sha256 = "1w6cr6j77nwxszm1d0y4phvjsz9q4aw214xkscw6izakfmk06h1x"; + rev = "d4a6b7278ae6a1fdc64e300c3ebc1e24719af342"; + sha256 = "0a4sc2ff67xdqy5wj1j384vrsbnvhcd15mmwv7yygd7rccc2wsxs"; }; meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-01-13"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "2cceff656f2bfac38da784f2cd4b202a64a2faf3"; - sha256 = "13sx0rwz53rf8yg4ndc4m9fgvxa2xs46y92yn8rbgrjgf4xv18xi"; + rev = "e2a80d5f51c326d6623979d614dd7968ef752061"; + sha256 = "1m8sc88g8sk41m4ml62zn7dn05q1ns8xr20c7bldqaz9rwqbhqny"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4643,12 +4643,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-01-24"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "e83f80295737e8f470329d768f6ae325bcd0bb23"; - sha256 = "12b78p8lw94ixwgcl71chwssi6li7q46aj0ahdna9v77hk2mlvc8"; + rev = "f632b0bc141ba6698a43425af43a2362eef9feba"; + sha256 = "1142mdjymf94wl1nm9dy66w7db584i1593g9dq3fpma0l7rh0ww0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -4667,24 +4667,24 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-01-24"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "c51096481dc13193991571b7132740d762902355"; - sha256 = "02gpqp2r6f6zz3mfbxhsg2hvs00yldkz5wn3snk8nyqllm13i3dm"; + rev = "e7df7ecae0b0d2f997ea65e951ddbe98ca3e154b"; + sha256 = "03nqjv7zy87k4k8q8a6zknywdsvbb3xm7sxfgc5zhi8z4ymk17nr"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-09-28"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "aaaf8c12771e905e5abf68470d8bda3e80536a0d"; - sha256 = "1iag2ynp2yba5xaw4z0hnp9q6hfcrvjmkhl4js9hqhhsrm42c2vh"; + rev = "ae1a4a62449863ad82c70713d5b6108f3a07917c"; + sha256 = "0xl3crhgkzmas8zdcycgk11am3wx0az4jh7fh5n4lsjip8895p4s"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -4727,12 +4727,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-12-30"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "15f52efacd169ea26b0f4070451d3ea53f98cd5a"; - sha256 = "1ixdckbmz6c54mm3mhkvh59ahfg5wc3h0ybnrp64d0bzsi3jngjh"; + rev = "83ebb5971eaecc0b2c70fb4ed540e87cbf50af6a"; + sha256 = "09kpaf3870011k1p6985jhy20j3gjgig0557mzsphfsn6gpbqrbw"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4775,12 +4775,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-01-06"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "4a4cf2c981b077055ef7725959d13007e366ba23"; - sha256 = "1aa062r2p69kn2xr9d2mbbrs8qdlv0q86lah2q9h6jhzxfi5ccdp"; + rev = "9842b5fe987fb2c5a4ec4d42f8dbcdd04a047d4d"; + sha256 = "12ww1yqxsk6qm6cimgr0ljgc98n831dpm711q4xqg9c6wm0pyzg7"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -4799,24 +4799,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-01-21"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "2dfed89af7724f9e71d2fdbe3cde791a93e9b9e0"; - sha256 = "1842c6s3q8hd8cnnyniwjxkkl48zzdy7v2gx20fiacnf365vgzpc"; + rev = "0bc8258529e620b3c9d38bf5e88158ea24c85350"; + sha256 = "1js0xg1w372xzihhs10zsrbgrgg47nx2pi6lrv9n5x9iiqigj2s3"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-01-25"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "620cc936ad6b26c59bb2d888b3890bb8d06c50c7"; - sha256 = "0f2lg3dwcfvgjal1b87sgf6kvqs16h3a90w4994hp0ps9imipsp8"; + rev = "6799824f6b9b9185622e79cda7eebb03c6f6ac15"; + sha256 = "1m2d37z98pphjx5yld578rsm75dwfjswaz9da13jy296mwz2h46q"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4895,12 +4895,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-01-24"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "38eb126412723fa4c3bfd137c1a3a811faf67eb5"; - sha256 = "13igbd268z0533bsrz0r8s69lbryh0h4w33cpywmacghxy672jjl"; + rev = "ac5032edc1d3e9216d081d130a14d4fcaf6cd3b3"; + sha256 = "1cqh19pwhfr0sqcajp1fwrk6sm1n6apy859890d9k52n9ir21zj2"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4943,12 +4943,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-01-22"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "47afb03249e36cd740bda79907c0f279f4e28544"; - sha256 = "18pbdp7ci5gb7i0als4rgcr151rbm8j3mc0pxc9h4x9cvxdl8x5f"; + rev = "b3d7072ab3a6db02ad173204b4420c1bbc46c2df"; + sha256 = "0rxm91qa41hs8w5sc7yibn2n7zhqxfkvnildx6bpig054r21pa91"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -4991,12 +4991,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-01-23"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "33224362e20e1b3e87eb7ef2d669de6c60e727db"; - sha256 = "0z163sfxly71bypskxnph9rwqamgp3h01i24va9n41wbbfvr0pw3"; + rev = "3f1c6b93df0d927999dc7a243b0dd684d09f9d3e"; + sha256 = "1sf7vqy0p6ssp6n9v91icvp1pm0yd0qki19icgpiqjsxya0qivca"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5087,12 +5087,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-01-19"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "27c4083e29702c8b4fa5e314926ae054eb4c0dc2"; - sha256 = "0vl95ywln1njxi7593gf2jp8y12fi6mwz3xmc8v6vd012vj4lbnk"; + rev = "f339a7f87e4736c0a3e0db563b8c3cb45fc00a61"; + sha256 = "1raicj3h524csqivw9x3l6znx5y7dwfn3cmh2hzddfy0n7n1mph0"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5207,12 +5207,12 @@ final: prev: plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2021-12-25"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "dbe57599bc340d7726938b624438779fa0ec2929"; - sha256 = "095j1an00187ampxklwd6hhy05xzz7ssjwkgdsv06ydx7a1kn8xk"; + rev = "32428a7b7bc1f1f4efe54490c212a7bda5dd073c"; + sha256 = "06jxfr484wa563hs5qj2g4i37a6mfdvdjdn7a72dmbqzismvzd48"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -5231,12 +5231,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-01-05"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "563d9f6d083f0514548f2ac4ad1888326d0a1c66"; - sha256 = "1i4sj56fral52xa2wqzx331a6xza4ksi0n6092g6q93kxx202xwq"; + rev = "e86dc9b11241ff69ece50c15a5cdd49d20d4c27c"; + sha256 = "1yfiqkvk71i68hha2xdikfmch9qkn0di9gl14x4b9snvcf6l9plh"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5364,12 +5364,12 @@ final: prev: python-mode = buildVimPluginFrom2Nix { pname = "python-mode"; - version = "2022-01-19"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "6d81349723fdb6a7ce03b27afa8ea88819f3c0d5"; - sha256 = "1cpmjg8867qmir79pd1zay63ihp2jzd8f1igxq2954q354bk08br"; + rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603"; + sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -5401,12 +5401,12 @@ final: prev: quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2021-12-28"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "4371a23bbb3b687e49c42a2a4379d17fc5c6a9a3"; - sha256 = "0f625gmrs8zk622b1a8hhdxwx3c7hnxxznr98aqbxik6924rmr8g"; + rev = "5e2373e36d774e1cebd58b318346db32c52db21a"; + sha256 = "1dqygvc1gr35niqqdqivz5vgqpca9yj68incq3z73rl9qya96pvx"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -5545,12 +5545,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-01-03"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "3a8b22157ad5b68380ee1b751bd87edbd6d46471"; - sha256 = "07adb9rrcy4vr0bhjn4h8r1si0xq31gdpwr4l9lypfr23b2pdm10"; + rev = "941a36e99bccc48fa9569a03b02ec95fb9c5222c"; + sha256 = "0w0n3210c3j2jpvx0jf718in5hkj7vczv9n1qnls2f46ljwl1f5a"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5713,12 +5713,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-01-26"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "6c831123b78a352216adb640d34bebe355b7df15"; - sha256 = "016r63vkyb2dpc6nvnky7ypv351893pyr5d1b11wpv53s0hr5z4y"; + rev = "fd5423e0c9c6c27812070be4a2ec4a75d9e7778c"; + sha256 = "16v8y6f40qx0n7gic3czhchch76yfrf3wp5ff10ij99sdsby84yc"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -6159,12 +6159,12 @@ final: prev: surround-nvim = buildVimPluginFrom2Nix { pname = "surround.nvim"; - version = "2022-01-23"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "blackCauldron7"; repo = "surround.nvim"; - rev = "b0105011437ab148261b5c4ed6b84c735c54cd61"; - sha256 = "1bs0ba29pfxvvz8j5qpam6mxch4b40idlpq7l39rsanrxyxl81yf"; + rev = "3d5ae1ecd8a29a513895d5bd34723623702a03b0"; + sha256 = "0rvj4l5hrr63alcg9dkr618xh8bvh2w6cinaxwdp0zx6a0ml2iv5"; }; meta.homepage = "https://github.com/blackCauldron7/surround.nvim/"; }; @@ -6183,12 +6183,12 @@ final: prev: swift-vim = buildVimPluginFrom2Nix { pname = "swift.vim"; - version = "2021-09-10"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "3278cf3b0522e6f08eaf11275fedce619beffe9a"; - sha256 = "0hhi49iwkgzxhdixj0jbc4mbgad1irb056ijf7l5022r4k4gs2n8"; + rev = "478e11812f3ddb1778918bd243d8b27c9984ab26"; + sha256 = "15kqlbp1spkbkrgaa9dwp7dbdppncq059cps1qljpqp49qmgay2l"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -6546,12 +6546,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-01-18"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "0011b1148d3975600f5a9f0be8058cdaac4e30d9"; - sha256 = "129cha5pwr1blnkyvkl59ildap0zdvk2khajmvd79fkcncgffvfi"; + rev = "f262e7d56d37625613c5de0df5a933cccacf13c5"; + sha256 = "0gi31w0rpd14zmnnc883hji7vf8hi1njdprhm9lk3n6pslipgfmv"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6606,12 +6606,12 @@ final: prev: thesaurus_query-vim = buildVimPluginFrom2Nix { pname = "thesaurus_query.vim"; - version = "2021-07-08"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "ron89"; repo = "thesaurus_query.vim"; - rev = "65e67a2dc3290d1fbed59db2a3f58944a73e7251"; - sha256 = "1hak0ncsq43j0vblcgy9y4ylx2lazhij71sm3471cgini42klmgp"; + rev = "23d8aa3f7d1a785e31e760e1b6b3b4c18abf8332"; + sha256 = "0mh87m2jimblmdkfw5hr07li3zh2zmvgp23izc79k1i41v4yffsi"; }; meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; @@ -7555,12 +7555,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-01-26"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5ce5ea352432acfe8e9a15ee86dfe623e28b96f6"; - sha256 = "1yh0iqcq6v5gj9bm2ni58bh69cy4y6ihlmp8x49lsr2jv9x4hck9"; + rev = "4525903a95f3c3831d521a67eae6d8dcb0a58b58"; + sha256 = "0c8r385zbadyqxwbpjh6r0ghys23mawv23arkpr1d2srj4dwaij4"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8455,12 +8455,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-09-07"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "256702dd1432894b3607d3de6cd660863b331818"; - sha256 = "0zpa7cs59a8sq0k3frlf9flpf30jcn239yrpmv40r7nqvxzglbpl"; + rev = "a02369403b8331b295f66a494d5d2ecf0e656b2f"; + sha256 = "0g1wdpap96n9by7gli9s5w1k2s2bm9s5vrgv4j4ak0rzlgyhl1i3"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -8503,12 +8503,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-01-20"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "8dfedede1c6e27e4339411b1071fee6a40663f11"; - sha256 = "0micmffcbw70bbxcx03isrf4b4s6plz3drfjbbls7dvalws0z5pa"; + rev = "430bc227654abc3eb5e27a9052a857344ca08cdc"; + sha256 = "0wh3g0lilzi4rjlszjf5gys11zpqvyv53hy5gyjd72k0kkbfbc2k"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8527,12 +8527,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2021-09-18"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "9a9fe186a73fce636398ee7f851466ef60c9fde5"; - sha256 = "0npqcpciq1pwm1ac6ldlyvrg7mhjg4ybrpmmld9b4nysiws97cnq"; + rev = "5ce866172da4b90f77b8371423dc031fe2f4ece7"; + sha256 = "07rl7il0aqirmrg720c3k96v0rfwj4njmx2pnql3wd8nbl2w5czb"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -9273,12 +9273,12 @@ final: prev: vim-manpager = buildVimPluginFrom2Nix { pname = "vim-manpager"; - version = "2020-10-28"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-manpager"; - rev = "c23c02dd79b0a5cabe140d1f10f9aa2591cf55ed"; - sha256 = "0g61qbp4vl010isigp6j3jjb3vb2kxalcbb56xzfa6c9k5zap5j9"; + rev = "194607a8d1bd122ad811ef601eb04a3df7786d59"; + sha256 = "0qnm4k0frki3p9fpb6h4xnv1dxijk9aqcd7glq28c216gh395a5d"; }; meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; @@ -9297,12 +9297,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-01-24"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "9156bba66350d4c0c32b4ac783550c3e132d6a88"; - sha256 = "0ghlswpc0qdxidc38y9xy22293nf0hjxqwvln71gzmxjlxj3rdgk"; + rev = "50d42082819cfa91745b6eff6e28ad5cbc8b27fa"; + sha256 = "1582y2cyqywbgf4pg8m5m2s0nd6wwgnm1nxy5kmrfcn1119hn639"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -9454,12 +9454,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2021-11-09"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "e193f185bad3aa58446e771f8f2739abf11d3262"; - sha256 = "1q2j88rcg0slvm2bfdri4fy42h5a2md9bbqsspb3kzx5yrhgawhp"; + rev = "595ee332719f397c2441d85f79608113957cc78f"; + sha256 = "0kwiw877izpjqfj4gp4km8ivj6iy2c2jxyiqgxrvjqna62kic0ap"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -10258,12 +10258,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-01-18"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "6ab5f16a56f5b2361ba17a41d8644631d2b43647"; - sha256 = "1z36b9vdl8zr1r08jm43p2qys598lbxplbjdqmywkx5y78dm4hhr"; + rev = "48acdaded60c6b75fce06a0d61183ee99950c0ec"; + sha256 = "0rijq9xwm3n84vpjzyvcpy6r58y6ma2pxj61h86122wda5ymwxwg"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -10654,12 +10654,12 @@ final: prev: vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2021-10-12"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "aeb933272e72617f7c4d35e1f003be16836b948d"; - sha256 = "1b0bd5m5lv1p4d299mrwjfs2gk0zqwyaqdaid9hs9yqlxnr8s5nf"; + rev = "baf89ad26488f6a7665d51b986f5c7ad2d22b30b"; + sha256 = "0kzp1g2zw2an0z7bb8h4xs8jf17z0mnn0zf6v1wkipvz6nvp7di8"; }; meta.homepage = "https://github.com/tpope/vim-surround/"; }; @@ -10931,12 +10931,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-01-24"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "72b956f668237a4cd9b020b2c173d013699b38b5"; - sha256 = "1f0kkxclpa9x3qc81yzagl1qili13ihbicb6d84pnpycy482k0sj"; + rev = "400e17c7af65ab194f968a1edac4bcae08fb48f2"; + sha256 = "0s22bkh77avklapn5lr7pm36zaxn656pf4dwxx6lc5xdj3p2qd7y"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -10991,12 +10991,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-01-21"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "00da9eacaf4396bdc11817f987c35e5d09486eb4"; - sha256 = "1r5zdwm20110mzwawxik563l4bw5zxhrpdsn0cgq04icp5gbbxrc"; + rev = "0aa467db97a075c576e97424865a57a457fd4851"; + sha256 = "0ds8a0qn4dx332rpfwjmk09iaqjjd7wiqp91j1c84ysjnc2c1pfk"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11123,12 +11123,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-01-27"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "6fd8b9401af0597cfe8f05550d0194d057fce9c7"; - sha256 = "1j3d0fl449a539azm1ldralmijnc8qgn6c703k4qg2kzdkvpaa48"; + rev = "b6754ace510ffa931bceb47df417a9ef3a87cb6b"; + sha256 = "13dfaf6y0yfnbnxl43fc0jwqv45gigki4iyhb4698fhmcy105jv6"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11169,6 +11169,18 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; + vim-windowswap = buildVimPluginFrom2Nix { + pname = "vim-windowswap"; + version = "2018-05-16"; + src = fetchFromGitHub { + owner = "wesQ3"; + repo = "vim-windowswap"; + rev = "15db3f697aa1fa696d99fcdc920c90cd2cec855e"; + sha256 = "1zzgwxv0a4i1qlig1c3n6n9ns2fqkkv6jqc2qxcipn6v6v88sl2b"; + }; + meta.homepage = "https://github.com/wesQ3/vim-windowswap/"; + }; + vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; version = "2021-12-28"; @@ -11291,12 +11303,12 @@ final: prev: vimade = buildVimPluginFrom2Nix { pname = "vimade"; - version = "2022-01-12"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "fd3d3eb4bf6e5bdb643353f9d4bdae70faa16768"; - sha256 = "046w99vqk0lmxiwnsw57yvz6xgs64wmqwfm3iymxygqz828c8n3s"; + rev = "b0ce0820240e72a330bd388caa48baf434f1a0e3"; + sha256 = "1yknp4fjdwkc5sfw8f6rkhffa1k7lz3pa9q62v9ifj27a0gykwsd"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -11424,12 +11436,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-01-25"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5659e6ac5ffc3ae43bd401d78b3a62653a28b750"; - sha256 = "1nqq10isng6fdkxbn5bjy8c54i00h85m3m13sm0j94lzcia7qxqr"; + rev = "a23fb3c17548d2d8f037e12f2c30edd599e3b8e7"; + sha256 = "1hfxx58jwh3kcfqzhlc32h2krzc73rhdx5m1pvkl9ffsnn4k6602"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11726,12 +11738,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-01-17"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "29ceb12298015dfb59a6e06706c9005f76153238"; - sha256 = "1i5h6lk0ikwhda4h368m4nn0shb6xciaqhxpag109l9xijgm3yap"; + rev = "0762d89c24f5a1da6bf26ca83f3719c379008ff9"; + sha256 = "00vfyi79m85d8pv0cnhyj82nqlnwiqs5pkzbr9yn8mvy6r0hscf3"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index db4f0057d68..b376b7fe1ae 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -65,8 +65,16 @@ , gobject-introspection , wrapGAppsHook - # vim-clap dependencies + # sniprun dependencies +, bashInteractive +, coreutils , curl +, gnugrep +, gnused +, makeWrapper +, procps + + # vim-clap dependencies , libgit2 , libiconv , openssl @@ -76,7 +84,6 @@ , asmfmt , delve , errcheck -, gnused , go-motion , go-tools , gocode @@ -536,6 +543,43 @@ self: super: { dependencies = with self; [ skim ]; }); + sniprun = + let + version = "1.1.2"; + src = fetchFromGitHub { + owner = "michaelb"; + repo = "sniprun"; + rev = "v${version}"; + sha256 = "sha256-WL0eXwiPhcndI74wtFox2tSnZn1siE86x2MLkfpxxT4="; + }; + sniprun-bin = rustPlatform.buildRustPackage { + pname = "sniprun-bin"; + inherit version src; + + cargoSha256 = "sha256-1WbgnsjoFdvko6VRKY+IjafMNqvJvyIZCDk8I9GV3GM="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/sniprun \ + --prefix PATH ${lib.makeBinPath [ bashInteractive coreutils curl gnugrep gnused procps ]} + ''; + + doCheck = false; + }; + in + buildVimPluginFrom2Nix { + pname = "sniprun"; + inherit version src; + + patches = [ ./patches/sniprun/fix-paths.patch ]; + postPatch = '' + substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin} + ''; + + propagatedBuildInputs = [ sniprun-bin ]; + }; + sqlite-lua = super.sqlite-lua.overrideAttrs (old: { postPatch = let libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -752,7 +796,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-4VXXQjGmGGQXgfzSOvFnQS+iQjidj0FjaNKZ3VzBqw0="; + cargoSha256 = "sha256-y4yQ8Zv9bpfOyQrBX/TAuVYHhDsXdj0rh8nHJonxgcU="; }; in '' diff --git a/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch b/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch new file mode 100644 index 00000000000..f3203e00757 --- /dev/null +++ b/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch @@ -0,0 +1,36 @@ +diff --git a/lua/sniprun.lua b/lua/sniprun.lua +index aa39e0b..188d54a 100644 +--- a/lua/sniprun.lua ++++ b/lua/sniprun.lua +@@ -4,9 +4,7 @@ M.custom_highlight=false + M.info_floatwin = {} + + -- See https://github.com/tjdevries/rofl.nvim/blob/632c10f2ec7c56882a3f7eda8849904bcac6e8af/lua/rofl.lua +-local binary_path = vim.fn.fnamemodify( +- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") +- .. "/target/release/sniprun" ++local binary_path = "@sniprun_bin@/bin/sniprun" + + local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." + +diff --git a/ressources/init_repl.sh b/ressources/init_repl.sh +index 2e6264d..0eab1c6 100644 +--- a/ressources/init_repl.sh ++++ b/ressources/init_repl.sh +@@ -23,7 +23,7 @@ mkfifo $working_dir/$pipe + touch $working_dir/$out + sleep 36000 > $working_dir/$pipe & + +-echo "/bin/cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh ++echo "cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh + chmod +x $working_dir/real_launcher.sh + + echo $repl " process started at $(date +"%F %T")." >> $working_dir/log +diff --git a/ressources/launcher_repl.sh b/ressources/launcher_repl.sh +index feaa91e..749c55e 100755 +--- a/ressources/launcher_repl.sh ++++ b/ressources/launcher_repl.sh +@@ -1,2 +1,2 @@ + #!/bin/bash +-/bin/cat $1 > $2 ++cat $1 > $2 diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 587c93be4f7..32d030f1255 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -202,8 +202,6 @@ gioele/vim-autoswap github/copilot.vim gleam-lang/gleam.vim glepnir/dashboard-nvim -glepnir/galaxyline.nvim -glepnir/lspsaga.nvim glepnir/oceanic-material glepnir/zephyr-nvim glts/vim-textobj-comment @@ -558,6 +556,7 @@ noc7c9/vim-iced-coffee-script norcalli/nvim-colorizer.lua norcalli/nvim-terminal.lua norcalli/snippets.nvim +NTBBloodbath/galaxyline.nvim ntpeters/vim-better-whitespace numirias/semshi numtostr/comment.nvim @@ -779,6 +778,7 @@ tamago324/compe-zsh tamago324/lir.nvim tami5/compe-conjure tami5/lispdocs.nvim +tami5/lspsaga.nvim tami5/sqlite.lua tbastos/vim-lua tbodt/deoplete-tabnine @@ -944,6 +944,7 @@ wbthomason/packer.nvim weilbith/nvim-code-action-menu wellle/targets.vim wellle/tmux-complete.vim +wesQ3/vim-windowswap wfxr/minimap.vim whonore/Coqtail will133/vim-dirdiff diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 111d5cf0489..f37183e3022 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -243,8 +243,8 @@ let mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2020.11.2"; - sha256 = "0n2dm21vgzir3hx1m3pmx7jq4zy3hdxfsandd2wv5da4fs9b5g50"; + version = "2022.1.5"; + sha256 = "1b5ihrac9xsq35a39vlq7krr1ffqpdjxdlhv9s056hs033kayazl"; }; buildInputs = [ nodePackages.pyright ]; @@ -693,8 +693,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.1.0"; - sha256 = "sha256-lR5BDbDYURCF1Gq5JIm7BcXVvKXPdNBYom0BiVX/3u0="; + version = "9.2.0"; + sha256 = "sha256-ROI312MPMUY1q6IV4qVCW8DD0MQPA/hVW7rfamo/IbI="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1448,13 +1448,13 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ratsclub ]; }; mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.5.1"; - sha256 = "0jkxpcrbr8xmwfl8jphmarjz2jk54hvmc24ww89d4bgx1awayqfh"; + version = "1.8.4"; + sha256 = "sha256-T1eYAuYMv4B7rdECxYzNfIpydjzCDjeo7gmb1uhr6VM="; }; }; @@ -1462,8 +1462,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.11.0"; - sha256 = "1l2s8j645riqjmj09i3v71s8ycin5vd6brdp35z472fnk6wyi1y6"; + version = "4.12.1"; + sha256 = "sha256-pmWnnZrdk6zb8YFG5ESgK4k875hgeseWyzkA9YUjg7A="; }; meta = { license = lib.licenses.mit; @@ -1494,6 +1494,18 @@ let }; }; + roman.ayu-next = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ayu-next"; + publisher = "roman"; + version = "1.2.9"; + sha256 = "sha256-rwZnqvHRmMquNq9PnU176vI4g8PtS6wSNvQaZ1BMa4I="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { name = "gi"; @@ -1682,8 +1694,8 @@ let mktplcRef = { name = "markdown-memo"; publisher = "svsool"; - version = "0.3.9"; - sha256 = "sha256-BsKFHR3wkSRHS8QOi63vLwGj3T2CPzvqXhgtEOq6gJM="; + version = "0.3.18"; + sha256 = "sha256-ypYqVH1ViJE7+mAJnxmpvUSmiImOo7rE7m+ijTEpmwg="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 3885da4cbeb..4ff3262d27a 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IkPv6oPdwfuIQrqQGqZAJ0b9OPRiA3GWDQuPXM/+fY4="; + sha256 = "sha256-IMNHsmL1L+zfGxfdTxJ4HBGiQOzWmYVE0P3ZInbMVl0="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-/56KsEg6deeROERWLd9lX+7v6n5Dx1VCzdr/GtPFuGo="; + cargoSha256 = "sha256-Q8Xl6L41cDeDN370owAAL9xZhdyUuDKrPlZxG3eg87c="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix deleted file mode 100644 index 26b60ea44f5..00000000000 --- a/pkgs/os-specific/darwin/usr-include/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, darwin}: - -/* - * This is needed to build GCC on Darwin. - * - * These are the collection of headers that would normally be available under - * /usr/include in macOS machines with command line tools installed. They need - * to be in one folder for gcc to use them correctly. - */ - -stdenv.mkDerivation { - name = "darwin-usr-include"; - buildInputs = [ darwin.CF stdenv.libc ]; - buildCommand = '' - mkdir -p $out - cd $out - ln -sf ${stdenv.libc}/include/* . - mkdir CoreFoundation - ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation - ''; - - meta.platforms = lib.platforms.darwin; -} diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index b8a017adcf4..9e21955808f 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation rec { ./busybox-in-store.patch ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; + separateDebugInfo = true; + postPatch = "patchShebangs ."; configurePhase = '' @@ -120,6 +122,8 @@ stdenv.mkDerivation rec { makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") ''; + makeFlags = [ "SKIP_STRIP=y" ]; + postInstall = '' sed -e ' 1 a busybox() { '$out'/bin/busybox "$@"; }\ diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 012833a538c..830ddf49810 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -452,6 +452,8 @@ let }; security = { + FORTIFY_SOURCE = whenAtLeast "4.13" yes; + # https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html DEBUG_LIST = yes; # Detect writes to read-only module pages diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 7b9013fbaf3..3b6262f4f97 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.263"; + version = "4.14.264"; # 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 = "0bn17p1mmkc37bqv7bvksli4xpyp660mbcjm6jmh6k348i1bfwqf"; + sha256 = "1d1588f0zrq93dk9j8gmvfm9mlniyw98s0i3gmg2sa7h1p04pc2m"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 98cc1392734..5a00b8b4c17 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.226"; + version = "4.19.227"; # 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 = "1b9qvl994n09708sql3q3g5l3xq2hxam83fnws5asd8mdnk7i7wk"; + sha256 = "0d1jyyxdrpyi35033fjg8g6zz99ffry2ks1wlldfaxfa6wh9dp39"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index d2de100ad3b..8feaeff1322 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.300"; + version = "4.4.301"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19mpqg48yi7qm1a2mncqax7pj42accryj6yrkbywd7kj4q0b64kg"; + sha256 = "0x0zq8i806i04p0cl742wxh8pxc0wglww0in98gr2ayp7r8qf7am"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 70457c1b3bb..50a803892bd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.298"; + version = "4.9.299"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0nrhjqn6bfp9h5dc7yacgkbfvfdhlks8ph4dzqyfjljmx9cf95ym"; + sha256 = "1n0y8hi7ljs9jr3viqhbpshq0wapmyqb8d9vlh4yzg2n5y5qs3l1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 90bd4dc2ae0..66a43d7f8a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.94"; + version = "5.10.95"; # 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 = "023mrm8wjmxi6qp21p1d0kzs8k0pls6l8kp75ajix2ls9am49zr8"; + sha256 = "08zwcf66varjm2s4lb5a5yh5lh90kb43d6dlrg4xv1179vwxmnf8"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 336ee4149ac..9ca862a25ba 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.17"; + version = "5.15.18"; # 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 = "1pmbf3xin533z4jpqj8p733ii5zk0k36v4cpzl14k62rrk0gb1r7"; + sha256 = "0pkcg3cns4l1i5r7ab77pksl76h54g2mnhvdhc1k8skp9pl71p91"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index 096c48c008b..0ebf566f80b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.3"; + version = "5.16.4"; # 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 = "1cdmp7k6qfm8gyr8zv589y6bgmyj7n6wyk36f98m0w2vq3ljyh5s"; + sha256 = "1gsh7gj5k6kqf5sf26b26rr0idgxdw4xxcba2qaajddyp502mqrb"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index fd47f8c0ec2..80ea507c8a7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.174"; + version = "5.4.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/v5.x/linux-${version}.tar.xz"; - sha256 = "1a88hfcskrcbz7gyh8pkcymka4djdhdy6fdh4i0b9ygsmvjipkg8"; + sha256 = "0h2838jrw69xv1mg1qj0n8qx6g8n48iv8yna633xd20lzggip45c"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 257485645f4..c1f2429d123 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.11-zen1"; + modDirVersion = "5.16.3-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-KOy1bmNnfa8LtnE+03Y+0pr9r1OCimY0bjGsVmGnPN4="; + sha256 = "sha256-7OoNbDYTFpgE47oNhVA54nAj0keRyYMJvuccFW3ah4c="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index ba972bb6916..0946d5050db 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -1,17 +1,32 @@ -{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, numactl, ncurses, check }: stdenv.mkDerivation rec { pname = "numatop"; - version = "2.1"; - src = fetchurl { - url = "https://github.com/intel/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; - sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76"; + version = "2.2"; + src = fetchFromGitHub { + owner = "intel"; + repo = "numatop"; + rev = "v${version}"; + sha256 = "sha256-GJvTwqgx34ZW10eIJj/xiKe3ZkAfs7GlJImz8jrnjfI="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ numactl ncurses ]; checkInputs = [ check ]; + patches = [ + (fetchpatch { + url = "https://github.com/intel/numatop/pull/54.patch"; + sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM="; + name = "fix-string-operations.patch"; + }) + (fetchpatch { + url = "https://github.com/intel/numatop/pull/64.patch"; + sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM="; + name = "fix-format-strings-mvwprintw.patch"; + }) + ]; + doCheck = true; meta = with lib; { @@ -20,8 +35,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; platforms = [ - { kernel.name = "linux"; cpu.family = "x86"; } - { kernel.name = "linux"; cpu.family = "power"; } + "i686-linux" "x86_64-linux" + "powerpc64-linux" "powerpc64le-linux" ]; }; } diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index e2346cca95c..380d76844c8 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.15.1"; + version = "2.16.2"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0vgijwycf3wvzv9v811jrfr5rlwmihlxwpf16spl6k9n6zaswysw"; + sha256 = "sha256-A6xMMpmzjlbAtNTCejKclYsAOgjztUigo8qLmU8tSTQ="; }; kernel = optional (_kernel != null) _kernel.dev; diff --git a/pkgs/os-specific/linux/sgx/samples/default.nix b/pkgs/os-specific/linux/sgx/samples/default.nix new file mode 100644 index 00000000000..f9c5ae45054 --- /dev/null +++ b/pkgs/os-specific/linux/sgx/samples/default.nix @@ -0,0 +1,109 @@ +{ stdenv +, lib +, makeWrapper +, sgx-sdk +, sgx-psw +, which + # "SIM" or "HW" +, sgxMode +}: +let + isSimulation = sgxMode == "SIM"; + buildSample = name: stdenv.mkDerivation { + pname = name; + version = sgxMode; + + src = sgx-sdk.out; + sourceRoot = "${sgx-sdk.name}/share/SampleCode/${name}"; + + nativeBuildInputs = [ + makeWrapper + which + ]; + + buildInputs = [ + sgx-sdk + ]; + + # The samples don't have proper support for parallel building + # causing them to fail randomly. + enableParallelBuilding = false; + + buildFlags = [ + "SGX_MODE=${sgxMode}" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + install -m 755 app $out/bin + install *.so $out/lib + + wrapProgram "$out/bin/app" \ + --run "cd $out/lib" \ + ${lib.optionalString (!isSimulation) + ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''} + + runHook postInstall + ''; + + # Breaks the signature of the enclaves + dontFixup = true; + + # We don't have access to real SGX hardware during the build + doInstallCheck = isSimulation; + installCheckPhase = '' + runHook preInstallCheck + + pushd / + echo a | $out/bin/app + popd + + runHook preInstallCheck + ''; + }; +in +{ + cxx11SGXDemo = buildSample "Cxx11SGXDemo"; + localAttestation = (buildSample "LocalAttestation").overrideAttrs (oldAttrs: { + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + install -m 755 bin/app* $out/bin + install bin/*.so $out/lib + + for bin in $out/bin/*; do + wrapProgram $bin \ + --run "cd $out/lib" \ + ${lib.optionalString (!isSimulation) + ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''} + done + + runHook postInstall + ''; + }); + powerTransition = buildSample "PowerTransition"; + protobufSGXDemo = buildSample "ProtobufSGXDemo"; + remoteAttestation = (buildSample "RemoteAttestation").overrideAttrs (oldAttrs: { + # Makefile sets rpath to point to $TMPDIR + preFixup = '' + patchelf --remove-rpath $out/bin/app + ''; + + postInstall = '' + install sample_libcrypto/*.so $out/lib + ''; + }); + sampleEnclave = buildSample "SampleEnclave"; + sampleEnclavePCL = buildSample "SampleEnclavePCL"; + sampleEnclaveGMIPP = buildSample "SampleEnclaveGMIPP"; + sealUnseal = (buildSample "SealUnseal").overrideAttrs (oldAttrs: { + prePatch = '' + substituteInPlace App/App.cpp \ + --replace '"sealed_data_blob.txt"' '"/tmp/sealed_data_blob.txt"' + ''; + }); + switchless = buildSample "Switchless"; +} diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index 93c12da94ac..baa4ad2a337 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -3,15 +3,16 @@ , fetchFromGitHub , fetchpatch , fetchzip -, callPackage , autoconf , automake , binutils +, callPackage , cmake , file , gdb , git , libtool +, linkFarmFromDrvs , nasm , ocaml , ocamlPackages @@ -20,6 +21,7 @@ , python3 , texinfo , validatePkgConfig +, writeShellApplication , writeShellScript , writeText , debug ? false @@ -262,7 +264,25 @@ stdenv.mkDerivation rec { postHooks+=(sgxsdk) ''; - passthru.tests = callPackage ./samples.nix { }; + passthru.tests = callPackage ../samples { sgxMode = "SIM"; }; + + # Run tests in SGX hardware mode on an SGX-enabled machine + # $(nix-build -A sgx-sdk.runTestsHW)/bin/run-tests-hw + passthru.runTestsHW = + let + testsHW = lib.filterAttrs (_: v: v ? "name") (callPackage ../samples { sgxMode = "HW"; }); + testsHWLinked = linkFarmFromDrvs "sgx-samples-hw-bundle" (lib.attrValues testsHW); + in + writeShellApplication { + name = "run-tests-hw"; + text = '' + for test in ${testsHWLinked}/*; do + printf '*** Running test %s ***\n\n' "$(basename "$test")" + printf 'a\n' | "$test/bin/app" + printf '\n' + done + ''; + }; meta = with lib; { description = "Intel SGX SDK for Linux built with IPP Crypto Library"; diff --git a/pkgs/os-specific/linux/sgx/sdk/samples.nix b/pkgs/os-specific/linux/sgx/sdk/samples.nix deleted file mode 100644 index 21b31f82447..00000000000 --- a/pkgs/os-specific/linux/sgx/sdk/samples.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, sgx-sdk -, which -}: -let - buildSample = name: stdenv.mkDerivation rec { - inherit name; - - src = sgx-sdk.out; - sourceRoot = "${sgx-sdk.name}/share/SampleCode/${name}"; - - buildInputs = [ - sgx-sdk - ]; - - # The samples don't have proper support for parallel building - # causing them to fail randomly. - enableParallelBuilding = false; - - buildFlags = [ - "SGX_MODE=SIM" - ]; - - installPhase = '' - mkdir $out - install -m 755 app $out/app - install *.so $out/ - ''; - - doInstallCheck = true; - installCheckInputs = [ which ]; - installCheckPhase = '' - pushd $out - ./app - popd - ''; - }; -in -{ - cxx11SGXDemo = buildSample "Cxx11SGXDemo"; - localAttestation = (buildSample "LocalAttestation").overrideAttrs (oldAttrs: { - installPhase = '' - mkdir $out - cp -r bin/. $out/ - ''; - }); - powerTransition = (buildSample "PowerTransition").overrideAttrs (oldAttrs: { - # Requires interaction - doInstallCheck = false; - }); - protobufSGXDemo = buildSample "ProtobufSGXDemo"; - remoteAttestation = (buildSample "RemoteAttestation").overrideAttrs (oldAttrs: { - dontFixup = true; - installCheckPhase = '' - echo "a" | LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/sample_libcrypto ./app - ''; - }); - sampleEnclave = buildSample "SampleEnclave"; - sampleEnclavePCL = buildSample "SampleEnclavePCL"; - sampleEnclaveGMIPP = buildSample "SampleEnclaveGMIPP"; - sealUnseal = buildSample "SealUnseal"; - switchless = buildSample "Switchless"; -} diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index f17dd02e7c0..c2879ed939e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -594,16 +594,20 @@ stdenv.mkDerivation { rm -rf $out/share/doc ''; - # The interface version prevents NixOS from switching to an - # incompatible systemd at runtime. (Switching across reboots is - # fine, of course.) It should be increased whenever systemd changes - # in a backwards-incompatible way. If the interface version of two - # systemd builds is the same, then we can switch between them at - # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 2; - - passthru.tests = { - inherit (nixosTests) switchTest; + passthru = { + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + interfaceVersion = 2; + + inherit withCryptsetup; + + tests = { + inherit (nixosTests) switchTest; + }; }; meta = with lib; { diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index f367dc59401..fb10a5369f1 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xKfRLdfeD7lWdmC0iiq4dOIv2SmzbKH7HcAISCJgdug="; }; - vendorSha256 = "sha256-8fmbv5uPRfzUqsYU95YzsnuFkq4cwj+LN2X3W/yBHyA="; + vendorSha256 = "sha256-Vg0k+YSMg6Ree/jkVV2VQ8RbSbQFUhmUN2MeTBxPeLo="; proxyVendor = true; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 475541231b1..4d0c07b0bf1 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv"; }; - vendorSha256 = "0d17qaqn33wi7lzw4hlym56d9v4qnmvs6plpm5jiby2g5yckq0mz"; + vendorSha256 = "1w9c0qzah2f9rbjdxqajwrfkia25cwbn30gidviaid3b7ddpd7r8"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 19b3a25de59..5aa702e28d6 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -9,18 +9,17 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.16"; + version = "9.16.25"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bJE5Aq34eOfcXiKc6pT678nUD0R3WjAhPt0Ihg92HXs="; + sha256 = "sha256-n6MohQ+ChD74t78f9TIstosRAnOjPzdbpB81Jw9eH/M="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; patches = [ ./dont-keep-configure-flags.patch - ./remove-mkdir-var.patch ]; nativeBuildInputs = [ perl pkg-config ]; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index ceb887e678e..89c58226573 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,20 +1,22 @@ -diff -ru a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h ---- a/bin/named/include/named/globals.h 2020-09-24 17:43:49.398977491 +0200 -+++ b/bin/named/include/named/globals.h 2020-09-24 17:44:36.826590553 +0200 -@@ -69,7 +69,9 @@ - EXTERN const char *named_g_product INIT(PRODUCT); - EXTERN const char *named_g_description INIT(DESCRIPTION); - EXTERN const char *named_g_srcid INIT(SRCID); +diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h +index 82b632ef04..dedfd4d33b 100644 +--- a/bin/named/include/named/globals.h ++++ b/bin/named/include/named/globals.h +@@ -71,7 +71,9 @@ EXTERN const char *named_g_version INIT(VERSION); + EXTERN const char *named_g_product INIT(PRODUCT); + EXTERN const char *named_g_description INIT(DESCRIPTION); + EXTERN const char *named_g_srcid INIT(SRCID); +#if 0 - EXTERN const char *named_g_configargs INIT(CONFIGARGS); + EXTERN const char *named_g_configargs INIT(CONFIGARGS); +#endif - EXTERN const char *named_g_builder INIT(BUILDER); - EXTERN in_port_t named_g_port INIT(0); - EXTERN isc_dscp_t named_g_dscp INIT(-1); -diff -ru a/bin/named/main.c b/bin/named/main.c ---- a/bin/named/main.c 2020-09-24 17:43:49.399977504 +0200 -+++ b/bin/named/main.c 2020-09-24 17:44:24.102426273 +0200 -@@ -506,7 +506,9 @@ + EXTERN const char *named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); +diff --git a/bin/named/main.c b/bin/named/main.c +index 9ad2d0e277..9729a2b3fc 100644 +--- a/bin/named/main.c ++++ b/bin/named/main.c +@@ -521,7 +521,9 @@ printversion(bool verbose) { } printf("running on %s\n", named_os_uname()); @@ -24,7 +26,7 @@ diff -ru a/bin/named/main.c b/bin/named/main.c #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); #else /* ifdef __clang__ */ -@@ -1102,9 +1104,11 @@ +@@ -1089,9 +1091,11 @@ setup(void) { NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", named_os_uname()); diff --git a/pkgs/servers/dns/bind/remove-mkdir-var.patch b/pkgs/servers/dns/bind/remove-mkdir-var.patch deleted file mode 100644 index d0dcd580c20..00000000000 --- a/pkgs/servers/dns/bind/remove-mkdir-var.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -53,8 +53,7 @@ docclean manclean maintainer-clean:: - doc man:: ${MANOBJS} - - installdirs: -- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} \ -- ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir} -+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${sysconfdir} - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 - - install:: isc-config.sh installdirs diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 8057b56e9f3..cba689df110 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-PgSjxDmPahGd2o3QBfvytMva+LHWeLPm500DsNdB77Q="; + sha256 = "sha256-0SIQninNnJZ6KN5RKIMJzJQZRV7ThfJZal1lhsBnTIY="; }; - vendorSha256 = "sha256-gD4jGaR4KQiYL6+yA8g2u6cTEbfySTMErNqerw76Ook="; + vendorSha256 = "sha256-n5E6pzswenMJrThCys0UM2LVXKDXqCXDW7uR0V4H56w="; ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ]; @@ -44,6 +44,6 @@ buildGoModule rec { Headscale implements this coordination server. ''; license = licenses.bsd3; - maintainers = with maintainers; [ nkje jk ]; + maintainers = with maintainers; [ nkje jk kradalby ]; }; } diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index ffeead30a29..da4715c5432 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.48.0"; + version = "1.49.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-oSimHF4qiI2zcMSx51qxs88AcrrewHIbhaRW8s4Ut7Q="; + sha256 = "sha256-9orJEt0w0ORHKEOpp40Aubj/pfnNO/A3oHEgWIdk+vM="; }; - vendorSha256 = "sha256-dzYO1yAQSVJmDJvjB5XPRBiYCk+ko1n928CTtUXbHBc="; + vendorSha256 = "sha256-/dmEsoeB3UDOBZ/9rbnywRtpXVKaJKGF6xPeWTA4PPE="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index ced4a6dec1f..ba163a719b1 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "sha256-TxeHfO5IUVsKmKZ1e0/KXi+6dk2nn6AoNG0eB3jyGkY="; + vendorSha256 = "sha256-hvmIOCqVZTfV7EnkDUWiChynGkwTpHClMbW4LpbdAgo="; proxyVendor = true; buildInputs = [ ffmpeg ]; diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index eb6f9345b2d..9db7ef3aaca 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "atheme"; - version = "7.2.11"; + version = "7.2.12"; src = fetchgit { url = "https://github.com/atheme/atheme.git"; rev = "v${version}"; - sha256 = "15fs48cgzxblh2g4abl5v647ndfx9hg8cih2x67v3y7s9wz68wk2"; + sha256 = "sha256-KAC1ZPNo4TqfVryKOYYef8cRWRgFmyEdvl1bgvpGNiM="; leaveDotGit = true; }; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 7d5ae0c74f2..48d6118add9 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2021-12-24"; + version = "unstable-2022-01-09"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "247cd753e283e70a9949e76d0ba669d99c0eb144"; - sha256 = "sha256-65wxhE/XqNK6ly+fxZFLjtImvpJlgU54RStUve40CJA="; + rev = "6e6ad7b5201d3452aa605f4ae852c51239c2c7d8"; + sha256 = "sha256-cflcGweEjB0xj2LhYJzyvqFSQen2vhYXlL7lz/HoGaM="; }; sourceRoot = "source/klippy"; diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index e5d282e64ec..046ad481457 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { version = "0.5.20"; proxyVendor = true; - vendorSha256 = "sha256-pyPxONcWniJoA0qYusHktF3/taYda2StaMiMhyRYEm4="; + vendorSha256 = "sha256-aRZoAEnRai8i5H08ReW8lEFlbmarYxU0lBRhR/Llw+M="; src = fetchFromGitHub { owner = "livepeer"; diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix new file mode 100644 index 00000000000..6d5ebbb76c0 --- /dev/null +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitLab, libcap_ng, libseccomp }: + +rustPlatform.buildRustPackage rec { + pname = "virtiofsd"; + version = "1.0.0"; + + src = fetchFromGitLab { + owner = "virtio-fs"; + repo = "virtiofsd"; + rev = "v${version}"; + sha256 = "010xf482qip91mv91wy9zjdsq0gfg1fd6iclrcry0nfnwlbigbwd"; + }; + + cargoSha256 = "0bfvqbmvkf17slra5k0nnva6j6w07769k226qnbzb3947zf4x2ga"; + + buildInputs = [ libcap_ng libseccomp ]; + + meta = with lib; { + homepage = "https://gitlab.com/virtio-fs/virtiofsd"; + description = "vhost-user virtio-fs device backend written in Rust"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + license = with licenses; [ asl20 /* and */ bsd3 ]; + }; +} diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 5490b29090e..a530a58e900 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,18 +46,18 @@ in { ''; nextcloud21 = generic { - version = "21.0.7"; - sha256 = "sha256-WZMhWW613q5c6grR/dzVSCKJKru7XPtRoxgBhi8VE7c="; + version = "21.0.8"; + sha256 = "00c37wp6fsnpm40bbhk6r6xycacfa5zk7arzc3i4xmhm89cyvm6z"; }; nextcloud22 = generic { - version = "22.2.3"; - sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo="; + version = "22.2.4"; + sha256 = "0vnf2j1hz0d7lxby73r2mq2rjm72nq55xajzm8sipj6wlbys15zl"; }; nextcloud23 = generic { - version = "23.0.0"; - sha256 = "sha256-w3WSq8O2XI/ShFkoGiT0FLh69S/IwuqXm+P5vnXQGiw="; + version = "23.0.1"; + sha256 = "047pnkp49rf0a9gl03dwkkdgzmdsf88m79mzq04bwmgkb3a3qxay"; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream b/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream deleted file mode 100644 index a18675347d5..00000000000 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream +++ /dev/null @@ -1,4 +0,0 @@ -name apache-jena-fuseki -attribute apache-jena-fuseki -target fuseki-binary.nix -minimize_overwrite diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index 7002749a0df..7f9ce7d5b56 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - vendorSha256 = "sha256-bmF38dj+ovVlSbTtv2TSXGLe/W1R4NUbeDrpgGlfPf4="; + vendorSha256 = "sha256-+5/j2lZJpyo67uRRSn4Fd8S2K0gfAGMe69OoEEdWijc="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 9922b98a827..443e54433f1 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.1.0"; + version = "3.1.3"; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; - hash = "sha256-LtPv+3FQMGC2YP2+1cSPZVUIzrUhteJTl58+JdvGcQg="; + hash = "sha256-a1oapCktJPvNO+MTsB9COtxSFB/ZIZvJiuqX+s+lncY="; }; postPatch = '' @@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://radicale.org/v3.html"; description = "CalDAV and CardDAV server"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda erictapen ]; }; } diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 14161b5d5a3..9b896cd2a11 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -2,71 +2,80 @@ , alsa-utils , autoPatchelfHook , fetchurl +, ffmpeg , lib , makeWrapper +, openssl , stdenv , zlib }: -let - inherit (stdenv.targetPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; -in stdenv.mkDerivation rec { pname = "roon-bridge"; - version = "1.8-814"; + version = "1.8-880"; src = let urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version; + inherit (stdenv.targetPlatform) system; + noSuchSystem = throw "Unsupposed system: ${system}"; in { x86_64-linux = fetchurl { url = "http://download.roonlabs.com/builds/RoonBridge_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A="; + sha256 = "sha256-YTLy3D1CQR1hlsGw2MmZtxHT82T0PCYZxD4adt2m1+o="; }; aarch64-linux = fetchurl { url = "http://download.roonlabs.com/builds/RoonBridge_linuxarmv8_${urlVersion}.tar.bz2"; - sha256 = "sha256-zZj7PkLUYYHo3dngqErv1RqynSXi6/D5VPZWfrppX5U="; + sha256 = "sha256-aCQtYMUIzwhmYJW4a8cFzIRuxyMVIkeaJH4w1Lasp3M="; }; - }.${system} or throwSystem; + }.${system} or noSuchSystem; + + dontConfigure = true; + dontBuild = true; buildInputs = [ alsa-lib - alsa-utils zlib + stdenv.cc.cc.lib ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - installPhase = '' - runHook preInstall - mkdir -p $out - mv * $out - runHook postInstall - ''; - - postFixup = + installPhase = let - linkFix = bin: '' - sed -i '/ulimit/d' ${bin} - sed -i '/ln -sf/d' ${bin} - ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} - ''; - wrapFix = bin: '' - wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} + fixBin = binPath: '' + ( + sed -i '/ulimit/d' ${binPath} + sed -i 's@^SCRIPT=.*@SCRIPT="$(basename "${binPath}")"@' ${binPath} + wrapProgram ${binPath} \ + --argv0 "$(basename ${binPath})" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib ffmpeg openssl ]}" \ + --prefix PATH : "${lib.makeBinPath [ alsa-utils ffmpeg ]}" + ) ''; in '' - ${linkFix "$out/Bridge/RAATServer"} - ${linkFix "$out/Bridge/RoonBridge"} - ${linkFix "$out/Bridge/RoonBridgeHelper"} + runHook preInstall + mkdir -p $out + mv * $out + + rm $out/check.sh + rm $out/start.sh + rm $out/VERSION + + ${fixBin "${placeholder "out"}/Bridge/RAATServer"} + ${fixBin "${placeholder "out"}/Bridge/RoonBridge"} + ${fixBin "${placeholder "out"}/Bridge/RoonBridgeHelper"} + + mkdir -p $out/bin + makeWrapper "$out/Bridge/RoonBridge" "$out/bin/RoonBridge" --run "cd $out" - ${wrapFix "$out/check.sh"} - ${wrapFix "$out/start.sh"} + runHook postInstall ''; meta = with lib; { description = "The music player for music lovers"; + changelog = "https://community.roonlabs.com/c/roon/software-release-notes/18"; homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index e62f0a9dfd9..4a619539776 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-880"; + version = "1.8-898"; src = let @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-Td3iRYGmTg8Vx9c4e4ugIIbAqhDFPax9vR2BsCIQCZA="; + sha256 = "sha256-khp2E5BYb7bGEW6xfCKEqYDqAdElOFLbAkaHjILfyqo="; }; dontConfigure = true; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2001ae00527..d32a545069d 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.2"; + version = "4.15.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-YoHXxqjEn3mQqfJJpmeEs1GA/iSVV+8RR82KbRZqIRM="; + sha256 = "sha256-aRFeM4MZN7pRUb4CR5QxR3Za7OZYunQ/RHQWcq1o0X8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index 29c223a3470..1363aea11e3 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "serviio"; - version = "2.1"; + version = "2.2.1"; src = fetchurl { url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz"; - sha256 = "0mxpdyhjf4w83q8ssmvpxm95hw4x7lfkh48vvdablccfndh82x2i"; + sha256 = "sha256-uRRWKMv4f2b1yIE9OnXDIZAmcoqw/8F0z1LOesQBsyQ="; }; installPhase = '' diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index b289177e799..5b57ca27049 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-sRlEF1ee+oBnYOGSN6rDOvNr3OnfAqV+1Wx5XOyIylw="; }; - vendorSha256 = "sha256-FukkmuBTPPhY0UTe3r1iU3nbGoMsPTcRKTLBd+VMGUk="; + vendorSha256 = "sha256-txC85Y5t880XGgJb7tumDgqWTdTRCXXgATAtlWXF7n8="; doCheck = false; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 4e4a0640df6..dd849ef9586 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-7nmpsmisrtBxdLgC9mwSDYbjtbCrGl564+deC9CaYps="; + vendorSha256 = "sha256-pP/KCj92Y8fEh9AXKEOxuXxMeTMcGJrYSW+OrfXvajk="; doCheck = false; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 3f1f3448dad..fb07bc39154 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nixosTests +{ lib, stdenv, fetchurl, nixosTests, buildPackages # Native buildInputs components , bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config # Common components @@ -18,7 +18,7 @@ let # in mariadb # spans the whole file libExt = stdenv.hostPlatform.extensions.sharedLibrary; -mytopEnv = perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]); +mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]); mariadbPackage = packageSettings: (server packageSettings) // { client = client packageSettings; # MariaDB Client @@ -208,6 +208,10 @@ in stdenv.mkDerivation (common // { "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_PLUGIN_S3=1" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # revisit this if nixpkgs supports any architecture whose stack grows upwards + "-DSTACK_DIRECTION=-1" + "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" ]; preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index c1ce4d9e1e1..1c8b21f399e 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, cmake, bison, pkg-config , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds -, libtirpc, rpcsvc-proto +, libtirpc, rpcsvc-proto, nixosTests }: # Note: zlib is not required; MySQL can use an internal zlib. @@ -9,11 +9,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "5.7.27"; + version = "5.7.37"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; - sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; + sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0="; }; preConfigure = lib.optionalString stdenv.isDarwin '' @@ -75,6 +75,7 @@ self = stdenv.mkDerivation rec { connector-c = self; server = self; mysqlVersion = "5.7"; + tests = nixosTests.mysql.mysql57; }; meta = with lib; { diff --git a/pkgs/servers/t-rex/default.nix b/pkgs/servers/t-rex/default.nix index 8475d5df4d9..551282b6058 100644 --- a/pkgs/servers/t-rex/default.nix +++ b/pkgs/servers/t-rex/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "t-rex"; - version = "0.14.3-beta4"; + version = "0.14.3"; src = fetchFromGitHub { owner = "t-rex-tileserver"; repo = pname; rev = "v${version}"; - hash = "sha256-EG/nnHxnBwlxreJ+RWHvKqLpaVtlU95+YTJynEnypOE="; - + hash = "sha256-LUVk5li2cl/LKbhKOh6Bbwav0GEuI/vUbDPLn7NSRIs="; }; - cargoHash = "sha256-noDZNFZlfX6lZ4czsSrHXe7xbBLTD0Gz8i5EyfEp8lc="; + cargoHash = "sha256-I4QmjTTKUp9iugEwzM0xCcNLvF5ozeBdYmbi8sytY88="; nativeBuildInputs = [ pkg-config ]; @@ -21,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Vector tile server specialized on publishing MVT tiles"; homepage = "https://t-rex.tileserver.ch/"; + changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 91a26642745..95ef4b0ea70 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.5.7"; + version = "2.6.0"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-CQXrAKdfNqGKXw3Ds47uq6ALsDh6JRf+94axOvLzWbE="; + sha256 = "sha256-+95GB4D6upo6s0K+rxpuolzF5Knind0bYCzgO33mNis="; stripRoot = false; }; - vendorSha256 = "sha256-aZemr1waV2hIujbI+1PrivXxa1RrT0Ams4xT4QxTQPY="; + vendorSha256 = "sha256-H67oCOCkS/xpkCZ4C3BuIzpUKuLvItDqC4tNSNKjv0E="; doCheck = false; diff --git a/pkgs/servers/web-apps/ethercalc/default.nix b/pkgs/servers/web-apps/ethercalc/default.nix new file mode 100644 index 00000000000..270b2e4cff7 --- /dev/null +++ b/pkgs/servers/web-apps/ethercalc/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, pkgs +, lib +, nodejs-14_x +}: + +let + nodejs = nodejs-14_x; + + nodePackages = import ./node-packages.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; + + ethercalc = lib.head (lib.attrValues nodePackages); + + combined = ethercalc.override { + meta = with lib; { + description = "Online collaborative spreadsheet"; + license = with licenses; [ cpal10 artistic2 mit asl20 cc0 mpl20 ]; + homepage = "https://github.com/audreyt/ethercalc"; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + }; + }; +in + combined diff --git a/pkgs/servers/web-apps/ethercalc/generate.sh b/pkgs/servers/web-apps/ethercalc/generate.sh new file mode 100755 index 00000000000..814a83a033d --- /dev/null +++ b/pkgs/servers/web-apps/ethercalc/generate.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +# Run this script not via `./generate.sh`, but via `$PWD/generate.sh`. +# Else `nix-shell` will not find this script. + +set -euo pipefail + +cd -- "$(dirname -- "$BASH_SOURCE[0]")" + +node2nix \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ../../../development/node-packages/node-env.nix diff --git a/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix b/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix new file mode 100644 index 00000000000..97435a5225f --- /dev/null +++ b/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix @@ -0,0 +1,2086 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: + +let + sources = { + "accepts-1.0.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz"; + sha1 = "5b501fb4f0704309964ccdb048172541208dab1a"; + }; + }; + "adler-32-1.0.0" = { + name = "adler-32"; + packageName = "adler-32"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/adler-32/-/adler-32-1.0.0.tgz"; + sha1 = "28728a71756f629666dd1653cd80793a9df18651"; + }; + }; + "adler-32-1.2.0" = { + name = "adler-32"; + packageName = "adler-32"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz"; + sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25"; + }; + }; + "adler-32-1.3.0" = { + name = "adler-32"; + packageName = "adler-32"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz"; + sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g=="; + }; + }; + "after-0.8.1" = { + name = "after"; + packageName = "after"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz"; + sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "arraybuffer.slice-0.0.6" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; + sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + }; + }; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + }; + "babyparse-0.2.1" = { + name = "babyparse"; + packageName = "babyparse"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babyparse/-/babyparse-0.2.1.tgz"; + sha1 = "069f035df3fdce6f3a455dd5dafc75178dcf3760"; + }; + }; + "balanced-match-1.0.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; + }; + }; + "base64-arraybuffer-0.1.2" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; + sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; + }; + }; + "base64-url-1.2.1" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; + sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; + }; + }; + "base64id-0.1.0" = { + name = "base64id"; + packageName = "base64id"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + }; + }; + "basic-auth-1.0.0" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz"; + sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637"; + }; + }; + "basic-auth-connect-1.0.0" = { + name = "basic-auth-connect"; + packageName = "basic-auth-connect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + }; + }; + "batch-0.5.1" = { + name = "batch"; + packageName = "batch"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.5.1.tgz"; + sha1 = "36a4bab594c050fd7b507bca0db30c2d92af4ff2"; + }; + }; + "better-assert-1.0.2" = { + name = "better-assert"; + packageName = "better-assert"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; + sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; + }; + }; + "blob-0.0.2" = { + name = "blob"; + packageName = "blob"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz"; + sha1 = "b89562bd6994af95ba1e812155536333aa23cf24"; + }; + }; + "body-parser-1.6.7" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz"; + sha1 = "82306becadf44543e826b3907eae93f0237c4e5c"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "buffer-crc32-0.2.3" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"; + sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921"; + }; + }; + "buffer-from-1.1.2" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; + }; + }; + "bytes-1.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + }; + "callsite-1.0.0" = { + name = "callsite"; + packageName = "callsite"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + }; + }; + "cfb-0.11.1" = { + name = "cfb"; + packageName = "cfb"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cfb/-/cfb-0.11.1.tgz"; + sha1 = "a96db8f272a6c3fb99dbbb23ef41223f48be1ea7"; + }; + }; + "cfb-1.2.1" = { + name = "cfb"; + packageName = "cfb"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cfb/-/cfb-1.2.1.tgz"; + sha512 = "wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ=="; + }; + }; + "codepage-1.14.0" = { + name = "codepage"; + packageName = "codepage"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz"; + sha1 = "8cbe25481323559d7d307571b0fff91e7a1d2f99"; + }; + }; + "codepage-1.8.1" = { + name = "codepage"; + packageName = "codepage"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/codepage/-/codepage-1.8.1.tgz"; + sha1 = "f1a009d5261dc2754628bacb6fbbf0e6e2abffaa"; + }; + }; + "coffee-css-0.0.5" = { + name = "coffee-css"; + packageName = "coffee-css"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-css/-/coffee-css-0.0.5.tgz"; + sha1 = "589a822fba5ae0d4f1a0424b22ba7501683275a4"; + }; + }; + "coffee-script-1.12.7" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="; + }; + }; + "coffeecup-0.3.21" = { + name = "coffeecup"; + packageName = "coffeecup"; + version = "0.3.21"; + src = fetchurl { + url = "https://registry.npmjs.org/coffeecup/-/coffeecup-0.3.21.tgz"; + sha1 = "54e714175cb223ddd10568517196e0cd566d198a"; + }; + }; + "colors-0.6.2" = { + name = "colors"; + packageName = "colors"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + }; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + }; + "commander-1.3.2" = { + name = "commander"; + packageName = "commander"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; + }; + }; + "commander-2.14.1" = { + name = "commander"; + packageName = "commander"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; + }; + }; + "commander-2.17.1" = { + name = "commander"; + packageName = "commander"; + version = "2.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; + }; + }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "component-bind-1.0.0" = { + name = "component-bind"; + packageName = "component-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; + }; + }; + "component-emitter-1.1.2" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + }; + }; + "component-inherit-0.0.3" = { + name = "component-inherit"; + packageName = "component-inherit"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; + sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; + }; + }; + "compressible-1.1.1" = { + name = "compressible"; + packageName = "compressible"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-1.1.1.tgz"; + sha1 = "23b71ea90ea6c6a66289701a918182c24d0729ef"; + }; + }; + "compression-1.0.11" = { + name = "compression"; + packageName = "compression"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.0.11.tgz"; + sha1 = "69700cf1ee8963454356ac192a6e5e91e232bffb"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "concat-stream-2.0.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz"; + sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; + }; + }; + "connect-2.25.9" = { + name = "connect"; + packageName = "connect"; + version = "2.25.9"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.25.9.tgz"; + sha1 = "9680d6f2fb200eadab3d272e419e78e5d87cf31f"; + }; + }; + "connect-timeout-1.2.2" = { + name = "connect-timeout"; + packageName = "connect-timeout"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.2.2.tgz"; + sha1 = "5953602bb66abfd5fa21ae911a7221c5e825a1c0"; + }; + }; + "cookie-0.1.2" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + }; + }; + "cookie-parser-1.3.2" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.2.tgz"; + sha1 = "52211cc82c955d79ff0c088954407724e19cf562"; + }; + }; + "cookie-signature-1.0.4" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz"; + sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca"; + }; + }; + "core-util-is-1.0.3" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + }; + }; + "cors-2.8.5" = { + name = "cors"; + packageName = "cors"; + version = "2.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"; + sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; + }; + }; + "crc-32-1.0.2" = { + name = "crc-32"; + packageName = "crc-32"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.0.2.tgz"; + sha1 = "09507984ee9bcce3bd1b8861f0de8ab10ae8187d"; + }; + }; + "crc-32-1.2.0" = { + name = "crc-32"; + packageName = "crc-32"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; + sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + }; + }; + "csrf-2.0.7" = { + name = "csrf"; + packageName = "csrf"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/csrf/-/csrf-2.0.7.tgz"; + sha1 = "d04f52e0f6a28a7e2cfe1e01dd5ebc251b3d4201"; + }; + }; + "cssom-0.2.5" = { + name = "cssom"; + packageName = "cssom"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz"; + sha1 = "2682709b5902e7212df529116ff788cd5b254894"; + }; + }; + "csurf-1.4.1" = { + name = "csurf"; + packageName = "csurf"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/csurf/-/csurf-1.4.1.tgz"; + sha1 = "0ccaf026992b2d218771d6174f5c6c402a6289fd"; + }; + }; + "csv-parse-0.0.6" = { + name = "csv-parse"; + packageName = "csv-parse"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-0.0.6.tgz"; + sha1 = "94610722650feac81cf549c2c9298632d2b6037c"; + }; + }; + "debug-0.6.0" = { + name = "debug"; + packageName = "debug"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; + sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f"; + }; + }; + "debug-0.7.4" = { + name = "debug"; + packageName = "debug"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + }; + "debug-1.0.4" = { + name = "debug"; + packageName = "debug"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; + sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; + }; + }; + "deep-is-0.1.4" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; + }; + }; + "depd-0.4.4" = { + name = "depd"; + packageName = "depd"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; + sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; + }; + }; + "destroy-1.0.3" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + }; + "ee-first-1.0.5" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; + sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0"; + }; + }; + "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { + name = "emitter"; + packageName = "emitter"; + version = "1.0.1"; + src = fetchurl { + name = "emitter-1.0.1.tar.gz"; + url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; + sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; + }; + }; + "engine.io-1.3.1" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz"; + sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e"; + }; + }; + "engine.io-client-1.3.1" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz"; + sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; + }; + }; + "engine.io-parser-1.0.6" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz"; + sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e"; + }; + }; + "errorhandler-1.1.1" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz"; + sha1 = "18defd436d8ca2efe0a2d886c5c4d6ee6d76d691"; + }; + }; + "escape-html-1.0.1" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; + }; + }; + "exit-on-epipe-1.0.1" = { + name = "exit-on-epipe"; + packageName = "exit-on-epipe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="; + }; + }; + "express-3.16.9" = { + name = "express"; + packageName = "express"; + version = "3.16.9"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-3.16.9.tgz"; + sha1 = "993747be5669700280d9682cb61ad138939847fc"; + }; + }; + "express-session-1.7.6" = { + name = "express-session"; + packageName = "express-session"; + version = "1.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.7.6.tgz"; + sha1 = "e1c369ba2176f7afdb79e77d65dcd8c7c46e48a5"; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "finalhandler-0.1.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz"; + sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa"; + }; + }; + "frac-0.3.1" = { + name = "frac"; + packageName = "frac"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/frac/-/frac-0.3.1.tgz"; + sha1 = "577677b7fdcbe6faf7c461f1801d34137cda4354"; + }; + }; + "frac-1.0.6" = { + name = "frac"; + packageName = "frac"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/frac/-/frac-1.0.6.tgz"; + sha1 = "9a0dfc23956852a8b320623bebcf1be9ea048229"; + }; + }; + "frac-1.1.2" = { + name = "frac"; + packageName = "frac"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz"; + sha512 = "w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="; + }; + }; + "fresh-0.2.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"; + sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77"; + }; + }; + "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { + name = "global"; + packageName = "global"; + version = "2.0.1"; + src = fetchurl { + name = "global-2.0.1.tar.gz"; + url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; + sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "harb-0.1.1" = { + name = "harb"; + packageName = "harb"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/harb/-/harb-0.1.1.tgz"; + sha1 = "b8239bae2f0724b65aaaf2e74e9eb15a04db50eb"; + }; + }; + "has-binary-data-0.1.1" = { + name = "has-binary-data"; + packageName = "has-binary-data"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz"; + sha1 = "e10749fb87828a52df96f4086587eb4a03966439"; + }; + }; + "has-cors-1.0.3" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz"; + sha1 = "502acb9b3104dac33dd2630eaf2f888b0baf4cb3"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "iconv-lite-0.4.4" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; + sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8"; + }; + }; + "indexof-0.0.1" = { + name = "indexof"; + packageName = "indexof"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ipaddr.js-0.1.2" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; + sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "j-0.4.5" = { + name = "j"; + packageName = "j"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/j/-/j-0.4.5.tgz"; + sha1 = "02cf29f1ddbe54e527263d0754d6e8d217a6064e"; + }; + }; + "json3-3.2.6" = { + name = "json3"; + packageName = "json3"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; + sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; + }; + }; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "livescript-1.5.0" = { + name = "livescript"; + packageName = "livescript"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/livescript/-/livescript-1.5.0.tgz"; + sha1 = "4fe7121c41217e4608e334eb9cbe1762e63e5566"; + }; + }; + "media-typer-0.2.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz"; + sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984"; + }; + }; + "merge-descriptors-0.0.2" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + }; + }; + "method-override-2.1.3" = { + name = "method-override"; + packageName = "method-override"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.1.3.tgz"; + sha1 = "511f41c4fb1dccdb6ab1844da5dc6ea81b7c1135"; + }; + }; + "methods-1.1.0" = { + name = "methods"; + packageName = "methods"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; + sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; + }; + }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.10" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + }; + "mkdirp-0.5.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }; + }; + "morgan-1.2.3" = { + name = "morgan"; + packageName = "morgan"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.2.3.tgz"; + sha1 = "3b0f1704df90255a542591abacd797891a8c40a1"; + }; + }; + "ms-0.6.2" = { + name = "ms"; + packageName = "ms"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }; + }; + "multiparty-3.3.2" = { + name = "multiparty"; + packageName = "multiparty"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; + sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + }; + }; + "mz-1.3.0" = { + name = "mz"; + packageName = "mz"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-1.3.0.tgz"; + sha1 = "06f093fdd9956a06d37e1b1e81344e27478c42f0"; + }; + }; + "nan-0.3.2" = { + name = "nan"; + packageName = "nan"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; + sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; + }; + }; + "native-or-bluebird-1.1.2" = { + name = "native-or-bluebird"; + packageName = "native-or-bluebird"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"; + sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e"; + }; + }; + "negotiator-0.4.7" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; + sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; + }; + }; + "node-uuid-1.4.1" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "object-component-0.0.3" = { + name = "object-component"; + packageName = "object-component"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + }; + }; + "on-finished-2.1.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; + sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d"; + }; + }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "optionator-0.8.3" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; + }; + }; + "options-0.0.6" = { + name = "options"; + packageName = "options"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + }; + "optparse-1.0.3" = { + name = "optparse"; + packageName = "optparse"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/optparse/-/optparse-1.0.3.tgz"; + sha1 = "2ff49a3d691b90b0b9a1be9117f292373eb1bd66"; + }; + }; + "parsejson-0.0.1" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; + sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; + }; + }; + "parseqs-0.0.2" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; + sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; + }; + }; + "parseuri-0.0.2" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz"; + sha1 = "db41878f2d6964718be870b3140973d8093be156"; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "printj-1.1.2" = { + name = "printj"; + packageName = "printj"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz"; + sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; + }; + }; + "printj-1.2.3" = { + name = "printj"; + packageName = "printj"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz"; + sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="; + }; + }; + "printj-1.3.0" = { + name = "printj"; + packageName = "printj"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz"; + sha512 = "017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg=="; + }; + }; + "proxy-addr-1.0.1" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; + sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; + }; + }; + "qs-2.2.2" = { + name = "qs"; + packageName = "qs"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz"; + sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c"; + }; + }; + "range-parser-1.0.0" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz"; + sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0"; + }; + }; + "raw-body-1.3.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; + sha1 = "978230a156a5548f42eef14de22d0f4f610083d1"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "redis-0.12.1" = { + name = "redis"; + packageName = "redis"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; + sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; + }; + }; + "response-time-2.0.1" = { + name = "response-time"; + packageName = "response-time"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz"; + sha1 = "c6d2cbadeac4cb251b21016fe182640c02aff343"; + }; + }; + "rndm-1.1.1" = { + name = "rndm"; + packageName = "rndm"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rndm/-/rndm-1.1.1.tgz"; + sha1 = "efcef4374021f78b63de6226b5985120269d64f1"; + }; + }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "scmp-1.0.0" = { + name = "scmp"; + packageName = "scmp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz"; + sha1 = "a0b272c3fc7292f77115646f00618b0262514e04"; + }; + }; + "send-0.8.3" = { + name = "send"; + packageName = "send"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.8.3.tgz"; + sha1 = "593886004fcb968a1b5727814a32b388b3b99083"; + }; + }; + "send-0.8.5" = { + name = "send"; + packageName = "send"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz"; + sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7"; + }; + }; + "serve-favicon-2.0.1" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.0.1.tgz"; + sha1 = "4826975d9f173ca3a4158e9698161f75dec7afec"; + }; + }; + "serve-index-1.1.6" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.1.6.tgz"; + sha1 = "b758318fe781628383f66ac80dd447712ea7781f"; + }; + }; + "serve-static-1.5.4" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz"; + sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782"; + }; + }; + "socialcalc-2.3.0" = { + name = "socialcalc"; + packageName = "socialcalc"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socialcalc/-/socialcalc-2.3.0.tgz"; + sha512 = "hkK5c7eRRGzOiRNPFCQ/kzv2wqOSFaD4AtYag962r0jV0mlyhTQ7xvs3r14MB3Xbo2hAWq5AKYddrtqvuWvDAA=="; + }; + }; + "socket.io-1.0.6" = { + name = "socket.io"; + packageName = "socket.io"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz"; + sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a"; + }; + }; + "socket.io-adapter-0.2.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz"; + sha1 = "bd39329b8961371787e24f345b074ec9cf000e33"; + }; + }; + "socket.io-client-1.0.6" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz"; + sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e"; + }; + }; + "socket.io-parser-2.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; + sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0"; + }; + }; + "socket.io-parser-2.2.0" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; + sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; + }; + }; + "source-map-0.1.34" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.34"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; + sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b"; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "ssf-0.10.3" = { + name = "ssf"; + packageName = "ssf"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz"; + sha512 = "pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w=="; + }; + }; + "ssf-0.8.2" = { + name = "ssf"; + packageName = "ssf"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssf/-/ssf-0.8.2.tgz"; + sha1 = "b9d4dc6a1c1bcf76f8abfa96d7d7656fb2abecd6"; + }; + }; + "ssf-0.9.4" = { + name = "ssf"; + packageName = "ssf"; + version = "0.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ssf/-/ssf-0.9.4.tgz"; + sha1 = "8e57a98c19dbbf1edd53f0f8c9e7fd524b0f6c9c"; + }; + }; + "stream-counter-0.2.0" = { + name = "stream-counter"; + packageName = "stream-counter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "string_decoder-1.3.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; + }; + }; + "stylus-0.27.2" = { + name = "stylus"; + packageName = "stylus"; + version = "0.27.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz"; + sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117"; + }; + }; + "thenify-3.3.1" = { + name = "thenify"; + packageName = "thenify"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; + sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; + }; + }; + "thenify-all-1.6.0" = { + name = "thenify-all"; + packageName = "thenify-all"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; + sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + }; + }; + "tinycolor-0.0.1" = { + name = "tinycolor"; + packageName = "tinycolor"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }; + }; + "to-array-0.1.3" = { + name = "to-array"; + packageName = "to-array"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz"; + sha1 = "d45dadc6363417f60f28474fea50ecddbb4f4991"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "type-is-1.3.2" = { + name = "type-is"; + packageName = "type-is"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz"; + sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb"; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "uglify-js-1.2.6" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.6.tgz"; + sha1 = "d354b2d3c1cf10ebc18fa78c11a28bdd9ce1580d"; + }; + }; + "uglify-js-2.4.15" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; + sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "uid-safe-1.0.1" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz"; + sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8"; + }; + }; + "uid-safe-1.1.0" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz"; + sha1 = "58d6c5dabf8dfbd8d52834839806c03fd6143232"; + }; + }; + "underscore-1.13.2" = { + name = "underscore"; + packageName = "underscore"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz"; + sha512 = "ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="; + }; + }; + "utf8-2.0.0" = { + name = "utf8"; + packageName = "utf8"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz"; + sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "utils-merge-1.0.0" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + }; + "uuid-pure-1.0.10" = { + name = "uuid-pure"; + packageName = "uuid-pure"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid-pure/-/uuid-pure-1.0.10.tgz"; + sha1 = "72f231b59cf6c3af5e9f6ba7b963a9186d109b5d"; + }; + }; + "vary-0.1.0" = { + name = "vary"; + packageName = "vary"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz"; + sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176"; + }; + }; + "vary-1.0.1" = { + name = "vary"; + packageName = "vary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; + sha1 = "99e4981566a286118dfb2b817357df7993376d10"; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "vhost-2.0.0" = { + name = "vhost"; + packageName = "vhost"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vhost/-/vhost-2.0.0.tgz"; + sha1 = "1e26770bd0fce86c40945591e6f284c6891791e2"; + }; + }; + "voc-1.2.0" = { + name = "voc"; + packageName = "voc"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/voc/-/voc-1.2.0.tgz"; + sha512 = "BOuDjFFYvJdZO6e/N65AlaDItXo2TgyLjeyRYcqgAPkXpp5yTJcvkL2n+syO1r9Qc5g96tfBD2tuiMhYDmaGcA=="; + }; + }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "ws-0.4.31" = { + name = "ws"; + packageName = "ws"; + version = "0.4.31"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; + sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927"; + }; + }; + "xlsjs-0.7.6" = { + name = "xlsjs"; + packageName = "xlsjs"; + version = "0.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/xlsjs/-/xlsjs-0.7.6.tgz"; + sha1 = "d88754569aabcf8eea70cc23961b462634a49565"; + }; + }; + "xlsx-0.14.5" = { + name = "xlsx"; + packageName = "xlsx"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xlsx/-/xlsx-0.14.5.tgz"; + sha512 = "s/5f4/mjeWREmIWZ+HtDfh/rnz51ar+dZ4LWKZU3u9VBx2zLdSIWTdXgoa52/pnZ9Oe/Vu1W1qzcKzLVe+lq4w=="; + }; + }; + "xlsx-0.9.13" = { + name = "xlsx"; + packageName = "xlsx"; + version = "0.9.13"; + src = fetchurl { + url = "https://registry.npmjs.org/xlsx/-/xlsx-0.9.13.tgz"; + sha1 = "5861d11e10a1f99b6f2b491e2d119a7777d066e7"; + }; + }; + "xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = { + name = "xmlhttprequest"; + packageName = "xmlhttprequest"; + version = "1.5.0"; + src = fetchurl { + name = "xmlhttprequest-1.5.0.tar.gz"; + url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; + sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; + }; + }; + "xoauth2-1.2.0" = { + name = "xoauth2"; + packageName = "xoauth2"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xoauth2/-/xoauth2-1.2.0.tgz"; + sha1 = "f2eefac11472c971ea3bc46e554eb4b1232146e5"; + }; + }; + "zappajs-0.5.0" = { + name = "zappajs"; + packageName = "zappajs"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zappajs/-/zappajs-0.5.0.tgz"; + sha1 = "1cc786d31c1559ba180f01ca3adf1e13ca02ca5c"; + }; + }; + }; +in +{ + "whitebophir-git+https://github.com/audreyt/ethercalc.git#b196277081d677be991d104e454a52d242ef0189" = nodeEnv.buildNodePackage { + name = "ethercalc"; + packageName = "ethercalc"; + version = "0.20201228.1"; + src = fetchgit { + url = "https://github.com/audreyt/ethercalc.git"; + rev = "b196277081d677be991d104e454a52d242ef0189"; + sha256 = "4494bada571057d86009f27470cc34f1e8a3b2c03b395cdba639c08d502a9bfe"; + }; + dependencies = [ + sources."accepts-1.0.7" + sources."adler-32-1.2.0" + sources."after-0.8.1" + sources."amdefine-1.0.1" + sources."any-promise-1.3.0" + sources."arraybuffer.slice-0.0.6" + sources."async-0.2.10" + sources."babyparse-0.2.1" + sources."balanced-match-1.0.2" + sources."base64-arraybuffer-0.1.2" + sources."base64-url-1.2.1" + sources."base64id-0.1.0" + sources."basic-auth-1.0.0" + sources."basic-auth-connect-1.0.0" + sources."batch-0.5.1" + sources."better-assert-1.0.2" + sources."blob-0.0.2" + (sources."body-parser-1.6.7" // { + dependencies = [ + sources."iconv-lite-0.4.4" + ]; + }) + sources."brace-expansion-1.1.11" + sources."buffer-crc32-0.2.3" + sources."buffer-from-1.1.2" + sources."bytes-1.0.0" + sources."callsite-1.0.0" + (sources."cfb-1.2.1" // { + dependencies = [ + (sources."adler-32-1.3.0" // { + dependencies = [ + sources."printj-1.2.3" + ]; + }) + sources."printj-1.3.0" + ]; + }) + (sources."codepage-1.14.0" // { + dependencies = [ + sources."commander-2.14.1" + ]; + }) + sources."coffee-css-0.0.5" + sources."coffee-script-1.12.7" + (sources."coffeecup-0.3.21" // { + dependencies = [ + sources."uglify-js-1.2.6" + ]; + }) + sources."colors-0.6.2" + sources."commander-2.17.1" + sources."component-bind-1.0.0" + sources."component-emitter-1.1.2" + sources."component-inherit-0.0.3" + sources."compressible-1.1.1" + (sources."compression-1.0.11" // { + dependencies = [ + sources."vary-1.0.1" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-2.0.0" + sources."connect-2.25.9" + sources."connect-timeout-1.2.2" + sources."cookie-0.1.2" + sources."cookie-parser-1.3.2" + sources."cookie-signature-1.0.4" + sources."core-util-is-1.0.3" + sources."cors-2.8.5" + sources."crc-32-1.2.0" + sources."csrf-2.0.7" + sources."cssom-0.2.5" + sources."csurf-1.4.1" + sources."csv-parse-0.0.6" + sources."debug-1.0.4" + sources."deep-is-0.1.4" + sources."depd-0.4.4" + sources."destroy-1.0.3" + sources."ee-first-1.0.5" + sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + (sources."engine.io-1.3.1" // { + dependencies = [ + sources."debug-0.6.0" + ]; + }) + (sources."engine.io-client-1.3.1" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + sources."engine.io-parser-1.0.6" + sources."errorhandler-1.1.1" + sources."escape-html-1.0.1" + sources."exit-on-epipe-1.0.1" + (sources."express-3.16.9" // { + dependencies = [ + sources."commander-1.3.2" + sources."vary-0.1.0" + ]; + }) + (sources."express-session-1.7.6" // { + dependencies = [ + sources."uid-safe-1.0.1" + ]; + }) + sources."fast-levenshtein-2.0.6" + sources."finalhandler-0.1.0" + sources."frac-1.1.2" + sources."fresh-0.2.2" + sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" + sources."graceful-readlink-1.0.1" + (sources."harb-0.1.1" // { + dependencies = [ + sources."frac-0.3.1" + sources."ssf-0.8.2" + ]; + }) + sources."has-binary-data-0.1.1" + sources."has-cors-1.0.3" + sources."iconv-lite-0.4.24" + sources."indexof-0.0.1" + sources."inherits-2.0.4" + sources."ipaddr.js-0.1.2" + sources."isarray-0.0.1" + (sources."j-0.4.5" // { + dependencies = [ + sources."adler-32-1.0.0" + sources."cfb-0.11.1" + sources."codepage-1.8.1" + sources."crc-32-1.0.2" + sources."frac-1.0.6" + sources."ssf-0.9.4" + (sources."xlsx-0.9.13" // { + dependencies = [ + sources."commander-2.9.0" + ]; + }) + ]; + }) + sources."json3-3.2.6" + sources."keypress-0.1.0" + sources."levn-0.3.0" + sources."livescript-1.5.0" + sources."media-typer-0.2.0" + sources."merge-descriptors-0.0.2" + (sources."method-override-2.1.3" // { + dependencies = [ + sources."vary-1.0.1" + ]; + }) + sources."methods-1.1.0" + sources."mime-1.2.11" + sources."mime-types-1.0.2" + sources."minimatch-3.0.4" + sources."minimist-0.0.10" + (sources."mkdirp-0.5.0" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."morgan-1.2.3" + sources."ms-0.6.2" + (sources."multiparty-3.3.2" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."mz-1.3.0" + sources."nan-0.3.2" + sources."native-or-bluebird-1.1.2" + sources."negotiator-0.4.7" + sources."node-uuid-1.4.1" + sources."object-assign-4.1.1" + sources."object-component-0.0.3" + sources."on-finished-2.1.0" + sources."on-headers-1.0.2" + sources."optimist-0.6.1" + sources."optionator-0.8.3" + sources."options-0.0.6" + sources."optparse-1.0.3" + sources."parsejson-0.0.1" + sources."parseqs-0.0.2" + sources."parseuri-0.0.2" + sources."parseurl-1.3.3" + sources."pause-0.0.1" + sources."prelude-ls-1.1.2" + sources."printj-1.1.2" + sources."proxy-addr-1.0.1" + sources."qs-2.2.2" + sources."range-parser-1.0.0" + (sources."raw-body-1.3.0" // { + dependencies = [ + sources."iconv-lite-0.4.4" + ]; + }) + sources."readable-stream-3.6.0" + sources."redis-0.12.1" + sources."response-time-2.0.1" + sources."rndm-1.1.1" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."scmp-1.0.0" + sources."send-0.8.3" + sources."serve-favicon-2.0.1" + sources."serve-index-1.1.6" + (sources."serve-static-1.5.4" // { + dependencies = [ + sources."send-0.8.5" + ]; + }) + sources."socialcalc-2.3.0" + (sources."socket.io-1.0.6" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + (sources."socket.io-adapter-0.2.0" // { + dependencies = [ + sources."debug-0.7.4" + sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + sources."socket.io-parser-2.1.2" + ]; + }) + (sources."socket.io-client-1.0.6" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + (sources."socket.io-parser-2.2.0" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + sources."source-map-0.5.7" + sources."ssf-0.10.3" + (sources."stream-counter-0.2.0" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."string_decoder-1.3.0" + (sources."stylus-0.27.2" // { + dependencies = [ + sources."mkdirp-0.3.5" + ]; + }) + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."tinycolor-0.0.1" + sources."to-array-0.1.3" + sources."type-check-0.3.2" + sources."type-is-1.3.2" + sources."typedarray-0.0.6" + (sources."uglify-js-2.4.15" // { + dependencies = [ + sources."optimist-0.3.7" + sources."source-map-0.1.34" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-safe-1.1.0" + sources."underscore-1.13.2" + sources."utf8-2.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.0" + sources."uuid-pure-1.0.10" + sources."vary-1.1.2" + sources."vhost-2.0.0" + sources."voc-1.2.0" + sources."word-wrap-1.2.3" + sources."wordwrap-0.0.3" + (sources."ws-0.4.31" // { + dependencies = [ + sources."commander-0.6.1" + ]; + }) + (sources."xlsjs-0.7.6" // { + dependencies = [ + sources."cfb-0.11.1" + sources."frac-0.3.1" + sources."ssf-0.8.2" + ]; + }) + sources."xlsx-0.14.5" + sources."xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" + sources."xoauth2-1.2.0" + sources."zappajs-0.5.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Multi-User Spreadsheet Server"; + homepage = "http://ethercalc.net/"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +} diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.json b/pkgs/servers/web-apps/ethercalc/node-packages.json new file mode 100644 index 00000000000..24675d73956 --- /dev/null +++ b/pkgs/servers/web-apps/ethercalc/node-packages.json @@ -0,0 +1,3 @@ +[ + { "whitebophir": "git+https://github.com/audreyt/ethercalc.git#b196277081d677be991d104e454a52d242ef0189" } +] diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix new file mode 100644 index 00000000000..0961603968e --- /dev/null +++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-generated.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 50d71e42287..acf3746de3f 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -12,13 +12,13 @@ let pname = "plausible"; - version = "1.4.0"; + version = "1.4.4"; src = fetchFromGitHub { owner = "plausible"; repo = "analytics"; rev = "v${version}"; - sha256 = "1d31y7mwvml17w97dm5c4312n0ciq39kf4hz3g80hdzbbn72mi4q"; + sha256 = "1ckw5cd4z96jkjhmzjq7k3kzjj7bvj38i5xq9r43cz0sn7w3470k"; }; # TODO consider using `mix2nix` as soon as it supports git dependencies. diff --git a/pkgs/servers/web-apps/plausible/package.json b/pkgs/servers/web-apps/plausible/package.json index 7d6daeca09f..2fb83b8e14a 100644 --- a/pkgs/servers/web-apps/plausible/package.json +++ b/pkgs/servers/web-apps/plausible/package.json @@ -64,5 +64,5 @@ "webpack-bundle-analyzer": "^4.4.2" }, "name": "plausible", - "version": "v1.4.0" + "version": "v1.4.4" } diff --git a/pkgs/servers/web-apps/plausible/yarn.lock b/pkgs/servers/web-apps/plausible/yarn.lock index 9481f797e59..4e720b0eb53 100644 --- a/pkgs/servers/web-apps/plausible/yarn.lock +++ b/pkgs/servers/web-apps/plausible/yarn.lock @@ -9,32 +9,32 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" - integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== dependencies: - "@babel/highlight" "^7.16.0" + "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.0.tgz#ea269d7f78deb3a7826c39a4048eecda541ebdaa" - integrity sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60" + integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q== "@babel/core@>=7.9.0", "@babel/core@^7.14.3": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4" - integrity sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ== - dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helpers" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + version "7.16.12" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784" + integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg== + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.16.8" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helpers" "^7.16.7" + "@babel/parser" "^7.16.12" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.10" + "@babel/types" "^7.16.8" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -42,64 +42,65 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" - integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew== +"@babel/generator@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe" + integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.8" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" - integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg== +"@babel/helper-annotate-as-pure@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" + integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882" - integrity sha512-9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" + integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA== dependencies: - "@babel/helper-explode-assignable-expression" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-explode-assignable-expression" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz#01d615762e796c17952c29e3ede9d6de07d235a8" - integrity sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" + integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== dependencies: - "@babel/compat-data" "^7.16.0" - "@babel/helper-validator-option" "^7.14.5" - browserslist "^4.16.6" + "@babel/compat-data" "^7.16.4" + "@babel/helper-validator-option" "^7.16.7" + browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" - integrity sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-member-expression-to-functions" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - -"@babel/helper-create-regexp-features-plugin@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" - integrity sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" +"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c" + integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-member-expression-to-functions" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + +"@babel/helper-create-regexp-features-plugin@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48" + integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" regexpu-core "^4.7.1" -"@babel/helper-define-polyfill-provider@^0.2.4": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz#8867aed79d3ea6cade40f801efb7ac5c66916b10" - integrity sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ== +"@babel/helper-define-polyfill-provider@^0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665" + integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA== dependencies: "@babel/helper-compilation-targets" "^7.13.0" "@babel/helper-module-imports" "^7.12.13" @@ -110,101 +111,109 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-explode-assignable-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" - integrity sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ== +"@babel/helper-environment-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" + integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" - integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== +"@babel/helper-explode-assignable-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" + integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ== dependencies: - "@babel/helper-get-function-arity" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-get-function-arity@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" - integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== +"@babel/helper-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" + integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== dependencies: - "@babel/types" "^7.16.0" + "@babel/helper-get-function-arity" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-hoist-variables@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" - integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== +"@babel/helper-get-function-arity@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" + integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-member-expression-to-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" - integrity sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ== +"@babel/helper-hoist-variables@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" + integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" - integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg== +"@babel/helper-member-expression-to-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0" + integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-module-transforms@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz#1c82a8dd4cb34577502ebd2909699b194c3e9bb5" - integrity sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA== - dependencies: - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.0" - "@babel/helper-simple-access" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/helper-validator-identifier" "^7.15.7" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" + integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== + dependencies: + "@babel/types" "^7.16.7" -"@babel/helper-optimise-call-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" - integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw== +"@babel/helper-module-transforms@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41" + integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng== dependencies: - "@babel/types" "^7.16.0" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" - integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== +"@babel/helper-optimise-call-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" + integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w== + dependencies: + "@babel/types" "^7.16.7" -"@babel/helper-remap-async-to-generator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz#d5aa3b086e13a5fe05238ff40c3a5a0c2dab3ead" - integrity sha512-MLM1IOMe9aQBqMWxcRw8dcb9jlM86NIw7KA0Wri91Xkfied+dE0QuBFSBjMNvqzmS0OSIDsMNC24dBEkPUi7ew== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" + integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== + +"@babel/helper-remap-async-to-generator@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" + integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-wrap-function" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-wrap-function" "^7.16.8" + "@babel/types" "^7.16.8" -"@babel/helper-replace-supers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" - integrity sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA== +"@babel/helper-replace-supers@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" + integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-member-expression-to-functions" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-simple-access@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" - integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw== +"@babel/helper-simple-access@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" + integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" @@ -213,199 +222,199 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" - integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== +"@babel/helper-split-export-declaration@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" + integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-validator-identifier@^7.15.7": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== +"@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== -"@babel/helper-validator-option@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" - integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== +"@babel/helper-validator-option@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" + integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== -"@babel/helper-wrap-function@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" - integrity sha512-VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g== +"@babel/helper-wrap-function@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" + integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw== dependencies: - "@babel/helper-function-name" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-function-name" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.8" + "@babel/types" "^7.16.8" -"@babel/helpers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.0.tgz#875519c979c232f41adfbd43a3b0398c2e388183" - integrity sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ== +"@babel/helpers@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc" + integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw== dependencies: - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" - integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== +"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" + integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.16.0", "@babel/parser@^7.7.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.0.tgz#cf147d7ada0a3655e79bf4b08ee846f00a00a295" - integrity sha512-TEHWXf0xxpi9wKVyBCmRcSSDjbJ/cl6LUdlbYUHEaNQUJGhreJbZrXT6sR4+fZLxVUJqNRB4KyOvjuy/D9009A== +"@babel/parser@^7.16.10", "@babel/parser@^7.16.12", "@babel/parser@^7.16.7", "@babel/parser@^7.7.0": + version "7.16.12" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6" + integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.0.tgz#efb7f147042aca34ce8156a055906a7abaadeaf0" - integrity sha512-djyecbGMEh4rOb/Tc1M5bUW2Ih1IZRa9PoubnPOCzM+DRE89uGUHR1Y+3aDdTMW4drjGRZ2ol8dt1JUFg6hJLQ== +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" + integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2" - integrity sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" + integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" + "@babel/plugin-proposal-optional-chaining" "^7.16.7" -"@babel/plugin-proposal-async-generator-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz#11425d47a60364352f668ad5fbc1d6596b2c5caf" - integrity sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw== +"@babel/plugin-proposal-async-generator-functions@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" + integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz#c029618267ddebc7280fa286e0f8ca2a278a2d1a" - integrity sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A== +"@babel/plugin-proposal-class-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" + integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-class-static-block@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.0.tgz#5296942c564d8144c83eea347d0aa8a0b89170e7" - integrity sha512-mAy3sdcY9sKAkf3lQbDiv3olOfiLqI51c9DR9b19uMoR2Z6r5pmGl7dfNFqEvqOyqbf1ta4lknK4gc5PJn3mfA== +"@babel/plugin-proposal-class-static-block@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a" + integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-dynamic-import@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" - integrity sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ== +"@babel/plugin-proposal-dynamic-import@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" + integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz#9c01dee40b9d6b847b656aaf4a3976a71740f222" - integrity sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA== +"@babel/plugin-proposal-export-namespace-from@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" + integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz#cae35a95ed1d2a7fa29c4dc41540b84a72e9ab25" - integrity sha512-kouIPuiv8mSi5JkEhzApg5Gn6hFyKPnlkO0a9YSzqRurH8wYzSlf6RJdzluAsbqecdW5pBvDJDfyDIUR/vLxvg== +"@babel/plugin-proposal-json-strings@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" + integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz#a711b8ceb3ffddd3ef88d3a49e86dbd3cc7db3fd" - integrity sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q== +"@babel/plugin-proposal-logical-assignment-operators@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" + integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz#44e1cce08fe2427482cf446a91bb451528ed0596" - integrity sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ== +"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" + integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz#5d418e4fbbf8b9b7d03125d3a52730433a373734" - integrity sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q== +"@babel/plugin-proposal-numeric-separator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" + integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz#5fb32f6d924d6e6712810362a60e12a2609872e6" - integrity sha512-LU/+jp89efe5HuWJLmMmFG0+xbz+I2rSI7iLc1AlaeSMDMOGzWlc5yJrMN1d04osXN4sSfpo4O+azkBNBes0jg== +"@babel/plugin-proposal-object-rest-spread@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8" + integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA== dependencies: - "@babel/compat-data" "^7.16.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/compat-data" "^7.16.4" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.16.0" + "@babel/plugin-transform-parameters" "^7.16.7" -"@babel/plugin-proposal-optional-catch-binding@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz#5910085811ab4c28b00d6ebffa4ab0274d1e5f16" - integrity sha512-kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw== +"@babel/plugin-proposal-optional-catch-binding@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" + integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz#56dbc3970825683608e9efb55ea82c2a2d6c8dc0" - integrity sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg== +"@babel/plugin-proposal-optional-chaining@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" + integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz#b4dafb9c717e4301c5776b30d080d6383c89aff6" - integrity sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg== +"@babel/plugin-proposal-private-methods@^7.16.11": + version "7.16.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" + integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.16.10" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-private-property-in-object@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.0.tgz#69e935b2c5c79d2488112d886f0c4e2790fee76f" - integrity sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw== +"@babel/plugin-proposal-private-property-in-object@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" + integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.16.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz#890482dfc5ea378e42e19a71e709728cabf18612" - integrity sha512-ti7IdM54NXv29cA4+bNNKEMS4jLMCbJgl+Drv+FgYy0erJLAxNAIXcNjNjrRZEcWq0xJHsNVwQezskMFpF8N9g== +"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" + integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -449,12 +458,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz#f9624394317365a9a88c82358d3f8471154698f1" - integrity sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg== +"@babel/plugin-syntax-jsx@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665" + integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" @@ -512,313 +521,315 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz#951706f8b449c834ed07bd474c0924c944b95a8e" - integrity sha512-vIFb5250Rbh7roWARvCLvIJ/PtAU5Lhv7BtZ1u24COwpI9Ypjsh+bZcKk6rlIyalK+r0jOc1XQ8I4ovNxNrWrA== +"@babel/plugin-transform-arrow-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" + integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-async-to-generator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz#df12637f9630ddfa0ef9d7a11bc414d629d38604" - integrity sha512-PbIr7G9kR8tdH6g8Wouir5uVjklETk91GMVSUq+VaOgiinbCkBP6Q7NN/suM/QutZkMJMvcyAriogcYAdhg8Gw== +"@babel/plugin-transform-async-to-generator@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" + integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg== dependencies: - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.16.0" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-remap-async-to-generator" "^7.16.8" -"@babel/plugin-transform-block-scoped-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" - integrity sha512-V14As3haUOP4ZWrLJ3VVx5rCnrYhMSHN/jX7z6FAt5hjRkLsb0snPCmJwSOML5oxkKO4FNoNv7V5hw/y2bjuvg== +"@babel/plugin-transform-block-scoped-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" + integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-block-scoping@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" - integrity sha512-27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw== +"@babel/plugin-transform-block-scoping@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" + integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-classes@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" - integrity sha512-HUxMvy6GtAdd+GKBNYDWCIA776byUQH8zjnfjxwT1P1ARv/wFu8eBDpmXQcLS/IwRtrxIReGiplOwMeyO7nsDQ== +"@babel/plugin-transform-classes@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" + integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" - integrity sha512-63l1dRXday6S8V3WFY5mXJwcRAnPYxvFfTlt67bwV1rTyVTM5zrp0DBBb13Kl7+ehkCVwIZPumPpFP/4u70+Tw== +"@babel/plugin-transform-computed-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" + integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-destructuring@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" - integrity sha512-Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q== +"@babel/plugin-transform-destructuring@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23" + integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-dotall-regex@^7.16.0", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f" - integrity sha512-FXlDZfQeLILfJlC6I1qyEwcHK5UpRCFkaoVyA1nk9A1L1Yu583YO4un2KsLBsu3IJb4CUbctZks8tD9xPQubLw== +"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" + integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-duplicate-keys@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" - integrity sha512-LIe2kcHKAZOJDNxujvmp6z3mfN6V9lJxubU4fJIGoQCkKe3Ec2OcbdlYP+vW++4MpxwG0d1wSDOJtQW5kLnkZQ== +"@babel/plugin-transform-duplicate-keys@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" + integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-exponentiation-operator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4" - integrity sha512-OwYEvzFI38hXklsrbNivzpO3fh87skzx8Pnqi4LoSYeav0xHlueSoCJrSgTPfnbyzopo5b3YVAJkFIcUpK2wsw== +"@babel/plugin-transform-exponentiation-operator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" + integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-for-of@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" - integrity sha512-5QKUw2kO+GVmKr2wMYSATCTTnHyscl6sxFRAY+rvN7h7WB0lcG0o4NoV6ZQU32OZGVsYUsfLGgPQpDFdkfjlJQ== +"@babel/plugin-transform-for-of@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" + integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" - integrity sha512-lBzMle9jcOXtSOXUpc7tvvTpENu/NuekNJVova5lCCWCV9/U1ho2HH2y0p6mBg8fPm/syEAbfaaemYGOHCY3mg== +"@babel/plugin-transform-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" + integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA== dependencies: - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" - integrity sha512-gQDlsSF1iv9RU04clgXqRjrPyyoJMTclFt3K1cjLmTKikc0s/6vE3hlDeEVC71wLTRu72Fq7650kABrdTc2wMQ== +"@babel/plugin-transform-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" + integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-member-expression-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz#5251b4cce01eaf8314403d21aedb269d79f5e64b" - integrity sha512-WRpw5HL4Jhnxw8QARzRvwojp9MIE7Tdk3ez6vRyUk1MwgjJN0aNpRoXainLR5SgxmoXx/vsXGZ6OthP6t/RbUg== +"@babel/plugin-transform-member-expression-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" + integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-modules-amd@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" - integrity sha512-rWFhWbCJ9Wdmzln1NmSCqn7P0RAD+ogXG/bd9Kg5c7PKWkJtkiXmYsMBeXjDlzHpVTJ4I/hnjs45zX4dEv81xw== +"@babel/plugin-transform-modules-amd@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" + integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g== dependencies: - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922" - integrity sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ== +"@babel/plugin-transform-modules-commonjs@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe" + integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA== dependencies: - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-simple-access" "^7.16.0" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-simple-access" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" - integrity sha512-yuGBaHS3lF1m/5R+6fjIke64ii5luRUg97N2wr+z1sF0V+sNSXPxXDdEEL/iYLszsN5VKxVB1IPfEqhzVpiqvg== +"@babel/plugin-transform-modules-systemjs@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" + integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw== dependencies: - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" - integrity sha512-nx4f6no57himWiHhxDM5pjwhae5vLpTK2zCnDH8+wNLJy0TVER/LJRHl2bkt6w9Aad2sPD5iNNoUpY3X9sTGDg== +"@babel/plugin-transform-modules-umd@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" + integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ== dependencies: - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca" - integrity sha512-LogN88uO+7EhxWc8WZuQ8vxdSyVGxhkh8WTC3tzlT8LccMuQdA81e9SGV6zY7kY2LjDhhDOFdQVxdGwPyBCnvg== +"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" + integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" -"@babel/plugin-transform-new-target@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" - integrity sha512-fhjrDEYv2DBsGN/P6rlqakwRwIp7rBGLPbrKxwh7oVt5NNkIhZVOY2GRV+ULLsQri1bDqwDWnU3vhlmx5B2aCw== +"@babel/plugin-transform-new-target@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" + integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-object-super@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b" - integrity sha512-fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg== +"@babel/plugin-transform-object-super@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" + integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" -"@babel/plugin-transform-parameters@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.0.tgz#1b50765fc421c229819dc4c7cdb8911660b3c2d7" - integrity sha512-XgnQEm1CevKROPx+udOi/8f8TiGhrUWiHiaUCIp47tE0tpFDjzXNTZc9E5CmCwxNjXTWEVqvRfWZYOTFvMa/ZQ== +"@babel/plugin-transform-parameters@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" + integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-property-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" - integrity sha512-XLldD4V8+pOqX2hwfWhgwXzGdnDOThxaNTgqagOcpBgIxbUvpgU2FMvo5E1RyHbk756WYgdbS0T8y0Cj9FKkWQ== +"@babel/plugin-transform-property-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" + integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-display-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz#9a0ad8aa8e8790883a7bd2736f66229a58125676" - integrity sha512-FJFdJAqaCpndL+pIf0aeD/qlQwT7QXOvR6Cc8JPvNhKJBi2zc/DPc4g05Y3fbD/0iWAMQFGij4+Xw+4L/BMpTg== +"@babel/plugin-transform-react-display-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340" + integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-jsx-development@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz#1cb52874678d23ab11d0d16488d54730807303ef" - integrity sha512-qq65iSqBRq0Hr3wq57YG2AmW0H6wgTnIzpffTphrUWUgLCOK+zf1f7G0vuOiXrp7dU1qq+fQBoqZ3wCDAkhFzw== +"@babel/plugin-transform-react-jsx-development@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8" + integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A== dependencies: - "@babel/plugin-transform-react-jsx" "^7.16.0" + "@babel/plugin-transform-react-jsx" "^7.16.7" -"@babel/plugin-transform-react-jsx@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.0.tgz#55b797d4960c3de04e07ad1c0476e2bc6a4889f1" - integrity sha512-rqDgIbukZ44pqq7NIRPGPGNklshPkvlmvqjdx3OZcGPk4zGIenYkxDTvl3LsSL8gqcc3ZzGmXPE6hR/u/voNOw== +"@babel/plugin-transform-react-jsx@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz#86a6a220552afd0e4e1f0388a68a372be7add0d4" + integrity sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-jsx" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-jsx" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/plugin-transform-react-pure-annotations@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz#23db6ddf558d8abde41b8ad9d59f48ad5532ccab" - integrity sha512-NC/Bj2MG+t8Ef5Pdpo34Ay74X4Rt804h5y81PwOpfPtmAK3i6CizmQqwyBQzIepz1Yt8wNr2Z2L7Lu3qBMfZMA== +"@babel/plugin-transform-react-pure-annotations@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" + integrity sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-regenerator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" - integrity sha512-JAvGxgKuwS2PihiSFaDrp94XOzzTUeDeOQlcKzVAyaPap7BnZXK/lvMDiubkPTdotPKOIZq9xWXWnggUMYiExg== +"@babel/plugin-transform-regenerator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" + integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" - integrity sha512-Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg== +"@babel/plugin-transform-reserved-words@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" + integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-shorthand-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" - integrity sha512-iVb1mTcD8fuhSv3k99+5tlXu5N0v8/DPm2mO3WACLG6al1CGZH7v09HJyUb1TtYl/Z+KrM6pHSIJdZxP5A+xow== +"@babel/plugin-transform-shorthand-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" + integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-spread@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb" - integrity sha512-Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg== +"@babel/plugin-transform-spread@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" + integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" -"@babel/plugin-transform-sticky-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" - integrity sha512-/ntT2NljR9foobKk4E/YyOSwcGUXtYWv5tinMK/3RkypyNBNdhHUaq6Orw5DWq9ZcNlS03BIlEALFeQgeVAo4Q== +"@babel/plugin-transform-sticky-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" + integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-template-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" - integrity sha512-Rd4Ic89hA/f7xUSJQk5PnC+4so50vBoBfxjdQAdvngwidM8jYIBVxBZ/sARxD4e0yMXRbJVDrYf7dyRtIIKT6Q== +"@babel/plugin-transform-template-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" + integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-typeof-symbol@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" - integrity sha512-++V2L8Bdf4vcaHi2raILnptTBjGEFxn5315YU+e8+EqXIucA+q349qWngCLpUYqqv233suJ6NOienIVUpS9cqg== +"@babel/plugin-transform-typeof-symbol@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" + integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-escapes@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" - integrity sha512-VFi4dhgJM7Bpk8lRc5CMaRGlKZ29W9C3geZjt9beuzSUrlJxsNwX7ReLwaL6WEvsOf2EQkyIJEPtF8EXjB/g2A== +"@babel/plugin-transform-unicode-escapes@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" + integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" - integrity sha512-jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A== +"@babel/plugin-transform-unicode-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" + integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/preset-env@^7.14.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.0.tgz#97228393d217560d6a1c6c56f0adb9d12bca67f5" - integrity sha512-cdTu/W0IrviamtnZiTfixPfIncr2M1VqRrkjzZWlr1B4TVYimCFK5jkyOdP4qw2MrlKHi+b3ORj6x8GoCew8Dg== - dependencies: - "@babel/compat-data" "^7.16.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.0" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-async-generator-functions" "^7.16.0" - "@babel/plugin-proposal-class-properties" "^7.16.0" - "@babel/plugin-proposal-class-static-block" "^7.16.0" - "@babel/plugin-proposal-dynamic-import" "^7.16.0" - "@babel/plugin-proposal-export-namespace-from" "^7.16.0" - "@babel/plugin-proposal-json-strings" "^7.16.0" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.0" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.0" - "@babel/plugin-proposal-numeric-separator" "^7.16.0" - "@babel/plugin-proposal-object-rest-spread" "^7.16.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-private-methods" "^7.16.0" - "@babel/plugin-proposal-private-property-in-object" "^7.16.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.0" + version "7.16.11" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" + integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g== + dependencies: + "@babel/compat-data" "^7.16.8" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7" + "@babel/plugin-proposal-async-generator-functions" "^7.16.8" + "@babel/plugin-proposal-class-properties" "^7.16.7" + "@babel/plugin-proposal-class-static-block" "^7.16.7" + "@babel/plugin-proposal-dynamic-import" "^7.16.7" + "@babel/plugin-proposal-export-namespace-from" "^7.16.7" + "@babel/plugin-proposal-json-strings" "^7.16.7" + "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7" + "@babel/plugin-proposal-numeric-separator" "^7.16.7" + "@babel/plugin-proposal-object-rest-spread" "^7.16.7" + "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" + "@babel/plugin-proposal-optional-chaining" "^7.16.7" + "@babel/plugin-proposal-private-methods" "^7.16.11" + "@babel/plugin-proposal-private-property-in-object" "^7.16.7" + "@babel/plugin-proposal-unicode-property-regex" "^7.16.7" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-class-static-block" "^7.14.5" @@ -833,44 +844,44 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.16.0" - "@babel/plugin-transform-async-to-generator" "^7.16.0" - "@babel/plugin-transform-block-scoped-functions" "^7.16.0" - "@babel/plugin-transform-block-scoping" "^7.16.0" - "@babel/plugin-transform-classes" "^7.16.0" - "@babel/plugin-transform-computed-properties" "^7.16.0" - "@babel/plugin-transform-destructuring" "^7.16.0" - "@babel/plugin-transform-dotall-regex" "^7.16.0" - "@babel/plugin-transform-duplicate-keys" "^7.16.0" - "@babel/plugin-transform-exponentiation-operator" "^7.16.0" - "@babel/plugin-transform-for-of" "^7.16.0" - "@babel/plugin-transform-function-name" "^7.16.0" - "@babel/plugin-transform-literals" "^7.16.0" - "@babel/plugin-transform-member-expression-literals" "^7.16.0" - "@babel/plugin-transform-modules-amd" "^7.16.0" - "@babel/plugin-transform-modules-commonjs" "^7.16.0" - "@babel/plugin-transform-modules-systemjs" "^7.16.0" - "@babel/plugin-transform-modules-umd" "^7.16.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.0" - "@babel/plugin-transform-new-target" "^7.16.0" - "@babel/plugin-transform-object-super" "^7.16.0" - "@babel/plugin-transform-parameters" "^7.16.0" - "@babel/plugin-transform-property-literals" "^7.16.0" - "@babel/plugin-transform-regenerator" "^7.16.0" - "@babel/plugin-transform-reserved-words" "^7.16.0" - "@babel/plugin-transform-shorthand-properties" "^7.16.0" - "@babel/plugin-transform-spread" "^7.16.0" - "@babel/plugin-transform-sticky-regex" "^7.16.0" - "@babel/plugin-transform-template-literals" "^7.16.0" - "@babel/plugin-transform-typeof-symbol" "^7.16.0" - "@babel/plugin-transform-unicode-escapes" "^7.16.0" - "@babel/plugin-transform-unicode-regex" "^7.16.0" + "@babel/plugin-transform-arrow-functions" "^7.16.7" + "@babel/plugin-transform-async-to-generator" "^7.16.8" + "@babel/plugin-transform-block-scoped-functions" "^7.16.7" + "@babel/plugin-transform-block-scoping" "^7.16.7" + "@babel/plugin-transform-classes" "^7.16.7" + "@babel/plugin-transform-computed-properties" "^7.16.7" + "@babel/plugin-transform-destructuring" "^7.16.7" + "@babel/plugin-transform-dotall-regex" "^7.16.7" + "@babel/plugin-transform-duplicate-keys" "^7.16.7" + "@babel/plugin-transform-exponentiation-operator" "^7.16.7" + "@babel/plugin-transform-for-of" "^7.16.7" + "@babel/plugin-transform-function-name" "^7.16.7" + "@babel/plugin-transform-literals" "^7.16.7" + "@babel/plugin-transform-member-expression-literals" "^7.16.7" + "@babel/plugin-transform-modules-amd" "^7.16.7" + "@babel/plugin-transform-modules-commonjs" "^7.16.8" + "@babel/plugin-transform-modules-systemjs" "^7.16.7" + "@babel/plugin-transform-modules-umd" "^7.16.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8" + "@babel/plugin-transform-new-target" "^7.16.7" + "@babel/plugin-transform-object-super" "^7.16.7" + "@babel/plugin-transform-parameters" "^7.16.7" + "@babel/plugin-transform-property-literals" "^7.16.7" + "@babel/plugin-transform-regenerator" "^7.16.7" + "@babel/plugin-transform-reserved-words" "^7.16.7" + "@babel/plugin-transform-shorthand-properties" "^7.16.7" + "@babel/plugin-transform-spread" "^7.16.7" + "@babel/plugin-transform-sticky-regex" "^7.16.7" + "@babel/plugin-transform-template-literals" "^7.16.7" + "@babel/plugin-transform-typeof-symbol" "^7.16.7" + "@babel/plugin-transform-unicode-escapes" "^7.16.7" + "@babel/plugin-transform-unicode-regex" "^7.16.7" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.16.0" - babel-plugin-polyfill-corejs2 "^0.2.3" - babel-plugin-polyfill-corejs3 "^0.3.0" - babel-plugin-polyfill-regenerator "^0.2.3" - core-js-compat "^3.19.0" + "@babel/types" "^7.16.8" + babel-plugin-polyfill-corejs2 "^0.3.0" + babel-plugin-polyfill-corejs3 "^0.5.0" + babel-plugin-polyfill-regenerator "^0.3.0" + core-js-compat "^3.20.2" semver "^6.3.0" "@babel/preset-modules@^0.1.5": @@ -885,68 +896,69 @@ esutils "^2.0.2" "@babel/preset-react@^7.13.13": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.0.tgz#f71d3e8dff5218478011df037fad52660ee6d82a" - integrity sha512-d31IFW2bLRB28uL1WoElyro8RH5l6531XfxMtCeCmp6RVAF1uTfxxUA0LH1tXl+psZdwfmIbwoG4U5VwgbhtLw== + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" + integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-transform-react-display-name" "^7.16.0" - "@babel/plugin-transform-react-jsx" "^7.16.0" - "@babel/plugin-transform-react-jsx-development" "^7.16.0" - "@babel/plugin-transform-react-pure-annotations" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-transform-react-display-name" "^7.16.7" + "@babel/plugin-transform-react-jsx" "^7.16.7" + "@babel/plugin-transform-react-jsx-development" "^7.16.7" + "@babel/plugin-transform-react-pure-annotations" "^7.16.7" "@babel/runtime-corejs3@^7.10.2": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz#58a7fb00e6948508f12f53a303993e8b6e2f6c70" - integrity sha512-Oi2qwQ21X7/d9gn3WiwkDTJmq3TQtYNz89lRnoFy8VeZpWlsyXvzSwiRrRZ8cXluvSwqKxqHJ6dBd9Rv+p0ZGQ== + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.8.tgz#ea533d96eda6fdc76b1812248e9fbd0c11d4a1a7" + integrity sha512-3fKhuICS1lMz0plI5ktOE/yEtBRMVxplzRkdn6mJQ197XiY0JnrzYV0+Mxozq3JZ8SBV9Ecurmw1XsGbwOf+Sg== dependencies: - core-js-pure "^3.19.0" + core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.14.8", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.0.tgz#e27b977f2e2088ba24748bf99b5e1dece64e4f0b" - integrity sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw== +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.14.8", "@babel/runtime@^7.16.3", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa" + integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" - integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== - dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/types" "^7.16.0" - -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.7.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.0.tgz#965df6c6bfc0a958c1e739284d3c9fa4a6e3c45b" - integrity sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ== - dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/types" "^7.16.0" +"@babel/template@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" + +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.7.0": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f" + integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw== + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.16.8" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/parser" "^7.16.10" + "@babel/types" "^7.16.8" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.16.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" - integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== +"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1" + integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" "@discoveryjs/json-ext@^0.5.0": - version "0.5.5" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" - integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA== + version "0.5.6" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f" + integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA== "@eslint/eslintrc@^0.4.3": version "0.4.3" @@ -964,9 +976,9 @@ strip-json-comments "^3.1.1" "@headlessui/react@^1.3.0": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.4.1.tgz#0a8dbb20e1d63dcea55bfc3ab1b87637aaac7777" - integrity sha512-gL6Ns5xQM57cZBzX6IVv6L7nsam8rDEpRhs5fg28SN64ikfmuuMgunc+Rw5C1cMScnvFM+cz32ueVrlSFEVlSg== + version "1.4.3" + resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.4.3.tgz#f77c6bb5cb4a614a5d730fb880cab502d48abf37" + integrity sha512-n2IQkaaw0aAAlQS5MEXsM4uRK+w18CrM72EqnGRl/UBOQeQajad8oiKXR9Nk15jOzTFQjpxzrZMf1NxHidFBiw== "@heroicons/react@^1.0.1": version "1.0.5" @@ -983,9 +995,9 @@ minimatch "^3.0.4" "@humanwhocodes/object-schema@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" - integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== "@juggle/resize-observer@^3.3.1": version "3.3.1" @@ -1071,17 +1083,17 @@ integrity sha1-dvjy6RWa5WKWWy+g5vvuGqZDobw= "@types/eslint-scope@^3.7.0": - version "3.7.1" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e" - integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g== + version "3.7.3" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" + integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== dependencies: "@types/eslint" "*" "@types/estree" "*" "@types/eslint@*": - version "7.28.2" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.2.tgz#0ff2947cdd305897c52d5372294e8c76f351db68" - integrity sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA== + version "8.4.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304" + integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -1096,7 +1108,7 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4" integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg== -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== @@ -1119,9 +1131,9 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node@*": - version "16.11.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" - integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== + version "17.0.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.13.tgz#5ed7ed7c662948335fcad6c412bb42d99ea754e3" + integrity sha512-Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -1259,22 +1271,22 @@ "@webassemblyjs/ast" "1.11.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.0.tgz#8342bef0badfb7dfd3b576f2574ab80c725be043" - integrity sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg== +"@webpack-cli/configtest@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" + integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== -"@webpack-cli/info@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.0.tgz#b9179c3227ab09cbbb149aa733475fcf99430223" - integrity sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw== +"@webpack-cli/info@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" + integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.0.tgz#2c275aa05c895eccebbfc34cfb223c6e8bd591a2" - integrity sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA== +"@webpack-cli/serve@^1.6.1": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" + integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -1321,15 +1333,29 @@ acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.0.4, acorn@^8.2.1: - version "8.5.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" - integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== + version "8.7.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" + integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== + +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== +ajv-keywords@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== + dependencies: + fast-deep-equal "^3.1.3" + ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -1340,21 +1366,16 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.1: - version "8.6.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" - integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== +ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0: + version "8.9.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18" + integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" require-from-string "^2.0.2" uri-js "^4.2.2" -alphanum-sort@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= - alpinejs@^2.8.2: version "2.8.2" resolved "https://registry.yarnpkg.com/alpinejs/-/alpinejs-2.8.2.tgz#b14ec21ae3cd78dcee4aed0a78ed0f01b676dac4" @@ -1412,7 +1433,7 @@ aria-query@^4.2.2: "@babel/runtime" "^7.10.2" "@babel/runtime-corejs3" "^7.10.2" -array-includes@^3.1.1, array-includes@^3.1.3, array-includes@^3.1.4: +array-includes@^3.1.3, array-includes@^3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== @@ -1437,7 +1458,7 @@ array.prototype.flat@^1.2.5: define-properties "^1.1.3" es-abstract "^1.19.0" -array.prototype.flatmap@^1.2.4: +array.prototype.flatmap@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA== @@ -1462,16 +1483,16 @@ astral-regex@^2.0.0: integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== autoprefixer@^10.2.6: - version "10.4.0" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8" - integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA== + version "10.4.2" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz#25e1df09a31a9fba5c40b578936b90d35c9d4d3b" + integrity sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ== dependencies: - browserslist "^4.17.5" - caniuse-lite "^1.0.30001272" - fraction.js "^4.1.1" + browserslist "^4.19.1" + caniuse-lite "^1.0.30001297" + fraction.js "^4.1.2" normalize-range "^0.1.2" picocolors "^1.0.0" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" autoprefixer@^9.8.6: version "9.8.8" @@ -1486,7 +1507,7 @@ autoprefixer@^9.8.6: postcss "^7.0.32" postcss-value-parser "^4.1.0" -axe-core@^4.0.2: +axe-core@^4.3.5: version "4.3.5" resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5" integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA== @@ -1525,29 +1546,29 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -babel-plugin-polyfill-corejs2@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz#6ed8e30981b062f8fe6aca8873a37ebcc8cc1c0f" - integrity sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA== +babel-plugin-polyfill-corejs2@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" + integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w== dependencies: "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.2.4" + "@babel/helper-define-polyfill-provider" "^0.3.1" semver "^6.1.1" -babel-plugin-polyfill-corejs3@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz#fa7ca3d1ee9ddc6193600ffb632c9785d54918af" - integrity sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg== +babel-plugin-polyfill-corejs3@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz#d66183bf10976ea677f4149a7fcc4d8df43d4060" + integrity sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A== dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.4" - core-js-compat "^3.18.0" + "@babel/helper-define-polyfill-provider" "^0.3.1" + core-js-compat "^3.20.0" -babel-plugin-polyfill-regenerator@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz#2e9808f5027c4336c994992b48a4262580cb8d6d" - integrity sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g== +babel-plugin-polyfill-regenerator@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990" + integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A== dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.4" + "@babel/helper-define-polyfill-provider" "^0.3.1" bail@^1.0.0: version "1.0.5" @@ -1604,13 +1625,13 @@ brfs@^1.3.0: static-module "^2.2.0" through2 "^2.0.0" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.17.5: - version "4.17.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.5.tgz#c827bbe172a4c22b123f5e337533ceebadfdd559" - integrity sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.19.1: + version "4.19.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" + integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== dependencies: - caniuse-lite "^1.0.30001271" - electron-to-chromium "^1.3.878" + caniuse-lite "^1.0.30001286" + electron-to-chromium "^1.4.17" escalade "^3.1.1" node-releases "^2.0.1" picocolors "^1.0.0" @@ -1626,9 +1647,9 @@ buffer-from@^1.0.0: integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== bytes@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" @@ -1672,10 +1693,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001271, caniuse-lite@^1.0.30001272: - version "1.0.30001274" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz#26ca36204d15b17601ba6fc35dbdad950a647cc7" - integrity sha512-+Nkvv0fHyhISkiMIjnyjmf5YJcQ1IQHZN6U9TLUMroWR38FNwpsC51Gb68yueafX1V6ifOisInSgP9WJFS13ew== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297: + version "1.0.30001304" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz#38af55ed3fc8220cb13e35e6e7309c8c65a05559" + integrity sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ== chalk@^2.0.0: version "2.4.2" @@ -1710,14 +1731,14 @@ character-reference-invalid@^1.0.0: integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== chart.js@^3.3.2: - version "3.6.0" - resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.6.0.tgz#a87fce8431d4e7c5523d721f487f53aada1e42fe" - integrity sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ== + version "3.7.0" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.7.0.tgz#7a19c93035341df801d613993c2170a1fcf1d882" + integrity sha512-31gVuqqKp3lDIFmzpKIrBeum4OpZsQjSIAqlOpgjosHDJZlULtvwLEZKtEhIAZc7JMPaHlYMys40Qy9Mf+1AAg== chokidar@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== dependencies: anymatch "~3.1.2" braces "~3.0.2" @@ -1779,26 +1800,26 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" - integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== +color-string@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa" + integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" color@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/color/-/color-4.0.1.tgz#21df44cd10245a91b1ccf5ba031609b0e10e7d67" - integrity sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA== + version "4.2.0" + resolved "https://registry.yarnpkg.com/color/-/color-4.2.0.tgz#0c782459a3e98838ea01e4bc0fb43310ca35af78" + integrity sha512-hHTcrbvEnGjC7WBMk6ibQWFVDgEFTVmjrz2Q5HlU6ltwxv0JJN2Z8I7uRbWeQLF04dikxs8zgyZkazRJvSMtyQ== dependencies: color-convert "^2.0.1" - color-string "^1.6.0" + color-string "^1.9.0" -colord@^2.0.1, colord@^2.6: - version "2.9.1" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz#c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e" - integrity sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw== +colord@^2.9.1: + version "2.9.2" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" + integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ== colorette@^2.0.14: version "2.0.16" @@ -1810,16 +1831,16 @@ commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" - integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== - commander@^7.0.0, commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +commander@^8.0.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -1853,30 +1874,29 @@ convert-source-map@^1.5.1, convert-source-map@^1.7.0: safe-buffer "~5.1.1" copy-webpack-plugin@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz#b71d21991599f61a4ee00ba79087b8ba279bbb59" - integrity sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw== + version "9.1.0" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" + integrity sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA== dependencies: - fast-glob "^3.2.5" - glob-parent "^6.0.0" + fast-glob "^3.2.7" + glob-parent "^6.0.1" globby "^11.0.3" normalize-path "^3.0.0" - p-limit "^3.1.0" - schema-utils "^3.0.0" + schema-utils "^3.1.1" serialize-javascript "^6.0.0" -core-js-compat@^3.18.0, core-js-compat@^3.19.0: - version "3.19.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.0.tgz#b3b93f93c8721b3ed52b91f12f964cc410967f8b" - integrity sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw== +core-js-compat@^3.20.0, core-js-compat@^3.20.2: + version "3.20.3" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.3.tgz#d71f85f94eb5e4bea3407412e549daa083d23bd6" + integrity sha512-c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw== dependencies: - browserslist "^4.17.5" + browserslist "^4.19.1" semver "7.0.0" -core-js-pure@^3.19.0: - version "3.19.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.0.tgz#db6fdadfdd4dc280ec93b64c3c2e8460e6f10094" - integrity sha512-UEQk8AxyCYvNAs6baNoPqDADv7BX0AmBLGxVsrAifPPx/C8EAzV4Q+2ZUJqVzfI2TQQEZITnwUkWcHpgc/IubQ== +core-js-pure@^3.20.2: + version "3.20.3" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.20.3.tgz#6cc4f36da06c61d95254efc54024fe4797fd5d02" + integrity sha512-Q2H6tQ5MtPtcC7f3HxJ48i4Q7T9ybPKgvWyuH7JXIoNa2pm0KuBnycsET/qw1SLLZYfbsbrZQNMeIOClb+6WIA== core-util-is@~1.0.0: version "1.0.3" @@ -1908,15 +1928,10 @@ css-color-names@^0.0.4: resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= -css-color-names@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67" - integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA== - css-declaration-sorter@^6.0.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" - integrity sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA== + version "6.1.4" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4" + integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw== dependencies: timsort "^0.3.0" @@ -1937,28 +1952,27 @@ css-loader@^5.2.6: semver "^7.3.5" css-minimizer-webpack-plugin@^3.0.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.1.1.tgz#27bafa3b75054713565b2266c64b0228acd18634" - integrity sha512-KlB8l5uoNcf9F7i5kXnkxoqJGd2BXH4f0+Lj2vSWSmuvMLYO1kNsJ1KHSzeDW8e45/whgSOPcKVT/3JopkT8dg== + version "3.4.1" + resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" + integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== dependencies: cssnano "^5.0.6" jest-worker "^27.0.2" - p-limit "^3.0.2" postcss "^8.3.5" - schema-utils "^3.1.0" + schema-utils "^4.0.0" serialize-javascript "^6.0.0" source-map "^0.6.1" css-select@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" - integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== + version "4.2.1" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" + integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== dependencies: boolbase "^1.0.0" - css-what "^5.0.0" - domhandler "^4.2.0" - domutils "^2.6.0" - nth-check "^2.0.0" + css-what "^5.1.0" + domhandler "^4.3.0" + domutils "^2.8.0" + nth-check "^2.0.1" css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" @@ -1973,7 +1987,7 @@ css-unit-converter@^1.1.1: resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21" integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA== -css-what@^5.0.0: +css-what@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== @@ -1983,53 +1997,52 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz#359943bf00c5c8e05489f12dd25f3006f2c1cbd2" - integrity sha512-sPpQNDQBI3R/QsYxQvfB4mXeEcWuw0wGtKtmS5eg8wudyStYMgKOQT39G07EbW1LB56AOYrinRS9f0ig4Y3MhQ== +cssnano-preset-default@^5.1.11: + version "5.1.11" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.11.tgz#db10fb1ecee310e8285c5aca45bd8237be206828" + integrity sha512-ETet5hqHxmzQq2ynXMOQofKuLm7VOjMiOB7E2zdtm/hSeCKlD9fabzIUV4GoPcRyJRHi+4kGf0vsfGYbQ4nmPw== dependencies: css-declaration-sorter "^6.0.3" - cssnano-utils "^2.0.1" - postcss-calc "^8.0.0" - postcss-colormin "^5.2.0" - postcss-convert-values "^5.0.1" - postcss-discard-comments "^5.0.1" - postcss-discard-duplicates "^5.0.1" - postcss-discard-empty "^5.0.1" - postcss-discard-overridden "^5.0.1" - postcss-merge-longhand "^5.0.2" - postcss-merge-rules "^5.0.2" - postcss-minify-font-values "^5.0.1" - postcss-minify-gradients "^5.0.2" - postcss-minify-params "^5.0.1" - postcss-minify-selectors "^5.1.0" - postcss-normalize-charset "^5.0.1" - postcss-normalize-display-values "^5.0.1" - postcss-normalize-positions "^5.0.1" - postcss-normalize-repeat-style "^5.0.1" - postcss-normalize-string "^5.0.1" - postcss-normalize-timing-functions "^5.0.1" - postcss-normalize-unicode "^5.0.1" - postcss-normalize-url "^5.0.2" - postcss-normalize-whitespace "^5.0.1" - postcss-ordered-values "^5.0.2" - postcss-reduce-initial "^5.0.1" - postcss-reduce-transforms "^5.0.1" - postcss-svgo "^5.0.2" - postcss-unique-selectors "^5.0.1" - -cssnano-utils@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2" - integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== + cssnano-utils "^3.0.1" + postcss-calc "^8.2.0" + postcss-colormin "^5.2.4" + postcss-convert-values "^5.0.3" + postcss-discard-comments "^5.0.2" + postcss-discard-duplicates "^5.0.2" + postcss-discard-empty "^5.0.2" + postcss-discard-overridden "^5.0.3" + postcss-merge-longhand "^5.0.5" + postcss-merge-rules "^5.0.5" + postcss-minify-font-values "^5.0.3" + postcss-minify-gradients "^5.0.5" + postcss-minify-params "^5.0.4" + postcss-minify-selectors "^5.1.2" + postcss-normalize-charset "^5.0.2" + postcss-normalize-display-values "^5.0.2" + postcss-normalize-positions "^5.0.3" + postcss-normalize-repeat-style "^5.0.3" + postcss-normalize-string "^5.0.3" + postcss-normalize-timing-functions "^5.0.2" + postcss-normalize-unicode "^5.0.3" + postcss-normalize-url "^5.0.4" + postcss-normalize-whitespace "^5.0.3" + postcss-ordered-values "^5.0.4" + postcss-reduce-initial "^5.0.2" + postcss-reduce-transforms "^5.0.3" + postcss-svgo "^5.0.3" + postcss-unique-selectors "^5.0.3" + +cssnano-utils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.1.tgz#d3cc0a142d3d217f8736837ec0a2ccff6a89c6ea" + integrity sha512-VNCHL364lh++/ono+S3j9NlUK+d97KNkxI77NlqZU2W3xd2/qmyN61dsa47pTpb55zuU4G4lI7qFjAXZJH1OAQ== cssnano@^5.0.6: - version "5.0.8" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.8.tgz#39ad166256980fcc64faa08c9bb18bb5789ecfa9" - integrity sha512-Lda7geZU0Yu+RZi2SGpjYuQz4HI4/1Y+BhdD0jL7NXAQ5larCzVn+PUGuZbDMYz904AXXCOgO5L1teSvgu7aFg== + version "5.0.16" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.16.tgz#4ee97d30411693f3de24cef70b36f7ae2a843e04" + integrity sha512-ryhRI9/B9VFCwPbb1z60LLK5/ldoExi7nwdnJzpkLZkm2/r7j2X3jfY+ZvDVJhC/0fPZlrAguYdHNFg0iglPKQ== dependencies: - cssnano-preset-default "^5.1.4" - is-resolvable "^1.1.0" + cssnano-preset-default "^5.1.11" lilconfig "^2.0.3" yaml "^1.10.2" @@ -2041,9 +2054,9 @@ csso@^4.2.0: css-tree "^1.1.2" csstype@^3.0.2: - version "3.0.9" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" - integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw== + version "3.0.10" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" + integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== d3-geo-projection@0.2: version "0.2.16" @@ -2067,10 +2080,10 @@ d3@3, d3@^3.5.6: resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g= -damerau-levenshtein@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d" - integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw== +damerau-levenshtein@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" + integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== datamaps@^0.5.9: version "0.5.9" @@ -2101,9 +2114,9 @@ debug@^3.2.7: ms "^2.1.1" debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== dependencies: ms "2.1.2" @@ -2219,10 +2232,10 @@ domhandler@^2.3.0: dependencies: domelementtype "1" -domhandler@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" - integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== +domhandler@^4.2.0, domhandler@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" + integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== dependencies: domelementtype "^2.2.0" @@ -2234,7 +2247,7 @@ domutils@^1.5.1: dom-serializer "0" domelementtype "1" -domutils@^2.6.0: +domutils@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== @@ -2266,17 +2279,17 @@ duplexer@^0.1.2: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -electron-to-chromium@^1.3.878: - version "1.3.885" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.885.tgz#c8cec32fbc61364127849ae00f2395a1bae7c454" - integrity sha512-JXKFJcVWrdHa09n4CNZYfYaK6EW5aAew7/wr3L1OnsD1L+JHL+RCtd7QgIsxUbFPeTwPlvnpqNNTOLkoefmtXg== +electron-to-chromium@^1.4.17: + version "1.4.57" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz#2b2766df76ac8dbc0a1d41249bc5684a31849892" + integrity sha512-FNC+P5K1n6pF+M0zIK+gFCoXcJhhzDViL3DRIGy2Fv5PohuSES1JHR7T+GlwxSxlzx4yYbsuzCZvHxcBSRCIOw== emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emoji-regex@^9.0.0: +emoji-regex@^9.2.2: version "9.2.2" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== @@ -2415,50 +2428,50 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^2.7.0: - version "2.7.1" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c" - integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ== +eslint-module-utils@^2.7.2: + version "2.7.3" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" + integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== dependencies: debug "^3.2.7" find-up "^2.1.0" - pkg-dir "^2.0.0" eslint-plugin-import@^2.22.1: - version "2.25.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz#b3b9160efddb702fc1636659e71ba1d10adbe9e9" - integrity sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g== + version "2.25.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" + integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.0" + eslint-module-utils "^2.7.2" has "^1.0.3" - is-core-module "^2.7.0" + is-core-module "^2.8.0" is-glob "^4.0.3" minimatch "^3.0.4" object.values "^1.1.5" resolve "^1.20.0" - tsconfig-paths "^3.11.0" + tsconfig-paths "^3.12.0" eslint-plugin-jsx-a11y@^6.4.1: - version "6.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd" - integrity sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg== + version "6.5.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8" + integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g== dependencies: - "@babel/runtime" "^7.11.2" + "@babel/runtime" "^7.16.3" aria-query "^4.2.2" - array-includes "^3.1.1" + array-includes "^3.1.4" ast-types-flow "^0.0.7" - axe-core "^4.0.2" + axe-core "^4.3.5" axobject-query "^2.2.0" - damerau-levenshtein "^1.0.6" - emoji-regex "^9.0.0" + damerau-levenshtein "^1.0.7" + emoji-regex "^9.2.2" has "^1.0.3" - jsx-ast-utils "^3.1.0" + jsx-ast-utils "^3.2.1" language-tags "^1.0.5" + minimatch "^3.0.4" eslint-plugin-prettier@^3.3.0: version "3.4.1" @@ -2468,29 +2481,29 @@ eslint-plugin-prettier@^3.3.0: prettier-linter-helpers "^1.0.0" eslint-plugin-react-hooks@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" - integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" + integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== eslint-plugin-react@^7.21.5: - version "7.26.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz#41bcfe3e39e6a5ac040971c1af94437c80daa40e" - integrity sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ== + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz#8f3ff450677571a659ce76efc6d80b6a525adbdf" + integrity sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw== dependencies: - array-includes "^3.1.3" - array.prototype.flatmap "^1.2.4" + array-includes "^3.1.4" + array.prototype.flatmap "^1.2.5" doctrine "^2.1.0" - estraverse "^5.2.0" + estraverse "^5.3.0" jsx-ast-utils "^2.4.1 || ^3.0.0" minimatch "^3.0.4" - object.entries "^1.1.4" - object.fromentries "^2.0.4" - object.hasown "^1.0.0" - object.values "^1.1.4" + object.entries "^1.1.5" + object.fromentries "^2.0.5" + object.hasown "^1.1.0" + object.values "^1.1.5" prop-types "^15.7.2" resolve "^2.0.0-next.3" semver "^6.3.0" - string.prototype.matchall "^4.0.5" + string.prototype.matchall "^4.0.6" eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" @@ -2601,7 +2614,7 @@ estraverse@^4.1.1, estraverse@^4.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== -estraverse@^5.1.0, estraverse@^5.2.0: +estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== @@ -2663,10 +2676,10 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^3.1.1, fast-glob@^3.2.5, fast-glob@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== +fast-glob@^3.2.5, fast-glob@^3.2.7, fast-glob@^3.2.9: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -2748,19 +2761,19 @@ flatpickr@^4.6.2: integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw== flatted@^3.1.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" - integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== foreach@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= -fraction.js@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.1.tgz#ac4e520473dae67012d618aab91eda09bcb400ff" - integrity sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg== +fraction.js@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz#13e420a92422b6cf244dff8690ed89401029fbe8" + integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA== fs-extra@^10.0.0: version "10.0.0" @@ -2830,7 +2843,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^6.0.0, glob-parent@^6.0.1: +glob-parent@^6.0.1: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== @@ -2842,7 +2855,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.0.0, glob@^7.1.3: +glob@^7.1.3, glob@^7.1.7: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -2883,15 +2896,15 @@ globals@^13.6.0, globals@^13.9.0: type-fest "^0.20.2" globby@^11.0.3: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" slash "^3.0.0" globjoin@^0.1.4: @@ -2907,9 +2920,9 @@ gonzales-pe@^4.3.0: minimist "^1.2.5" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== gzip-size@^6.0.0: version "6.0.0" @@ -2987,9 +3000,9 @@ hosted-git-info@^2.1.4: integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== hosted-git-info@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" - integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -3045,17 +3058,10 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.4, ignore@^5.1.8: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - -import-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" - integrity sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg== - dependencies: - import-from "^3.0.0" +ignore@^5.1.8, ignore@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" @@ -3065,22 +3071,15 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -import-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966" - integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ== - dependencies: - resolve-from "^5.0.0" - import-lazy@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== import-local@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0" - integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -3127,11 +3126,6 @@ interpret@^2.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== -is-absolute-url@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" - integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== - is-alphabetical@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" @@ -3199,10 +3193,10 @@ is-color-stop@^1.1.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.7.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" - integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== +is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.0, is-core-module@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== dependencies: has "^1.0.3" @@ -3241,9 +3235,9 @@ is-hexadecimal@^1.0.0: integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-number-object@^1.0.4: version "1.0.6" @@ -3287,11 +3281,6 @@ is-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d" integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA== -is-resolvable@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" - integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== - is-shared-array-buffer@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" @@ -3327,11 +3316,11 @@ is-unicode-supported@^0.1.0: integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== is-weakref@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" - integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" isarray@0.0.1: version "0.0.1" @@ -3358,10 +3347,10 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -jest-worker@^27.0.2, jest-worker@^27.0.6: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.3.1.tgz#0def7feae5b8042be38479799aeb7b5facac24b2" - integrity sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g== +jest-worker@^27.0.2, jest-worker@^27.4.1: + version "27.4.6" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e" + integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw== dependencies: "@types/node" "*" merge-stream "^2.0.0" @@ -3438,7 +3427,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0: +"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== @@ -3451,7 +3440,7 @@ kind-of@^6.0.2, kind-of@^6.0.3: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klona@^2.0.4: +klona@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== @@ -3489,15 +3478,15 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lilconfig@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd" - integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg== +lilconfig@^2.0.3, lilconfig@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== loader-runner@^4.2.0: version "4.2.0" @@ -3514,9 +3503,9 @@ loader-utils@^1.4.0: json5 "^1.0.1" loader-utils@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.1.tgz#3b8d4386f42378d6434d32d7bc08e7a52d39575e" - integrity sha512-g4miPa9uUrZz4iElkaVJgDFwKJGh8aQGM7pUL4ejXl6cu7kSb30seQOVGNMP6sW8j7DW77X68hJZ+GM7UGhXeQ== + version "2.0.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -3542,11 +3531,6 @@ lodash.castarray@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -3706,7 +3690,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.3.0: +merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -3727,22 +3711,17 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.50.0: - version "1.50.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" - integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== +mime-db@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-types@^2.1.27: - version "2.1.33" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb" - integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g== + version "2.1.34" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: - mime-db "1.50.0" - -mime@^2.3.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + mime-db "1.51.0" mimic-fn@^2.1.0: version "2.1.0" @@ -3802,6 +3781,11 @@ modern-normalize@^1.1.0: resolved "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.1.0.tgz#da8e80140d9221426bd4f725c6e11283d34f90b7" integrity sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA== +mrmime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b" + integrity sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -3817,15 +3801,10 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -nanocolors@^0.1.12: - version "0.1.12" - resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6" - integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ== - nanoid@^3.1.30: - version "3.1.30" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" - integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" + integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== natural-compare@^1.4.0: version "1.4.0" @@ -3896,7 +3875,7 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -nth-check@^2.0.0: +nth-check@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== @@ -3919,9 +3898,9 @@ object-hash@^2.2.0: integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" - integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== + version "1.12.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== object-inspect@~1.4.0: version "1.4.1" @@ -3943,7 +3922,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.entries@^1.1.4: +object.entries@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== @@ -3952,7 +3931,7 @@ object.entries@^1.1.4: define-properties "^1.1.3" es-abstract "^1.19.1" -object.fromentries@^2.0.4: +object.fromentries@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== @@ -3961,7 +3940,7 @@ object.fromentries@^2.0.4: define-properties "^1.1.3" es-abstract "^1.19.1" -object.hasown@^1.0.0: +object.hasown@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== @@ -3969,7 +3948,7 @@ object.hasown@^1.0.0: define-properties "^1.1.3" es-abstract "^1.19.1" -object.values@^1.1.4, object.values@^1.1.5: +object.values@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== @@ -4042,13 +4021,6 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -4122,7 +4094,7 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: +path-parse@^1.0.6, path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -4156,16 +4128,9 @@ picocolors@^1.0.0: integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= - dependencies: - find-up "^2.1.0" + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" @@ -4174,50 +4139,50 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -postcss-calc@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" - integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g== +postcss-calc@^8.2.0: + version "8.2.3" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.3.tgz#53b95ce93de19213c2a5fdd71277a81690ef41d0" + integrity sha512-EGM2EBBWqP57N0E7N7WOLT116PJ39dwHVU01WO4XPPQLJfkL2xVgkMZ+TZvCfapj/uJH07UEfKHQNPHzSw/14Q== dependencies: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" -postcss-colormin@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.0.tgz#2b620b88c0ff19683f3349f4cf9e24ebdafb2c88" - integrity sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw== +postcss-colormin@^5.2.4: + version "5.2.4" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.4.tgz#7726d3f3d24f111d39faff50a6500688225d5324" + integrity sha512-rYlC5015aNqVQt/B6Cy156g7sH5tRUJGmT9xeagYthtKehetbKx7jHxhyLpulP4bs4vbp8u/B2rac0J7S7qPQg== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" - colord "^2.0.1" - postcss-value-parser "^4.1.0" + colord "^2.9.1" + postcss-value-parser "^4.2.0" -postcss-convert-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz#4ec19d6016534e30e3102fdf414e753398645232" - integrity sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg== +postcss-convert-values@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.3.tgz#492db08a28af84d57651f10edc8f6c8fb2f6df40" + integrity sha512-fVkjHm2T0PSMqXUCIhHNWVGjhB9mHEWX2GboVs7j3iCgr6FpIl9c/IdXy0PHWZSQ9LFTRgmj98amxJE6KOnlsA== dependencies: - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-discard-comments@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" - integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg== +postcss-discard-comments@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.2.tgz#811ed34e2b6c40713daab0beb4d7a04125927dcd" + integrity sha512-6VQ3pYTsJHEsN2Bic88Aa7J/Brn4Bv8j/rqaFQZkH+pcVkKYwxCIvoMQkykEW7fBjmofdTnQgcivt5CCBJhtrg== -postcss-discard-duplicates@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" - integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA== +postcss-discard-duplicates@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.2.tgz#61076f3d256351bdaac8e20aade730fef0609f44" + integrity sha512-LKY81YjUjc78p6rbXIsnppsaFo8XzCoMZkXVILJU//sK0DgPkPSpuq/cZvHss3EtdKvWNYgWzQL+wiJFtEET4g== -postcss-discard-empty@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" - integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw== +postcss-discard-empty@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.2.tgz#0676a9bcfc44bb00d338352a45ab80845a31d8f0" + integrity sha512-SxBsbTjlsKUvZLL+dMrdWauuNZU8TBq5IOL/DHa6jBUSXFEwmDqeXRfTIK/FQpPTa8MJMxEHjSV3UbiuyLARPQ== -postcss-discard-overridden@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" - integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q== +postcss-discard-overridden@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.3.tgz#004b9818cabb407e60616509267567150b327a3f" + integrity sha512-yRTXknIZA4k8Yo4FiF1xbsLj/VBxfXEWxJNIrtIy6HC9KQ4xJxcPtoaaskh6QptCGrrcGnhKsTsENTRPZOBu4g== postcss-html@^0.36.0: version "0.36.0" @@ -4242,21 +4207,20 @@ postcss-less@^3.1.4: postcss "^7.0.14" postcss-load-config@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.0.tgz#d39c47091c4aec37f50272373a6a648ef5e97829" - integrity sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g== + version "3.1.1" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.1.tgz#2f53a17f2f543d9e63864460af42efdac0d41f87" + integrity sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg== dependencies: - import-cwd "^3.0.0" - lilconfig "^2.0.3" + lilconfig "^2.0.4" yaml "^1.10.2" postcss-loader@^6.1.1: - version "6.2.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.0.tgz#714370a3f567141cf4cadcdf9575f5234d186bc5" - integrity sha512-H9hv447QjQJVDbHj3OUdciyAXY3v5+UDduzEytAlZCVHCpNAAg/mCSwhYYqZr9BiGYhmYspU8QXxZwiHTLn3yA== + version "6.2.1" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef" + integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q== dependencies: cosmiconfig "^7.0.0" - klona "^2.0.4" + klona "^2.0.5" semver "^7.3.5" postcss-media-query-parser@^0.2.3: @@ -4264,59 +4228,54 @@ postcss-media-query-parser@^0.2.3: resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ= -postcss-merge-longhand@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz#277ada51d9a7958e8ef8cf263103c9384b322a41" - integrity sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw== +postcss-merge-longhand@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.5.tgz#cbc217ca22fb5a3e6ee22a6a1aa6920ec1f3c628" + integrity sha512-R2BCPJJ/U2oh1uTWEYn9CcJ7MMcQ1iIbj9wfr2s/zHu5om5MP/ewKdaunpfJqR1WYzqCsgnXuRoVXPAzxdqy8g== dependencies: - css-color-names "^1.0.1" - postcss-value-parser "^4.1.0" - stylehacks "^5.0.1" + postcss-value-parser "^4.2.0" + stylehacks "^5.0.2" -postcss-merge-rules@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz#d6e4d65018badbdb7dcc789c4f39b941305d410a" - integrity sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg== +postcss-merge-rules@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.5.tgz#2a18669ec214019884a60f0a0d356803a8138366" + integrity sha512-3Oa26/Pb9VOFVksJjFG45SNoe4nhGvJ2Uc6TlRimqF8uhfOCEhVCaJ3rvEat5UFOn2UZqTY5Da8dFgCh3Iq0Ug== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" - cssnano-utils "^2.0.1" + cssnano-utils "^3.0.1" postcss-selector-parser "^6.0.5" - vendors "^1.0.3" -postcss-minify-font-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" - integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA== +postcss-minify-font-values@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.3.tgz#48c455c4cd980ecd07ac9bf3fc58e9d8a2ae4168" + integrity sha512-bC45rVzEwsLhv/cL1eCjoo2OOjbSk9I7HKFBYnBvtyuIZlf7uMipMATXtA0Fc3jwPo3wuPIW1jRJWKzflMh1sA== dependencies: - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-minify-gradients@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz#7c175c108f06a5629925d698b3c4cf7bd3864ee5" - integrity sha512-7Do9JP+wqSD6Prittitt2zDLrfzP9pqKs2EcLX7HJYxsxCOwrrcLt4x/ctQTsiOw+/8HYotAoqNkrzItL19SdQ== +postcss-minify-gradients@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.5.tgz#a5572b9c98ed52cbd7414db24b873f8b9e418290" + integrity sha512-/YjvXs8PepsoiZAIpjstOO4IHKwFAqYNqbA1yVdqklM84tbUUneh6omJxGlRlF3mi6K5Pa067Mg6IwqEnYC8Zg== dependencies: - colord "^2.6" - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" + colord "^2.9.1" + cssnano-utils "^3.0.1" + postcss-value-parser "^4.2.0" -postcss-minify-params@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz#371153ba164b9d8562842fdcd929c98abd9e5b6c" - integrity sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw== +postcss-minify-params@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.4.tgz#230a4d04456609e614db1d48c2eebc21f6490a45" + integrity sha512-Z0vjod9lRZEmEPfEmA2sCfjbfEEFKefMD3RDIQSUfXK4LpCyWkX1CniUgyNvnjJFLDPSxtgKzozhHhPHKoeGkg== dependencies: - alphanum-sort "^1.0.2" - browserslist "^4.16.0" - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - uniqs "^2.0.0" + browserslist "^4.16.6" + cssnano-utils "^3.0.1" + postcss-value-parser "^4.2.0" -postcss-minify-selectors@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" - integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og== +postcss-minify-selectors@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.2.tgz#bc9698f713b9dab7f44f1ec30643fcbad9a043c0" + integrity sha512-gpn1nJDMCf3g32y/7kl+jsdamhiYT+/zmEt57RoT9GmzlixBNRPohI7k8UIHelLABhdLf3MSZhtM33xuH5eQOQ== dependencies: - alphanum-sort "^1.0.2" postcss-selector-parser "^6.0.5" postcss-modules-extract-imports@^3.0.0: @@ -4354,96 +4313,91 @@ postcss-nested@5.0.6: dependencies: postcss-selector-parser "^6.0.6" -postcss-normalize-charset@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" - integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg== +postcss-normalize-charset@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.2.tgz#eb6130c8a8e950ce25f9ea512de1d9d6a6f81439" + integrity sha512-fEMhYXzO8My+gC009qDc/3bgnFP8Fv1Ic8uw4ec4YTlhIOw63tGPk1YFd7fk9bZUf1DAbkhiL/QPWs9JLqdF2g== -postcss-normalize-display-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" - integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ== +postcss-normalize-display-values@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.2.tgz#8b5273c6c7d0a445e6ef226b8a5bb3204a55fb99" + integrity sha512-RxXoJPUR0shSjkMMzgEZDjGPrgXUVYyWA/YwQRicb48H15OClPuaDR7tYokLAlGZ2tCSENEN5WxjgxSD5m4cUw== dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-normalize-positions@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5" - integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg== +postcss-normalize-positions@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.3.tgz#b63fcc4ff5fbf65934fafaf83270b2da214711d1" + integrity sha512-U+rmhjrNBvIGYqr/1tD4wXPFFMKUbXsYXvlUCzLi0tOCUS6LoeEAnmVXXJY/MEB/1CKZZwBSs2tmzGawcygVBA== dependencies: - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" - integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w== +postcss-normalize-repeat-style@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.3.tgz#488c0ad8aac0fa4f66ef56cc8d604b3fd9bf705f" + integrity sha512-uk1+xYx0AMbA3nLSNhbDrqbf/rx+Iuq5tVad2VNyaxxJzx79oGieJ6D9F6AfOL2GtiIbP7vTYlpYHtG+ERFXTg== dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-normalize-string@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" - integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA== +postcss-normalize-string@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.3.tgz#49e0a1d58a119d5435ef21893ad03136a6e8f0e6" + integrity sha512-Mf2V4JbIDboNGQhW6xW0YREDiYXoX3WrD3EjKkjvnpAJ6W4qqjLnK/c9aioyVFaWWHVdP5zVRw/9DI5S3oLDFw== dependencies: - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-normalize-timing-functions@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" - integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q== +postcss-normalize-timing-functions@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.2.tgz#db4f4f49721f47667afd1fdc5edb032f8d9cdb2e" + integrity sha512-Ao0PP6MoYsRU1LxeVUW740ioknvdIUmfr6uAA3xWlQJ9s69/Tupy8qwhuKG3xWfl+KvLMAP9p2WXF9cwuk/7Bg== dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-normalize-unicode@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" - integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA== +postcss-normalize-unicode@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.3.tgz#10f0d30093598a58c48a616491cc7fa53256dd43" + integrity sha512-uNC7BmS/7h6to2UWa4RFH8sOTzu2O9dVWPE/F9Vm9GdhONiD/c1kNaCLbmsFHlKWcEx7alNUChQ+jH/QAlqsQw== dependencies: - browserslist "^4.16.0" - postcss-value-parser "^4.1.0" + browserslist "^4.16.6" + postcss-value-parser "^4.2.0" -postcss-normalize-url@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz#ddcdfb7cede1270740cf3e4dfc6008bd96abc763" - integrity sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ== +postcss-normalize-url@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.4.tgz#3b0322c425e31dd275174d0d5db0e466f50810fb" + integrity sha512-cNj3RzK2pgQQyNp7dzq0dqpUpQ/wYtdDZM3DepPmFjCmYIfceuD9VIAcOdvrNetjIU65g1B4uwdP/Krf6AFdXg== dependencies: - is-absolute-url "^3.0.3" normalize-url "^6.0.1" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-normalize-whitespace@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" - integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA== +postcss-normalize-whitespace@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.3.tgz#fb6bcc9ff2f834448b802657c7acd0956f4591d1" + integrity sha512-333JWRnX655fSoUbufJ10HJop3c8mrpKkCCUnEmgz/Cb/QEtW+/TMZwDAUt4lnwqP6tCCk0x0b58jqvDgiQm/A== dependencies: - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-ordered-values@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" - integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ== +postcss-ordered-values@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.4.tgz#f799dca87a7f17526d31a20085e61768d0b00534" + integrity sha512-taKtGDZtyYUMVYkg+MuJeBUiTF6cGHZmo/qcW7ibvW79UlyKuSHbo6dpCIiqI+j9oJsXWzP+ovIxoyLDOeQFdw== dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" + cssnano-utils "^3.0.1" + postcss-value-parser "^4.2.0" -postcss-reduce-initial@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946" - integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw== +postcss-reduce-initial@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz#fa424ce8aa88a89bc0b6d0f94871b24abe94c048" + integrity sha512-v/kbAAQ+S1V5v9TJvbGkV98V2ERPdU6XvMcKMjqAlYiJ2NtsHGlKYLPjWWcXlaTKNxooId7BGxeraK8qXvzKtw== dependencies: - browserslist "^4.16.0" + browserslist "^4.16.6" caniuse-api "^3.0.0" -postcss-reduce-transforms@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" - integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA== +postcss-reduce-transforms@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.3.tgz#df60fab34698a43073e8b87938c71df7a3b040ac" + integrity sha512-yDnTUab5i7auHiNwdcL1f+pBnqQFf+7eC4cbC7D8Lc1FkvNZhtpkdad+9U4wDdFb84haupMf0rA/Zc5LcTe/3A== dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" postcss-resolve-nested-selector@^0.1.1: version "0.1.1" @@ -4473,44 +4427,42 @@ postcss-scss@^2.1.1: postcss "^7.0.6" postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6: - version "6.0.6" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" - integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== + version "6.0.9" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" + integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.2.tgz#bc73c4ea4c5a80fbd4b45e29042c34ceffb9257f" - integrity sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A== +postcss-svgo@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + integrity sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA== dependencies: postcss-value-parser "^4.1.0" - svgo "^2.3.0" + svgo "^2.7.0" postcss-syntax@^0.36.2: version "0.36.2" resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c" integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w== -postcss-unique-selectors@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc" - integrity sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w== +postcss-unique-selectors@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.3.tgz#07fd116a8fbd9202e7030f7c4952e7b52c26c63d" + integrity sha512-V5tX2hadSSn+miVCluuK1IDGy+7jAXSOfRZ2DQ+s/4uQZb/orDYBjH0CHgFrXsRw78p4QTuEFA9kI6C956UnHQ== dependencies: - alphanum-sort "^1.0.2" postcss-selector-parser "^6.0.5" - uniqs "^2.0.0" postcss-value-parser@^3.3.0: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" - integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6: version "7.0.39" @@ -4520,14 +4472,14 @@ postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0. picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.1.6, postcss@^8.2.1, postcss@^8.2.15, postcss@^8.3.0, postcss@^8.3.5: - version "8.3.11" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858" - integrity sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA== +postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.0, postcss@^8.3.5: + version "8.4.5" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95" + integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg== dependencies: nanoid "^3.1.30" picocolors "^1.0.0" - source-map-js "^0.6.2" + source-map-js "^1.0.1" prelude-ls@^1.2.1: version "1.2.1" @@ -4562,13 +4514,13 @@ progress@^2.0.0: integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" object-assign "^4.1.1" - react-is "^16.8.1" + react-is "^16.13.1" punycode@^2.1.0: version "2.1.1" @@ -4576,14 +4528,14 @@ punycode@^2.1.0: integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== purgecss@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.0.3.tgz#8147b429f9c09db719e05d64908ea8b672913742" - integrity sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw== + version "4.1.3" + resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.3.tgz#683f6a133c8c4de7aa82fe2746d1393b214918f7" + integrity sha512-99cKy4s+VZoXnPxaoM23e5ABcP851nC2y2GROkkjS8eJaJtlciGavd7iYAw2V84WeBqggZ12l8ef44G99HmTaw== dependencies: - commander "^6.0.0" - glob "^7.0.0" - postcss "^8.2.1" - postcss-selector-parser "^6.0.2" + commander "^8.0.0" + glob "^7.1.7" + postcss "^8.3.5" + postcss-selector-parser "^6.0.6" queue-microtask@^1.2.2: version "1.2.3" @@ -4639,7 +4591,7 @@ react-flip-move@^3.0.4: resolved "https://registry.yarnpkg.com/react-flip-move/-/react-flip-move-3.0.4.tgz#261f66101fbc305f9b7b28959c5cf8236413ca74" integrity sha512-HyUVv9g3t/BS7Yz9HgrtYSWyRNdR2F81nkj+C5iRY675AwlqCLB5JU9mnZWg0cdVz7IM4iquoyZx70vzZv3Z8Q== -react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -4793,9 +4745,9 @@ regenerator-transform@^0.14.2: "@babel/runtime" "^7.8.4" regexp.prototype.flags@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== + version "1.4.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" + integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" @@ -4885,12 +4837,13 @@ resolve-pathname@^3.0.0: integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== resolve@^1.1.5, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.9.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" resolve@^2.0.0-next.3: version "2.0.0-next.3" @@ -4961,7 +4914,7 @@ schema-utils@^2.6.5: ajv "^6.12.4" ajv-keywords "^3.5.2" -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: +schema-utils@^3.0.0, schema-utils@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== @@ -4970,6 +4923,16 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" +schema-utils@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.8.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.0.0" + "semver@2 || 3 || 4 || 5": version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -5042,9 +5005,9 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== simple-swizzle@^0.2.2: version "0.2.2" @@ -5054,12 +5017,12 @@ simple-swizzle@^0.2.2: is-arrayish "^0.3.1" sirv@^1.0.7: - version "1.0.18" - resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.18.tgz#105fab52fb656ce8a2bebbf36b11052005952899" - integrity sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA== + version "1.0.19" + resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49" + integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ== dependencies: "@polka/url" "^1.0.0-next.20" - mime "^2.3.1" + mrmime "^1.0.0" totalist "^1.0.0" slash@^3.0.0: @@ -5081,15 +5044,15 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-js@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" - integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== +source-map-js@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== source-map-support@~0.5.20: - version "0.5.20" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" - integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -5131,9 +5094,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.10" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" - integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== + version "3.0.11" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" + integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== specificity@^0.4.1: version "0.4.1" @@ -5186,7 +5149,7 @@ string-width@^4.2.2, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.prototype.matchall@^4.0.5: +string.prototype.matchall@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg== @@ -5264,12 +5227,12 @@ style-search@^0.1.0: resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI= -stylehacks@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" - integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA== +stylehacks@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.2.tgz#fa10e5181c6e8dc0bddb4a3fb372e9ac42bba2ad" + integrity sha512-114zeJdOpTrbQYRD4OU5UWJ99LKUaqCPJTU1HQ/n3q3BwmllFN8kHENaLnOeqVq6AhXrWfxHNZTl33iJ4oy3cQ== dependencies: - browserslist "^4.16.0" + browserslist "^4.16.6" postcss-selector-parser "^6.0.4" stylelint-config-prettier@^8.0.2: @@ -5371,31 +5334,35 @@ supports-color@^8.0.0: dependencies: has-flag "^4.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + svg-tags@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= -svgo@^2.3.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.7.0.tgz#e164cded22f4408fe4978f082be80159caea1e2d" - integrity sha512-aDLsGkre4fTDCWvolyW+fs8ZJFABpzLXbtdK1y71CKnHzAnpDxKXPj2mNKj+pyOXUCzFHzuxRJ94XOFygOWV3w== +svgo@^2.7.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== dependencies: "@trysound/sax" "0.2.0" commander "^7.2.0" css-select "^4.1.3" css-tree "^1.1.3" csso "^4.2.0" - nanocolors "^0.1.12" + picocolors "^1.0.0" stable "^0.1.8" table@^6.0.9, table@^6.6.0: - version "6.7.2" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0" - integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g== + version "6.8.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" + integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== dependencies: ajv "^8.0.1" - lodash.clonedeep "^4.5.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.3" @@ -5445,21 +5412,20 @@ tapable@^2.1.1, tapable@^2.2.0: integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.1.2: - version "5.2.4" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz#ad1be7639b1cbe3ea49fab995cbe7224b31747a1" - integrity sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA== + version "5.3.0" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f" + integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ== dependencies: - jest-worker "^27.0.6" - p-limit "^3.1.0" + jest-worker "^27.4.1" schema-utils "^3.1.1" serialize-javascript "^6.0.0" source-map "^0.6.1" terser "^5.7.2" terser@^5.7.2: - version "5.9.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351" - integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ== + version "5.10.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -5539,10 +5505,10 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -tsconfig-paths@^3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" - integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== +tsconfig-paths@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b" + integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" @@ -5645,11 +5611,6 @@ unified@^9.1.0: trough "^1.0.0" vfile "^4.0.0" -uniqs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= - unist-util-find-all-after@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6" @@ -5709,11 +5670,6 @@ value-equal@^1.0.1: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== -vendors@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" - integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== - vfile-message@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" @@ -5738,9 +5694,9 @@ vlq@^0.2.2: integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== watchpack@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce" - integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA== + version "2.3.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" + integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" @@ -5761,14 +5717,14 @@ webpack-bundle-analyzer@^4.4.2: ws "^7.3.1" webpack-cli@^4.7.0: - version "4.9.1" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.1.tgz#b64be825e2d1b130f285c314caa3b1ba9a4632b3" - integrity sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ== + version "4.9.2" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" + integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.0" - "@webpack-cli/info" "^1.4.0" - "@webpack-cli/serve" "^1.6.0" + "@webpack-cli/configtest" "^1.1.1" + "@webpack-cli/info" "^1.4.1" + "@webpack-cli/serve" "^1.6.1" colorette "^2.0.14" commander "^7.0.0" execa "^5.0.0" @@ -5887,9 +5843,9 @@ write-file-atomic@^3.0.3: typedarray-to-buffer "^3.1.5" ws@^7.3.1: - version "7.5.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" - integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== + version "7.5.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" + integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== xtend@^4.0.2, xtend@~4.0.1: version "4.0.2" @@ -5911,11 +5867,6 @@ yargs-parser@^20.2.3: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - zwitch@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" diff --git a/pkgs/servers/web-apps/plausible/yarn.nix b/pkgs/servers/web-apps/plausible/yarn.nix index 044005f80ec..8429259ef89 100644 --- a/pkgs/servers/web-apps/plausible/yarn.nix +++ b/pkgs/servers/web-apps/plausible/yarn.nix @@ -10,179 +10,187 @@ }; } { - name = "_babel_code_frame___code_frame_7.16.0.tgz"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz"; - sha1 = "0dfc80309beec8411e65e706461c408b0bb9b431"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha1 = "44416b6bd7624b998f5b1af5d470856c40138789"; }; } { - name = "_babel_compat_data___compat_data_7.16.0.tgz"; + name = "_babel_compat_data___compat_data_7.16.8.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.0.tgz"; - sha1 = "ea269d7f78deb3a7826c39a4048eecda541ebdaa"; + name = "_babel_compat_data___compat_data_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz"; + sha1 = "31560f9f29fdf1868de8cb55049538a1b9732a60"; }; } { - name = "_babel_core___core_7.16.0.tgz"; + name = "_babel_core___core_7.16.12.tgz"; path = fetchurl { - name = "_babel_core___core_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz"; - sha1 = "c4ff44046f5fe310525cc9eb4ef5147f0c5374d4"; + name = "_babel_core___core_7.16.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz"; + sha1 = "5edc53c1b71e54881315923ae2aedea2522bb784"; }; } { - name = "_babel_generator___generator_7.16.0.tgz"; + name = "_babel_generator___generator_7.16.8.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz"; - sha1 = "d40f3d1d5075e62d3500bccb67f3daa8a95265b2"; + name = "_babel_generator___generator_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz"; + sha1 = "359d44d966b8cd059d543250ce79596f792f2ebe"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.0.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz"; - sha1 = "9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; + sha1 = "bb2339a7534a9c128e3102024c60760a3a7f3862"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.16.0.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz"; - sha1 = "f1a686b92da794020c26582eb852e9accd0d7882"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"; + sha1 = "38d138561ea207f0f69eb1626a418e4f7e6a580b"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.0.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz"; - sha1 = "01d615762e796c17952c29e3ede9d6de07d235a8"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz"; + sha1 = "06e66c5f299601e6c7da350049315e83209d551b"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.0.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.10.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz"; - sha1 = "090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz"; + sha1 = "8a6959b9cc818a88815ba3c5474619e9c0f2c21c"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.0.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz"; - sha1 = "06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz"; + sha1 = "0cb82b9bac358eb73bfbd73985a776bfa6b14d48"; }; } { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.4.tgz"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.1.tgz"; path = fetchurl { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz"; - sha1 = "8867aed79d3ea6cade40f801efb7ac5c66916b10"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"; + sha1 = "52411b445bdb2e676869e5a74960d2d3826d2665"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.0.tgz"; + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz"; - sha1 = "753017337a15f46f9c09f674cff10cee9b9d7778"; + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; + sha1 = "ff484094a839bde9d89cd63cba017d7aae80ecd7"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; - sha1 = "b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; + sha1 = "12a6d8522fdd834f194e868af6354e8650242b7a"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; - sha1 = "0088c7486b29a9cb5d948b1a1de46db66e089cfa"; + name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; + sha1 = "f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; - sha1 = "4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; + sha1 = "ea08ac753117a669f1508ba06ebcc49156387419"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.0.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz"; - sha1 = "29287040efd197c77636ef75188e81da8bccd5a4"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; + sha1 = "86bcb19a77a509c7b77d0e22323ef588fa58c246"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.16.0.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz"; - sha1 = "90538e60b672ecf1b448f5f4f5433d37e79a3ec3"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz"; + sha1 = "42b9ca4b2b200123c3b7e726b0ae5153924905b0"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.16.0.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz"; - sha1 = "1c82a8dd4cb34577502ebd2909699b194c3e9bb5"; + name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; + sha1 = "25612a8091a999704461c8a222d0efec5d091437"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz"; - sha1 = "cecdb145d70c54096b1564f8e9f10cd7d193b338"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"; + sha1 = "7665faeb721a01ca5327ddc6bba15a5cb34b6a41"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; - sha1 = "5ac822ce97eec46741ab70a517971e443a70c5a9"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; + sha1 = "a34e3560605abbd31a18546bd2aad3e6d9a174f2"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.0.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz"; - sha1 = "d5aa3b086e13a5fe05238ff40c3a5a0c2dab3ead"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"; + sha1 = "aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.16.0.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.8.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz"; - sha1 = "73055e8d3cf9bcba8ddb55cad93fedc860f68f17"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; + sha1 = "29ffaade68a367e2ed09c90901986918d25e57e3"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.16.0.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz"; - sha1 = "21d6a27620e383e37534cf6c10bba019a6f90517"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz"; + sha1 = "e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.16.7.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz"; + sha1 = "d656654b9ea08dbb9659b69d61063ccd343ff0f7"; }; } { @@ -194,195 +202,195 @@ }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; - sha1 = "29672f43663e936df370aaeb22beddb3baec7438"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; + sha1 = "0b648c0c42da9d3920d85ad585f2778620b8726b"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha1 = "220df993bfe904a4a6b02ab4f3385a5ebf6e2389"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha1 = "e8c602438c4a8195751243da9031d1607d247cad"; }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; - sha1 = "6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"; + name = "_babel_helper_validator_option___helper_validator_option_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; + sha1 = "b203ce62ce5fe153899b617c08957de860de4d23"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.16.0.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.16.8.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz"; - sha1 = "b3cf318afce774dfe75b86767cd6d68f3482e57c"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; + sha1 = "58afda087c4cd235de92f7ceedebca2c41274200"; }; } { - name = "_babel_helpers___helpers_7.16.0.tgz"; + name = "_babel_helpers___helpers_7.16.7.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.0.tgz"; - sha1 = "875519c979c232f41adfbd43a3b0398c2e388183"; + name = "_babel_helpers___helpers_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz"; + sha1 = "7e3504d708d50344112767c3542fc5e357fffefc"; }; } { - name = "_babel_highlight___highlight_7.16.0.tgz"; + name = "_babel_highlight___highlight_7.16.10.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz"; - sha1 = "6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"; + name = "_babel_highlight___highlight_7.16.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz"; + sha1 = "744f2eb81579d6eea753c227b0f570ad785aba88"; }; } { - name = "_babel_parser___parser_7.16.0.tgz"; + name = "_babel_parser___parser_7.16.12.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.0.tgz"; - sha1 = "cf147d7ada0a3655e79bf4b08ee846f00a00a295"; + name = "_babel_parser___parser_7.16.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz"; + sha1 = "9474794f9a650cf5e2f892444227f98e28cdf8b6"; }; } { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.0.tgz"; + name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.0.tgz"; - sha1 = "efb7f147042aca34ce8156a055906a7abaadeaf0"; + name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz"; + sha1 = "4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"; }; } { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.0.tgz"; + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz"; - sha1 = "358972eaab006f5eb0826183b0c93cbcaf13e1e2"; + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz"; + sha1 = "cc001234dfc139ac45f6bcf801866198c8c72ff9"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.16.0.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.16.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz"; - sha1 = "11425d47a60364352f668ad5fbc1d6596b2c5caf"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz"; + sha1 = "3bdd1ebbe620804ea9416706cd67d60787504bc8"; }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.16.0.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz"; - sha1 = "c029618267ddebc7280fa286e0f8ca2a278a2d1a"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz"; + sha1 = "925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"; }; } { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.0.tgz"; + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.0.tgz"; - sha1 = "5296942c564d8144c83eea347d0aa8a0b89170e7"; + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; + sha1 = "712357570b612106ef5426d13dc433ce0f200c2a"; }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.16.0.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz"; - sha1 = "783eca61d50526202f9b296095453977e88659f1"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; + sha1 = "c19c897eaa46b27634a00fee9fb7d829158704b2"; }; } { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.16.0.tgz"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz"; - sha1 = "9c01dee40b9d6b847b656aaf4a3976a71740f222"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz"; + sha1 = "09de09df18445a5786a305681423ae63507a6163"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.0.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz"; - sha1 = "cae35a95ed1d2a7fa29c4dc41540b84a72e9ab25"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz"; + sha1 = "9732cb1d17d9a2626a08c5be25186c195b6fa6e8"; }; } { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.0.tgz"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz"; - sha1 = "a711b8ceb3ffddd3ef88d3a49e86dbd3cc7db3fd"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz"; + sha1 = "be23c0ba74deec1922e639832904be0bea73cdea"; }; } { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.0.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz"; - sha1 = "44e1cce08fe2427482cf446a91bb451528ed0596"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz"; + sha1 = "141fc20b6857e59459d430c850a0011e36561d99"; }; } { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.0.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz"; - sha1 = "5d418e4fbbf8b9b7d03125d3a52730433a373734"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"; + sha1 = "d6b69f4af63fb38b6ca2558442a7fb191236eba9"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.16.0.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz"; - sha1 = "5fb32f6d924d6e6712810362a60e12a2609872e6"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz"; + sha1 = "94593ef1ddf37021a25bdcb5754c4a8d534b01d8"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.0.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz"; - sha1 = "5910085811ab4c28b00d6ebffa4ab0274d1e5f16"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; + sha1 = "c623a430674ffc4ab732fd0a0ae7722b67cb74cf"; }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.16.0.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz"; - sha1 = "56dbc3970825683608e9efb55ea82c2a2d6c8dc0"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz"; + sha1 = "7cd629564724816c0e8a969535551f943c64c39a"; }; } { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.0.tgz"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.11.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz"; - sha1 = "b4dafb9c717e4301c5776b30d080d6383c89aff6"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz"; + sha1 = "e8df108288555ff259f4527dbe84813aac3a1c50"; }; } { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.0.tgz"; + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.0.tgz"; - sha1 = "69e935b2c5c79d2488112d886f0c4e2790fee76f"; + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz"; + sha1 = "b0b8cef543c2c3d57e59e2c611994861d46a3fce"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.0.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz"; - sha1 = "890482dfc5ea378e42e19a71e709728cabf18612"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz"; + sha1 = "635d18eb10c6214210ffc5ff4932552de08188a2"; }; } { @@ -434,11 +442,11 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.0.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz"; - sha1 = "f9624394317365a9a88c82358d3f8471154698f1"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz"; + sha1 = "50b6571d13f764266a113d77c82b4a6508bbe665"; }; } { @@ -506,299 +514,299 @@ }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.16.0.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz"; - sha1 = "951706f8b449c834ed07bd474c0924c944b95a8e"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz"; + sha1 = "44125e653d94b98db76369de9c396dc14bef4154"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.0.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz"; - sha1 = "df12637f9630ddfa0ef9d7a11bc414d629d38604"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz"; + sha1 = "b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.0.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz"; - sha1 = "c618763233ad02847805abcac4c345ce9de7145d"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; + sha1 = "4d0d57d9632ef6062cdf354bb717102ee042a620"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.16.0.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz"; - sha1 = "bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz"; + sha1 = "f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.0.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz"; - sha1 = "54cf5ff0b2242c6573d753cd4bfc7077a8b282f5"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz"; + sha1 = "8f4b9562850cd973de3b498f1218796eb181ce00"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.0.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz"; - sha1 = "e0c385507d21e1b0b076d66bed6d5231b85110b7"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz"; + sha1 = "66dee12e46f61d2aae7a73710f591eb3df616470"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz"; - sha1 = "ad3d7e74584ad5ea4eadb1e6642146c590dee33c"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz"; + sha1 = "ca9588ae2d63978a4c29d3f33282d8603f618e23"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.0.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz"; - sha1 = "50bab00c1084b6162d0a58a818031cf57798e06f"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; + sha1 = "6b2d67686fab15fb6a7fd4bd895d5982cfc81241"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.16.0.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz"; - sha1 = "8bc2e21813e3e89e5e5bf3b60aa5fc458575a176"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz"; + sha1 = "2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.0.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz"; - sha1 = "a180cd2881e3533cef9d3901e48dad0fbeff4be4"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; + sha1 = "efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.16.0.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz"; - sha1 = "f7abaced155260e2461359bbc7c7248aca5e6bd2"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz"; + sha1 = "649d639d4617dff502a9a158c479b3b556728d8c"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.0.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz"; - sha1 = "02e3699c284c6262236599f751065c5d5f1f400e"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; + sha1 = "5ab34375c64d61d083d7d2f05c38d90b97ec65cf"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.0.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz"; - sha1 = "79711e670ffceb31bd298229d50f3621f7980cac"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz"; + sha1 = "254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.0.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz"; - sha1 = "5251b4cce01eaf8314403d21aedb269d79f5e64b"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; + sha1 = "6e5dcf906ef8a098e630149d14c867dd28f92384"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.16.0.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz"; - sha1 = "09abd41e18dcf4fd479c598c1cef7bd39eb1337e"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz"; + sha1 = "b28d323016a7daaae8609781d1f8c9da42b13186"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.0.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz"; - sha1 = "add58e638c8ddc4875bd9a9ecb5c594613f6c922"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz"; + sha1 = "cdee19aae887b16b9d331009aa9a219af7c86afe"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.0.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz"; - sha1 = "a92cf240afeb605f4ca16670453024425e421ea4"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz"; + sha1 = "887cefaef88e684d29558c2b13ee0563e287c2d7"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz"; - sha1 = "195f26c2ad6d6a391b70880effce18ce625e06a7"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz"; + sha1 = "23dad479fa585283dbd22215bff12719171e7618"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.0.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz"; - sha1 = "d3db61cc5d5b97986559967cd5ea83e5c32096ca"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz"; + sha1 = "7f860e0e40d844a02c9dcf9d84965e7dfd666252"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.0.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz"; - sha1 = "af823ab576f752215a49937779a41ca65825ab35"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz"; + sha1 = "9967d89a5c243818e0800fdad89db22c5f514244"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.0.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz"; - sha1 = "fb20d5806dc6491a06296ac14ea8e8d6fedda72b"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; + sha1 = "ac359cf8d32cf4354d27a46867999490b6c32a94"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.0.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.0.tgz"; - sha1 = "1b50765fc421c229819dc4c7cdb8911660b3c2d7"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz"; + sha1 = "a1721f55b99b736511cb7e0152f61f17688f331f"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.0.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz"; - sha1 = "a95c552189a96a00059f6776dc4e00e3690c78d1"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; + sha1 = "2dadac85155436f22c696c4827730e0fe1057a55"; }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.0.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz"; - sha1 = "9a0ad8aa8e8790883a7bd2736f66229a58125676"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz"; + sha1 = "7b6d40d232f4c0f550ea348593db3b21e2404340"; }; } { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.0.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz"; - sha1 = "1cb52874678d23ab11d0d16488d54730807303ef"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz"; + sha1 = "43a00724a3ed2557ed3f276a01a929e6686ac7b8"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.0.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.0.tgz"; - sha1 = "55b797d4960c3de04e07ad1c0476e2bc6a4889f1"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz"; + sha1 = "86a6a220552afd0e4e1f0388a68a372be7add0d4"; }; } { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.0.tgz"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz"; - sha1 = "23db6ddf558d8abde41b8ad9d59f48ad5532ccab"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz"; + sha1 = "232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.0.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz"; - sha1 = "eaee422c84b0232d03aea7db99c97deeaf6125a4"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz"; + sha1 = "9e7576dc476cb89ccc5096fff7af659243b4adeb"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.0.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz"; - sha1 = "fff4b9dcb19e12619394bda172d14f2d04c0379c"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz"; + sha1 = "1d798e078f7c5958eec952059c460b220a63f586"; }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.0.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz"; - sha1 = "090372e3141f7cc324ed70b3daf5379df2fa384d"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; + sha1 = "e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.0.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz"; - sha1 = "d21ca099bbd53ab307a8621e019a7bd0f40cdcfb"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz"; + sha1 = "a303e2122f9f12e0105daeedd0f30fb197d8ff44"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.0.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz"; - sha1 = "c35ea31a02d86be485f6aa510184b677a91738fd"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; + sha1 = "c84741d4f4a38072b9a1e2e3fd56d359552e8660"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.16.0.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz"; - sha1 = "a8eced3a8e7b8e2d40ec4ec4548a45912630d302"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz"; + sha1 = "f3d1c45d28967c8e80f53666fc9c3e50618217ab"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.0.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz"; - sha1 = "8b19a244c6f8c9d668dca6a6f754ad6ead1128f2"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz"; + sha1 = "9cdbe622582c21368bd482b660ba87d5545d4f7e"; }; } { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.0.tgz"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz"; - sha1 = "1a354064b4c45663a32334f46fa0cf6100b5b1f3"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz"; + sha1 = "da8717de7b3287a2c6d659750c964f302b31ece3"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.16.0.tgz"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz"; - sha1 = "293b80950177c8c85aede87cef280259fb995402"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; + sha1 = "0f7aa4a501198976e25e82702574c34cfebe9ef2"; }; } { - name = "_babel_preset_env___preset_env_7.16.0.tgz"; + name = "_babel_preset_env___preset_env_7.16.11.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.0.tgz"; - sha1 = "97228393d217560d6a1c6c56f0adb9d12bca67f5"; + name = "_babel_preset_env___preset_env_7.16.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz"; + sha1 = "5dd88fd885fae36f88fd7c8342475c9f0abe2982"; }; } { @@ -810,59 +818,59 @@ }; } { - name = "_babel_preset_react___preset_react_7.16.0.tgz"; + name = "_babel_preset_react___preset_react_7.16.7.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.0.tgz"; - sha1 = "f71d3e8dff5218478011df037fad52660ee6d82a"; + name = "_babel_preset_react___preset_react_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz"; + sha1 = "4c18150491edc69c183ff818f9f2aecbe5d93852"; }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.16.0.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.16.8.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz"; - sha1 = "58a7fb00e6948508f12f53a303993e8b6e2f6c70"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.8.tgz"; + sha1 = "ea533d96eda6fdc76b1812248e9fbd0c11d4a1a7"; }; } { - name = "_babel_runtime___runtime_7.16.0.tgz"; + name = "_babel_runtime___runtime_7.16.7.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.0.tgz"; - sha1 = "e27b977f2e2088ba24748bf99b5e1dece64e4f0b"; + name = "_babel_runtime___runtime_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz"; + sha1 = "03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"; }; } { - name = "_babel_template___template_7.16.0.tgz"; + name = "_babel_template___template_7.16.7.tgz"; path = fetchurl { - name = "_babel_template___template_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz"; - sha1 = "d16a35ebf4cd74e202083356fab21dd89363ddd6"; + name = "_babel_template___template_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz"; + sha1 = "8d126c8701fde4d66b264b3eba3d96f07666d155"; }; } { - name = "_babel_traverse___traverse_7.16.0.tgz"; + name = "_babel_traverse___traverse_7.16.10.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.0.tgz"; - sha1 = "965df6c6bfc0a958c1e739284d3c9fa4a6e3c45b"; + name = "_babel_traverse___traverse_7.16.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz"; + sha1 = "448f940defbe95b5a8029975b051f75993e8239f"; }; } { - name = "_babel_types___types_7.16.0.tgz"; + name = "_babel_types___types_7.16.8.tgz"; path = fetchurl { - name = "_babel_types___types_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz"; - sha1 = "db3b313804f96aadd0b776c4823e127ad67289ba"; + name = "_babel_types___types_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz"; + sha1 = "0ba5da91dd71e0a4e7781a30f22770831062e3c1"; }; } { - name = "_discoveryjs_json_ext___json_ext_0.5.5.tgz"; + name = "_discoveryjs_json_ext___json_ext_0.5.6.tgz"; path = fetchurl { - name = "_discoveryjs_json_ext___json_ext_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz"; - sha1 = "9283c9ce5b289a3c4f61c12757469e59377f81f3"; + name = "_discoveryjs_json_ext___json_ext_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz"; + sha1 = "d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"; }; } { @@ -874,11 +882,11 @@ }; } { - name = "_headlessui_react___react_1.4.1.tgz"; + name = "_headlessui_react___react_1.4.3.tgz"; path = fetchurl { - name = "_headlessui_react___react_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/@headlessui/react/-/react-1.4.1.tgz"; - sha1 = "0a8dbb20e1d63dcea55bfc3ab1b87637aaac7777"; + name = "_headlessui_react___react_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/@headlessui/react/-/react-1.4.3.tgz"; + sha1 = "f77c6bb5cb4a614a5d730fb880cab502d48abf37"; }; } { @@ -898,11 +906,11 @@ }; } { - name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; path = fetchurl { - name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; - sha1 = "87de7af9c231826fdd68ac7258f77c429e0e5fcf"; + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha1 = "b520529ec21d8e5945a1851dfd1c32e94e39ff45"; }; } { @@ -1010,19 +1018,19 @@ }; } { - name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; + name = "_types_eslint_scope___eslint_scope_3.7.3.tgz"; path = fetchurl { - name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "8dc390a7b4f9dd9f1284629efce982e41612116e"; + name = "_types_eslint_scope___eslint_scope_3.7.3.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz"; + sha1 = "125b88504b61e3c8bc6f870882003253005c3224"; }; } { - name = "_types_eslint___eslint_7.28.2.tgz"; + name = "_types_eslint___eslint_8.4.1.tgz"; path = fetchurl { - name = "_types_eslint___eslint_7.28.2.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.2.tgz"; - sha1 = "0ff2947cdd305897c52d5372294e8c76f351db68"; + name = "_types_eslint___eslint_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz"; + sha1 = "c48251553e8759db9e656de3efc846954ac32304"; }; } { @@ -1074,11 +1082,11 @@ }; } { - name = "_types_node___node_16.11.6.tgz"; + name = "_types_node___node_17.0.13.tgz"; path = fetchurl { - name = "_types_node___node_16.11.6.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz"; - sha1 = "6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"; + name = "_types_node___node_17.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.13.tgz"; + sha1 = "5ed7ed7c662948335fcad6c412bb42d99ea754e3"; }; } { @@ -1226,27 +1234,27 @@ }; } { - name = "_webpack_cli_configtest___configtest_1.1.0.tgz"; + name = "_webpack_cli_configtest___configtest_1.1.1.tgz"; path = fetchurl { - name = "_webpack_cli_configtest___configtest_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.0.tgz"; - sha1 = "8342bef0badfb7dfd3b576f2574ab80c725be043"; + name = "_webpack_cli_configtest___configtest_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz"; + sha1 = "9f53b1b7946a6efc2a749095a4f450e2932e8356"; }; } { - name = "_webpack_cli_info___info_1.4.0.tgz"; + name = "_webpack_cli_info___info_1.4.1.tgz"; path = fetchurl { - name = "_webpack_cli_info___info_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.0.tgz"; - sha1 = "b9179c3227ab09cbbb149aa733475fcf99430223"; + name = "_webpack_cli_info___info_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz"; + sha1 = "2360ea1710cbbb97ff156a3f0f24556e0fc1ebea"; }; } { - name = "_webpack_cli_serve___serve_1.6.0.tgz"; + name = "_webpack_cli_serve___serve_1.6.1.tgz"; path = fetchurl { - name = "_webpack_cli_serve___serve_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.0.tgz"; - sha1 = "2c275aa05c895eccebbfc34cfb223c6e8bd591a2"; + name = "_webpack_cli_serve___serve_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz"; + sha1 = "0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe"; }; } { @@ -1314,11 +1322,19 @@ }; } { - name = "acorn___acorn_8.5.0.tgz"; + name = "acorn___acorn_8.7.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz"; - sha1 = "4512ccb99b3698c752591e9bb4472e38ad43cee2"; + name = "acorn___acorn_8.7.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz"; + sha1 = "90951fde0f8f09df93549481e5fc141445b791cf"; + }; + } + { + name = "ajv_formats___ajv_formats_2.1.1.tgz"; + path = fetchurl { + name = "ajv_formats___ajv_formats_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz"; + sha1 = "6e669400659eb74973bbf2e33327180a0996b520"; }; } { @@ -1330,27 +1346,27 @@ }; } { - name = "ajv___ajv_6.12.6.tgz"; + name = "ajv_keywords___ajv_keywords_5.1.0.tgz"; path = fetchurl { - name = "ajv___ajv_6.12.6.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + name = "ajv_keywords___ajv_keywords_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz"; + sha1 = "69d4d385a4733cdbeab44964a1170a88f87f0e16"; }; } { - name = "ajv___ajv_8.6.3.tgz"; + name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { - name = "ajv___ajv_8.6.3.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz"; - sha1 = "11a66527761dc3e9a3845ea775d2d3c0414e8764"; + name = "ajv___ajv_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"; + name = "ajv___ajv_8.9.0.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 = "ajv___ajv_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz"; + sha1 = "738019146638824dea25edcf299dcba1b0e7eb18"; }; } { @@ -1482,11 +1498,11 @@ }; } { - name = "autoprefixer___autoprefixer_10.4.0.tgz"; + name = "autoprefixer___autoprefixer_10.4.2.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_10.4.0.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz"; - sha1 = "c3577eb32a1079a440ec253e404eaf1eb21388c8"; + name = "autoprefixer___autoprefixer_10.4.2.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz"; + sha1 = "25e1df09a31a9fba5c40b578936b90d35c9d4d3b"; }; } { @@ -1538,27 +1554,27 @@ }; } { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.3.tgz"; + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.1.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz"; - sha1 = "6ed8e30981b062f8fe6aca8873a37ebcc8cc1c0f"; + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz"; + sha1 = "440f1b70ccfaabc6b676d196239b138f8a2cfba5"; }; } { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.3.0.tgz"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.5.1.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz"; - sha1 = "fa7ca3d1ee9ddc6193600ffb632c9785d54918af"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz"; + sha1 = "d66183bf10976ea677f4149a7fcc4d8df43d4060"; }; } { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.3.tgz"; + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.3.1.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz"; - sha1 = "2e9808f5027c4336c994992b48a4262580cb8d6d"; + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz"; + sha1 = "2c0678ea47c75c8cc2fbb1852278d8fb68233990"; }; } { @@ -1634,11 +1650,11 @@ }; } { - name = "browserslist___browserslist_4.17.5.tgz"; + name = "browserslist___browserslist_4.19.1.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.17.5.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.5.tgz"; - sha1 = "c827bbe172a4c22b123f5e337533ceebadfdd559"; + name = "browserslist___browserslist_4.19.1.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz"; + sha1 = "4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"; }; } { @@ -1658,11 +1674,11 @@ }; } { - name = "bytes___bytes_3.1.0.tgz"; + name = "bytes___bytes_3.1.2.tgz"; path = fetchurl { - name = "bytes___bytes_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; - sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + name = "bytes___bytes_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz"; + sha1 = "8b0beeb98605adf1b128fa4386403c009e0221a5"; }; } { @@ -1714,11 +1730,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001274.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001304.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001274.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz"; - sha1 = "26ca36204d15b17601ba6fc35dbdad950a647cc7"; + name = "caniuse_lite___caniuse_lite_1.0.30001304.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz"; + sha1 = "38af55ed3fc8220cb13e35e6e7309c8c65a05559"; }; } { @@ -1762,19 +1778,19 @@ }; } { - name = "chart.js___chart.js_3.6.0.tgz"; + name = "chart.js___chart.js_3.7.0.tgz"; path = fetchurl { - name = "chart.js___chart.js_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/chart.js/-/chart.js-3.6.0.tgz"; - sha1 = "a87fce8431d4e7c5523d721f487f53aada1e42fe"; + name = "chart.js___chart.js_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/chart.js/-/chart.js-3.7.0.tgz"; + sha1 = "7a19c93035341df801d613993c2170a1fcf1d882"; }; } { - name = "chokidar___chokidar_3.5.2.tgz"; + name = "chokidar___chokidar_3.5.3.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz"; - sha1 = "dba3976fcadb016f66fd365021d91600d01c1e75"; + name = "chokidar___chokidar_3.5.3.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz"; + sha1 = "1cf37c8707b932bd1af1ae22c0432e2acd1903bd"; }; } { @@ -1842,27 +1858,27 @@ }; } { - name = "color_string___color_string_1.6.0.tgz"; + name = "color_string___color_string_1.9.0.tgz"; path = fetchurl { - name = "color_string___color_string_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz"; - sha1 = "c3915f61fe267672cb7e1e064c9d692219f6c312"; + name = "color_string___color_string_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz"; + sha1 = "63b6ebd1bec11999d1df3a79a7569451ac2be8aa"; }; } { - name = "color___color_4.0.1.tgz"; + name = "color___color_4.2.0.tgz"; path = fetchurl { - name = "color___color_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-4.0.1.tgz"; - sha1 = "21df44cd10245a91b1ccf5ba031609b0e10e7d67"; + name = "color___color_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-4.2.0.tgz"; + sha1 = "0c782459a3e98838ea01e4bc0fb43310ca35af78"; }; } { - name = "colord___colord_2.9.1.tgz"; + name = "colord___colord_2.9.2.tgz"; path = fetchurl { - name = "colord___colord_2.9.1.tgz"; - url = "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz"; - sha1 = "c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e"; + name = "colord___colord_2.9.2.tgz"; + url = "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz"; + sha1 = "25e2bacbbaa65991422c07ea209e2089428effb1"; }; } { @@ -1882,14 +1898,6 @@ }; } { - name = "commander___commander_6.2.1.tgz"; - path = fetchurl { - name = "commander___commander_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz"; - sha1 = "0792eb682dfbc325999bb2b84fddddba110ac73c"; - }; - } - { name = "commander___commander_7.2.0.tgz"; path = fetchurl { name = "commander___commander_7.2.0.tgz"; @@ -1898,6 +1906,14 @@ }; } { + name = "commander___commander_8.3.0.tgz"; + path = fetchurl { + name = "commander___commander_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz"; + sha1 = "4837ea1b2da67b9c616a67afbb0fafee567bca66"; + }; + } + { name = "commondir___commondir_1.0.1.tgz"; path = fetchurl { name = "commondir___commondir_1.0.1.tgz"; @@ -1938,27 +1954,27 @@ }; } { - name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; + name = "copy_webpack_plugin___copy_webpack_plugin_9.1.0.tgz"; path = fetchurl { - name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz"; - sha1 = "b71d21991599f61a4ee00ba79087b8ba279bbb59"; + name = "copy_webpack_plugin___copy_webpack_plugin_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz"; + sha1 = "2d2c460c4c4695ec0a58afb2801a1205256c4e6b"; }; } { - name = "core_js_compat___core_js_compat_3.19.0.tgz"; + name = "core_js_compat___core_js_compat_3.20.3.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.19.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.0.tgz"; - sha1 = "b3b93f93c8721b3ed52b91f12f964cc410967f8b"; + name = "core_js_compat___core_js_compat_3.20.3.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.3.tgz"; + sha1 = "d71f85f94eb5e4bea3407412e549daa083d23bd6"; }; } { - name = "core_js_pure___core_js_pure_3.19.0.tgz"; + name = "core_js_pure___core_js_pure_3.20.3.tgz"; path = fetchurl { - name = "core_js_pure___core_js_pure_3.19.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.0.tgz"; - sha1 = "db6fdadfdd4dc280ec93b64c3c2e8460e6f10094"; + name = "core_js_pure___core_js_pure_3.20.3.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.20.3.tgz"; + sha1 = "6cc4f36da06c61d95254efc54024fe4797fd5d02"; }; } { @@ -1994,19 +2010,11 @@ }; } { - name = "css_color_names___css_color_names_1.0.1.tgz"; - path = fetchurl { - name = "css_color_names___css_color_names_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz"; - sha1 = "6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67"; - }; - } - { - name = "css_declaration_sorter___css_declaration_sorter_6.1.3.tgz"; + name = "css_declaration_sorter___css_declaration_sorter_6.1.4.tgz"; path = fetchurl { - name = "css_declaration_sorter___css_declaration_sorter_6.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz"; - sha1 = "e9852e4cf940ba79f509d9425b137d1f94438dc2"; + name = "css_declaration_sorter___css_declaration_sorter_6.1.4.tgz"; + url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz"; + sha1 = "b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4"; }; } { @@ -2018,19 +2026,19 @@ }; } { - name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.1.1.tgz"; + name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.4.1.tgz"; path = fetchurl { - name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.1.1.tgz"; - sha1 = "27bafa3b75054713565b2266c64b0228acd18634"; + name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz"; + sha1 = "ab78f781ced9181992fe7b6e4f3422e76429878f"; }; } { - name = "css_select___css_select_4.1.3.tgz"; + name = "css_select___css_select_4.2.1.tgz"; path = fetchurl { - name = "css_select___css_select_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz"; - sha1 = "a70440f70317f2669118ad74ff105e65849c7067"; + name = "css_select___css_select_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz"; + sha1 = "9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd"; }; } { @@ -2066,27 +2074,27 @@ }; } { - name = "cssnano_preset_default___cssnano_preset_default_5.1.4.tgz"; + name = "cssnano_preset_default___cssnano_preset_default_5.1.11.tgz"; path = fetchurl { - name = "cssnano_preset_default___cssnano_preset_default_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz"; - sha1 = "359943bf00c5c8e05489f12dd25f3006f2c1cbd2"; + name = "cssnano_preset_default___cssnano_preset_default_5.1.11.tgz"; + url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.11.tgz"; + sha1 = "db10fb1ecee310e8285c5aca45bd8237be206828"; }; } { - name = "cssnano_utils___cssnano_utils_2.0.1.tgz"; + name = "cssnano_utils___cssnano_utils_3.0.1.tgz"; path = fetchurl { - name = "cssnano_utils___cssnano_utils_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz"; - sha1 = "8660aa2b37ed869d2e2f22918196a9a8b6498ce2"; + name = "cssnano_utils___cssnano_utils_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.1.tgz"; + sha1 = "d3cc0a142d3d217f8736837ec0a2ccff6a89c6ea"; }; } { - name = "cssnano___cssnano_5.0.8.tgz"; + name = "cssnano___cssnano_5.0.16.tgz"; path = fetchurl { - name = "cssnano___cssnano_5.0.8.tgz"; - url = "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.8.tgz"; - sha1 = "39ad166256980fcc64faa08c9bb18bb5789ecfa9"; + name = "cssnano___cssnano_5.0.16.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.16.tgz"; + sha1 = "4ee97d30411693f3de24cef70b36f7ae2a843e04"; }; } { @@ -2098,11 +2106,11 @@ }; } { - name = "csstype___csstype_3.0.9.tgz"; + name = "csstype___csstype_3.0.10.tgz"; path = fetchurl { - name = "csstype___csstype_3.0.9.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz"; - sha1 = "6410af31b26bd0520933d02cbc64fce9ce3fbf0b"; + name = "csstype___csstype_3.0.10.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz"; + sha1 = "2ad3a7bed70f35b965707c092e5f30b327c290e5"; }; } { @@ -2138,11 +2146,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz"; - sha1 = "64368003512a1a6992593741a09a9d31a836f55d"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"; + sha1 = "b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"; }; } { @@ -2178,11 +2186,11 @@ }; } { - name = "debug___debug_4.3.2.tgz"; + name = "debug___debug_4.3.3.tgz"; path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha1 = "04266e0b70a98d4462e6e288e38259213332b664"; }; } { @@ -2322,11 +2330,11 @@ }; } { - name = "domhandler___domhandler_4.2.2.tgz"; + name = "domhandler___domhandler_4.3.0.tgz"; path = fetchurl { - name = "domhandler___domhandler_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz"; - sha1 = "e825d721d19a86b8c201a35264e226c678ee755f"; + name = "domhandler___domhandler_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz"; + sha1 = "16c658c626cf966967e306f966b431f77d4a5626"; }; } { @@ -2370,11 +2378,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.885.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.4.57.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.885.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.885.tgz"; - sha1 = "c8cec32fbc61364127849ae00f2395a1bae7c454"; + name = "electron_to_chromium___electron_to_chromium_1.4.57.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz"; + sha1 = "2b2766df76ac8dbc0a1d41249bc5684a31849892"; }; } { @@ -2530,27 +2538,27 @@ }; } { - name = "eslint_module_utils___eslint_module_utils_2.7.1.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz"; - sha1 = "b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"; + name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz"; + sha1 = "ad7e3a10552fdd0642e1e55292781bd6e34876ee"; }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.25.2.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.25.4.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.25.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz"; - sha1 = "b3b9160efddb702fc1636659e71ba1d10adbe9e9"; + name = "eslint_plugin_import___eslint_plugin_import_2.25.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz"; + sha1 = "322f3f916a4e9e991ac7af32032c25ce313209f1"; }; } { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.5.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_jsx_a11y___eslint_plugin_jsx_a11y_6.5.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz"; + sha1 = "cdbf2df901040ca140b6ec14715c988889c2a6d8"; }; } { @@ -2562,19 +2570,19 @@ }; } { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; path = fetchurl { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz"; - sha1 = "8c229c268d468956334c943bb45fc860280f5556"; + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz"; + sha1 = "318dbf312e06fab1c835a4abef00121751ac1172"; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.28.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz"; - sha1 = "41bcfe3e39e6a5ac040971c1af94437c80daa40e"; + name = "eslint_plugin_react___eslint_plugin_react_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz"; + sha1 = "8f3ff450677571a659ce76efc6d80b6a525adbdf"; }; } { @@ -2738,11 +2746,11 @@ }; } { - name = "fast_glob___fast_glob_3.2.7.tgz"; + name = "fast_glob___fast_glob_3.2.11.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.7.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; - sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; + name = "fast_glob___fast_glob_3.2.11.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz"; + sha1 = "a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"; }; } { @@ -2834,11 +2842,11 @@ }; } { - name = "flatted___flatted_3.2.2.tgz"; + name = "flatted___flatted_3.2.5.tgz"; path = fetchurl { - name = "flatted___flatted_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz"; - sha1 = "64bfed5cb68fe3ca78b3eb214ad97b63bedce561"; + name = "flatted___flatted_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; + sha1 = "76c8584f4fc843db64702a6bd04ab7a8bd666da3"; }; } { @@ -2850,11 +2858,11 @@ }; } { - name = "fraction.js___fraction.js_4.1.1.tgz"; + name = "fraction.js___fraction.js_4.1.2.tgz"; path = fetchurl { - name = "fraction.js___fraction.js_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.1.tgz"; - sha1 = "ac4e520473dae67012d618aab91eda09bcb400ff"; + name = "fraction.js___fraction.js_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz"; + sha1 = "13e420a92422b6cf244dff8690ed89401029fbe8"; }; } { @@ -3002,11 +3010,11 @@ }; } { - name = "globby___globby_11.0.4.tgz"; + name = "globby___globby_11.1.0.tgz"; path = fetchurl { - name = "globby___globby_11.0.4.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; - sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; + name = "globby___globby_11.1.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz"; + sha1 = "bd4be98bb042f83d796f7e3811991fbe82a0d34b"; }; } { @@ -3026,11 +3034,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha1 = "041b05df45755e587a24942279b9d113146e1c96"; }; } { @@ -3130,11 +3138,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; - sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha1 = "827b82867e9ff1c8d0c4d9d53880397d2c86d224"; }; } { @@ -3210,19 +3218,11 @@ }; } { - name = "ignore___ignore_5.1.8.tgz"; + name = "ignore___ignore_5.2.0.tgz"; path = fetchurl { - name = "ignore___ignore_5.1.8.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; - sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; - }; - } - { - name = "import_cwd___import_cwd_3.0.0.tgz"; - path = fetchurl { - name = "import_cwd___import_cwd_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz"; - sha1 = "20845547718015126ea9b3676b7592fb8bd4cf92"; + name = "ignore___ignore_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; + sha1 = "6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"; }; } { @@ -3234,14 +3234,6 @@ }; } { - name = "import_from___import_from_3.0.0.tgz"; - path = fetchurl { - name = "import_from___import_from_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz"; - sha1 = "055cfec38cd5a27d8057ca51376d7d3bf0891966"; - }; - } - { name = "import_lazy___import_lazy_4.0.0.tgz"; path = fetchurl { name = "import_lazy___import_lazy_4.0.0.tgz"; @@ -3250,11 +3242,11 @@ }; } { - name = "import_local___import_local_3.0.3.tgz"; + name = "import_local___import_local_3.1.0.tgz"; path = fetchurl { - name = "import_local___import_local_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz"; - sha1 = "4d51c2c495ca9393da259ec66b62e022920211e0"; + name = "import_local___import_local_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz"; + sha1 = "b4479df8a5fd44f6cdce24070675676063c95cb4"; }; } { @@ -3314,14 +3306,6 @@ }; } { - 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_alphabetical___is_alphabetical_1.0.4.tgz"; path = fetchurl { name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; @@ -3402,11 +3386,11 @@ }; } { - name = "is_core_module___is_core_module_2.8.0.tgz"; + name = "is_core_module___is_core_module_2.8.1.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz"; - sha1 = "0321336c3d0925e497fd97f5d95cb114a5ccd548"; + name = "is_core_module___is_core_module_2.8.1.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz"; + sha1 = "f59fdfca701d5879d0a6b100a40aa1560ce27211"; }; } { @@ -3458,11 +3442,11 @@ }; } { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; + sha1 = "7bf6f03a28003b8b3965de3ac26f664d765f3150"; }; } { @@ -3522,14 +3506,6 @@ }; } { - 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_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; path = fetchurl { name = "is_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; @@ -3578,11 +3554,11 @@ }; } { - name = "is_weakref___is_weakref_1.0.1.tgz"; + name = "is_weakref___is_weakref_1.0.2.tgz"; path = fetchurl { - name = "is_weakref___is_weakref_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz"; - sha1 = "842dba4ec17fa9ac9850df2d6efbc1737274f2a2"; + name = "is_weakref___is_weakref_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz"; + sha1 = "9529f383a9338205e89765e0392efc2f100f06f2"; }; } { @@ -3626,11 +3602,11 @@ }; } { - name = "jest_worker___jest_worker_27.3.1.tgz"; + name = "jest_worker___jest_worker_27.4.6.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_27.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.3.1.tgz"; - sha1 = "0def7feae5b8042be38479799aeb7b5facac24b2"; + name = "jest_worker___jest_worker_27.4.6.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz"; + sha1 = "5d2d93db419566cb680752ca0792780e71b3273e"; }; } { @@ -3794,19 +3770,19 @@ }; } { - name = "lilconfig___lilconfig_2.0.3.tgz"; + name = "lilconfig___lilconfig_2.0.4.tgz"; path = fetchurl { - name = "lilconfig___lilconfig_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz"; - sha1 = "68f3005e921dafbd2a2afb48379986aa6d2579fd"; + name = "lilconfig___lilconfig_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz"; + sha1 = "f4507d043d7058b380b6a8f5cb7bcd4b34cee082"; }; } { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha1 = "eca284f75d2965079309dc0ad9255abb2ebc1632"; }; } { @@ -3826,11 +3802,11 @@ }; } { - name = "loader_utils___loader_utils_2.0.1.tgz"; + name = "loader_utils___loader_utils_2.0.2.tgz"; path = fetchurl { - name = "loader_utils___loader_utils_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.1.tgz"; - sha1 = "3b8d4386f42378d6434d32d7bc08e7a52d39575e"; + name = "loader_utils___loader_utils_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz"; + sha1 = "d6e3b4fb81870721ae4e0868ab11dd638368c129"; }; } { @@ -3858,14 +3834,6 @@ }; } { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - path = fetchurl { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - } - { name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; path = fetchurl { name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; @@ -4082,27 +4050,19 @@ }; } { - name = "mime_db___mime_db_1.50.0.tgz"; + name = "mime_db___mime_db_1.51.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.50.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz"; - sha1 = "abd4ac94e98d3c0e185016c67ab45d5fde40c11f"; + name = "mime_db___mime_db_1.51.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; + sha1 = "d9ff62451859b18342d960850dc3cfb77e63fb0c"; }; } { - name = "mime_types___mime_types_2.1.33.tgz"; + name = "mime_types___mime_types_2.1.34.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.33.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz"; - sha1 = "1fa12a904472fafd068e48d9e8401f74d3f70edb"; - }; - } - { - name = "mime___mime_2.5.2.tgz"; - path = fetchurl { - name = "mime___mime_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; - sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; + name = "mime_types___mime_types_2.1.34.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; + sha1 = "5a712f9ec1503511a945803640fafe09d3793c24"; }; } { @@ -4178,6 +4138,14 @@ }; } { + name = "mrmime___mrmime_1.0.0.tgz"; + path = fetchurl { + name = "mrmime___mrmime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz"; + sha1 = "14d387f0585a5233d291baba339b063752a2398b"; + }; + } + { name = "ms___ms_2.0.0.tgz"; path = fetchurl { name = "ms___ms_2.0.0.tgz"; @@ -4202,19 +4170,11 @@ }; } { - name = "nanocolors___nanocolors_0.1.12.tgz"; - path = fetchurl { - name = "nanocolors___nanocolors_0.1.12.tgz"; - url = "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz"; - sha1 = "8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"; - }; - } - { - name = "nanoid___nanoid_3.1.30.tgz"; + name = "nanoid___nanoid_3.2.0.tgz"; path = fetchurl { - name = "nanoid___nanoid_3.1.30.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz"; - sha1 = "63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"; + name = "nanoid___nanoid_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz"; + sha1 = "62667522da6673971cca916a6d3eff3f415ff80c"; }; } { @@ -4338,11 +4298,11 @@ }; } { - name = "object_inspect___object_inspect_1.11.0.tgz"; + name = "object_inspect___object_inspect_1.12.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; - sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; + name = "object_inspect___object_inspect_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz"; + sha1 = "6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"; }; } { @@ -4466,14 +4426,6 @@ }; } { - name = "p_limit___p_limit_3.1.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; - sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; - }; - } - { name = "p_locate___p_locate_2.0.0.tgz"; path = fetchurl { name = "p_locate___p_locate_2.0.0.tgz"; @@ -4603,19 +4555,11 @@ }; } { - name = "picomatch___picomatch_2.3.0.tgz"; - path = fetchurl { - name = "picomatch___picomatch_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; - sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; - }; - } - { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; + name = "picomatch___picomatch_2.3.1.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 = "picomatch___picomatch_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz"; + sha1 = "3ba3833733646d9d3e4995946c1365a67fb07a42"; }; } { @@ -4627,59 +4571,59 @@ }; } { - name = "postcss_calc___postcss_calc_8.0.0.tgz"; + name = "postcss_calc___postcss_calc_8.2.3.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz"; - sha1 = "a05b87aacd132740a5db09462a3612453e5df90a"; + name = "postcss_calc___postcss_calc_8.2.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.3.tgz"; + sha1 = "53b95ce93de19213c2a5fdd71277a81690ef41d0"; }; } { - name = "postcss_colormin___postcss_colormin_5.2.0.tgz"; + name = "postcss_colormin___postcss_colormin_5.2.4.tgz"; path = fetchurl { - name = "postcss_colormin___postcss_colormin_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.0.tgz"; - sha1 = "2b620b88c0ff19683f3349f4cf9e24ebdafb2c88"; + name = "postcss_colormin___postcss_colormin_5.2.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.4.tgz"; + sha1 = "7726d3f3d24f111d39faff50a6500688225d5324"; }; } { - name = "postcss_convert_values___postcss_convert_values_5.0.1.tgz"; + name = "postcss_convert_values___postcss_convert_values_5.0.3.tgz"; path = fetchurl { - name = "postcss_convert_values___postcss_convert_values_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz"; - sha1 = "4ec19d6016534e30e3102fdf414e753398645232"; + name = "postcss_convert_values___postcss_convert_values_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.3.tgz"; + sha1 = "492db08a28af84d57651f10edc8f6c8fb2f6df40"; }; } { - name = "postcss_discard_comments___postcss_discard_comments_5.0.1.tgz"; + name = "postcss_discard_comments___postcss_discard_comments_5.0.2.tgz"; path = fetchurl { - name = "postcss_discard_comments___postcss_discard_comments_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz"; - sha1 = "9eae4b747cf760d31f2447c27f0619d5718901fe"; + name = "postcss_discard_comments___postcss_discard_comments_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.2.tgz"; + sha1 = "811ed34e2b6c40713daab0beb4d7a04125927dcd"; }; } { - name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.1.tgz"; + name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.2.tgz"; path = fetchurl { - name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz"; - sha1 = "68f7cc6458fe6bab2e46c9f55ae52869f680e66d"; + name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.2.tgz"; + sha1 = "61076f3d256351bdaac8e20aade730fef0609f44"; }; } { - name = "postcss_discard_empty___postcss_discard_empty_5.0.1.tgz"; + name = "postcss_discard_empty___postcss_discard_empty_5.0.2.tgz"; path = fetchurl { - name = "postcss_discard_empty___postcss_discard_empty_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz"; - sha1 = "ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8"; + name = "postcss_discard_empty___postcss_discard_empty_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.2.tgz"; + sha1 = "0676a9bcfc44bb00d338352a45ab80845a31d8f0"; }; } { - name = "postcss_discard_overridden___postcss_discard_overridden_5.0.1.tgz"; + name = "postcss_discard_overridden___postcss_discard_overridden_5.0.3.tgz"; path = fetchurl { - name = "postcss_discard_overridden___postcss_discard_overridden_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz"; - sha1 = "454b41f707300b98109a75005ca4ab0ff2743ac6"; + name = "postcss_discard_overridden___postcss_discard_overridden_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.3.tgz"; + sha1 = "004b9818cabb407e60616509267567150b327a3f"; }; } { @@ -4707,19 +4651,19 @@ }; } { - name = "postcss_load_config___postcss_load_config_3.1.0.tgz"; + name = "postcss_load_config___postcss_load_config_3.1.1.tgz"; path = fetchurl { - name = "postcss_load_config___postcss_load_config_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.0.tgz"; - sha1 = "d39c47091c4aec37f50272373a6a648ef5e97829"; + name = "postcss_load_config___postcss_load_config_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.1.tgz"; + sha1 = "2f53a17f2f543d9e63864460af42efdac0d41f87"; }; } { - name = "postcss_loader___postcss_loader_6.2.0.tgz"; + name = "postcss_loader___postcss_loader_6.2.1.tgz"; path = fetchurl { - name = "postcss_loader___postcss_loader_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.0.tgz"; - sha1 = "714370a3f567141cf4cadcdf9575f5234d186bc5"; + name = "postcss_loader___postcss_loader_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz"; + sha1 = "0895f7346b1702103d30fdc66e4d494a93c008ef"; }; } { @@ -4731,51 +4675,51 @@ }; } { - name = "postcss_merge_longhand___postcss_merge_longhand_5.0.2.tgz"; + name = "postcss_merge_longhand___postcss_merge_longhand_5.0.5.tgz"; path = fetchurl { - name = "postcss_merge_longhand___postcss_merge_longhand_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz"; - sha1 = "277ada51d9a7958e8ef8cf263103c9384b322a41"; + name = "postcss_merge_longhand___postcss_merge_longhand_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.5.tgz"; + sha1 = "cbc217ca22fb5a3e6ee22a6a1aa6920ec1f3c628"; }; } { - name = "postcss_merge_rules___postcss_merge_rules_5.0.2.tgz"; + name = "postcss_merge_rules___postcss_merge_rules_5.0.5.tgz"; path = fetchurl { - name = "postcss_merge_rules___postcss_merge_rules_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz"; - sha1 = "d6e4d65018badbdb7dcc789c4f39b941305d410a"; + name = "postcss_merge_rules___postcss_merge_rules_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.5.tgz"; + sha1 = "2a18669ec214019884a60f0a0d356803a8138366"; }; } { - name = "postcss_minify_font_values___postcss_minify_font_values_5.0.1.tgz"; + name = "postcss_minify_font_values___postcss_minify_font_values_5.0.3.tgz"; path = fetchurl { - name = "postcss_minify_font_values___postcss_minify_font_values_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz"; - sha1 = "a90cefbfdaa075bd3dbaa1b33588bb4dc268addf"; + name = "postcss_minify_font_values___postcss_minify_font_values_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.3.tgz"; + sha1 = "48c455c4cd980ecd07ac9bf3fc58e9d8a2ae4168"; }; } { - name = "postcss_minify_gradients___postcss_minify_gradients_5.0.2.tgz"; + name = "postcss_minify_gradients___postcss_minify_gradients_5.0.5.tgz"; path = fetchurl { - name = "postcss_minify_gradients___postcss_minify_gradients_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz"; - sha1 = "7c175c108f06a5629925d698b3c4cf7bd3864ee5"; + name = "postcss_minify_gradients___postcss_minify_gradients_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.5.tgz"; + sha1 = "a5572b9c98ed52cbd7414db24b873f8b9e418290"; }; } { - name = "postcss_minify_params___postcss_minify_params_5.0.1.tgz"; + name = "postcss_minify_params___postcss_minify_params_5.0.4.tgz"; path = fetchurl { - name = "postcss_minify_params___postcss_minify_params_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz"; - sha1 = "371153ba164b9d8562842fdcd929c98abd9e5b6c"; + name = "postcss_minify_params___postcss_minify_params_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.4.tgz"; + sha1 = "230a4d04456609e614db1d48c2eebc21f6490a45"; }; } { - name = "postcss_minify_selectors___postcss_minify_selectors_5.1.0.tgz"; + name = "postcss_minify_selectors___postcss_minify_selectors_5.1.2.tgz"; path = fetchurl { - name = "postcss_minify_selectors___postcss_minify_selectors_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz"; - sha1 = "4385c845d3979ff160291774523ffa54eafd5a54"; + name = "postcss_minify_selectors___postcss_minify_selectors_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.2.tgz"; + sha1 = "bc9698f713b9dab7f44f1ec30643fcbad9a043c0"; }; } { @@ -4819,99 +4763,99 @@ }; } { - name = "postcss_normalize_charset___postcss_normalize_charset_5.0.1.tgz"; + name = "postcss_normalize_charset___postcss_normalize_charset_5.0.2.tgz"; path = fetchurl { - name = "postcss_normalize_charset___postcss_normalize_charset_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz"; - sha1 = "121559d1bebc55ac8d24af37f67bd4da9efd91d0"; + name = "postcss_normalize_charset___postcss_normalize_charset_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.2.tgz"; + sha1 = "eb6130c8a8e950ce25f9ea512de1d9d6a6f81439"; }; } { - name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.1.tgz"; + name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.2.tgz"; path = fetchurl { - name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz"; - sha1 = "62650b965981a955dffee83363453db82f6ad1fd"; + name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.2.tgz"; + sha1 = "8b5273c6c7d0a445e6ef226b8a5bb3204a55fb99"; }; } { - name = "postcss_normalize_positions___postcss_normalize_positions_5.0.1.tgz"; + name = "postcss_normalize_positions___postcss_normalize_positions_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_positions___postcss_normalize_positions_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz"; - sha1 = "868f6af1795fdfa86fbbe960dceb47e5f9492fe5"; + name = "postcss_normalize_positions___postcss_normalize_positions_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.3.tgz"; + sha1 = "b63fcc4ff5fbf65934fafaf83270b2da214711d1"; }; } { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.1.tgz"; + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz"; - sha1 = "cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5"; + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.3.tgz"; + sha1 = "488c0ad8aac0fa4f66ef56cc8d604b3fd9bf705f"; }; } { - name = "postcss_normalize_string___postcss_normalize_string_5.0.1.tgz"; + name = "postcss_normalize_string___postcss_normalize_string_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_string___postcss_normalize_string_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz"; - sha1 = "d9eafaa4df78c7a3b973ae346ef0e47c554985b0"; + name = "postcss_normalize_string___postcss_normalize_string_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.3.tgz"; + sha1 = "49e0a1d58a119d5435ef21893ad03136a6e8f0e6"; }; } { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.1.tgz"; + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.2.tgz"; path = fetchurl { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz"; - sha1 = "8ee41103b9130429c6cbba736932b75c5e2cb08c"; + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.2.tgz"; + sha1 = "db4f4f49721f47667afd1fdc5edb032f8d9cdb2e"; }; } { - name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.1.tgz"; + name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz"; - sha1 = "82d672d648a411814aa5bf3ae565379ccd9f5e37"; + name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.3.tgz"; + sha1 = "10f0d30093598a58c48a616491cc7fa53256dd43"; }; } { - name = "postcss_normalize_url___postcss_normalize_url_5.0.2.tgz"; + name = "postcss_normalize_url___postcss_normalize_url_5.0.4.tgz"; path = fetchurl { - name = "postcss_normalize_url___postcss_normalize_url_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz"; - sha1 = "ddcdfb7cede1270740cf3e4dfc6008bd96abc763"; + name = "postcss_normalize_url___postcss_normalize_url_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.4.tgz"; + sha1 = "3b0322c425e31dd275174d0d5db0e466f50810fb"; }; } { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.1.tgz"; + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz"; - sha1 = "b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a"; + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.3.tgz"; + sha1 = "fb6bcc9ff2f834448b802657c7acd0956f4591d1"; }; } { - name = "postcss_ordered_values___postcss_ordered_values_5.0.2.tgz"; + name = "postcss_ordered_values___postcss_ordered_values_5.0.4.tgz"; path = fetchurl { - name = "postcss_ordered_values___postcss_ordered_values_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz"; - sha1 = "1f351426977be00e0f765b3164ad753dac8ed044"; + name = "postcss_ordered_values___postcss_ordered_values_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.4.tgz"; + sha1 = "f799dca87a7f17526d31a20085e61768d0b00534"; }; } { - name = "postcss_reduce_initial___postcss_reduce_initial_5.0.1.tgz"; + name = "postcss_reduce_initial___postcss_reduce_initial_5.0.2.tgz"; path = fetchurl { - name = "postcss_reduce_initial___postcss_reduce_initial_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz"; - sha1 = "9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946"; + name = "postcss_reduce_initial___postcss_reduce_initial_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz"; + sha1 = "fa424ce8aa88a89bc0b6d0f94871b24abe94c048"; }; } { - name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.1.tgz"; + name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.3.tgz"; path = fetchurl { - name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz"; - sha1 = "93c12f6a159474aa711d5269923e2383cedcf640"; + name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.3.tgz"; + sha1 = "df60fab34698a43073e8b87938c71df7a3b040ac"; }; } { @@ -4947,19 +4891,19 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.9.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; - sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.9.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz"; + sha1 = "ee71c3b9ff63d9cd130838876c13a2ec1a992b2f"; }; } { - name = "postcss_svgo___postcss_svgo_5.0.2.tgz"; + name = "postcss_svgo___postcss_svgo_5.0.3.tgz"; path = fetchurl { - name = "postcss_svgo___postcss_svgo_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.2.tgz"; - sha1 = "bc73c4ea4c5a80fbd4b45e29042c34ceffb9257f"; + name = "postcss_svgo___postcss_svgo_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.3.tgz"; + sha1 = "d945185756e5dfaae07f9edb0d3cae7ff79f9b30"; }; } { @@ -4971,11 +4915,11 @@ }; } { - name = "postcss_unique_selectors___postcss_unique_selectors_5.0.1.tgz"; + name = "postcss_unique_selectors___postcss_unique_selectors_5.0.3.tgz"; path = fetchurl { - name = "postcss_unique_selectors___postcss_unique_selectors_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz"; - sha1 = "3be5c1d7363352eff838bd62b0b07a0abad43bfc"; + name = "postcss_unique_selectors___postcss_unique_selectors_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.3.tgz"; + sha1 = "07fd116a8fbd9202e7030f7c4952e7b52c26c63d"; }; } { @@ -4987,11 +4931,11 @@ }; } { - name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; - sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; + sha1 = "723c09920836ba6d3e5af019f92bc0971c02e514"; }; } { @@ -5003,11 +4947,11 @@ }; } { - name = "postcss___postcss_8.3.11.tgz"; + name = "postcss___postcss_8.4.5.tgz"; path = fetchurl { - name = "postcss___postcss_8.3.11.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz"; - sha1 = "c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858"; + name = "postcss___postcss_8.4.5.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz"; + sha1 = "bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"; }; } { @@ -5059,11 +5003,11 @@ }; } { - name = "prop_types___prop_types_15.7.2.tgz"; + name = "prop_types___prop_types_15.8.1.tgz"; path = fetchurl { - name = "prop_types___prop_types_15.7.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + name = "prop_types___prop_types_15.8.1.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz"; + sha1 = "67d87bf1a694f48435cf332c24af10214a3140b5"; }; } { @@ -5075,11 +5019,11 @@ }; } { - name = "purgecss___purgecss_4.0.3.tgz"; + name = "purgecss___purgecss_4.1.3.tgz"; path = fetchurl { - name = "purgecss___purgecss_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/purgecss/-/purgecss-4.0.3.tgz"; - sha1 = "8147b429f9c09db719e05d64908ea8b672913742"; + name = "purgecss___purgecss_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.3.tgz"; + sha1 = "683f6a133c8c4de7aa82fe2746d1393b214918f7"; }; } { @@ -5291,11 +5235,11 @@ }; } { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.4.1.tgz"; path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; - sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz"; + sha1 = "b3f4c0059af9e47eca9f3f660e51d81307e72307"; }; } { @@ -5403,11 +5347,11 @@ }; } { - name = "resolve___resolve_1.20.0.tgz"; + name = "resolve___resolve_1.22.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; - sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + name = "resolve___resolve_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz"; + sha1 = "5e0b8c67c15df57a89bdbabe603a002f21731198"; }; } { @@ -5507,6 +5451,14 @@ }; } { + name = "schema_utils___schema_utils_4.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz"; + sha1 = "60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"; + }; + } + { name = "semver___semver_5.7.1.tgz"; path = fetchurl { name = "semver___semver_5.7.1.tgz"; @@ -5595,11 +5547,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.5.tgz"; + name = "signal_exit___signal_exit_3.0.6.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; - sha1 = "9e3e8cc0c75a99472b44321033a7702e7738252f"; + name = "signal_exit___signal_exit_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; + sha1 = "24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"; }; } { @@ -5611,11 +5563,11 @@ }; } { - name = "sirv___sirv_1.0.18.tgz"; + name = "sirv___sirv_1.0.19.tgz"; path = fetchurl { - name = "sirv___sirv_1.0.18.tgz"; - url = "https://registry.yarnpkg.com/sirv/-/sirv-1.0.18.tgz"; - sha1 = "105fab52fb656ce8a2bebbf36b11052005952899"; + name = "sirv___sirv_1.0.19.tgz"; + url = "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz"; + sha1 = "1d73979b38c7fe91fcba49c85280daa9c2363b49"; }; } { @@ -5643,19 +5595,19 @@ }; } { - name = "source_map_js___source_map_js_0.6.2.tgz"; + name = "source_map_js___source_map_js_1.0.2.tgz"; path = fetchurl { - name = "source_map_js___source_map_js_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; - sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; + name = "source_map_js___source_map_js_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz"; + sha1 = "adbc361d9c62df380125e7f161f71c826f1e490c"; }; } { - name = "source_map_support___source_map_support_0.5.20.tgz"; + name = "source_map_support___source_map_support_0.5.21.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.20.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz"; - sha1 = "12166089f8f5e5e8c56926b377633392dd2cb6c9"; + name = "source_map_support___source_map_support_0.5.21.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; + sha1 = "04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"; }; } { @@ -5707,11 +5659,11 @@ }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; - sha1 = "0d9becccde7003d6c658d487dd48a32f0bf3014b"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha1 = "50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"; }; } { @@ -5851,11 +5803,11 @@ }; } { - name = "stylehacks___stylehacks_5.0.1.tgz"; + name = "stylehacks___stylehacks_5.0.2.tgz"; path = fetchurl { - name = "stylehacks___stylehacks_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz"; - sha1 = "323ec554198520986806388c7fdaebc38d2c06fb"; + name = "stylehacks___stylehacks_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.2.tgz"; + sha1 = "fa10e5181c6e8dc0bddb4a3fb372e9ac42bba2ad"; }; } { @@ -5923,6 +5875,14 @@ }; } { + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; + path = fetchurl { + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha1 = "6eda4bd344a3c94aea376d4cc31bc77311039e09"; + }; + } + { name = "svg_tags___svg_tags_1.0.0.tgz"; path = fetchurl { name = "svg_tags___svg_tags_1.0.0.tgz"; @@ -5931,19 +5891,19 @@ }; } { - name = "svgo___svgo_2.7.0.tgz"; + name = "svgo___svgo_2.8.0.tgz"; path = fetchurl { - name = "svgo___svgo_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-2.7.0.tgz"; - sha1 = "e164cded22f4408fe4978f082be80159caea1e2d"; + name = "svgo___svgo_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz"; + sha1 = "4ff80cce6710dc2795f0c7c74101e6764cfccd24"; }; } { - name = "table___table_6.7.2.tgz"; + name = "table___table_6.8.0.tgz"; path = fetchurl { - name = "table___table_6.7.2.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz"; - sha1 = "a8d39b9f5966693ca8b0feba270a78722cbaf3b0"; + name = "table___table_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz"; + sha1 = "87e28f14fa4321c3377ba286f07b79b281a3b3ca"; }; } { @@ -5963,19 +5923,19 @@ }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_5.2.4.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_5.3.0.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_5.2.4.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz"; - sha1 = "ad1be7639b1cbe3ea49fab995cbe7224b31747a1"; + name = "terser_webpack_plugin___terser_webpack_plugin_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz"; + sha1 = "21641326486ecf91d8054161c816e464435bae9f"; }; } { - name = "terser___terser_5.9.0.tgz"; + name = "terser___terser_5.10.0.tgz"; path = fetchurl { - name = "terser___terser_5.9.0.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz"; - sha1 = "47d6e629a522963240f2b55fcaa3c99083d2c351"; + name = "terser___terser_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz"; + sha1 = "b86390809c0389105eb0a0b62397563096ddafcc"; }; } { @@ -6075,11 +6035,11 @@ }; } { - name = "tsconfig_paths___tsconfig_paths_3.11.0.tgz"; + name = "tsconfig_paths___tsconfig_paths_3.12.0.tgz"; path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.11.0.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz"; - sha1 = "954c1fe973da6339c78e06b03ce2e48810b65f36"; + name = "tsconfig_paths___tsconfig_paths_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz"; + sha1 = "19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"; }; } { @@ -6203,14 +6163,6 @@ }; } { - 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 = "unist_util_find_all_after___unist_util_find_all_after_3.0.2.tgz"; path = fetchurl { name = "unist_util_find_all_after___unist_util_find_all_after_3.0.2.tgz"; @@ -6291,14 +6243,6 @@ }; } { - 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 = "vfile_message___vfile_message_2.0.4.tgz"; path = fetchurl { name = "vfile_message___vfile_message_2.0.4.tgz"; @@ -6323,11 +6267,11 @@ }; } { - name = "watchpack___watchpack_2.2.0.tgz"; + name = "watchpack___watchpack_2.3.1.tgz"; path = fetchurl { - name = "watchpack___watchpack_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz"; - sha1 = "47d78f5415fe550ecd740f99fe2882323a58b1ce"; + name = "watchpack___watchpack_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz"; + sha1 = "4200d9447b401156eeca7767ee610f8809bc9d25"; }; } { @@ -6339,11 +6283,11 @@ }; } { - name = "webpack_cli___webpack_cli_4.9.1.tgz"; + name = "webpack_cli___webpack_cli_4.9.2.tgz"; path = fetchurl { - name = "webpack_cli___webpack_cli_4.9.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.1.tgz"; - sha1 = "b64be825e2d1b130f285c314caa3b1ba9a4632b3"; + name = "webpack_cli___webpack_cli_4.9.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz"; + sha1 = "77c1adaea020c3f9e2db8aad8ea78d235c83659d"; }; } { @@ -6443,11 +6387,11 @@ }; } { - name = "ws___ws_7.5.5.tgz"; + name = "ws___ws_7.5.6.tgz"; path = fetchurl { - name = "ws___ws_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz"; - sha1 = "8b4bc4af518cfabd0473ae4f99144287b33eb881"; + name = "ws___ws_7.5.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz"; + sha1 = "e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"; }; } { @@ -6483,14 +6427,6 @@ }; } { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - path = fetchurl { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; - sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; - }; - } - { name = "zwitch___zwitch_1.0.5.tgz"; path = fetchurl { name = "zwitch___zwitch_1.0.5.tgz"; diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 3b4af1b86a8..8eb1a9e7a87 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.272"; + version = "2.5.274"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz"; - sha256 = "sha256-30thDjmjc24tChgih0FZyIUU6/aKKl4MAD5yqn0yYa4="; + sha256 = "sha256-l3mvlC/DIJ2W3xLdwSV2gCRDdNGcg6OUW4e1IOihlyQ="; }; sourceRoot = "."; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 2a019d75e72..522acd29327 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-4cfRysJ202y1996TB/7jvlWO5K2vNJ70IjIkANXIpcQ="; + sha256 = "sha256-JtuCQM7uh4tmZrSwJj1Oh3hUzQKqKFxxWS11CDbvl+o="; }; postPatch = '' diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index d15bd024573..83ef9ea65e1 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/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-12-18"; + version = "2022-01-18"; pname = "oh-my-zsh"; - rev = "904f8685f75ff5dd3f544f8c6f2cabb8e5952e9a"; + rev = "22c11da108764336d92d03d3113c1f486cdb5911"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "Pos7LaNQllZrzBUx8a7QXi1sAVcIABQJOLUjIwGIP/U="; + sha256 = "Tnwy+3lCWjzDhjXtgLIiX3SxpJG6shxmmPFyeWkO2R0="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 333da40adbb..be5c6650557 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "13rc1afds5xg30faqz35haha4kxg73b5nvjirbrkc6kna0vhb54z"; + vendorSha256 = "1863ad97y82fx0an1ysalkxnqjz3zfz228wag9a92wdssl1vwzws"; doCheck = false; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 971be95e935..9884c219ff6 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -270,4 +270,25 @@ rec { allowSubstitutes = false; }); }); + + + /* Modify a stdenv so that it builds binaries with the specified list of + compilerFlags appended and passed to the compiler. + + This example would recompile every derivation on the system with + -funroll-loops and -O3 passed to each gcc invocation. + + Example: + nixpkgs.overlays = [ + (self: super: { + stdenv = super.withCFlags [ "-funroll-loops" "-O3" ] super.stdenv; + }) + ]; + */ + withCFlags = compilerFlags: stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { + NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; + }); + }); } diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 7a70accb723..44caa6838e8 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -119,13 +119,20 @@ let } ''; + # flakeNote will be printed in the remediation messages below. + flakeNote = " + Note: For `nix shell`, `nix build`, `nix develop` or any other Nix 2.4+ + (Flake) command, `--impure` must be passed in order to read this + environment variable. + "; + remediate_allowlist = allow_attr: rebuild_amendment: attrs: '' a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable for a single invocation of the nix tools. $ export ${remediation_env_var allow_attr}=1 - + ${flakeNote} b) For `nixos-rebuild` you can set { nixpkgs.config.allow${allow_attr} = true; } in configuration.nix to override this. @@ -148,7 +155,7 @@ let variable for a single invocation of the nix tools: $ export NIXPKGS_ALLOW_INSECURE=1 - + ${flakeNote} b) for `nixos-rebuild` you can add ‘${getName attrs}’ to `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, like so: diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index a6865961128..d4d62cf527d 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-5cBQFkagDfMb8xvEQgWlVbYp++mXIHl2p5TZuiaO4Rw="; }; - vendorSha256 = "sha256-iRJjN+fG5tFhMvHHR3pnWW8Y9VWopuKVv/AgivJC4Eo="; + vendorSha256 = "sha256-THqVvu5eJs1ZTUQ3JxGIt7IsoMhSkeMNicBGbkPz63A="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 7208e4e8cdd..ffb7b76cd48 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-KhAS8JUM6dobcSJ/QaRhxv2jNpn6AFqiDRCdxeKHwZE="; }; - vendorSha256 = "sha256-6eiJR7DRx3zYKT3B1wBTGSvPQwYw3815K1V/Y9aBX5E="; + vendorSha256 = "sha256-bUbStgIJeqzBkoSffJ8ZvqVtOMJ/mqxIIB/Fq9GhoXc="; doCheck = false; diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 322e3535b81..9f79db85928 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-GSdVwpYmJ3VnZaMQ8SjzcHpeefFjSaZXRcUAXEI9PKo="; }; - vendorSha256 = "sha256-RZ4cy9XHpWRP85G4A1/qYPjt/4CZ7pgECf+rsViPjGE="; + vendorSha256 = "sha256-4iQxqhXMGeMgHarjVY/rCLr7Am1mniqxTkMxbcp3fGI="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 2576208e8d2..436c6290626 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "yYzcziEKPSiMvw9LWd60MkHmYFAvN7Qza6Z117NOOv0="; }; - vendorSha256 = "0V9sHi/E095txnfF8YFW5O7o0e1H3sdn3tw5LqB92tI="; + vendorSha256 = "7cGVeja1YE96PEV1IRklyh6MeMDFAP+2TpYvvFkBYnQ="; # some tests require network access to scaleway's API, failing when sandboxed doCheck = false; diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 04f66eaba95..bbfeaf4867a 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-F1+goZURc0f1dWV/PGxSVtqHkuePACq4+UzfMTEVJ0M="; }; - vendorSha256 = "sha256-Duu6lP87KKLC1eGIebycBSIPw7FN6BBxPexize9+jPE="; + vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk="; subPackages = [ "cmd/stripe" diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 957ad7f51ef..47320eff779 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DH4vr6WiGwzT9zTMs/UqVoCHhpOSoT5t8P9plTPt8ZQ="; + sha256 = "sha256-6eOoFZ2ms1upnbO4brKYKBSPw/9cnQT1Cz/0A4dwoxc="; }; - vendorSha256 = "sha256-1m3izHfxMUvUiz21NRjqdNS95sXf8Rwlu5TuQ411190="; + vendorSha256 = "sha256-ZHVcLmjz7cfL5CjUwCEoWr5fgWZmNsCzHL83Mr+p7kA="; excludedPackages = "misc"; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index f5344a63f49..c93a750e48f 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -1,5 +1,14 @@ -{ stdenv, lib, fetchurl, p7zip }: - +{ stdenv, lib, fetchurl, p7zip, uasm, useUasm ? stdenv.isx86_64 }: + +let + inherit (stdenv.hostPlatform) system; + platformSuffix = + if useUasm then + { + x86_64-linux = "_x64"; + }.${system} or (throw "`useUasm` is not supported for system ${system}") + else ""; +in stdenv.mkDerivation rec { pname = "7zz"; version = "21.07"; @@ -11,19 +20,18 @@ stdenv.mkDerivation rec { sourceRoot = "CPP/7zip/Bundles/Alone2"; - # we need https://github.com/nidud/asmc/tree/master/source/asmc/linux in order - # to build with the optimized assembler but that doesn't support building with - # GCC: https://github.com/nidud/asmc/issues/8 - makefile = "../../cmpl_gcc.mak"; # "../../cmpl_gcc_x64.mak"; + makeFlags = lib.optionals useUasm [ "MY_ASM=uasm" ]; + + makefile = "../../cmpl_gcc${platformSuffix}.mak"; - nativeBuildInputs = [ p7zip ]; + nativeBuildInputs = [ p7zip ] ++ lib.optionals useUasm [ uasm ]; enableParallelBuilding = true; installPhase = '' runHook preInstall - install -Dm555 -t $out/bin b/g/7zz + install -Dm555 -t $out/bin b/g${platformSuffix}/7zz install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt runHook postInstall @@ -37,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line archiver utility"; - homepage = "https://7zip.org"; + homepage = "https://7-zip.org"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ anna328p peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index b94d514e8ec..0a62020b3ba 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -1,25 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, which, docutils, freetype, pango }: +{ lib +, stdenv +, fetchFromGitHub +, docutils +, pkg-config +, freetype +, pango +}: stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.12"; + version = "8.14.13"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "sha256-RELWtI+S2cbG7cXCehXymvWRdair28UaDZRVr5xt9Tk="; + hash = "sha256-31cEBtVn7GlNIsPkRiW0DyKA/giLeJ86EUZr8zjYy3s="; }; configureFlags = [ "--INSTALL=install" ]; - buildFlags = [ - "CC=${stdenv.cc}/bin/cc" - ]; - - nativeBuildInputs = [ which pkg-config docutils ]; + nativeBuildInputs = [ docutils pkg-config ]; buildInputs = [ freetype pango ]; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index d9c34c3fef7..7237ba880ce 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.01.13"; + version = "2022.01.28"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-jXXUdPAmU6JcnqWBnzc9tfjEyLSdYxZZJh4w4iSCD1w="; + hash = "sha256-+g5oKUfm6vRuRQfOx0QDueYMabgScL8Mfw5GJcXQztg="; }; meta = with lib; { diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 688906e684d..f08832b02ac 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -34,28 +34,28 @@ let tomlplusplus = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; - rev = "47216c8a73d77e7431ec536fb3e251aed06cc420"; - sha256 = "sha256-cwAzWu5j3ch/56a6JmEoKCsxVNTk6tiZswNdNT6qzX0="; + rev = "8e669aa6990e0ed219c169d491472d749f54c393"; + sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4="; }; # Derived from vst3.wrap vst3 = fetchFromGitHub { owner = "robbert-vdh"; repo = "vst3sdk"; - rev = "v3.7.3_build_20-patched"; + rev = "v3.7.4_build_25-patched"; fetchSubmodules = true; - sha256 = "sha256-m2y7No7BNbIjLNgdAqIAEr6UuAZZ/wwM2+iPWKK17gQ="; + sha256 = "sha256-oHRJZItw+he5M+beVZkUrhJir6rgFZ80ORzA73mJT2A="; }; in multiStdenv.mkDerivation rec { pname = "yabridge"; - version = "3.7.0"; + version = "3.8.0"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - sha256 = "sha256-dz7kScNrVUsjokJntzUCJzDIboqi3vQI+RpXl0UFmUQ="; + sha256 = "sha256-XacJjHxsp60/l36pFPGonUyOsyFF2lmqplAaisHXZDY="; }; # Unpack subproject sources diff --git a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch index 255b0eb88cb..9f6bc0c9a9d 100644 --- a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch +++ b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 8eae0442..ec0649da 100644 +index 95ecb728..cb30f3af 100644 --- a/meson.build +++ b/meson.build -@@ -196,6 +196,7 @@ if with_32bit_libraries or with_bitbridge +@@ -201,6 +201,7 @@ if with_32bit_libraries or with_bitbridge 'boost_filesystem', static : with_static_boost, dirs : [ @@ -10,7 +10,7 @@ index 8eae0442..ec0649da 100644 # Used by Arch based distros '/usr/local/lib32', '/usr/lib32', -@@ -219,7 +220,7 @@ if is_64bit_system +@@ -224,7 +225,7 @@ if is_64bit_system xcb_64bit_dep = dependency('xcb') endif if with_32bit_libraries or with_bitbridge @@ -20,7 +20,7 @@ index 8eae0442..ec0649da 100644 # These are all headers-only libraries, and thus won't require separate 32-bit diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index 6e32b4c9..f6eb09eb 100644 +index 1a457f03..20ca1e63 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp @@ -107,7 +107,7 @@ std::string PluginInfo::wine_version() const { diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 902734de0bd..d2e8438e0c9 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoSha256 = "sha256-/VREh/f4bAt2DXCqK0noEjn+4hcK5VZUn+gdbYbeAmk="; + cargoSha256 = "sha256-pwy2Q2HUCihr7W81hGvDm9EiZHk9G8knSy0yxPy6hl8="; patches = [ # By default, yabridgectl locates libyabridge.so by using diff --git a/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch b/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch index 7b8e10b2ba8..905068f75f8 100644 --- a/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch +++ b/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch @@ -1,5 +1,5 @@ diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs -index bc5ccfc4..c6d119bc 100644 +index bc5f6a81..0fcd38d3 100644 --- a/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs @@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet}; @@ -10,7 +10,7 @@ index bc5ccfc4..c6d119bc 100644 use std::path::{Path, PathBuf}; use which::which; use xdg::BaseDirectories; -@@ -233,34 +234,24 @@ impl Config { +@@ -235,34 +236,27 @@ impl Config { } } None => { @@ -20,6 +20,8 @@ index bc5ccfc4..c6d119bc 100644 - // in the error message when `libyabridge-vst2.so` can't be found. - let system_path = Path::new("/usr/lib"); + // Search through NIX_PROFILES & data home directory if no path was set explicitly. ++ // NIX_PROFILES is iterated in reverse from the most specific (the user profile) to ++ // the least specific (the system profile). + let nix_profiles = env::var("NIX_PROFILES"); let user_path = xdg_dirs.get_data_home(); - let lib_directories = [ @@ -35,6 +37,7 @@ index bc5ccfc4..c6d119bc 100644 - ]; + let lib_directories = nix_profiles.iter() + .flat_map(|profiles| profiles.split(' ') ++ .rev() + .map(|profile| Path::new(profile).join("lib"))) + .chain(iter::once(user_path.clone())); + @@ -56,12 +59,12 @@ index bc5ccfc4..c6d119bc 100644 )); } diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs -index 8c273f92..432619ec 100644 +index 48cce4fa..209e40e4 100644 --- a/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs -@@ -148,7 +148,7 @@ fn main() -> Result<()> { - .about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") - .long_about( +@@ -151,7 +151,7 @@ fn main() -> Result<()> { + .help("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") + .long_help( "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \ - is not set, then yabridgectl will look in both '/usr/lib' and \ + is not set, then yabridgectl will look through 'NIX_PROFILES' and \ diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 2b7a9b0faa9..e452f47bf5d 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGo117Module rec { pname = "kopia"; - version = "0.10.0"; + version = "0.10.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-445E+RiYlfDNOuw51Wdsavb52RjL3FkcrN9EeKmJ+Q8="; + sha256 = "sha256-FdLQI+MbGaO0Kj6icUmcvPzo3rC7mbHYC1xoGv/FzPk="; }; - vendorSha256 = "sha256-wq/9MUCeJBZjrg0SXgHYMyXodqIF3KLRHQmvi7gbv5M="; + vendorSha256 = "sha256-7QgD4kMiULE2G+/FIqe19kZGvJDEXBY27bEfxabD+ic="; doCheck = false; diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 7a7f442878c..0e6f5ad8834 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0vmcn3AOASjN61QzxxGYpPMWlukanh8+vbZQcFpU/vs="; + sha256 = "sha256-FqlSMTCKtcG2HOA6KaPYArK/rxHG9eJSQmNOWIzJzCs="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 9f5980a07e7..30283d560f8 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "snapraid"; - version = "12.0"; + version = "12.1"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "sha256-CcJaxnbRvGYiQjU38qnTgNyim5aDQWmxhQv16ZT1F00="; + sha256 = "sha256-DaFL5YxKdL7swfiWAHNufkeQ7mNd/MdZ6E0yAtC58lc="; }; VERSION = version; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 2767b4c7c0e..422b1148d05 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx-libpinyin"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz"; - sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; + sha256 = "1wvsc21imbgq3chlxfw4aycmkb2vi1bkjj9frvhga2m5b5pq82k5"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/tools/inputmethods/kime/default.nix b/pkgs/tools/inputmethods/kime/default.nix index 6cac37da7db..68a91d2bfca 100644 --- a/pkgs/tools/inputmethods/kime/default.nix +++ b/pkgs/tools/inputmethods/kime/default.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation rec { pname = "kime"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs="; + sha256 = "sha256-r5luI6B4IjNTbh2tzpqabokgwkmbyXrA61+F2HDEWuo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4="; + sha256 = "sha256-GvBnNPY51RPt+I73oet5tB/EE2UsEPKbelJZkSY3xNw="; }; # Replace autostart path diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 3d691033ccb..0028fa6b7b2 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2oHjx5RpuZmWcv954ZOrmHhOkQBfrDpEFqgiBFQfAuo="; + sha256 = "sha256-XyE8N+YVwfgxToKkhpe8zJ0e3HFDpKt7cfERxWCfbfU="; }; buildInputs = [ libX11 libXi libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "sha256-8w3muVJwDmFKY6AFKv/x6vS6jIyR7M/wlxzAvl5ROdE="; + vendorSha256 = "sha256-zTx38kW/ylXXML73C2sFQciV2y3+qbO0S/ZdkiEh5Qs="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index 735508fed21..aca0a6b687f 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "sha256-f3IdTk1GEo1GlbiJMCpqwheNJrndm7aCojA+GuKMTao="; + sha256 = "sha256-q+FLmu2JCDTJ6zC8blkd27jAKWbNpPyKzmUj1bW1mfA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 5eff549a651..8fd5c55c89f 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloudsql-proxy"; rev = "v${version}"; - sha256 = "sha256-xVPs7D639KY2ryDZpivineH4yZSNXi78FWk2SFKX1sk="; + sha256 = "sha256-XA74rZ477Mwf8u0KLkFngfwiJexS10vh++ST6VtkcVg="; }; subPackages = [ "cmd/cloud_sql_proxy" ]; - vendorSha256 = "sha256-913GJ/rPvDavQQMqDDTe4gBXziPPeQRPpUUG3DAz96g="; + vendorSha256 = "sha256-ZXWhADfzvHcEW3IZlPyau5nHEXBJRH8aTvb3zCKl/LE="; checkFlags = [ "-short" ]; diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 8d01cd2531a..9df8b37f703 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duf"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "sha256-Usdu7f3XPTIT39H23vfP0XBlvNPgPA+3BMyOzFOyLHQ="; + sha256 = "sha256-FZ4NplvCc1c+wPy1NSs2qwfWVtCPNHs6JquubGnwiEY="; }; - vendorSha256 = "sha256-6PV/v+rk63FIR2M0Q7EzqjVvWIwHtK6TQpEYxkXLQ50="; + vendorSha256 = "sha256-VLGsfazTD7hSNXPxuGJJwyqvUlqk5wuz8NqFHs/jyZc="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 3a5f1111992..e8d77f0e612 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.3.1"; + version = "8.3.2"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-1Fxkd37KoFkUYYeFTaCAtndCa00lZB2KptsKIwpIt2o="; + sha256 = "sha256-aNAV0FVZEqtTdgvnLiS1ixtsPU48rUOZdmj07MiMVKg="; }; - cargoSha256 = "sha256-qymlTuFnYMbldNDGVDpkLCC0QQK1il/LAXcIil5koCo="; + cargoSha256 = "sha256-A8MAgV7/6Vf+PaND+gaZz8IEq4Cw9ETEY+lF8R77lA4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index 27eb1275a2d..1afacc4b4b8 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "git-town"; - version = "7.6.0"; + version = "7.7.0"; goPackagePath = "github.com/git-town/git-town"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "sha256-yarJWIEIZuBcXXxltkiM7LwrEM8fveD3+JVoPGarhJQ="; + sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc="; }; ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 446f401dae6..5c1ef4b9f42 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QFb702/v+fSzPWJ+hIGAXqVYfLpecA4sOFM+r8QvdYE="; }; - vendorSha256 = "sha256-LZ2fVFvctLw/X2IX8p5/2D3qvoOYmGWhvef6HoeAGeE="; + vendorSha256 = "sha256-EPm+QNGCY3miuhdMETl98c9SQhcqvHbYeLUQQeI/IsM="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 7f5eef3b442..e52744223de 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-X41m7bCilDgnTMJy3ISz8g7dAtaz/lphwaCPZDGMDXk="; }; - vendorSha256 = "sha256-EKscJM8r1dbKRQPSZFwFqJYACkQynIS347460PuxQiU="; + vendorSha256 = "sha256-DvpdmURhOxDVFJiRtTGVw6u6y+s5XteT1owmdBJcKHA="; postInstall = '' mv $out/bin/cli $out/bin/gotify diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix new file mode 100644 index 00000000000..b89868460e2 --- /dev/null +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -0,0 +1,45 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "opentelemetry-collector-contrib"; + version = "0.43.0"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-collector-contrib"; + rev = "v${version}"; + sha256 = "sha256-ktzP+ugG2sa0v8B1Zp47o8Bmpxv98zQyFyWf9QfQRoQ="; + }; + # proxy vendor to avoid hash missmatches between linux and macOS + proxyVendor = true; + vendorSha256 = "sha256-0E52YSWlq1ebHA3kR9Qo/6ufug9R+z1cSD9AfbN/Mi0="; + + subPackages = [ "cmd/otelcontribcol" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/open-telemetry/opentelemetry-collector-contrib/internal/version.Version=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; + description = "OpenTelemetry Collector superset with additional community collectors"; + longDescription = '' + The OpenTelemetry Collector offers a vendor-agnostic implementation on how + to receive, process and export telemetry data. In addition, it removes the + need to run, operate and maintain multiple agents/collectors in order to + support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) + sending to multiple open-source or commercial back-ends. The Contrib + edition provides aditional vendor specific receivers/exporters and/or + components that are only useful to a relatively small number of users and + is multiple times larger as a result. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ uri-canva jk ]; + }; +} diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 6c83d72976d..e0abe89359e 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -1,30 +1,52 @@ { buildGoModule , fetchFromGitHub , lib +, writeScript }: +let + otelcontribcol = writeScript "otelcontribcol" '' + echo 'ERROR: otelcontribcol is now in `pkgs.opentelemetry-collector-contrib`, call the collector with `otelcorecol` or move to `pkgs.opentelemetry-collector-contrib`' >&2 + exit 1 + ''; +in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.40.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "open-telemetry"; - repo = "opentelemetry-collector-contrib"; + repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-YFgAS4WReyMnzb6FOeRUXHf1LUgknH5gWObiZNKMbv8="; + sha256 = "sha256-hYhJv5LbebUA9Sp8/admfKWXBoOVvXdr3Mzc3qG8GlM="; }; + # there is a nested go.mod + sourceRoot = "source/cmd/otelcorecol"; + vendorSha256 = "sha256-w5uyAVZ1TrurD4CEWTTk1fWmdlQn8eAFWZrNpISB5Rk="; - vendorSha256 = "sha256-DTZLYF3BoQGou59KaL56pkxySsoQ0xeJ5aF/SkewziE="; - proxyVendor = true; + preBuild = '' + # set the build version, can't be done via ldflags + sed -i -E 's/Version:(\s*)".*"/Version:\1"${version}"/' main.go + ''; - CGO_ENABLED = 0; + ldflags = [ "-s" "-w" ]; - subPackages = [ "cmd/otelcontribcol" ]; + postInstall = '' + cp ${otelcontribcol} $out/bin/otelcontribcol + ''; meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-collector"; - description = "OpenTelemetry Collector"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector/blob/v${version}/CHANGELOG.md"; + description = "OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data"; + longDescription = '' + The OpenTelemetry Collector offers a vendor-agnostic implementation on how + to receive, process and export telemetry data. In addition, it removes the + need to run, operate and maintain multiple agents/collectors in order to + support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) + sending to multiple open-source or commercial back-ends. + ''; license = licenses.asl20; - maintainers = [ maintainers.uri-canva ]; + maintainers = with maintainers; [ uri-canva jk ]; }; } diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index a94a4c9bd35..8d5d7356da5 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.03.11"; + version = "03.03.12"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-CCZ7CENeI8zNUgtBYesGWbqf53OCr9hBTN1ibegB4lo="; + sha256 = "sha256-1KpM2lobU+KsxjHpNeAxwAx3mCrU8IZyhvfYJwlUQJ4="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 2fb9553a7fe..048e8eb6008 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -3,6 +3,10 @@ , fetchFromGitHub , ffmpeg , yt-dlp +, libsecret +, python3 +, pkg-config +, nodejs , electron , makeWrapper , makeDesktopItem @@ -13,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-0moxrRxydH/g3J5cQmaFSDhTZh9OnUi8ncPVw7q1JC0="; + sha256 = "sha256-wQEP3fdp+Mhgoz873cgF65WouWtbEdCdXfLiVSmrjyA="; }; nativeBuildInputs = [ @@ -55,6 +59,34 @@ stdenvNoCC.mkDerivation rec { "--production" ]; + pkgConfig = { + keytar = { + nativeBuildInputs = [ + python3 + pkg-config + ]; + buildInputs = [ + libsecret + ]; + postInstall = '' + yarn --offline run build + # Remove unnecessary store path references. + rm build/config.gypi + ''; + }; + }; + + preBuild = '' + # Set up headers for node-gyp, which is needed to build keytar. + mkdir -p "$HOME/.cache/node-gyp/${nodejs.version}" + + # Set up version which node-gyp checks in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/lib/install.js#L87-L96> against the version in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/package.json#L15>. + echo 9 > "$HOME/.cache/node-gyp/${nodejs.version}/installVersion" + + # Link node headers so that node-gyp does not try to download them. + ln -sfv "${nodejs}/include" "$HOME/.cache/node-gyp/${nodejs.version}" + ''; + packageJSON = "${src}/package.json"; yarnLock = ./yarn.lock; yarnNix = ./yarndeps.nix; diff --git a/pkgs/tools/misc/sharedown/update.sh b/pkgs/tools/misc/sharedown/update.sh index 584cb8511a7..d08a258a6a8 100755 --- a/pkgs/tools/misc/sharedown/update.sh +++ b/pkgs/tools/misc/sharedown/update.sh @@ -1,9 +1,19 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update yarn yarn2nix-moretea.yarn2nix +#!nix-shell -i bash -p common-updater-scripts curl jq yarn yarn2nix-moretea.yarn2nix set -euo pipefail -nix-update sharedown +owner=kylon +repo=Sharedown +latestVersion=$(curl "https://api.github.com/repos/$owner/$repo/releases/latest" | jq -r '.tag_name') +currentVersion=$(nix-instantiate --eval --expr 'with import ./. {}; sharedown.version' | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" && "${BUMP_LOCK-}" != "1" ]]; then + # Skip update when already on the latest version. + exit 0 +fi + +update-source-version sharedown "$latestVersion" dirname="$(realpath "$(dirname "$0")")" sourceDir="$(nix-build -A sharedown.src --no-out-link)" diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock index 5b5638db505..58cfe65b3dd 100644 --- a/pkgs/tools/misc/sharedown/yarn.lock +++ b/pkgs/tools/misc/sharedown/yarn.lock @@ -109,14 +109,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "16.11.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz#2e3ad0a680d96367103d3e670d41c2fed3da61ae" - integrity sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA== + version "17.0.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab" + integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog== "@types/node@^14.6.2": - version "14.17.34" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz#fe4b38b3f07617c0fa31ae923fca9249641038f0" - integrity sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg== + version "14.18.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz#0e5944eefe2b287391279a19b407aa98bd14436d" + integrity sha512-j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q== "@types/plist@^3.0.1": version "3.0.2" @@ -137,9 +137,9 @@ integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== "@types/yargs@^17.0.1": - version "17.0.7" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz#44a484c634761da4391477515a98772b82b5060f" - integrity sha512-OvLKmpKdea1aWtqHv9bxVVcMoT6syAeK+198dfETIFkAevYRGwqh4H+KFxfjUETZuUuE5sQCAFwdOdoHUdo8eg== + version "17.0.8" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz#d23a3476fd3da8a0ea44b5494ca7fa677b9dad4c" + integrity sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw== dependencies: "@types/yargs-parser" "*" @@ -179,10 +179,10 @@ ansi-align@^3.0.0: dependencies: string-width "^4.1.0" -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= ansi-regex@^5.0.1: version "5.0.1" @@ -239,11 +239,24 @@ app-builder-lib@22.14.5: semver "^7.3.5" temp-file "^3.4.0" +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + arch@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== +are-we-there-yet@~1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -266,6 +279,11 @@ assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-exit-hook@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" @@ -440,9 +458,9 @@ cacheable-request@^6.0.0: responselike "^1.0.2" camelcase@^6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" - integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== chalk@^2.4.2: version "2.4.2" @@ -491,13 +509,13 @@ cli-boxes@^2.2.1: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== -cli-truncate@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086" - integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA== +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== dependencies: - slice-ansi "^1.0.0" - string-width "^2.0.0" + slice-ansi "^3.0.0" + string-width "^4.2.0" clipboardy@2.3.0: version "2.3.0" @@ -524,6 +542,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -612,6 +635,11 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -659,7 +687,14 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debug@4, debug@4.3.2, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + +debug@4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -680,6 +715,13 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== + dependencies: + mimic-response "^2.0.0" + deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -702,15 +744,25 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.901419: - version "0.0.901419" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd" - integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ== +devtools-protocol@0.0.937139: + version "0.0.937139" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz#bdee3751fdfdb81cb701fd3afa94b1065dafafcf" + integrity sha512-daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ== dir-compare@^2.4.0: version "2.4.0" @@ -737,17 +789,16 @@ dmg-builder@22.14.5: dmg-license "^1.0.9" dmg-license@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f" - integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q== + version "1.0.10" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz#89f52afae25d827fce8d818c13aff30af1c16bcc" + integrity sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A== dependencies: "@types/plist" "^3.0.1" "@types/verror" "^1.10.3" ajv "^6.10.0" - cli-truncate "^1.1.0" crc "^3.8.0" - iconv-corefoundation "^1.1.6" - plist "^3.0.1" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" smart-buffer "^4.0.2" verror "^1.10.0" @@ -780,7 +831,7 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@^22.13.1: +electron-builder@^22.14.5: version "22.14.5" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz#3a25547bd4fe3728d4704da80956a794c5c31496" integrity sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg== @@ -823,10 +874,10 @@ electron-publish@22.14.5: lazy-val "^1.0.5" mime "^2.5.2" -electron@^15.3.1: - version "15.3.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz#4f0cbad781d14e0194f5dfef1709e09a70c8074a" - integrity sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ== +electron@^16.0.6: + version "16.0.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz#87eaccd05ab61563d3c17dfbad2949bba7ead162" + integrity sha512-/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" @@ -892,6 +943,11 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + extract-zip@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -951,9 +1007,9 @@ find-up@^4.0.0: path-exists "^4.0.0" follow-redirects@^1.14.4: - version "1.14.5" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" - integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== font-awesome@^4.7.0: version "4.7.0" @@ -1007,6 +1063,20 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -1026,6 +1096,11 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + glob@^7.1.3, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -1092,9 +1167,9 @@ got@^9.6.0: url-parse-lax "^3.0.0" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -1111,15 +1186,20 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== hosted-git-info@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" - integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -1136,12 +1216,12 @@ https-proxy-agent@5.0.0: agent-base "6" debug "4" -iconv-corefoundation@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a" - integrity sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw== +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== dependencies: - cli-truncate "^1.1.0" + cli-truncate "^2.1.0" node-addon-api "^1.6.3" iconv-lite@^0.6.2: @@ -1213,10 +1293,12 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -1350,6 +1432,14 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" +keytar@^7.7.0: + version "7.7.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2" + integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A== + dependencies: + node-addon-api "^3.0.0" + prebuild-install "^6.0.0" + keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -1443,6 +1533,11 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1450,12 +1545,12 @@ minimatch@3.0.4, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp-classic@^0.5.2: +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== @@ -1477,16 +1572,33 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abi@^2.21.0: + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== + dependencies: + semver "^5.4.1" + node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== +node-addon-api@^3.0.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + node-fetch@2.6.5: version "2.6.5" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" @@ -1514,6 +1626,26 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + object-keys@^1.0.12: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -1602,7 +1734,7 @@ pkg-dir@4.2.0: dependencies: find-up "^4.0.0" -plist@^3.0.1: +plist@^3.0.1, plist@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== @@ -1610,6 +1742,25 @@ plist@^3.0.1: base64-js "^1.5.1" xmlbuilder "^9.0.7" +prebuild-install@^6.0.0: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^2.21.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -1655,13 +1806,13 @@ pupa@^2.1.1: dependencies: escape-goat "^2.0.0" -puppeteer@11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz#0808719c38e15315ecc1b1c28911f1c9054d201f" - integrity sha512-6rPFqN1ABjn4shgOICGDBITTRV09EjXVqhDERBDKwCLz0UyBxeeBH6Ay0vQUJ84VACmlxwzOIzVEJXThcF3aNg== +puppeteer@13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz#9cd9bb8ec090bade183ca186bf342396bdffa135" + integrity sha512-wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A== dependencies: debug "4.3.2" - devtools-protocol "0.0.901419" + devtools-protocol "0.0.937139" extract-zip "2.0.1" https-proxy-agent "5.0.0" node-fetch "2.6.5" @@ -1673,7 +1824,7 @@ puppeteer@11.0.0: unbzip2-stream "1.4.3" ws "8.2.3" -rc@^1.2.8: +rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -1694,7 +1845,7 @@ read-config-file@6.2.0: json5 "^2.2.0" lazy-val "^1.0.4" -readable-stream@^2.2.2: +readable-stream@^2.0.6, readable-stream@^2.2.2: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -1761,16 +1912,16 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" +safe-buffer@^5.0.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -1800,7 +1951,7 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -semver@^5.5.0: +semver@^5.4.1, semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -1824,6 +1975,11 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -1853,12 +2009,28 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== -slice-ansi@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" - integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" + integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== dependencies: - is-fullwidth-code-point "^2.0.0" + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" + +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" smart-buffer@^4.0.2: version "4.2.0" @@ -1888,15 +2060,16 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -string-width@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -1919,12 +2092,12 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: - ansi-regex "^3.0.0" + ansi-regex "^2.0.0" strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" @@ -1964,7 +2137,7 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -tar-fs@2.1.1: +tar-fs@2.1.1, tar-fs@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== @@ -2029,6 +2202,13 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + tunnel@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" @@ -2161,6 +2341,13 @@ which@^2.0.1: dependencies: isexe "^2.0.0" +wide-align@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + widest-line@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -2222,23 +2409,23 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== +yargs-parser@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" + integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== yargs@^17.0.1: - version "17.2.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea" - integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q== + version "17.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9" + integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA== dependencies: cliui "^7.0.2" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" - string-width "^4.2.0" + string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^20.2.2" + yargs-parser "^21.0.0" yauzl@^2.10.0: version "2.10.0" diff --git a/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/tools/misc/sharedown/yarndeps.nix index 046a6c71bad..153a9282427 100644 --- a/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/pkgs/tools/misc/sharedown/yarndeps.nix @@ -6,7 +6,7 @@ path = fetchurl { name = "7zip_bin___7zip_bin_5.1.1.tgz"; url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; - sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; + sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; }; } { @@ -14,7 +14,7 @@ path = fetchurl { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; - sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; + sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; }; } { @@ -22,7 +22,7 @@ path = fetchurl { name = "_electron_get___get_1.13.1.tgz"; url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz"; - sha1 = "42a0aa62fd1189638bd966e23effaebb16108368"; + sha512 = "U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA=="; }; } { @@ -30,7 +30,7 @@ path = fetchurl { name = "_electron_universal___universal_1.0.5.tgz"; url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; - sha1 = "b812340e4ef21da2b3ee77b2b4d35c9b86defe37"; + sha512 = "zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag=="; }; } { @@ -38,7 +38,7 @@ path = fetchurl { name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; - sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; + sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; } { @@ -46,7 +46,7 @@ path = fetchurl { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; - sha1 = "e8a32c30a95d20c2b1bb635cc580981a06389858"; + sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; }; } { @@ -54,7 +54,7 @@ path = fetchurl { name = "_sindresorhus_is___is_0.14.0.tgz"; url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; } { @@ -62,7 +62,7 @@ path = fetchurl { name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; } { @@ -70,7 +70,7 @@ path = fetchurl { name = "_tedconf_fessonia___fessonia_2.2.1.tgz"; url = "https://registry.yarnpkg.com/@tedconf/fessonia/-/fessonia-2.2.1.tgz"; - sha1 = "24499e69c3aeda4926670675b9fdfeb9ab15f19d"; + sha512 = "eX+O8P/xIkuCDeDI3IOIoyzuTJLVqbGnoBhLiBoFU7MwntF02ygQcByMinhUtXv2zm0pOSy6zeKoQTKAVBK60A=="; }; } { @@ -78,7 +78,7 @@ path = fetchurl { name = "_types_debug___debug_4.1.7.tgz"; url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; - sha1 = "7cc0ea761509124709b8b2d1090d8f6c17aadb82"; + sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; }; } { @@ -86,7 +86,7 @@ path = fetchurl { name = "_types_fs_extra___fs_extra_9.0.13.tgz"; url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha1 = "7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"; + sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; }; } { @@ -94,7 +94,7 @@ path = fetchurl { name = "_types_glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; - sha1 = "bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; } { @@ -102,7 +102,7 @@ path = fetchurl { name = "_types_minimatch___minimatch_3.0.5.tgz"; url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; - sha1 = "1001cc5e6a3704b83c236027e77f2f58ea010f40"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; } { @@ -110,23 +110,23 @@ path = fetchurl { name = "_types_ms___ms_0.7.31.tgz"; url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; - sha1 = "31b7ca6407128a3d2bbc27fe2d21b345397f6197"; + sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; } { - name = "_types_node___node_16.11.10.tgz"; + name = "_types_node___node_17.0.10.tgz"; path = fetchurl { - name = "_types_node___node_16.11.10.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz"; - sha1 = "2e3ad0a680d96367103d3e670d41c2fed3da61ae"; + name = "_types_node___node_17.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz"; + sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; }; } { - name = "_types_node___node_14.17.34.tgz"; + name = "_types_node___node_14.18.9.tgz"; path = fetchurl { - name = "_types_node___node_14.17.34.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz"; - sha1 = "fe4b38b3f07617c0fa31ae923fca9249641038f0"; + name = "_types_node___node_14.18.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz"; + sha512 = "j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q=="; }; } { @@ -134,7 +134,7 @@ path = fetchurl { name = "_types_plist___plist_3.0.2.tgz"; url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; - sha1 = "61b3727bba0f5c462fe333542534a0c3e19ccb01"; + sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; }; } { @@ -142,7 +142,7 @@ path = fetchurl { name = "_types_verror___verror_1.10.5.tgz"; url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; - sha1 = "2a1413aded46e67a1fe2386800e291123ed75eb1"; + sha512 = "9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw=="; }; } { @@ -150,15 +150,15 @@ path = fetchurl { name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha1 = "3b9ce2489919d9e4fea439b76916abc34b2df129"; + sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; } { - name = "_types_yargs___yargs_17.0.7.tgz"; + name = "_types_yargs___yargs_17.0.8.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz"; - sha1 = "44a484c634761da4391477515a98772b82b5060f"; + name = "_types_yargs___yargs_17.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz"; + sha512 = "wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw=="; }; } { @@ -166,7 +166,7 @@ path = fetchurl { name = "_types_yauzl___yauzl_2.9.2.tgz"; url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "c48e5d56aff1444409e39fa164b0b4d4552a7b7a"; + sha512 = "8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA=="; }; } { @@ -174,7 +174,7 @@ path = fetchurl { name = "agent_base___agent_base_6.0.2.tgz"; url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } { @@ -182,7 +182,7 @@ 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"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; } { @@ -190,7 +190,7 @@ path = fetchurl { name = "ajv___ajv_6.12.6.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } { @@ -198,15 +198,15 @@ path = fetchurl { name = "ansi_align___ansi_align_3.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha1 = "0cdf12e111ace773a86e9a1fad1225c43cb19a59"; + sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; } { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; + name = "ansi_regex___ansi_regex_2.1.1.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_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } { @@ -214,7 +214,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_5.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } { @@ -222,7 +222,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; } { @@ -230,7 +230,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_4.3.0.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; } { @@ -238,7 +238,7 @@ path = fetchurl { name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz"; - sha1 = "cb0825c5e12efc85b196ac3ed9c89f076c61040e"; + sha512 = "ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw=="; }; } { @@ -246,7 +246,15 @@ path = fetchurl { name = "app_builder_lib___app_builder_lib_22.14.5.tgz"; url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.5.tgz"; - sha1 = "a61a50b132b858e98fdc70b6b88994ae99b4f96d"; + sha512 = "k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg=="; + }; + } + { + 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"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; } { @@ -254,7 +262,15 @@ path = fetchurl { name = "arch___arch_2.2.0.tgz"; url = "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz"; - sha1 = "1bc47818f305764f23ab3306b0bfc086c5a29d11"; + sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; }; } { @@ -262,7 +278,7 @@ path = fetchurl { name = "argparse___argparse_2.0.1.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; } { @@ -270,7 +286,7 @@ path = fetchurl { name = "asar___asar_3.1.0.tgz"; url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; - sha1 = "70b0509449fe3daccc63beb4d3c7d2e24d3c6473"; + sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; }; } { @@ -278,7 +294,15 @@ 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"; + sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } { @@ -286,7 +310,7 @@ path = fetchurl { name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; - sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; + sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; }; } { @@ -294,7 +318,7 @@ path = fetchurl { name = "async___async_0.9.2.tgz"; url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; }; } { @@ -302,7 +326,7 @@ path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; }; } { @@ -310,7 +334,7 @@ path = fetchurl { name = "at_least_node___at_least_node_1.0.0.tgz"; url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; }; } { @@ -318,7 +342,7 @@ path = fetchurl { name = "axios___axios_0.24.0.tgz"; url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; - sha1 = "804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"; + sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; }; } { @@ -326,7 +350,7 @@ path = fetchurl { name = "balanced_match___balanced_match_1.0.2.tgz"; url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; } { @@ -334,7 +358,7 @@ path = fetchurl { name = "base64_js___base64_js_1.5.1.tgz"; url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } { @@ -342,7 +366,7 @@ path = fetchurl { name = "bl___bl_4.1.0.tgz"; url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; - sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; } { @@ -350,7 +374,7 @@ path = fetchurl { name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; - sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c"; + sha512 = "7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw=="; }; } { @@ -358,7 +382,7 @@ path = fetchurl { name = "bluebird___bluebird_3.7.2.tgz"; url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; } { @@ -366,7 +390,7 @@ path = fetchurl { name = "boolean___boolean_3.1.4.tgz"; url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz"; - sha1 = "f51a2fb5838a99e06f9b6ec1edb674de67026435"; + sha512 = "3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w=="; }; } { @@ -374,7 +398,7 @@ path = fetchurl { name = "bootstrap___bootstrap_5.1.3.tgz"; url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz"; - sha1 = "ba081b0c130f810fa70900acbc1c6d3c28fa8f34"; + sha512 = "fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q=="; }; } { @@ -382,7 +406,7 @@ path = fetchurl { name = "boxen___boxen_5.1.2.tgz"; url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha1 = "788cb686fc83c1f486dfa8a40c68fc2b831d2b50"; + sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; }; } { @@ -390,7 +414,7 @@ path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } { @@ -398,7 +422,7 @@ path = fetchurl { name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha1 = "bd7dc26ae2972d0eda253be061dba992349c19f0"; + sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; }; } { @@ -406,7 +430,7 @@ path = fetchurl { name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha1 = "890dd90d923a873e08e10e5fd51a57e5b7cce0ec"; + sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; }; } { @@ -414,7 +438,7 @@ path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; }; } { @@ -422,7 +446,7 @@ path = fetchurl { name = "buffer_equal___buffer_equal_1.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + sha1 = "WWFrSYME1Var1GaWayLu2j7KX74="; }; } { @@ -430,7 +454,7 @@ path = fetchurl { name = "buffer_fill___buffer_fill_1.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; + sha1 = "+PeLdniYiO858gXNY39o5wISKyw="; }; } { @@ -438,7 +462,7 @@ path = fetchurl { name = "buffer_from___buffer_from_1.1.2.tgz"; url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; } { @@ -446,7 +470,7 @@ path = fetchurl { name = "buffer___buffer_5.7.1.tgz"; url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; } { @@ -454,7 +478,7 @@ path = fetchurl { name = "builder_util_runtime___builder_util_runtime_8.9.1.tgz"; url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz"; - sha1 = "25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a"; + sha512 = "c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg=="; }; } { @@ -462,7 +486,7 @@ path = fetchurl { name = "builder_util___builder_util_22.14.5.tgz"; url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz"; - sha1 = "42a18608d2a566c0846e91266464776c8bfb0cc9"; + sha512 = "zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA=="; }; } { @@ -470,15 +494,15 @@ path = fetchurl { name = "cacheable_request___cacheable_request_6.1.0.tgz"; url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; } { - name = "camelcase___camelcase_6.2.1.tgz"; + name = "camelcase___camelcase_6.3.0.tgz"; path = fetchurl { - name = "camelcase___camelcase_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz"; - sha1 = "250fd350cfd555d0d2160b1d51510eaf8326e86e"; + name = "camelcase___camelcase_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; } { @@ -486,7 +510,7 @@ path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -494,7 +518,7 @@ path = fetchurl { name = "chalk___chalk_4.1.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; } { @@ -502,7 +526,7 @@ path = fetchurl { name = "charenc___charenc_0.0.2.tgz"; url = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz"; - sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + sha1 = "wKHS86cJLgN3S/qD8UwPxXkKhmc="; }; } { @@ -510,7 +534,7 @@ path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; - sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; } { @@ -518,7 +542,7 @@ path = fetchurl { name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + sha1 = "BKEGZywYsIWrd02YPfo+oTjyIgU="; }; } { @@ -526,7 +550,7 @@ path = fetchurl { name = "ci_info___ci_info_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; } { @@ -534,7 +558,7 @@ path = fetchurl { name = "ci_info___ci_info_3.3.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz"; - sha1 = "b4ed1fb6818dea4803a55c623041f9165d2066b2"; + sha512 = "riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="; }; } { @@ -542,15 +566,15 @@ path = fetchurl { name = "cli_boxes___cli_boxes_2.2.1.tgz"; url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; } { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; path = fetchurl { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz"; - sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; } { @@ -558,7 +582,7 @@ path = fetchurl { name = "clipboardy___clipboardy_2.3.0.tgz"; url = "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz"; - sha1 = "3c2903650c68e46a91b388985bc2774287dba290"; + sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; }; } { @@ -566,7 +590,7 @@ path = fetchurl { name = "cliui___cliui_7.0.4.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; } { @@ -574,7 +598,15 @@ path = fetchurl { name = "clone_response___clone_response_1.0.2.tgz"; url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + sha1 = "0dyXOSAxTfZ/vrlCI7TuNQI56Ws="; + }; + } + { + 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 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; }; } { @@ -582,7 +614,7 @@ path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; } { @@ -590,7 +622,7 @@ path = fetchurl { name = "color_convert___color_convert_2.0.1.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } { @@ -598,7 +630,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; }; } { @@ -606,7 +638,7 @@ path = fetchurl { name = "color_name___color_name_1.1.4.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } { @@ -614,7 +646,7 @@ path = fetchurl { name = "colors___colors_1.0.3.tgz"; url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + sha1 = "BDP0TYCWgP3rYO0mDxsMJi6CpAs="; }; } { @@ -622,7 +654,7 @@ 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"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; } { @@ -630,7 +662,7 @@ path = fetchurl { name = "commander___commander_2.9.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + sha1 = "nJkJQXbhIkDLItbFFGCYQA/g99Q="; }; } { @@ -638,7 +670,7 @@ path = fetchurl { name = "commander___commander_5.1.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; - sha1 = "46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; } { @@ -646,7 +678,7 @@ path = fetchurl { name = "compare_version___compare_version_0.1.2.tgz"; url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; - sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080"; + sha1 = "AWLsLZNR9d3VmpICy6k1NmpyUIA="; }; } { @@ -654,7 +686,7 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; }; } { @@ -662,7 +694,7 @@ 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"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; } { @@ -670,7 +702,7 @@ path = fetchurl { name = "config_chain___config_chain_1.1.13.tgz"; url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; } { @@ -678,7 +710,15 @@ path = fetchurl { name = "configstore___configstore_5.0.1.tgz"; url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; + }; + } + { + 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 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; }; } { @@ -686,7 +726,7 @@ 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"; + sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; }; } { @@ -694,7 +734,7 @@ path = fetchurl { name = "core_util_is___core_util_is_1.0.3.tgz"; url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; - sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } { @@ -702,7 +742,7 @@ path = fetchurl { name = "crc___crc_3.8.0.tgz"; url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; } { @@ -710,7 +750,7 @@ 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"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; } { @@ -718,7 +758,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } { @@ -726,7 +766,7 @@ path = fetchurl { name = "crypt___crypt_0.0.2.tgz"; url = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz"; - sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + sha1 = "iNf/fsDfuG9xPch7u0LQRNPmxBs="; }; } { @@ -734,7 +774,15 @@ path = fetchurl { name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; + sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; + }; + } + { + name = "debug___debug_4.3.3.tgz"; + path = fetchurl { + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; } { @@ -742,7 +790,7 @@ path = fetchurl { name = "debug___debug_4.3.2.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; } { @@ -750,7 +798,7 @@ path = fetchurl { name = "debug___debug_2.6.9.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; } { @@ -758,7 +806,15 @@ path = fetchurl { name = "decompress_response___decompress_response_3.3.0.tgz"; url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + sha1 = "gKTdMjdIOEv6JICDYirt7Jgq3/M="; + }; + } + { + name = "decompress_response___decompress_response_4.2.1.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; }; } { @@ -766,7 +822,7 @@ path = fetchurl { name = "deep_extend___deep_extend_0.6.0.tgz"; url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; } { @@ -774,7 +830,7 @@ path = fetchurl { name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; } { @@ -782,7 +838,7 @@ path = fetchurl { name = "define_properties___define_properties_1.1.3.tgz"; url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; } { @@ -790,7 +846,23 @@ 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"; + sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; + }; + } + { + 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 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; + }; + } + { + name = "detect_libc___detect_libc_1.0.3.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "+hN8S9aY7fVc1c0CrFWfkaTEups="; }; } { @@ -798,15 +870,15 @@ path = fetchurl { name = "detect_node___detect_node_2.1.0.tgz"; url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; - sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; + sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; } { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; - sha1 = "79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"; + name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz"; + sha512 = "daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ=="; }; } { @@ -814,7 +886,7 @@ path = fetchurl { name = "dir_compare___dir_compare_2.4.0.tgz"; url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; - sha1 = "785c41dc5f645b34343a4eafc50b79bac7f11631"; + sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; }; } { @@ -822,15 +894,15 @@ path = fetchurl { name = "dmg_builder___dmg_builder_22.14.5.tgz"; url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz"; - sha1 = "137c0b55e639badcc0b119eb060e6fa4ed61d948"; + sha512 = "1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w=="; }; } { - name = "dmg_license___dmg_license_1.0.9.tgz"; + name = "dmg_license___dmg_license_1.0.10.tgz"; path = fetchurl { - name = "dmg_license___dmg_license_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz"; - sha1 = "a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f"; + name = "dmg_license___dmg_license_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz"; + sha512 = "SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A=="; }; } { @@ -838,7 +910,7 @@ 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"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; } { @@ -846,7 +918,7 @@ path = fetchurl { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; + sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; }; } { @@ -854,7 +926,7 @@ path = fetchurl { name = "dotenv___dotenv_9.0.2.tgz"; url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; + sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; }; } { @@ -862,7 +934,7 @@ path = fetchurl { name = "duplexer3___duplexer3_0.1.4.tgz"; url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + sha1 = "7gHdHKwO08vH/b6jfcCo8c4ALOI="; }; } { @@ -870,7 +942,7 @@ path = fetchurl { name = "ejs___ejs_3.1.6.tgz"; url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; - sha1 = "5bfd0a0689743bb5268b3550cceeebbc1702822a"; + sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; } { @@ -878,7 +950,7 @@ path = fetchurl { name = "electron_builder___electron_builder_22.14.5.tgz"; url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz"; - sha1 = "3a25547bd4fe3728d4704da80956a794c5c31496"; + sha512 = "N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg=="; }; } { @@ -886,7 +958,7 @@ path = fetchurl { name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz"; - sha1 = "fc258c5e896859904bbe3d01da06902c04b51c3a"; + sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; }; } { @@ -894,15 +966,15 @@ path = fetchurl { name = "electron_publish___electron_publish_22.14.5.tgz"; url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz"; - sha1 = "34bcdce671f0e651330db20040d6919c77c94bd6"; + sha512 = "h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg=="; }; } { - name = "electron___electron_15.3.2.tgz"; + name = "electron___electron_16.0.7.tgz"; path = fetchurl { - name = "electron___electron_15.3.2.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz"; - sha1 = "4f0cbad781d14e0194f5dfef1709e09a70c8074a"; + name = "electron___electron_16.0.7.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz"; + sha512 = "/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w=="; }; } { @@ -910,7 +982,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_8.0.0.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } { @@ -918,7 +990,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; }; } { @@ -926,7 +998,7 @@ path = fetchurl { name = "end_of_stream___end_of_stream_1.4.4.tgz"; url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } { @@ -934,7 +1006,7 @@ path = fetchurl { name = "env_paths___env_paths_2.2.1.tgz"; url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; - sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; } { @@ -942,7 +1014,7 @@ path = fetchurl { name = "es6_error___es6_error_4.1.1.tgz"; url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; - sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; + sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; }; } { @@ -950,7 +1022,7 @@ path = fetchurl { name = "escalade___escalade_3.1.1.tgz"; url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } { @@ -958,7 +1030,7 @@ path = fetchurl { name = "escape_goat___escape_goat_2.1.1.tgz"; url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; }; } { @@ -966,7 +1038,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; }; } { @@ -974,7 +1046,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } { @@ -982,7 +1054,15 @@ path = fetchurl { name = "execa___execa_1.0.0.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + } + { + name = "expand_template___expand_template_2.0.3.tgz"; + path = fetchurl { + name = "expand_template___expand_template_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; } { @@ -990,7 +1070,7 @@ path = fetchurl { name = "extract_zip___extract_zip_2.0.1.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; - sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; }; } { @@ -998,7 +1078,7 @@ path = fetchurl { name = "extract_zip___extract_zip_1.7.0.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; - sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; }; } { @@ -1006,7 +1086,7 @@ path = fetchurl { name = "extsprintf___extsprintf_1.4.1.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; - sha1 = "8d172c064867f235c0c84a596806d279bf4bcc07"; + sha512 = "Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="; }; } { @@ -1014,7 +1094,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; } { @@ -1022,7 +1102,7 @@ path = fetchurl { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; } { @@ -1030,7 +1110,7 @@ path = fetchurl { name = "fd_slicer___fd_slicer_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; }; } { @@ -1038,7 +1118,7 @@ path = fetchurl { name = "filelist___filelist_1.0.2.tgz"; url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; - sha1 = "80202f21462d4d1c2e214119b1807c1bc0380e5b"; + sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; }; } { @@ -1046,15 +1126,15 @@ path = fetchurl { name = "find_up___find_up_4.1.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; } { - name = "follow_redirects___follow_redirects_1.14.5.tgz"; + name = "follow_redirects___follow_redirects_1.14.7.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.5.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz"; - sha1 = "f09a5848981d3c772b5392309778523f8d85c381"; + name = "follow_redirects___follow_redirects_1.14.7.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz"; + sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; }; } { @@ -1062,7 +1142,7 @@ 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"; + sha1 = "j6jPBBGhoxr9B7BtKQK7n8gVoTM="; }; } { @@ -1070,7 +1150,7 @@ path = fetchurl { name = "form_data___form_data_4.0.0.tgz"; url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; - sha1 = "93919daeaf361ee529584b9b31664dc12c9fa452"; + sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; } { @@ -1078,7 +1158,7 @@ path = fetchurl { name = "fs_constants___fs_constants_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; - sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; } { @@ -1086,7 +1166,7 @@ path = fetchurl { name = "fs_extra___fs_extra_10.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz"; - sha1 = "9ff61b655dde53fb34a82df84bb214ce802e17c1"; + sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; } { @@ -1094,7 +1174,7 @@ 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"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; } { @@ -1102,7 +1182,7 @@ path = fetchurl { name = "fs_extra___fs_extra_9.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; } { @@ -1110,7 +1190,15 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + }; + } + { + 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 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; }; } { @@ -1118,7 +1206,7 @@ path = fetchurl { name = "get_caller_file___get_caller_file_2.0.5.tgz"; url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } { @@ -1126,7 +1214,7 @@ 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"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; } { @@ -1134,7 +1222,15 @@ path = fetchurl { name = "get_stream___get_stream_5.2.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + } + { + name = "github_from_package___github_from_package_0.0.0.tgz"; + path = fetchurl { + name = "github_from_package___github_from_package_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "l/tdlr/eiXMxPyDoKI75oWf6ZM4="; }; } { @@ -1142,7 +1238,7 @@ path = fetchurl { name = "glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } { @@ -1150,7 +1246,7 @@ path = fetchurl { name = "global_agent___global_agent_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; - sha1 = "ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"; + sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } { @@ -1158,7 +1254,7 @@ path = fetchurl { name = "global_dirs___global_dirs_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha1 = "70a76fe84ea315ab37b1f5576cbde7d48ef72686"; + sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; }; } { @@ -1166,7 +1262,7 @@ path = fetchurl { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; - sha1 = "d03b5102dfde3a69914f5ee7d86761ca35d57d8f"; + sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; }; } { @@ -1174,7 +1270,7 @@ path = fetchurl { name = "globalthis___globalthis_1.0.2.tgz"; url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; - sha1 = "2a235d34f4d8036219f7e34929b5de9e18166b8b"; + sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ=="; }; } { @@ -1182,15 +1278,15 @@ path = fetchurl { name = "got___got_9.6.0.tgz"; url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; - sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; } { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; } { @@ -1198,7 +1294,7 @@ path = fetchurl { name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + sha1 = "TK+tdrxi8C+gObL5Tpo906ORpyU="; }; } { @@ -1206,7 +1302,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; }; } { @@ -1214,7 +1310,15 @@ path = fetchurl { name = "has_flag___has_flag_4.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + } + { + 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 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; }; } { @@ -1222,15 +1326,15 @@ path = fetchurl { name = "has_yarn___has_yarn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; } { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; - sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; }; } { @@ -1238,7 +1342,7 @@ path = fetchurl { name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; } { @@ -1246,15 +1350,15 @@ path = fetchurl { name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; } { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; path = fetchurl { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz"; - sha1 = "27c135470237f6f8d13462fa1f5eaf250523c29a"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; + sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; }; } { @@ -1262,7 +1366,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.6.3.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; } { @@ -1270,7 +1374,7 @@ path = fetchurl { name = "ieee754___ieee754_1.2.1.tgz"; url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } { @@ -1278,7 +1382,7 @@ path = fetchurl { name = "import_lazy___import_lazy_2.1.0.tgz"; url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + sha1 = "BWmOPUXIjo1+nZLLBYTnfwlvPkM="; }; } { @@ -1286,7 +1390,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; }; } { @@ -1294,7 +1398,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; }; } { @@ -1302,7 +1406,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -1310,7 +1414,7 @@ path = fetchurl { name = "ini___ini_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha1 = "e5fd556ecdd5726be978fa1001862eacb0a94bc5"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; } { @@ -1318,7 +1422,7 @@ path = fetchurl { name = "ini___ini_1.3.8.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha1 = "a29da425b48806f34767a4efce397269af28432c"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } { @@ -1326,7 +1430,7 @@ 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"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; } { @@ -1334,7 +1438,7 @@ 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"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; } { @@ -1342,7 +1446,7 @@ path = fetchurl { name = "is_ci___is_ci_3.0.1.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; - sha1 = "db6ecbed1bd659c43dac0f45661e7674103d1867"; + sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; }; } { @@ -1350,15 +1454,15 @@ path = fetchurl { name = "is_docker___is_docker_2.2.1.tgz"; url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; - sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; } { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.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_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; }; } { @@ -1366,7 +1470,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } { @@ -1374,7 +1478,7 @@ path = fetchurl { name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha1 = "9a0fd407949c30f86eb6959ef1b7994ed0b7b520"; + sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; }; } { @@ -1382,7 +1486,7 @@ path = fetchurl { name = "is_npm___is_npm_5.0.0.tgz"; url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha1 = "43e8d65cc56e1b67f8d47262cf667099193f45a8"; + sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; }; } { @@ -1390,7 +1494,7 @@ 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"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; } { @@ -1398,7 +1502,7 @@ path = fetchurl { name = "is_path_inside___is_path_inside_3.0.3.tgz"; url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; } { @@ -1406,7 +1510,7 @@ 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"; + sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; }; } { @@ -1414,7 +1518,7 @@ 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"; + sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; }; } { @@ -1422,7 +1526,7 @@ 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"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } { @@ -1430,7 +1534,7 @@ path = fetchurl { name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha1 = "d502d3382590ea3004893746754c89139973e232"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; }; } { @@ -1438,7 +1542,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; }; } { @@ -1446,7 +1550,7 @@ path = fetchurl { name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; - sha1 = "5d6def3edebf6e8ca8cae9c30183a804b5f8be80"; + sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; } { @@ -1454,7 +1558,7 @@ path = fetchurl { name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; - sha1 = "5d34b94865bd4946633ecc78a026fc76c5b11fcf"; + sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; }; } { @@ -1462,7 +1566,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; }; } { @@ -1470,7 +1574,7 @@ path = fetchurl { name = "iso8601_duration___iso8601_duration_1.3.0.tgz"; url = "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-1.3.0.tgz"; - sha1 = "29d7b69e0574e4acdee50c5e5e09adab4137ba5a"; + sha512 = "K4CiUBzo3YeWk76FuET/dQPH03WE04R94feo5TSKQCXpoXQt9E4yx2CnY737QZnSAI3PI4WlKo/zfqizGx52QQ=="; }; } { @@ -1478,7 +1582,7 @@ path = fetchurl { name = "jake___jake_10.8.2.tgz"; url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; - sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; }; } { @@ -1486,7 +1590,7 @@ path = fetchurl { name = "js_yaml___js_yaml_4.1.0.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; } { @@ -1494,7 +1598,7 @@ path = fetchurl { name = "json_buffer___json_buffer_3.0.0.tgz"; url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + sha1 = "Wx85evx11ne96Lz8Dkfh+aPZqJg="; }; } { @@ -1502,7 +1606,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; } { @@ -1510,7 +1614,7 @@ 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"; + sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; }; } { @@ -1518,7 +1622,7 @@ path = fetchurl { name = "json5___json5_2.2.0.tgz"; url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; - sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; } { @@ -1526,7 +1630,7 @@ path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; }; } { @@ -1534,7 +1638,15 @@ path = fetchurl { name = "jsonfile___jsonfile_6.1.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + } + { + name = "keytar___keytar_7.7.0.tgz"; + path = fetchurl { + name = "keytar___keytar_7.7.0.tgz"; + url = "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz"; + sha512 = "YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A=="; }; } { @@ -1542,7 +1654,7 @@ path = fetchurl { name = "keyv___keyv_3.1.0.tgz"; url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; - sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; } { @@ -1550,7 +1662,7 @@ path = fetchurl { name = "latest_version___latest_version_5.1.0.tgz"; url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; } { @@ -1558,7 +1670,7 @@ path = fetchurl { name = "lazy_val___lazy_val_1.0.5.tgz"; url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; - sha1 = "6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"; + sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; }; } { @@ -1566,7 +1678,7 @@ path = fetchurl { name = "locate_path___locate_path_5.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; } { @@ -1574,7 +1686,7 @@ path = fetchurl { name = "lodash___lodash_4.17.21.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } { @@ -1582,7 +1694,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; } { @@ -1590,7 +1702,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; } { @@ -1598,7 +1710,7 @@ path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } { @@ -1606,7 +1718,7 @@ 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"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; } { @@ -1614,7 +1726,7 @@ path = fetchurl { name = "matcher___matcher_3.0.0.tgz"; url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; - sha1 = "bd9060f4c5b70aa8041ccc6f80368760994f30ca"; + sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; }; } { @@ -1622,7 +1734,7 @@ path = fetchurl { name = "md5___md5_2.3.0.tgz"; url = "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz"; - sha1 = "c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"; + sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; }; } { @@ -1630,7 +1742,7 @@ path = fetchurl { name = "mime_db___mime_db_1.51.0.tgz"; url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; - sha1 = "d9ff62451859b18342d960850dc3cfb77e63fb0c"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; } { @@ -1638,7 +1750,7 @@ path = fetchurl { name = "mime_types___mime_types_2.1.34.tgz"; url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; - sha1 = "5a712f9ec1503511a945803640fafe09d3793c24"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; } { @@ -1646,7 +1758,7 @@ path = fetchurl { name = "mime___mime_2.6.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; - sha1 = "a2a682a95cd4d0cb1d6257e28f83da7e35800367"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; } { @@ -1654,7 +1766,15 @@ path = fetchurl { name = "mimic_response___mimic_response_1.0.1.tgz"; url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; - sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + } + { + name = "mimic_response___mimic_response_2.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; } { @@ -1662,7 +1782,7 @@ path = fetchurl { name = "minimatch___minimatch_3.0.4.tgz"; url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } { @@ -1670,7 +1790,7 @@ path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; } { @@ -1678,7 +1798,7 @@ path = fetchurl { name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; - sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; } { @@ -1686,7 +1806,7 @@ path = fetchurl { name = "mkdirp___mkdirp_0.5.5.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; } { @@ -1694,7 +1814,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } { @@ -1702,7 +1822,15 @@ path = fetchurl { name = "ms___ms_2.1.2.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + } + { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + path = fetchurl { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; } { @@ -1710,7 +1838,15 @@ 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"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + } + { + name = "node_abi___node_abi_2.30.1.tgz"; + path = fetchurl { + name = "node_abi___node_abi_2.30.1.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; } { @@ -1718,7 +1854,15 @@ path = fetchurl { name = "node_addon_api___node_addon_api_1.7.2.tgz"; url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; - sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; + sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; + }; + } + { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; }; } { @@ -1726,7 +1870,7 @@ path = fetchurl { name = "node_fetch___node_fetch_2.6.5.tgz"; url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; - sha1 = "42735537d7f080a7e5f78b6c549b7146be1742fd"; + sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; }; } { @@ -1734,7 +1878,7 @@ path = fetchurl { name = "normalize_url___normalize_url_4.5.1.tgz"; url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha1 = "0dd90cf1288ee1d1313b87081c9a5932ee48518a"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; } { @@ -1742,7 +1886,7 @@ path = fetchurl { name = "npm_conf___npm_conf_1.1.3.tgz"; url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; - sha1 = "256cc47bd0e218c259c4e9550bf413bc2192aff9"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; } { @@ -1750,7 +1894,31 @@ 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"; + sha1 = "NakjLfo11wZ7TLLd8jV7GHFTbF8="; + }; + } + { + 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"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + } + { + 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 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; + }; + } + { + 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 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; }; } { @@ -1758,7 +1926,7 @@ path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; } { @@ -1766,7 +1934,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; }; } { @@ -1774,7 +1942,7 @@ path = fetchurl { name = "p_cancelable___p_cancelable_1.1.0.tgz"; url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; } { @@ -1782,7 +1950,7 @@ 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"; + sha1 = "P7z7FbiZpEEjs0ttzBi3JDNqLK4="; }; } { @@ -1790,7 +1958,7 @@ path = fetchurl { name = "p_limit___p_limit_2.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; } { @@ -1798,7 +1966,7 @@ path = fetchurl { name = "p_locate___p_locate_4.1.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; } { @@ -1806,7 +1974,7 @@ path = fetchurl { name = "p_try___p_try_2.2.0.tgz"; url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } { @@ -1814,7 +1982,7 @@ path = fetchurl { name = "package_json___package_json_6.5.0.tgz"; url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; } { @@ -1822,7 +1990,7 @@ path = fetchurl { name = "path_exists___path_exists_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; } { @@ -1830,7 +1998,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } { @@ -1838,7 +2006,7 @@ 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"; + sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A="; }; } { @@ -1846,7 +2014,7 @@ path = fetchurl { name = "path_key___path_key_3.1.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } { @@ -1854,7 +2022,7 @@ path = fetchurl { name = "pend___pend_1.2.0.tgz"; url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; }; } { @@ -1862,7 +2030,7 @@ path = fetchurl { name = "pify___pify_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; }; } { @@ -1870,7 +2038,7 @@ path = fetchurl { name = "pkg_dir___pkg_dir_4.2.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; } { @@ -1878,7 +2046,15 @@ path = fetchurl { name = "plist___plist_3.0.4.tgz"; url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; - sha1 = "a62df837e3aed2bb3b735899d510c4f186019cbe"; + sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; + }; + } + { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; }; } { @@ -1886,7 +2062,7 @@ path = fetchurl { name = "prepend_http___prepend_http_2.0.0.tgz"; url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + sha1 = "6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="; }; } { @@ -1894,7 +2070,7 @@ 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"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; } { @@ -1902,7 +2078,7 @@ path = fetchurl { name = "progress___progress_2.0.3.tgz"; url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } { @@ -1910,7 +2086,7 @@ path = fetchurl { name = "proto_list___proto_list_1.2.4.tgz"; url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + sha1 = "IS1b/hMYMGpCD2QCuOJv85ZHqEk="; }; } { @@ -1918,7 +2094,7 @@ path = fetchurl { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; - sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; }; } { @@ -1926,7 +2102,7 @@ path = fetchurl { name = "pump___pump_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; } { @@ -1934,7 +2110,7 @@ path = fetchurl { name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; } { @@ -1942,15 +2118,15 @@ path = fetchurl { name = "pupa___pupa_2.1.1.tgz"; url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; } { - name = "puppeteer___puppeteer_11.0.0.tgz"; + name = "puppeteer___puppeteer_13.0.1.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz"; - sha1 = "0808719c38e15315ecc1b1c28911f1c9054d201f"; + name = "puppeteer___puppeteer_13.0.1.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz"; + sha512 = "wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A=="; }; } { @@ -1958,7 +2134,7 @@ path = fetchurl { name = "rc___rc_1.2.8.tgz"; url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; } { @@ -1966,7 +2142,7 @@ path = fetchurl { name = "read_config_file___read_config_file_6.2.0.tgz"; url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; - sha1 = "71536072330bcd62ba814f91458b12add9fc7ade"; + sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; }; } { @@ -1974,7 +2150,7 @@ path = fetchurl { name = "readable_stream___readable_stream_2.3.7.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } { @@ -1982,7 +2158,7 @@ path = fetchurl { name = "readable_stream___readable_stream_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } { @@ -1990,7 +2166,7 @@ path = fetchurl { name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; - sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; }; } { @@ -1998,7 +2174,7 @@ path = fetchurl { name = "registry_url___registry_url_5.1.0.tgz"; url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; } { @@ -2006,7 +2182,7 @@ path = fetchurl { name = "require_directory___require_directory_2.1.1.tgz"; url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; }; } { @@ -2014,7 +2190,7 @@ path = fetchurl { name = "responselike___responselike_1.0.2.tgz"; url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; }; } { @@ -2022,7 +2198,7 @@ path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; } { @@ -2030,23 +2206,23 @@ path = fetchurl { name = "roarr___roarr_2.15.4.tgz"; url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; - sha1 = "f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"; + sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; } { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; + name = "safe_buffer___safe_buffer_5.2.1.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"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; + name = "safe_buffer___safe_buffer_5.1.2.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_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; } { @@ -2054,7 +2230,7 @@ path = fetchurl { name = "safer_buffer___safer_buffer_2.1.2.tgz"; url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; } { @@ -2062,7 +2238,7 @@ path = fetchurl { name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; - sha1 = "755ebd752045931977e30b2025d340d7c9090378"; + sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; } { @@ -2070,7 +2246,7 @@ path = fetchurl { name = "sax___sax_1.2.4.tgz"; url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; } { @@ -2078,7 +2254,7 @@ path = fetchurl { name = "semver_compare___semver_compare_1.0.0.tgz"; url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w="; }; } { @@ -2086,7 +2262,7 @@ path = fetchurl { name = "semver_diff___semver_diff_3.1.1.tgz"; url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; }; } { @@ -2094,7 +2270,7 @@ path = fetchurl { name = "semver___semver_5.7.1.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; } { @@ -2102,7 +2278,7 @@ path = fetchurl { name = "semver___semver_6.3.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; } { @@ -2110,7 +2286,7 @@ path = fetchurl { name = "semver___semver_7.3.5.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } { @@ -2118,7 +2294,15 @@ path = fetchurl { name = "serialize_error___serialize_error_7.0.1.tgz"; url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; - sha1 = "f1360b0447f61ffb483ec4157c737fab7d778e18"; + sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; + }; + } + { + 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 = "BF+XgtARrppoA93TgrJDkrPYkPc="; }; } { @@ -2126,7 +2310,7 @@ 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"; + sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo="; }; } { @@ -2134,7 +2318,7 @@ path = fetchurl { name = "shebang_command___shebang_command_2.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; } { @@ -2142,7 +2326,7 @@ 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"; + sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM="; }; } { @@ -2150,7 +2334,7 @@ path = fetchurl { name = "shebang_regex___shebang_regex_3.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; } { @@ -2158,15 +2342,31 @@ path = fetchurl { name = "signal_exit___signal_exit_3.0.6.tgz"; url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; - sha1 = "24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"; + sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + }; + } + { + name = "simple_concat___simple_concat_1.0.1.tgz"; + path = fetchurl { + name = "simple_concat___simple_concat_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + } + { + name = "simple_get___simple_get_3.1.0.tgz"; + path = fetchurl { + name = "simple_get___simple_get_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; + sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; }; } { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; + name = "slice_ansi___slice_ansi_3.0.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha1 = "044f1a49d8842ff307aad6b505ed178bd950134d"; + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; }; } { @@ -2174,7 +2374,7 @@ path = fetchurl { name = "smart_buffer___smart_buffer_4.2.0.tgz"; url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha1 = "6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; } { @@ -2182,7 +2382,7 @@ path = fetchurl { name = "source_map_support___source_map_support_0.5.21.tgz"; url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; - sha1 = "04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; } { @@ -2190,7 +2390,7 @@ path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -2198,7 +2398,7 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.1.2.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; } { @@ -2206,15 +2406,15 @@ path = fetchurl { name = "stat_mode___stat_mode_1.0.0.tgz"; url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; - sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; + sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; }; } { - name = "string_width___string_width_2.1.1.tgz"; + name = "string_width___string_width_1.0.2.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_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; }; } { @@ -2222,7 +2422,7 @@ path = fetchurl { name = "string_width___string_width_4.2.3.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha1 = "269c7117d27b05ad2e536830a8ec895ef9c6d010"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } { @@ -2230,7 +2430,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -2238,15 +2438,15 @@ path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; + name = "strip_ansi___strip_ansi_3.0.1.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_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; }; } { @@ -2254,7 +2454,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_6.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha1 = "9e26c63d30f53443e9489495b2105d37b67a85d9"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } { @@ -2262,7 +2462,7 @@ 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"; + sha1 = "u0P/VZim6wXYm1n80SnJgzE2Br8="; }; } { @@ -2270,7 +2470,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; }; } { @@ -2278,7 +2478,7 @@ path = fetchurl { name = "sumchecker___sumchecker_3.0.1.tgz"; url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; - sha1 = "6377e996795abb0b6d348e9b3e1dfb24345a8e42"; + sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; }; } { @@ -2286,7 +2486,7 @@ path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; } { @@ -2294,7 +2494,7 @@ path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; } { @@ -2302,7 +2502,7 @@ path = fetchurl { name = "tar_fs___tar_fs_2.1.1.tgz"; url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; - sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; }; } { @@ -2310,7 +2510,7 @@ path = fetchurl { name = "tar_stream___tar_stream_2.2.0.tgz"; url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; - sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; }; } { @@ -2318,7 +2518,7 @@ path = fetchurl { name = "temp_file___temp_file_3.4.0.tgz"; url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; - sha1 = "766ea28911c683996c248ef1a20eea04d51652c7"; + sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; }; } { @@ -2326,7 +2526,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; }; } { @@ -2334,7 +2534,7 @@ path = fetchurl { name = "tmp_promise___tmp_promise_3.0.3.tgz"; url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; - sha1 = "60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"; + sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; }; } { @@ -2342,7 +2542,7 @@ path = fetchurl { name = "tmp___tmp_0.2.1.tgz"; url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; - sha1 = "8457fc3037dcf4719c251367a1af6500ee1ccf14"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; }; } { @@ -2350,7 +2550,7 @@ path = fetchurl { name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; }; } { @@ -2358,7 +2558,7 @@ path = fetchurl { name = "tr46___tr46_0.0.3.tgz"; url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + sha1 = "gYT9NH2snNwYWZLzpmIuFLnZq2o="; }; } { @@ -2366,7 +2566,15 @@ path = fetchurl { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + sha1 = "QFkjkJWS1W94pYGENLC3hInKXys="; + }; + } + { + 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 = "J6XeoGs2sEoKmWZ3SykIaPD8QP0="; }; } { @@ -2374,7 +2582,7 @@ path = fetchurl { name = "tunnel___tunnel_0.0.6.tgz"; url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c"; + sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; }; } { @@ -2382,7 +2590,7 @@ path = fetchurl { name = "type_fest___type_fest_0.13.1.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; - sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; } { @@ -2390,7 +2598,7 @@ path = fetchurl { name = "type_fest___type_fest_0.20.2.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; } { @@ -2398,7 +2606,7 @@ 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"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; } { @@ -2406,7 +2614,7 @@ path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; }; } { @@ -2414,7 +2622,7 @@ path = fetchurl { name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; - sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; + sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; } { @@ -2422,7 +2630,7 @@ path = fetchurl { name = "unique_string___unique_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; + sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; }; } { @@ -2430,7 +2638,7 @@ path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; } { @@ -2438,7 +2646,7 @@ path = fetchurl { name = "universalify___universalify_2.0.0.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } { @@ -2446,7 +2654,7 @@ path = fetchurl { name = "update_notifier___update_notifier_5.1.0.tgz"; url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha1 = "4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"; + sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; } { @@ -2454,7 +2662,7 @@ path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; } { @@ -2462,7 +2670,7 @@ path = fetchurl { name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + sha1 = "FrXK/Afb42dsGxmZF3gj1lA6yww="; }; } { @@ -2470,7 +2678,7 @@ path = fetchurl { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + sha1 = "9F8VDExm7uloGGUFq5P8u4rWv2E="; }; } { @@ -2478,7 +2686,7 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; }; } { @@ -2486,7 +2694,7 @@ path = fetchurl { name = "verror___verror_1.10.1.tgz"; url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; - sha1 = "4bf09eeccf4563b109ed4b3d458380c972b0cdeb"; + sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; }; } { @@ -2494,7 +2702,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha1 = "JFNCdeKnvGvnvIZhHMFq4KVlSHE="; }; } { @@ -2502,7 +2710,7 @@ path = fetchurl { name = "whatwg_url___whatwg_url_5.0.0.tgz"; url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + sha1 = "lmRU6HZUYuN2RNNib2dCzotwll0="; }; } { @@ -2510,7 +2718,7 @@ path = fetchurl { name = "which___which_1.3.1.tgz"; url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; } { @@ -2518,7 +2726,15 @@ path = fetchurl { name = "which___which_2.0.2.tgz"; url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + } + { + name = "wide_align___wide_align_1.1.5.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; } { @@ -2526,7 +2742,7 @@ path = fetchurl { name = "widest_line___widest_line_3.1.0.tgz"; url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; } { @@ -2534,7 +2750,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } { @@ -2542,7 +2758,7 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } { @@ -2550,7 +2766,7 @@ 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"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; } { @@ -2558,7 +2774,7 @@ path = fetchurl { name = "ws___ws_8.2.3.tgz"; url = "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz"; - sha1 = "63a56456db1b04367d0b721a0b80cae6d8becbba"; + sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; }; } { @@ -2566,7 +2782,7 @@ path = fetchurl { name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; }; } { @@ -2574,7 +2790,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; - sha1 = "9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"; + sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; }; } { @@ -2582,7 +2798,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + sha1 = "Ey7mPS7FVlxVfiD0wi35rKaGsQ0="; }; } { @@ -2590,7 +2806,7 @@ path = fetchurl { name = "y18n___y18n_5.0.8.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; } { @@ -2598,23 +2814,23 @@ path = fetchurl { name = "yallist___yallist_4.0.0.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; + name = "yargs_parser___yargs_parser_21.0.0.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + name = "yargs_parser___yargs_parser_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA=="; }; } { - name = "yargs___yargs_17.2.1.tgz"; + name = "yargs___yargs_17.3.1.tgz"; path = fetchurl { - name = "yargs___yargs_17.2.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz"; - sha1 = "e2c95b9796a0e1f7f3bf4427863b42e0418191ea"; + name = "yargs___yargs_17.3.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz"; + sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; }; } { @@ -2622,7 +2838,7 @@ path = fetchurl { name = "yauzl___yauzl_2.10.0.tgz"; url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; }; } ]; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 68e828a07b1..554822ba8de 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,17 @@ buildGoModule rec { pname = "steampipe"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-vDyox8UArgK27FkNFK3SNksvOmpaRgZ/ueZgqO7MOl0="; + sha256 = "sha256-xLw3y9DYkei0MoErsMpSDhEK73lK9b13st+DqHvvhys="; }; - vendorSha256 = "sha256-ikmcayOy87u6XMYjxxzFv35Rlp9oTteEKFOPr/+xc2Y="; + vendorSha256 = "sha256-hqjjwYBVnuw7Bt2901tPIkfvYLy955IdeMbeSWTjtL0="; + proxyVendor = true; # tests are failing for no obvious reasons doCheck = false; diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 0a51eda4857..ec42cf7136e 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-bCTlKhYmMe89dYuLiZ58CPpYZiXSGqbddxugsZS5/Cs="; }; - vendorSha256 = "sha256-1VRK8tmsbOuP5t5uJ1h+KPcS4K9D+y6UQKeUP2HPXrQ="; + vendorSha256 = "sha256-X6iVbljbHb9nBoXAZuy+vG8w7Alct+8BkabZlJeuUAM="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/tools/misc/tz/default.nix index 8148dfdec70..30e2fa3ece2 100644 --- a/pkgs/tools/misc/tz/default.nix +++ b/pkgs/tools/misc/tz/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-D0rakLZ+swrDwBMcr+EJPgaYsQTWob50QteW1PoIdNk="; }; - vendorSha256 = "sha256-gMHPWf/kFb55GyyMciLWRzvrQXUGDQ72RNkIhkMVe54="; + vendorSha256 = "sha256-PGsj7pLtd+xpy9Dhv6qJX5sHin4YAOdXaYj4QCSFte4="; meta = with lib; { description = "A time zone helper"; diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix index 4b65a63431b..f882ce4b5be 100644 --- a/pkgs/tools/misc/viddy/default.nix +++ b/pkgs/tools/misc/viddy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-V/x969wi5u5ND9QgJfc4vtI2t1G1ETlATzeqnpHMncc="; }; - vendorSha256 = "sha256-iSgFDTNeRPpCMxNqj2LhYV+6/eskGa58e+rT0Nhg+pE="; + vendorSha256 = "sha256-LtRHnZF0ynnIp77K9anljqq42BumXohDMwlU7hzSxZk="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index d0a6114316f..71d67ed7489 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "vivid"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2rdNjpJrBuj6toLFzFJScNh6od5qUhkSaZF+NbPBlQA="; + sha256 = "sha256-83ff0T2P5aRQ6cM9z7IEuoi7syvJldIuzzdiTrygckA="; }; - cargoSha256 = "sha256-1aox1eiF3hu5guBjRcM3qb6mHJOutI+yargW7X4cFfg="; + cargoSha256 = "sha256-W1tLQTTMOKB/BR9P3y3goPIdOe12Qdkf4wYPlhbQjzY="; meta = with lib; { description = "A generator for LS_COLORS with support for multiple color themes"; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 8851a4a8740..fb4a7f32f46 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.7.1"; + version = "0.7.3"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-5m5ckeX3gVY82q9aQWusnq3o/+UBPJSPDdISL86OfV8="; - aarch64-linux = "sha256-+dnQh89kg3JcDL8sucMceCMRFyUjoAIYuZtDM8AUMYw="; - x86_64-darwin = "sha256-ZoWW8y048+5Ru3s7lUxLTMxuITFBC9AgwqafyHPDc54="; + x86_64-linux = "sha256-9WEvGU4VfJ1781DlvdJhpdzY4djoSRWu6ZzfOpBvKJQ="; + aarch64-linux = "sha256-QLjewB1FeYHVehM1U81GzyewWns40IlVEFWgzWP+2Vw="; + x86_64-darwin = "sha256-YxPkZnU8EBvRWBMsB0jifS63tJ7LQibgtwTbqosC/fg="; }; in fetchzip { diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 73a39c8e544..82a418d5de9 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-sSXl2I5vZ8PVLaZWlMl5phcqQ1k1OBy5v+X0O8nHtvw="; }; - vendorSha256 = "sha256-4XA7B0gmFE52VoKiPLsa0urPS7IdzrTBXuU4wZv/Lag="; + vendorSha256 = "sha256-aiqnJ1PjrwSC6YtixNvyTxgbs8z2radcETNhKHGlPk0="; # Requires network doCheck = false; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 81fe5cacda2..03962f1e9e2 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.3.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "0sf2r4q57hwdakv0b4skn76b0xy7bwj2j9rpj6frs5fkk6gsi6sm"; + sha256 = "sha256-23f+WJcTf+x9GW+hGUU3/j4Qi9MfcsfQuS7aEU4uGU4="; }; - vendorSha256 = "123f9y1pfayfd5amkw5b8jzi8dbn7a16kbf7lzbmw69c1gj4gx9z"; + vendorSha256 = "sha256-SSa+yBZjZ+5vRfzfCtNhF+kRyJ/VMgd9uWqKPwIi8+Y="; doCheck = false; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 57b2f8be52c..cb39de338ab 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-BgUurfzgezbbH0pCTuRINocc5y6ANCM91VlWht86QeE="; }; - vendorSha256 = "sha256-MstlmaMEbbAY9+h5pNVCXqDOqoSv5hjuRSFS/MTg6lo="; + vendorSha256 = "sha256-QVLl78X5gYuD1QgmHlpHz+yTfQF9VyDnhx7eMclqxyY="; doCheck = false; @@ -19,7 +19,8 @@ buildGoModule rec { passthru = { tests = { - local-relay = callPackage ./test-local-relay.nix { }; + # test fails + #local-relay = callPackage ./test-local-relay.nix { }; }; }; meta = with lib; { diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 3bb1ab38e6b..4b8add57b2d 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.15.1"; + version = "0.16.1"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "1p4rz4kdiif8i78zgxhw6dd0c1bq159f6l1idvig5apph7zi2bwm"; + sha256 = "sha256-5NrULpbf3PStzoywLyrfM5qup43idzeHCMRSuNLXR3g="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 8a5440f6b07..a20d63af233 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-U8fmjcPeTcKlf721UIbA4/JYeM4l+OIyAPGNp8IPvSk="; }; - vendorSha256 = "sha256-8fluCDKrMNnIAlJFlDAisk/P+IYHBCdl7hkSbQtgy1A="; + vendorSha256 = "sha256-OyqkjA90zcfqRL6pfISR/6WXbv5LwVhKDECBtlqords="; # Some tests require internet access, broken in sandbox doCheck = false; diff --git a/pkgs/tools/networking/godspeed/default.nix b/pkgs/tools/networking/godspeed/default.nix index 011d09848d8..44cac245927 100644 --- a/pkgs/tools/networking/godspeed/default.nix +++ b/pkgs/tools/networking/godspeed/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI="; }; - vendorSha256 = "sha256-MCr1ShhkxM9CeSmqqtgAW0qv0QaIPRSOzASj8gt2ZAg="; + vendorSha256 = "sha256-DCDAuKvov4tkf77nJNo9mQU/bAeQasp4VBQRtLX+U6c="; buildInputs = [ libpcap diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index fc1280be6c7..de332843c04 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "i2p"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2"; - sha256 = "sha256-JuX02VsaB2aHD5ezDlfJqOmGkCecO/CRmOMO/6vsxFA="; + sha256 = "sha256-cZYGxMtRDeT+dPJLv6U5EacFMYIfwe55op49luqhZzM="; }; buildInputs = [ jdk ant gettext which ]; diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix index 7945cd168d4..52c481e3c7e 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/tools/networking/mqttui/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-taGpVLO9K5VmthWadstQcujcLHTb3fhEWDxKGd3Pj+E="; + sha256 = "sha256-ScB0zJXyk8bPEDCxdymMqNmlhe/skNHr6IRmJpme+qQ="; }; - cargoSha256 = "sha256-aAMDl8GZ+XqA4uBiDm2eHQsNFiqCrMBO66X0ruEjpJg="; + cargoSha256 = "sha256-736UYTCs4d1DcpHWl5AejEaW+SYzlgElozC3t/RU41g="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index a75936a1520..4b270998a6b 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; + vendorSha256 = "17m0ssfw9n3g2lkv63qajz3adrk5yp0c9hx66x7dl79snwqd49yg"; doCheck = false; diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 7960324cbd7..d38200a53da 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-BtyPy6ow3flHl4jM9cfF+y3JCtLYx2c+a8f7ol3nQj4="; }; - vendorSha256 = "sha256-jIU5UZdmBUqyjva+g7zoijPqHF2p3vzImEFQCP/CFwE="; + vendorSha256 = "sha256-lgbTfIsfYFSToCaDppMGaxfE1Bmk52eShQ+40g2VNw0="; modRoot = "./v2"; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 12eb1a7f0a6..17e8d9b9fba 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fSDmwZNKAHXcMtNZlqJmUFkuFdZLkDbnn+ZrNtnszgU="; + sha256 = "sha256-eEvSELCzpAm9Me46U54MQEQiAPCFlBa5iG2AZMn5BbE="; }; - vendorSha256 = "sha256-DktuZ0NUyg8LbYklxde2ZZJ8/WOyBq50E9yEHtS+Hqw="; + vendorSha256 = "sha256-aYY3rGm2Wvd5v1QrfhN0jWzAO9JYu4j5ZHk9UyEPjH8="; subPackages = [ "cmd/tendermint" ]; diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix new file mode 100644 index 00000000000..c24de3947f6 --- /dev/null +++ b/pkgs/tools/nix/alejandra/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "alejandra"; + version = "unstable-2022-01-30"; + + src = fetchFromGitHub { + owner = "kamadorueda"; + repo = "alejandra"; + rev = "b72274b052ae06cbe60a97d623829b1458369cc2"; + sha256 = "sha256-snq9C/a/53VivFcLNvdeKwVmPBXbcVzbbjTB+iULFUc="; + }; + + cargoSha256 = "sha256-/JzATzRhNexmyjtgjHVkw8LVyr4PdIdPJfUGXz4pZbQ="; + + meta = with lib; { + description = "The uncompromising Nix formatter"; + homepage = "https://github.com/kamadorueda/alejandra"; + license = licenses.unlicense; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index fd219935aee..df239beb60b 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "statix"; # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix # the version can be found in flake.nix of the source code - version = "0.4.2"; + version = "0.5.2"; src = fetchFromGitHub { owner = "nerdypepper"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4hVEwm2xuuHFy38/EJLKjGuxTYCAcKRHHfFKLvqp+M0="; + sha256 = "sha256-68ejROWcDqc4SnivFIrbsSZDqCXEo0sXSiwpro7AmgU="; }; - cargoSha256 = "sha256-15C/ye8nYLtriBlqbf1ul41IFtShGY2LTX10z1/08Po="; + cargoSha256 = "sha256-YHA97bnGHYRwSZYZ3ZViUlRQskwLPUC26FBWQyBG5Uc="; buildFeatures = lib.optional withJson "json"; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 392a7f2e9b9..8ef9fea016a 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xwziGGdFBmPpLRlBBficioULISt8WjGBocbrQUXa8CY="; }; - vendorSha256 = "sha256-RaAb8QDFp/7TolsNZqcXurozr3vvK0SRyyy2h8MPhnk="; + vendorSha256 = "sha256-5gH19R+SZpGWXntQ/Te96t1YGIIIQuy2ZRQSiczvM3Y="; doCheck = false; diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index ba95e0ddbf4..842ef5de328 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -9,6 +9,7 @@ assert (sha256 == null) -> (src != null); let atLeast24 = lib.versionAtLeast version "2.4pre"; atLeast25 = lib.versionAtLeast version "2.5pre"; + atLeast27 = lib.versionAtLeast version "2.7pre"; in { stdenv , autoconf-archive @@ -44,7 +45,7 @@ in , util-linuxMinimal , xz -, enableDocumentation ? atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform +, enableDocumentation ? !atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform , enableStatic ? stdenv.hostPlatform.isStatic , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp @@ -100,6 +101,8 @@ stdenv.mkDerivation { lowdown ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [ libcpuid + ] ++ lib.optional (atLeast27) [ + nlohmann_json ] ++ lib.optionals withLibseccomp [ libseccomp ] ++ lib.optionals withAWS [ @@ -165,7 +168,8 @@ stdenv.mkDerivation { makeFlags = [ "profiledir=$(out)/etc/profile.d" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0" + ++ lib.optional (stdenv.hostPlatform.isDarwin) "PRECOMPILE_HEADERS=1"; installFlags = [ "sysconfdir=$(out)/etc" ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 51f09e5dc43..ffbe598b929 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -62,17 +62,16 @@ in lib.makeExtensible (self: { sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; }; - # FIXME: nix_2_6 is broken on aarch64-darwin for now. - stable = self.nix_2_5; + stable = self.nix_2_6; unstable = lib.lowPrio (common rec { version = "2.7"; - suffix = "pre20220124_${lib.substring 0 7 src.rev}"; + suffix = "pre20220127_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "0a70b37b5694c769fb855c1afe7642407d1db64f"; - sha256 = "sha256-aOM9MPNlnWNMobx4CuD4JIXH2poRlG8AKkuxY7FysWg="; + rev = "558c4ee3e370c9f9a6ea293df54ed6914a999f1c"; + sha256 = "sha256-hMzKQflpgf3P7OdYKSnD1VMBSnF48XSRjaNX3bUJct4="; }; }); }) diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index 40f43c7b054..0724a756b91 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "aide"; - version = "0.17.3"; + version = "0.17.4"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-ousYg8r6rQVvvkPuHorgn9NsqjCgvI7f6l1HvWfEZPg="; + sha256 = "sha256-yBUFJG8//C52A21Dp3ISroKJW1iB2bniXBNhsam3qEY="; }; buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix index 670a03c8881..9f29826808d 100644 --- a/pkgs/tools/security/cariddi/default.nix +++ b/pkgs/tools/security/cariddi/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-PXQljC9rwlxXQ96fII3EjD4NXu61EMkYvMWqkcJZ4vU="; }; - vendorSha256 = "sha256-yVfRjUlw90oUsbF2P6pW6FhMXok9ZwcKmAWyTFLI/cY="; + vendorSha256 = "sha256-zNUdglsfy6lEV54afCAoigxa3rR0qf/e3+B4PvVRIa4="; meta = with lib; { description = "Crawler for URLs and endpoints"; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index fbbd26dea68..54beab643a8 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mxDLF9DQKySDR1c7jD/D0/xI+/R8a/ZlukliT/R4wCg="; + sha256 = "sha256-hQFkbHOmtk0SqFSPw1+5nCvjq9cKsGzFPtK4jXDrubQ="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-xqwwvVGXWFFKKBtH4a/+akFSlZ2hCOC1v1sO0d2p9fs="; + vendorSha256 = "sha256-d3aOX4iMlhlxgYbqCHCIFKXunVha0Fw4ZBmy4OA6EhI="; excludedPackages = "\\(sample\\|webhook\\|help\\)"; @@ -26,6 +26,9 @@ buildGoModule rec { postPatch = '' rm pkg/cosign/tuf/client_test.go # Require network access + rm internal/pkg/cosign/fulcio/signer_test.go # Require network access + rm internal/pkg/cosign/rekor/signer_test.go # Require network access + rm pkg/cosign/kubernetes/webhook/validator_test.go # Require network access ''; postInstall = '' diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/tools/security/dalfox/default.nix index 2919354db4e..ebbdd9882b7 100644 --- a/pkgs/tools/security/dalfox/default.nix +++ b/pkgs/tools/security/dalfox/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-QSIaqHUNsVpb1qbQLIxxjoDH1DMM1XpXxWZtImMV1yM="; }; - vendorSha256 = "sha256-QtSWlGsbCxLpb4+TZgV0/wfSb5flGG3qHquO2maIOKU="; + vendorSha256 = "sha256-F0uIV4T/dCqPY/gsSOrzJTxFGlDh9NfxKhJxrftj0Lo="; meta = with lib; { description = "Tool for analysing parameter and XSS scanning"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index a59fc1dc90e..15f67789850 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-01-26"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-5WdAh4YFNLOF8h8f0pN6GHdoyASf/3fN345Mp9b1Cfg="; + sha256 = "sha256-yIZFlj8WtKU3STdPXsZ+s3hoq/zBvqA64D6GoyUFXvE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/extrude/default.nix b/pkgs/tools/security/extrude/default.nix index dbe9471bf2d..e8d2b078411 100644 --- a/pkgs/tools/security/extrude/default.nix +++ b/pkgs/tools/security/extrude/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-7gCEBhnNU5CqC5n0KP4Dd/fmddPRwNqyMFXTrRrJjfU="; }; - vendorSha256 = "sha256-auhRXKt5dcQ+gr3a9Wfen8/BISP17HVsIRP16sBmiZM="; + vendorSha256 = "sha256-8qjIYPkWtYTvl7wAnefpZAjbNSQLQFqRnGGccYZ8ZmU="; meta = with lib; { description = "Tool to analyse binaries for missing security features"; diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index d744b8b5daa..59dc202e694 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ="; }; - vendorSha256 = "sha256-u5ketxHPwZN2mV0uTgwJbY+ImusGZ9GTTmFAGvdH5yA="; + vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ="; meta = with lib; { description = "Tool to fetch known URLs"; diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index f818dc7f11b..ef7a5cf85e7 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { ./tests-add-test-cases-for-import-without-uid.patch ./allow-import-of-previously-known-keys-even-without-UI.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch + ] ++ lib.optional stdenv.isDarwin [ + # Remove an innocent warning printed on systems without procfs + # https://dev.gnupg.org/T5656 + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/890be5f6af88e7913d177af87a50129049e681bb/gnupg/2.3.3-proc-error.patch"; + sha256 = "sha256-oiTa7Nf+AEmhZ683CJEaCb559PXJ6RpSSgRLpxz4CKU="; + }) ]; postPatch = '' sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 2614ee67e55..1e57679b4ad 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-XA099gBp52g0RUbbFSE8uFa7gh56bO8H66KaFAtK1RU="; }; - vendorSha256 = "sha256-rmuRZ8jRwSaAYgrOBgJwsEOAaUNJwhPJX9hEaJTX6/E="; + vendorSha256 = "sha256-Qx0QaPKpEq4U+G3qdfMN4EVyY5zI2SyzcK/U6o6loHE="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 058ed8d1487..d8773080b9d 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,15 +1,14 @@ -{ stdenv, substituteAll, lib, buildGoPackage, fetchFromGitHub +{ stdenv, substituteAll, lib, buildGoModule, fetchFromGitHub , AVFoundation, AudioToolbox, ImageIO, CoreMedia -, Foundation, CoreGraphics, MediaToolbox -, gnupg +, Foundation, CoreGraphics, MediaToolbox, gnupg }: -buildGoPackage rec { +buildGoModule rec { pname = "keybase"; - version = "5.8.1"; + version = "5.9.1"; - goPackagePath = "github.com/keybase/client"; - subPackages = [ "go/kbnm" "go/keybase" ]; + modRoot = "go"; + subPackages = [ "kbnm" "keybase" ]; dontRenameImports = true; @@ -17,8 +16,9 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-SeBZtrRsWTv5yBBsp18daKCNAr70OalH3shlKf+aiEU="; + sha256 = "sha256-WAI/rl6awVLbXqdqYAq8fyABAO2qet+GYucuiwClylI="; }; + vendorSha256 = "sha256-ZZTM1s/kFHkCjnaDYuP7xCrkW2an3I6kvcMXMy63ySE="; patches = [ (substituteAll { @@ -30,12 +30,13 @@ buildGoPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; tags = [ "production" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne ]; + maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne shofius ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 8912961e352..d5f04099f75 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20210930160723.fefa22edc1"; + versionSuffix = "20220120174718.95a3939b3a"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.8.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.9.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "cqbGvnJ6wx5boVe78Ju8CimH1H08DfkM5nmwbV0uKG0="; + sha256 = "sha256-Wdl5pZFIz+mDkkE0EDpLGH/eGWYoBbLV05LYJgkwpI4="; }; nativeBuildInputs = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keybase.io/"; description = "The Keybase official GUI"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne ]; + maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne shofius ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index dc49f9d9e77..52fedf3feef 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -1,22 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub, keybase }: +{ lib, buildGoModule, fetchFromGitHub, keybase }: -buildGoPackage { +buildGoModule { pname = "kbfs"; - inherit (keybase) src version; + inherit (keybase) src version vendorSha256; - goPackagePath = "github.com/keybase/client"; - subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/redirector" "go/kbfs/kbfsgit/git-remote-keybase" ]; - - dontRenameImports = true; + modRoot = "go"; + subPackages = [ "kbfs/kbfsfuse" "kbfs/redirector" "kbfs/kbfsgit/git-remote-keybase" ]; tags = [ "production" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://keybase.io/docs/kbfs"; description = "The Keybase filesystem"; platforms = platforms.unix; - maintainers = with maintainers; [ avaq rvolosatovs bennofs np ]; + maintainers = with maintainers; [ avaq rvolosatovs bennofs np shofius ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/tools/security/kube-hunter/default.nix index c1ecd55c38c..cbd4e4e3150 100644 --- a/pkgs/tools/security/kube-hunter/default.nix +++ b/pkgs/tools/security/kube-hunter/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "kube-hunter"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "066pivd9mdhy24n40m9917zr5f9gh4fva4zmxk9vyppgk1b3mpwc"; + sha256 = "sha256-2pmViizQLwyTdP6J92ynvdIdqkfgc6SIhsll85g9pHA="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index ef18a0f2d73..a75c669f89f 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { installShellFiles ]; - vendorSha256 = "sha256-1TupDdiG8hnbAM+JJRTJWCYQBGN/o+C3H2e0w9muYog="; + vendorSha256 = "sha256-gB1/WkGC3sgMqmA4F9/dGU0R0hIDwwTVBNNsY6Yj8KU="; ldflags = [ "-s" diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix index d15fab720f9..001e851912a 100644 --- a/pkgs/tools/security/kubesec/default.nix +++ b/pkgs/tools/security/kubesec/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-z1v+xm0ZWs8F5KtltBSDx9W+xNqRsfvAgQUKgrZa+28="; }; - vendorSha256 = "sha256-/2u92KvfzbJxJjh1cy9+4AuM5Qw1tK9Hu0xjRs0nhBE="; + vendorSha256 = "sha256-t2GZaLa/Pc/TCjqTNGuLnOFSepExmE2xA8pc9HkUtcs="; # Tests wants to download the kubernetes schema for use with kubeval doCheck = false; diff --git a/pkgs/tools/security/lmp/default.nix b/pkgs/tools/security/lmp/default.nix index 6fd544df20a..2f7f0283f90 100644 --- a/pkgs/tools/security/lmp/default.nix +++ b/pkgs/tools/security/lmp/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-VL/Hp7YaXNcV9JPb3kgRHcdhJJ5p3KHUf3hHbT3gKVk="; }; - vendorSha256 = "sha256-K3jD+r/JFQH5QeLHatCzTdgiABbmKOd/jR3Di10w6mo="; + vendorSha256 = "sha256-3NTaJ/Y3Tc6UGLfYTKjZxAAI43GJyZQ5wQVYbnXHSYc="; meta = with lib; { description = "Scanning and validation toolkit for the Log4J vulnerability"; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4e770c3ead1..de625d4cb52 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.25" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.27" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d7be1df5a86..b25da2ff7e7 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 4a1ba0f9095d5c6e954ba58bc71d02feefc411a5 - ref: refs/tags/6.1.25 + revision: e8c59985fa8e2c65660f2103b75622018e99f6b3 + ref: refs/tags/6.1.27 specs: - metasploit-framework (6.1.25) + metasploit-framework (6.1.27) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,9 +31,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.66) + metasploit-payloads (= 2.0.70) metasploit_data_models - metasploit_payloads-mettle (= 1.0.17) + metasploit_payloads-mettle (= 1.0.18) mqtt msgpack nessus_rest @@ -47,7 +47,7 @@ GIT openvas-omp packetfu patch_finder - pcaprub (= 0.12.4) + pcaprub pdf-reader pg puma @@ -128,13 +128,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.549.0) + aws-partitions (1.551.0) aws-sdk-core (3.125.5) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.294.0) + aws-sdk-ec2 (1.296.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.65.0) @@ -143,7 +143,7 @@ GEM aws-sdk-kms (1.53.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.111.1) + aws-sdk-s3 (1.111.3) aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -216,7 +216,7 @@ GEM domain_name (~> 0.5) http_parser.rb (0.8.0) httpclient (2.8.3) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) io-console (0.5.11) irb (1.3.6) @@ -251,7 +251,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.66) + metasploit-payloads (2.0.70) metasploit_data_models (5.0.4) activerecord (~> 6.0) activesupport (~> 6.0) @@ -262,12 +262,12 @@ GEM railties (~> 6.0) recog (~> 2.0) webrick - metasploit_payloads-mettle (1.0.17) + metasploit_payloads-mettle (1.0.18) method_source (1.0.0) mini_portile2 (2.7.1) minitest (5.15.0) mqtt (0.5.0) - msgpack (1.4.3) + msgpack (1.4.4) multi_json (1.15.0) multipart-post (2.1.1) mustermann (1.1.1) @@ -291,16 +291,16 @@ GEM packetfu (1.1.13) pcaprub patch_finder (1.0.2) - pcaprub (0.12.4) - pdf-reader (2.8.0) + pcaprub (0.13.1) + pdf-reader (2.9.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.2.3) + pg (1.3.0) public_suffix (4.0.6) - puma (5.5.2) + puma (5.6.1) nio4r (~> 2.0) racc (1.6.0) rack (2.2.3) @@ -334,7 +334,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.20) + rex-core (0.1.25) rex-encoder (0.1.6) metasm rex-arch @@ -379,12 +379,12 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.0.0) + ruby_smb (3.0.1) bindata openssl-ccm openssl-cmac rubyntlm - windows_error + windows_error (>= 0.1.3) rubyntlm (0.6.3) rubyzip (2.3.2) sawyer (0.8.2) @@ -437,7 +437,7 @@ GEM activesupport (>= 4.2, < 7.0) xmlrpc (0.3.2) webrick - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS ruby diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index d9a508640ca..8de94c7b59e 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.25"; + version = "6.1.27"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-lfTueN3s7wsyQRrulsx7TKVMhOu6//4Z6DDjR/Lm6Vw="; + sha256 = "sha256-nc9Oxl5dLGU60jaQdkaErW51s4QsuD977bJubd9BA3A="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 56bc0138714..2652cd7dfb5 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02d86hv5jfs27hszd9d92q31dz3wl3s1racimkhb7nx8xg0l9ldj"; + sha256 = "0shhwh5wra3h5vibabdkx422vzs4bwp8kmvn1x46sqscmqk8hw9p"; type = "gem"; }; - version = "1.549.0"; + version = "1.551.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rzbd111n7pgzpgjabcxi2mpnkxf3fcxkvy4rqidyf80m4633gwy"; + sha256 = "0f45py2sgai3d7k67kp4hb9ljf8khfz6wd33sj1pdvj55pcg7zai"; type = "gem"; }; - version = "1.294.0"; + version = "1.296.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pgh6zd07r9sfzkdz4bf6piq4n8gzl0f76h68l2zxchc1g9z4lqw"; + sha256 = "085nizd80w75djrch1c38g0xchw6hsyfcg039qp27aalwhxd44b4"; type = "gem"; }; - version = "1.111.1"; + version = "1.111.3"; }; aws-sigv4 = { groups = ["default"]; @@ -564,10 +564,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; type = "gem"; }; - version = "1.8.11"; + version = "1.9.1"; }; io-console = { groups = ["default"]; @@ -684,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "4a1ba0f9095d5c6e954ba58bc71d02feefc411a5"; - sha256 = "0p79wvr4gqrhx0czxzxsxf24r9acgg69dvhs84r0pvzcvmwfxx4m"; + rev = "e8c59985fa8e2c65660f2103b75622018e99f6b3"; + sha256 = "0w0387gnsvmjxmxkzf1chjrpavmdhi37d41ns8x6ab2xbv34xkwx"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.25"; + version = "6.1.27"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpsxysd6lg4falybci1fwlxjmxazjx5birqppdyc9wkqha58j9r"; + sha256 = "07vjb7kdgr2wi9b5jk7a9niapvbwi7xk4jx9a521fm6p1fhrnlnn"; type = "gem"; }; - version = "2.0.66"; + version = "2.0.70"; }; metasploit_data_models = { groups = ["default"]; @@ -726,10 +726,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06v72lyj08haqzs5a12ds6vadq6r2kxy50s7jxp1vxq5i2j4p2gm"; + sha256 = "09mm8wbp7yaaqpz16bhsag3q5xd4aqx5l1n2p06zg55nph1dgy0s"; type = "gem"; }; - version = "1.0.17"; + version = "1.0.18"; }; method_source = { groups = ["default"]; @@ -776,10 +776,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14kg9wdfls7s63lds9blrd77n8mx780bzyh05dj8kn0aimw3l9dx"; + sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; multi_json = { groups = ["default"]; @@ -957,30 +957,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz"; + sha256 = "0886fcc5bi0kc0rbma5fj3wa3hbg2nl7ivnbi2j995yzg36zq7xy"; type = "gem"; }; - version = "0.12.4"; + version = "0.13.1"; }; pdf-reader = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; + sha256 = "1fh2pq3gk5fh18g71wir98k4bz4rvihhx8qmn8zi9fz6yfqx39qj"; type = "gem"; }; - version = "2.8.0"; + version = "2.9.0"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "0y16aa24ljnyhszqr6g3m0369rmx5xw6dgglipwhi6pn8dl678mr"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.0"; }; public_suffix = { groups = ["default"]; @@ -997,10 +997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; + sha256 = "03blhf8snz59433zsv7apwqy1hg92yhkb5am9x2dpqr0c4i6hscs"; type = "gem"; }; - version = "5.5.2"; + version = "5.6.1"; }; racc = { groups = ["default"]; @@ -1147,10 +1147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hy7xrd3pwyfk2199zkgfa6kz1fsx7ngf6s512gpk8gadjc8hq6j"; + sha256 = "04w1pknswnjs02fgsqcr8dx6cz3qjmx7hs83kbhn836s4yfpyv6a"; type = "gem"; }; - version = "0.1.20"; + version = "0.1.25"; }; rex-encoder = { groups = ["default"]; @@ -1357,10 +1357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1klfrp56qid5fr1kzsi62bkhpp2yn6pbv0yg4ikf0lgzg5nq781w"; + sha256 = "0mf3mzxq83y7i8nr6bcl5yacvfz6y5p3hdmvr1m6xq0l0i9a9axy"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; rubyntlm = { groups = ["default"]; @@ -1627,9 +1627,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; } diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index 83bb83e4e2c..5acd0a93ac2 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "0kbpfb1ryfqy8a54ksm7zm8pqy8f4adh06jc1ccpdxks3k0rygid"; }; - vendorSha256 = "0kkkx8p0r04gg3pp0qy835afaxnqxjggnr7q7l6azdvg8qvgxfms"; + vendorSha256 = "17x60x68hd2jm84xw5mgsclv6phn6ajkp92kpcz013vlkcdaqrxs"; buildInputs = [ libpcap diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 396b8e03792..27805bdd762 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-r6nOVTg/vZr2somTCoEJQHtbMMZ1RCkdDzGQeTISreU="; }; - vendorSha256 = "sha256-/TFg+ztubfZfyUbRabVr943oF9R0Xg8mIDxUl/MFbJE="; + vendorSha256 = "sha256-zLZ7+eJPKJ8nX47SdbzCLwg3nmv2lFcd2te8oh0UU4s="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/tools/security/otpauth/default.nix index b8974bc720d..e4c42a83f04 100644 --- a/pkgs/tools/security/otpauth/default.nix +++ b/pkgs/tools/security/otpauth/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "otpauth"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "dim13"; repo = "otpauth"; rev = "v${version}"; - sha256 = "sha256-LGDeNkCxVLDVpwi5VFFL0DFsf8CexI7Nc5l+l2ASHaw="; + sha256 = "sha256-qSu0kGRi1es9OciN1s9Eh1Z3JkxbcKO8W5cAC7c7n0k="; }; - vendorSha256 = "sha256-fwO3cmlnmuD682vGB8X06yGHZqBadeltRrsEUjQWazc="; + vendorSha256 = "sha256-TU5crhmQAhSfURdfPe/xaa3RgGyc+UFn2E+jJ0flNsg="; doCheck = true; meta = with lib; { diff --git a/pkgs/tools/security/passphrase2pgp/default.nix b/pkgs/tools/security/passphrase2pgp/default.nix index 55e19b94813..f1dce116a6d 100644 --- a/pkgs/tools/security/passphrase2pgp/default.nix +++ b/pkgs/tools/security/passphrase2pgp/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-VNOoYYnHsSgiSbVxlBwYUq0JsLa4BwZQSvMVSiyB6rg="; }; - vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs"; + vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs="; postInstall = '' mkdir -p $out/share/doc/$name diff --git a/pkgs/tools/security/rnp/cmake_nogit.patch b/pkgs/tools/security/rnp/cmake_nogit.patch deleted file mode 100644 index 733b093de5e..00000000000 --- a/pkgs/tools/security/rnp/cmake_nogit.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git i/cmake/version.cmake w/cmake/version.cmake -index 0ed123b5..4348e7e1 100644 ---- i/cmake/version.cmake -+++ w/cmake/version.cmake -@@ -90,41 +90,12 @@ function(determine_version source_dir var_prefix) - else() - message(STATUS "Found no version.txt.") - endif() -- # for GIT_EXECUTABLE -- find_package(Git REQUIRED) -- # get a description of the version, something like: -- # v1.9.1-0-g38ffe82 (a tagged release) -- # v1.9.1-0-g38ffe82-dirty (a tagged release with local modifications) -- # v1.9.0-3-g5b92266 (post-release snapshot) -- # v1.9.0-3-g5b92266-dirty (post-release snapshot with local modifications) -- _git(version describe --abbrev=${GIT_REV_LEN} --match "v[0-9]*" --long --dirty) -- if (NOT _git_ec EQUAL 0) -- # no annotated tags, fake one -- message(STATUS "Found no annotated tags.") -- _git(revision rev-parse --short=${GIT_REV_LEN} --verify HEAD) -- if (_git_ec EQUAL 0) -- set(version "v${base_version}-0-g${revision}") -- # check if dirty (this won't detect untracked files, but should be ok) -- _git(changes diff-index --quiet HEAD --) -- if (NOT _git_ec EQUAL 0) -- string(APPEND version "-dirty") -- endif() -- # append the commit timestamp of the most recent commit (only -- # in non-release branches -- typically master) -- _git(commit_timestamp show -s --format=%ct) -- if (_git_ec EQUAL 0) -- string(APPEND version "+${commit_timestamp}") -- endif() -- elseif(has_version_txt) -- # Nothing to get from git - so use version.txt completely -- set(version "${version_file}") -- else() -- # Sad case - no git, no version.txt -- set(version "v${base_version}") -- endif() -+ if(has_version_txt) -+ # Nothing to get from git - so use version.txt completely -+ set(version "${version_file}") - else() -- set(has_release_tag YES) -- message(STATUS "Found annotated tag ${version}") -+ # Sad case - no git, no version.txt -+ set(version "v${base_version}") - endif() - extract_version_info("${version}" "${local_prefix}") - if ("${has_version_txt}" AND NOT ${base_version} STREQUAL ${local_prefix}_VERSION) diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/tools/security/rnp/default.nix index 38e6c80428f..a18571c8040 100644 --- a/pkgs/tools/security/rnp/default.nix +++ b/pkgs/tools/security/rnp/default.nix @@ -15,17 +15,15 @@ stdenv.mkDerivation rec { pname = "rnp"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rnpgp"; repo = "rnp"; rev = "v${version}"; - sha256 = "1jph69nsz245fbv04nalh1qmhniyh88sacsf3nxv1vxm190314i9"; + sha256 = "u0etVslTBF9fBqnpVBofYsm0uC/eR6gO3lhwzqua5Qw="; }; - patches = [ ./cmake_nogit.patch ]; - buildInputs = [ zlib bzip2 json_c botan2 ]; cmakeFlags = [ diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index 8fd4276427b..a865e441f1e 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-SXBdtwYEslR871wLwCCHD7hsM/riHswyKrIilrsLqns="; + vendorSha256 = "sha256-NSV7mDn1efQAO4jm6bJm12ExDFTN76TkmD4r61V6D2Q="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index c5d33645f11..412cba21f93 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.1.2"; + version = "1.2.0"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MX2kbdLj72S2WBceUW/3ps34Bcsf/VArK8RN4r13wQY="; + sha256 = "01ph9jzh18bnidrsbnnxm3gxh0cgfllnjvf7a5haqz51lm6a9pny"; }; - vendorSha256 = "sha256-ZRcXMNKhNY3W5fV9q/V7xsnODoG6KWHrzpWte9hx/Ms="; + vendorSha256 = "1fd1k5by4wcjmzfgi3gnrwnb38b0wa3w67kzjlx8s0nwapyfgx0b"; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch b/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch new file mode 100644 index 00000000000..b19b9ffe8a6 --- /dev/null +++ b/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 1c915f1..83a8e41 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,7 +4,7 @@ + WARN_CLANG=-Wformat-nonliteral -Wstrncat-size -Wformat-security -Wsign-conversion -Wconversion -Wfloat-conversion -Wshorten-64-to-32 -Wuninitialized -Wmissing-variable-declarations -Wmissing-declarations + WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral -Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 -Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion -Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fno-common -Wcast-align + CFLAGS ?= -g +-OPTS=-I. -O3 $(CFLAGS) -fcommon -Wl,--allow-multiple-definition ++OPTS=-I. -O3 $(CFLAGS) -fcommon + # -Wall -g -pedantic + LIBS=-lm + DESTDIR ?= diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index f60d5374648..b12daff0038 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-V9rr5fbJWm0pa+Kp8g95XvLPo/uWcDwyU2goImnIq58="; }; + patches = lib.optionals stdenv.isDarwin [ + ./darwin-remove-ldflag.patch + ]; + postPatch = let makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs); in '' @@ -43,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://www.thc.org/thc-hydra/"; license = licenses.agpl3; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index fa243e4b048..d2496df94c7 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; - vendorSha256 = "0cpj4nj2g0ick6p79h4pnjg7ybnyz9p26jivv0awi6bmn378nbxn"; + vendorSha256 = "1v4ccn7ysh8ax1nkf1v9fcgsdnz6zjyh6j6ivyljyfvma1lmcrmk"; doCheck = false; diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix index 8a06c363faf..476ea3dbfb5 100644 --- a/pkgs/tools/security/yubikey-touch-detector/default.nix +++ b/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = version; sha256 = "sha256-f6j+YNYASH0Adg3236QijApALd/yXJjNMYEdP0Pifw0="; }; - vendorSha256 = "sha256-bmFbxMU3PEWpYI0eQw/1RRDP+JGfUY8kOCeTWbdVt9k="; + vendorSha256 = "sha256-H05EJwYDdg4lq6+psXiwujQd5g294epdRPjqviHhLWs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index a771e3967c8..ec94a9f337f 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.12.1"; + version = "5.13.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pXHMNyebUkHEZvUWtDkyp5Fqk07GA5sd+254fls8PjU="; + sha256 = "sha256-yOYwPr/Yz/PGpCZtv/dWVFgll6VM7wQEtU/jEVpMjlE="; }; - vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; + vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix index 22918f14145..9613ab8d650 100644 --- a/pkgs/tools/system/goreman/default.nix +++ b/pkgs/tools/system/goreman/default.nix @@ -1,18 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { - pname = "goreman"; - version = "0.2.1"; +{ lib, buildGoModule, fetchFromGitHub }: - goPackagePath = "github.com/mattn/goreman"; - subPackages = ["."]; +buildGoModule rec { + pname = "goreman"; + version = "0.3.9"; + rev = "df1209e7cdbad10aecc0aa75d332bc32822925f5"; src = fetchFromGitHub { owner = "mattn"; repo = "goreman"; rev = "v${version}"; - sha256 = "1h7ip788j7bkygahpp7ylgnrx9jrbhwjzqpjhd1pflmlaxcbflcy"; + sha256 = "1irjf5i5ybdchyn42bamfq8pj3w00p633h1gg202n0vsr39h0bxw"; }; + ldflags = [ + "-s" + "-w" + "-X main.revision=${builtins.substring 0 7 rev}" + ]; + + vendorSha256 = "sha256-+RFh6Ppxxs7P7DWqOBeEJTvPsBgOfopMjx22hPEI1/U="; + + doCheck = false; + meta = with lib; { description = "foreman clone written in go language"; homepage = "https://github.com/mattn/goreman"; @@ -20,4 +29,3 @@ buildGoPackage rec { maintainers = with maintainers; [ zimbatm ]; }; } - diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 7fc247c8a57..3edc6d4694a 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-c+9IZEKiW95JIh6krs9NhdBohUatTTEIYBU13kj9zB8="; + vendorSha256 = "sha256-WwHaprq4+4uduiKpNu5iVcV6qJsYX/aSXJAJWpbDVqc="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 42784d65a73..8b8a8a7b775 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -6,7 +6,7 @@ in buildGoModule rec { pname = "chroma"; - version = "0.9.4"; + version = "0.10.0"; # To update: # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json @@ -17,7 +17,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorSha256 = "1l5ryhwifhff41r4z1d2lifpvjcc4yi1vzrzlvkx3iy9dmxqcssl"; + vendorSha256 = "09b718vjd6npg850fr7z6srs2sc5vsr7byzlz5yb5qx0vm3ajxpf"; modRoot = "./cmd/chroma"; diff --git a/pkgs/tools/text/chroma/src.json b/pkgs/tools/text/chroma/src.json index 9bfc8d9c2c7..224bb4328d7 100644 --- a/pkgs/tools/text/chroma/src.json +++ b/pkgs/tools/text/chroma/src.json @@ -1,9 +1,9 @@ { "url": "https://github.com/alecthomas/chroma.git", - "rev": "6520148857c2ae3106ff371e527abea815b23915", - "date": "2021-10-17T08:46:20+11:00", - "path": "/nix/store/0s8a46d1nyjl3yhsgni2jz5vdv95cka8-chroma", - "sha256": "1iy6mymdjxbl5wbll1mivv7gqdyqhl6xpfqps99z307m7y38r1ni", + "rev": "36bdd4b98823bd1d7be96767cde3dd575e60b406", + "date": "2022-01-12T21:49:38+11:00", + "path": "/nix/store/951ya4wlxp217a2j3qdni29zwqfq0z7v-chroma", + "sha256": "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 8303e46e463..86ea78c4aa1 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-4kFd2ULap9kcMu81Lu0SxER7xDAnVVyi9yAVsS1yhnw="; }; - vendorSha256 = "sha256-tZarz6xwZo9IFfKB9qGxqezYaFrPyQp3wcug5jGaElY="; + vendorSha256 = "sha256-MGNv1mEIOvhcpL40MuQob5Uu4qqIGhJxPZTi8BvqQ0s="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile index 9e65ac43afa..cfeefff2f0a 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile @@ -5,6 +5,7 @@ gem 'asciidoctor-diagram' gem 'asciidoctor-epub3' gem 'asciidoctor-html5s' gem 'asciidoctor-mathematical' +gem 'asciidoctor-multipage' gem 'asciidoctor-pdf' gem 'asciidoctor-revealjs' gem 'asciidoctor-rouge' diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock index 98418e183d4..5b0e79aa2bd 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock @@ -5,7 +5,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - asciidoctor (2.0.16) + asciidoctor (2.0.17) asciidoctor-bibtex (0.8.0) asciidoctor (~> 2.0) bibtex-ruby (~> 5.1) @@ -30,7 +30,9 @@ GEM asciidoctor (~> 2.0) asciimath (~> 2.0) mathematical (~> 1.6.0) - asciidoctor-pdf (1.6.1) + asciidoctor-multipage (0.0.15) + asciidoctor (>= 2.0.11, < 2.1) + asciidoctor-pdf (1.6.2) asciidoctor (~> 2.0) concurrent-ruby (~> 1.1) prawn (~> 2.4.0) @@ -62,7 +64,7 @@ GEM rexml csl-styles (1.0.1.11) csl (~> 1.0) - css_parser (1.10.0) + css_parser (1.11.0) addressable gepub (1.0.15) nokogiri (>= 1.8.2, < 2.0) @@ -75,14 +77,14 @@ GEM ruby-enum (~> 0.4) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) - mini_portile2 (2.6.1) + mime-types-data (3.2022.0105) + mini_portile2 (2.7.1) namae (1.1.1) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.1) + mini_portile2 (~> 2.7.0) racc (~> 1.4) pdf-core (0.9.0) - pdf-reader (2.6.0) + pdf-reader (2.8.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -104,10 +106,10 @@ GEM pdf-reader (~> 2.0) prawn (~> 2.2) public_suffix (4.0.6) - pygments.rb (2.2.0) + pygments.rb (2.3.0) racc (1.6.0) rexml (3.2.5) - rouge (3.26.1) + rouge (3.27.0) ruby-enum (0.9.0) i18n ruby-rc4 (0.1.5) @@ -128,6 +130,7 @@ DEPENDENCIES asciidoctor-epub3 asciidoctor-html5s asciidoctor-mathematical + asciidoctor-multipage asciidoctor-pdf asciidoctor-revealjs asciidoctor-rouge diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix index 6bb0eac62f1..c4aa7fa4a27 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix @@ -10,8 +10,9 @@ bundlerApp { exes = [ "asciidoctor" - "asciidoctor-pdf" "asciidoctor-epub3" + "asciidoctor-multipage" + "asciidoctor-pdf" "asciidoctor-revealjs" ]; diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix index e88f9701d0d..498653c12f2 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2"; + sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd"; type = "gem"; }; - version = "2.0.16"; + version = "2.0.17"; }; asciidoctor-bibtex = { dependencies = ["asciidoctor" "bibtex-ruby" "citeproc-ruby" "csl-styles" "latex-decode"]; @@ -115,16 +115,27 @@ }; version = "0.3.5"; }; + asciidoctor-multipage = { + dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1372213kxw1b9k120dmyackafzsk80h1y2n0r1hmfrri26kczgfb"; + type = "gem"; + }; + version = "0.0.15"; + }; asciidoctor-pdf = { dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "treetop"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk"; + sha256 = "1inl7cykm542jb7a6kraxkgfqn4y3185wrabh5pd5m68rdv56f04"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; asciidoctor-revealjs = { dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"]; @@ -239,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; gepub = { dependencies = ["nokogiri" "rubyzip"]; @@ -313,20 +324,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "3.2021.1115"; + version = "3.2022.0105"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.1"; }; namae = { groups = ["default"]; @@ -344,10 +355,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.1"; }; pdf-core = { groups = ["default"]; @@ -365,10 +376,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz"; + sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; type = "gem"; }; - version = "2.6.0"; + version = "2.8.0"; }; polyglot = { groups = ["default"]; @@ -450,10 +461,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mshqjh8v0v8k29f8annqfr4qlgkp39nbwx3sgm69aymv4skfddb"; + sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; racc = { groups = ["default"]; @@ -480,10 +491,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; + sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; type = "gem"; }; - version = "3.26.1"; + version = "3.27.0"; }; ruby-enum = { dependencies = ["i18n"]; diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 5c607d269b2..7652239b998 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -5,8 +5,8 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - asciidoctor (2.0.16) - asciidoctor-pdf (1.6.1) + asciidoctor (2.0.17) + asciidoctor-pdf (1.6.2) asciidoctor (~> 2.0) concurrent-ruby (~> 1.1) prawn (~> 2.4.0) @@ -18,11 +18,11 @@ GEM treetop (~> 1.6.0) coderay (1.1.3) concurrent-ruby (1.1.9) - css_parser (1.10.0) + css_parser (1.11.0) addressable hashery (2.1.2) pdf-core (0.9.0) - pdf-reader (2.6.0) + pdf-reader (2.8.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -44,9 +44,9 @@ GEM pdf-reader (~> 2.0) prawn (~> 2.2) public_suffix (4.0.6) - pygments.rb (2.2.0) + pygments.rb (2.3.0) rexml (3.2.5) - rouge (3.26.1) + rouge (3.27.0) ruby-rc4 (0.1.5) safe_yaml (1.0.5) treetop (1.6.11) diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index b57d1e5ac4a..d87c6c1fa99 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2"; + sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd"; type = "gem"; }; - version = "2.0.16"; + version = "2.0.17"; }; asciidoctor-pdf = { dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "treetop"]; @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk"; + sha256 = "1inl7cykm542jb7a6kraxkgfqn4y3185wrabh5pd5m68rdv56f04"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; coderay = { groups = ["default"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; hashery = { groups = ["default"]; @@ -108,10 +108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz"; + sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; type = "gem"; }; - version = "2.6.0"; + version = "2.8.0"; }; polyglot = { groups = ["default"]; @@ -193,10 +193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mshqjh8v0v8k29f8annqfr4qlgkp39nbwx3sgm69aymv4skfddb"; + sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; rexml = { groups = ["default"]; @@ -213,10 +213,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; + sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; type = "gem"; }; - version = "3.26.1"; + version = "3.27.0"; }; ruby-rc4 = { groups = ["default"]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 30f11acc309..d5dd54b48f1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -106,8 +106,6 @@ mapAliases ({ bsod = throw "bsod has been removed: deleted by upstream"; # added 2022-01-07 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 - buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 - buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 buildkite-agent3 = buildkite-agent; # added 2018-09-26 bundler_HEAD = bundler; # added 2015-11-15 bunny = throw "bunny has been removed: deleted by upstream"; # added 2022-01-07 @@ -364,7 +362,6 @@ mapAliases ({ gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 gmock = gtest; # moved from top-level 2021-03-14 - go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobby5 = gobby; # added 2021-02-01 gobjectIntrospection = gobject-introspection; # added 2018-12-02 @@ -1112,6 +1109,7 @@ mapAliases ({ winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18 wireguard = wireguard-tools; # added 2018-05-19 + wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # 2022-01-31 morituri = whipper; # added 2018-09-13 xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # added 2021-11-19 xp-pen-g430 = pentablet-driver; # added 2020-05-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e45b5239ee3..bcb49b39bae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -281,7 +281,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - conftest = callPackage ../development/tools/conftest { }; + conftest = callPackage ../development/tools/conftest { + buildGoModule = buildGo117Module; + }; corgi = callPackage ../development/tools/corgi { }; @@ -323,7 +325,9 @@ with pkgs; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; - evans = callPackage ../development/tools/evans { }; + evans = callPackage ../development/tools/evans { + buildGoModule = buildGo117Module; + }; firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; @@ -349,7 +353,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - proto-contrib = callPackage ../development/tools/proto-contrib {}; + proto-contrib = callPackage ../development/tools/proto-contrib { + buildGoModule = buildGo117Module; + }; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -363,11 +369,15 @@ with pkgs; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; - protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; + protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { + buildGoModule = buildGo117Module; + }; protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { }; - protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; + protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { + buildGoModule = buildGo117Module; + }; proton-caller = callPackage ../misc/emulators/proton-caller { }; @@ -529,7 +539,9 @@ with pkgs; perseus-cli = callPackage ../development/tools/perseus-cli { }; - pet = callPackage ../development/tools/pet { }; + pet = callPackage ../development/tools/pet { + buildGoModule = buildGo117Module; + }; pkger = callPackage ../development/libraries/pkger { }; @@ -907,7 +919,9 @@ with pkgs; wxGTK = wxGTK30; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { }; + aerc = callPackage ../applications/networking/mailreaders/aerc { + buildGoModule = buildGo117Module; + }; aerospike = callPackage ../servers/nosql/aerospike { }; @@ -1015,9 +1029,13 @@ with pkgs; gofu = callPackage ../applications/misc/gofu { }; - godns = callPackage ../tools/networking/godns { }; + godns = callPackage ../tools/networking/godns { + buildGoModule = buildGo117Module; + }; - godspeed = callPackage ../tools/networking/godspeed { }; + godspeed = callPackage ../tools/networking/godspeed { + buildGoModule = buildGo117Module; + }; fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; @@ -1047,7 +1065,9 @@ with pkgs; tnat64 = callPackage ../tools/networking/tnat64 { }; - topicctl = callPackage ../tools/misc/topicctl { }; + topicctl = callPackage ../tools/misc/topicctl { + buildGoModule = buildGo117Module; + }; veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; @@ -1413,7 +1433,9 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; - aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; + aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { + buildGoModule = buildGo116Module; + }; aws-env = callPackage ../tools/admin/aws-env { }; @@ -1429,7 +1451,9 @@ with pkgs; aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; - aws-vault = callPackage ../tools/admin/aws-vault { }; + aws-vault = callPackage ../tools/admin/aws-vault { + buildGoModule = buildGo117Module; + }; aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { }; @@ -1467,19 +1491,25 @@ with pkgs; chaos = callPackage ../tools/networking/chaos { }; - charm = callPackage ../applications/misc/charm { }; + charm = callPackage ../applications/misc/charm { + buildGoModule = buildGo117Module; + }; chars = callPackage ../tools/text/chars { inherit (darwin.apple_sdk.frameworks) Security; }; - checkip = callPackage ../tools/networking/checkip { }; + checkip = callPackage ../tools/networking/checkip { + buildGoModule = buildGo117Module; + }; ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { }; - ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { }; + ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { + buildGoModule = buildGo117Module; + }; ec2-utils = callPackage ../tools/virtualization/ec2-utils { }; @@ -1909,7 +1939,9 @@ with pkgs; pass = callPackage ../tools/security/pass { }; - passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; + passphrase2pgp = callPackage ../tools/security/passphrase2pgp { + buildGoModule = buildGo117Module; + }; pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { }; @@ -2165,7 +2197,9 @@ with pkgs; packetbeat6 journalbeat6; - inherit (callPackages ../misc/logging/beats/7.x.nix { }) + inherit (callPackages ../misc/logging/beats/7.x.nix { + buildGoModule = buildGo117Module; + }) filebeat7 heartbeat7 metricbeat7 @@ -2199,7 +2233,9 @@ with pkgs; blitz = callPackage ../development/libraries/blitz { }; - blockbook = callPackage ../servers/blockbook { }; + blockbook = callPackage ../servers/blockbook { + buildGoModule = buildGo117Module; + }; blockhash = callPackage ../tools/graphics/blockhash { }; @@ -2344,7 +2380,9 @@ with pkgs; asciidoc = asciidoc-full; }; - buildpack = callPackage ../development/tools/buildpack { }; + buildpack = callPackage ../development/tools/buildpack { + buildGoModule = buildGo117Module; + }; bottom-rs = callPackage ../tools/misc/bottom-rs { }; @@ -2477,7 +2515,9 @@ with pkgs; cassowary = callPackage ../tools/networking/cassowary { }; - croc = callPackage ../tools/networking/croc { }; + croc = callPackage ../tools/networking/croc { + buildGoModule = buildGo117Module; + }; cbftp = callPackage ../tools/networking/cbftp { }; @@ -2722,7 +2762,9 @@ with pkgs; dapr-cli = callPackage ../development/tools/dapr/cli {}; - dasel = callPackage ../applications/misc/dasel { }; + dasel = callPackage ../applications/misc/dasel { + buildGoModule = buildGo117Module; + }; dasher = callPackage ../applications/accessibility/dasher { }; @@ -2750,7 +2792,9 @@ with pkgs; ddate = callPackage ../tools/misc/ddate { }; - ddosify = callPackage ../development/tools/ddosify { }; + ddosify = callPackage ../development/tools/ddosify { + buildGoModule = buildGo117Module; + }; dduper = callPackage ../tools/filesystems/dduper { }; @@ -2921,7 +2965,9 @@ with pkgs; ekam = callPackage ../development/tools/build-managers/ekam { }; - eksctl = callPackage ../tools/admin/eksctl { }; + eksctl = callPackage ../tools/admin/eksctl { + buildGoModule = buildGo117Module; + }; electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; @@ -2933,7 +2979,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; electron = electron_13; }; - element-desktop-wayland = writeScript "element-desktop-wayland" '' + element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" ''; @@ -2980,7 +3026,9 @@ with pkgs; eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; - extrude = callPackage ../tools/security/extrude { }; + extrude = callPackage ../tools/security/extrude { + buildGoModule = buildGo117Module; + }; f3 = callPackage ../tools/filesystems/f3 { }; @@ -3028,7 +3076,9 @@ with pkgs; firestarter = callPackage ../applications/misc/firestarter { }; - fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; + fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { + buildGoModule = buildGo117Module; + }; flitter = callPackage ../tools/misc/flitter { }; @@ -3171,13 +3221,17 @@ with pkgs; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; - godu = callPackage ../tools/misc/godu { }; + godu = callPackage ../tools/misc/godu { + buildGoModule = buildGo116Module; + }; goss = callPackage ../tools/misc/goss { }; gosu = callPackage ../tools/misc/gosu { }; - gotify-cli = callPackage ../tools/misc/gotify-cli { }; + gotify-cli = callPackage ../tools/misc/gotify-cli { + buildGoModule = buildGo117Module; + }; gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; @@ -3666,11 +3720,15 @@ with pkgs; stagit = callPackage ../development/tools/stagit { }; - starboard = callPackage ../applications/networking/cluster/starboard { }; + starboard = callPackage ../applications/networking/cluster/starboard { + buildGoModule = buildGo117Module; + }; statserial = callPackage ../tools/misc/statserial { }; - steampipe = callPackage ../tools/misc/steampipe { }; + steampipe = callPackage ../tools/misc/steampipe { + buildGoModule = buildGo117Module; + }; step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; @@ -3680,7 +3738,9 @@ with pkgs; string-machine = callPackage ../applications/audio/string-machine { }; - stripe-cli = callPackage ../tools/admin/stripe-cli { }; + stripe-cli = callPackage ../tools/admin/stripe-cli { + buildGoModule = buildGo117Module; + }; bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; @@ -4101,7 +4161,9 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { + buildGoModule = buildGo117Module; + }; circus = callPackage ../tools/networking/circus { }; @@ -4253,7 +4315,7 @@ with pkgs; anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { - go = go_1_15; + go = go_1_17; }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -4348,7 +4410,9 @@ with pkgs; checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; - checkmate = callPackage ../development/tools/checkmate { }; + checkmate = callPackage ../development/tools/checkmate { + buildGoModule = buildGo117Module; + }; civetweb = callPackage ../development/libraries/civetweb { }; @@ -4932,7 +4996,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; electron = electron_13; }; - schildichat-desktop-wayland = writeScript "schildichat-desktop-wayland" '' + schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh NIXOS_OZONE_WL=1 exec ${schildichat-desktop}/bin/schildichat-desktop "$@" ''; @@ -4989,7 +5053,9 @@ with pkgs; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; - utahfs = callPackage ../applications/networking/utahfs { }; + utahfs = callPackage ../applications/networking/utahfs { + buildGoPackage = buildGo116Package; + }; wakeonlan = callPackage ../tools/networking/wakeonlan { }; @@ -5131,6 +5197,8 @@ with pkgs; electron = electron_14; }; + ethercalc = callPackage ../servers/web-apps/ethercalc { }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; @@ -5569,7 +5637,9 @@ with pkgs; garmintools = callPackage ../development/libraries/garmintools {}; - gau = callPackage ../tools/security/gau { }; + gau = callPackage ../tools/security/gau { + buildGoModule = buildGo117Module; + }; gauge = callPackage ../development/tools/gauge { }; @@ -5884,7 +5954,9 @@ with pkgs; gl2ps = callPackage ../development/libraries/gl2ps { }; - glab = callPackage ../applications/version-management/git-and-tools/glab { }; + glab = callPackage ../applications/version-management/git-and-tools/glab { + buildGoModule = buildGo117Module; + }; glitter = callPackage ../applications/version-management/git-and-tools/glitter { }; @@ -5996,7 +6068,9 @@ with pkgs; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; - goofys = callPackage ../tools/filesystems/goofys { }; + goofys = callPackage ../tools/filesystems/goofys { + buildGoModule = buildGo116Module; + }; go-sct = callPackage ../tools/X11/go-sct { }; @@ -6037,7 +6111,9 @@ with pkgs; gopro = callPackage ../tools/video/gopro { }; - goreleaser = callPackage ../tools/misc/goreleaser { }; + goreleaser = callPackage ../tools/misc/goreleaser { + buildGoModule = buildGo117Module; + }; goreplay = callPackage ../tools/networking/goreplay { }; @@ -6122,7 +6198,9 @@ with pkgs; inherit (xorg) libXdmcp; }; - gron = callPackage ../development/tools/gron { }; + gron = callPackage ../development/tools/gron { + buildGoModule = buildGo116Module; + }; groonga = callPackage ../servers/search/groonga { }; @@ -6308,7 +6386,9 @@ with pkgs; haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { }; - hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; + hasmail = callPackage ../applications/networking/mailreaders/hasmail { + buildGoModule = buildGo117Module; + }; haste-client = callPackage ../tools/misc/haste-client { }; @@ -6459,7 +6539,9 @@ with pkgs; httptunnel = callPackage ../tools/networking/httptunnel { }; - httpx = callPackage ../tools/security/httpx { }; + httpx = callPackage ../tools/security/httpx { + buildGoModule = buildGo117Module; + }; hurl = callPackage ../tools/networking/hurl { }; @@ -7210,7 +7292,9 @@ with pkgs; mxt-app = callPackage ../misc/mxt-app { }; - naabu = callPackage ../tools/security/naabu { }; + naabu = callPackage ../tools/security/naabu { + buildGoModule = buildGo117Module; + }; nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; @@ -7228,7 +7312,9 @@ with pkgs; ncrack = callPackage ../tools/security/ncrack { }; - nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; + nerdctl = callPackage ../applications/networking/cluster/nerdctl { + buildGoModule = buildGo117Module; + }; netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; @@ -7245,7 +7331,9 @@ with pkgs; nyxt = callPackage ../applications/networking/browsers/nyxt { }; - nfpm = callPackage ../tools/package-management/nfpm { }; + nfpm = callPackage ../tools/package-management/nfpm { + buildGoModule = buildGo117Module; + }; nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; @@ -7523,7 +7611,9 @@ with pkgs; liquidctl = with python3Packages; toPythonApplication liquidctl; - lmp = callPackage ../tools/security/lmp { }; + lmp = callPackage ../tools/security/lmp { + buildGoModule = buildGo117Module; + }; localtime = callPackage ../tools/system/localtime { }; @@ -7841,6 +7931,10 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; + morgen = callPackage ../applications/office/morgen { + electron = electron_15; + }; + mosh = callPackage ../tools/networking/mosh { }; mpage = callPackage ../tools/text/mpage { }; @@ -8100,7 +8194,10 @@ with pkgs; nvidiaGpuSupport = config.cudaSupport or false; }; - nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; + nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { + go = go_1_17; + buildGoModule = buildGo117Module; + }; nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; @@ -8282,7 +8379,9 @@ with pkgs; obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { }; + obfs4 = callPackage ../tools/networking/obfs4 { + buildGoModule = buildGo116Module; + }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; @@ -8481,7 +8580,12 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; - opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; + opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { + buildGoModule = buildGo117Module; + }; + opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { + buildGoModule = buildGo117Module; + }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; @@ -8662,7 +8766,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; - otpauth = callPackage ../tools/security/otpauth { }; + otpauth = callPackage ../tools/security/otpauth { + buildGoModule = buildGo117Module; + }; pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -8744,7 +8850,9 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; - photon-rss = callPackage ../applications/networking/feedreaders/photon { }; + photon-rss = callPackage ../applications/networking/feedreaders/photon { + buildGoModule = buildGo117Module; + }; pim6sd = callPackage ../servers/pim6sd { }; @@ -9161,7 +9269,9 @@ with pkgs; ratools = callPackage ../tools/networking/ratools { }; - ratt = callPackage ../applications/misc/ratt { }; + ratt = callPackage ../applications/misc/ratt { + buildGoModule = buildGo117Module; + }; rc = callPackage ../shells/rc { }; @@ -9189,6 +9299,8 @@ with pkgs; rep = callPackage ../development/tools/rep { }; + repseek = callPackage ../applications/science/biology/repseek { }; + reicast = callPackage ../misc/emulators/reicast { }; reredirect = callPackage ../tools/misc/reredirect { }; @@ -9479,7 +9591,7 @@ with pkgs; sasquatch = callPackage ../tools/filesystems/sasquatch { }; - sasview = callPackage ../applications/science/misc/sasview {}; + sasview = libsForQt5.callPackage ../applications/science/misc/sasview {}; scallion = callPackage ../tools/security/scallion { }; @@ -9489,7 +9601,9 @@ with pkgs; scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; - scorecard = callPackage ../tools/security/scorecard { }; + scorecard = callPackage ../tools/security/scorecard { + buildGoModule = buildGo117Module; + }; scream = callPackage ../applications/audio/scream { }; @@ -9537,7 +9651,9 @@ with pkgs; skim = callPackage ../tools/misc/skim { }; - seaweedfs = callPackage ../applications/networking/seaweedfs { }; + seaweedfs = callPackage ../applications/networking/seaweedfs { + buildGoModule = buildGo117Module; + }; sec = callPackage ../tools/admin/sec { }; @@ -9691,7 +9807,9 @@ with pkgs; # Not updated upstream since 2018, doesn't support qt newer than 5.12 sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; - slides = callPackage ../applications/misc/slides { }; + slides = callPackage ../applications/misc/slides { + buildGoModule = buildGo117Module; + }; slirp4netns = callPackage ../tools/networking/slirp4netns { }; @@ -9758,7 +9876,9 @@ with pkgs; spicy = callPackage ../development/tools/spicy { }; - spire = callPackage ../tools/security/spire { }; + spire = callPackage ../tools/security/spire { + buildGoModule = buildGo117Module; + }; # to match naming of other package repositories spire-agent = spire.agent; spire-server = spire.server; @@ -9989,7 +10109,9 @@ with pkgs; subsonic = callPackage ../servers/misc/subsonic { }; - subfinder = callPackage ../tools/networking/subfinder { }; + subfinder = callPackage ../tools/networking/subfinder { + buildGoModule = buildGo117Module; + }; subzerod = with python3Packages; toPythonApplication subzerod; @@ -10483,7 +10605,9 @@ with pkgs; typos = callPackage ../development/tools/typos { }; - tz = callPackage ../tools/misc/tz { }; + tz = callPackage ../tools/misc/tz { + buildGoModule = buildGo117Module; + }; u9fs = callPackage ../servers/u9fs { }; @@ -10823,7 +10947,9 @@ with pkgs; testdisk-qt = testdisk.override { enableQt = true; }; - textql = callPackage ../development/tools/textql { }; + textql = callPackage ../development/tools/textql { + buildGoPackage = buildGo116Package; + }; html2text = callPackage ../tools/text/html2text { }; @@ -11229,7 +11355,9 @@ with pkgs; yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yajsv = callPackage ../tools/misc/yajsv { }; + yajsv = callPackage ../tools/misc/yajsv { + buildGoModule = buildGo116Module; + }; yallback = callPackage ../development/tools/analysis/yallback { }; @@ -11349,7 +11477,9 @@ with pkgs; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; - zsh-history = callPackage ../shells/zsh/zsh-history { }; + zsh-history = callPackage ../shells/zsh/zsh-history { + buildGoModule = buildGo117Module; + }; zsh-history-search-multi-word = callPackage ../shells/zsh/zsh-history-search-multi-word { }; @@ -11781,7 +11911,9 @@ with pkgs; dasm = callPackage ../development/compilers/dasm { }; - dbmate = callPackage ../development/tools/database/dbmate { }; + dbmate = callPackage ../development/tools/database/dbmate { + buildGoModule = buildGo117Module; + }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; @@ -12378,13 +12510,6 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { @@ -13277,6 +13402,8 @@ with pkgs; bupc = callPackage ../development/compilers/bupc { }; + uasm = callPackage ../development/compilers/uasm { }; + urn = callPackage ../development/compilers/urn { }; urweb = callPackage ../development/compilers/urweb { @@ -14240,7 +14367,9 @@ with pkgs; buildozer = bazel-buildtools; unused_deps = bazel-buildtools; - bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; + bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { + buildGoModule = buildGo117Module; + }; bazel-watcher = callPackage ../development/tools/bazel-watcher { }; @@ -14357,7 +14486,9 @@ with pkgs; buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; - bump = callPackage ../development/tools/github/bump { }; + bump = callPackage ../development/tools/github/bump { + buildGoModule = buildGo117Module; + }; libbpf = callPackage ../os-specific/linux/libbpf { }; @@ -14601,7 +14732,9 @@ with pkgs; cli11 = callPackage ../development/tools/misc/cli11 { }; - datree = callPackage ../development/tools/datree { }; + datree = callPackage ../development/tools/datree { + buildGoModule = buildGo117Module; + }; dcadec = callPackage ../development/tools/dcadec { }; @@ -14661,7 +14794,9 @@ with pkgs; doit = with python3Packages; toPythonApplication doit; - dolt = callPackage ../servers/sql/dolt { }; + dolt = callPackage ../servers/sql/dolt { + buildGoModule = buildGo117Module; + }; dot2tex = with python3.pkgs; toPythonApplication dot2tex; @@ -14920,6 +15055,8 @@ with pkgs; ccloud-cli = callPackage ../development/tools/ccloud-cli { }; + confluent-cli = callPackage ../development/tools/confluent-cli { }; + htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; hyenae = callPackage ../tools/networking/hyenae { }; @@ -14976,9 +15113,13 @@ with pkgs; jpexs = callPackage ../development/tools/jpexs { }; - k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; + k0sctl = callPackage ../applications/networking/cluster/k0sctl { + buildGoModule = buildGo117Module; + }; - k2tf = callPackage ../development/tools/misc/k2tf { }; + k2tf = callPackage ../development/tools/misc/k2tf { + buildGoModule = buildGo116Module; + }; kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { }; @@ -15026,9 +15167,13 @@ with pkgs; kubeprompt = callPackage ../development/tools/kubeprompt { }; - kubescape = callPackage ../tools/security/kubescape { }; + kubescape = callPackage ../tools/security/kubescape { + buildGoModule = buildGo117Module; + }; - kubesec = callPackage ../tools/security/kubesec { }; + kubesec = callPackage ../tools/security/kubesec { + buildGoModule = buildGo117Module; + }; kubespy = callPackage ../applications/networking/cluster/kubespy { }; @@ -15498,7 +15643,9 @@ with pkgs; spooles = callPackage ../development/libraries/science/math/spooles {}; - spruce = callPackage ../development/tools/misc/spruce { }; + spruce = callPackage ../development/tools/misc/spruce { + buildGoModule = buildGo116Module; + }; sqlcheck = callPackage ../development/tools/database/sqlcheck { }; @@ -15532,7 +15679,9 @@ with pkgs; swiftformat = callPackage ../development/tools/swiftformat { }; - symfony-cli = callPackage ../development/tools/symfony-cli { }; + symfony-cli = callPackage ../development/tools/symfony-cli { + buildGoModule = buildGo117Module; + }; swiftshader = callPackage ../development/libraries/swiftshader { }; @@ -15577,7 +15726,9 @@ with pkgs; tytools = libsForQt5.callPackage ../development/embedded/tytools { }; - terracognita = callPackage ../development/tools/misc/terracognita { }; + terracognita = callPackage ../development/tools/misc/terracognita { + buildGoModule = buildGo117Module; + }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; @@ -15609,7 +15760,9 @@ with pkgs; time-ghc-modules = callPackage ../development/tools/time-ghc-modules { }; - tflint = callPackage ../development/tools/analysis/tflint { }; + tflint = callPackage ../development/tools/analysis/tflint { + buildGoModule = buildGo117Module; + }; tfsec = callPackage ../development/tools/analysis/tfsec { }; @@ -15748,7 +15901,9 @@ with pkgs; yq = python3.pkgs.toPythonApplication python3.pkgs.yq; - yq-go = callPackage ../development/tools/yq-go { }; + yq-go = callPackage ../development/tools/yq-go { + buildGoModule = buildGo117Module; + }; ytt = callPackage ../development/tools/ytt {}; @@ -16552,8 +16707,7 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; garble = callPackage ../build-support/go/garble.nix { - # https://github.com/burrowers/garble/issues/124 - buildGoModule = buildGo115Module; + buildGoModule = buildGo117Module; }; gcab = callPackage ../development/libraries/gcab { }; @@ -18229,7 +18383,9 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; - llama = callPackage ../applications/misc/llama { }; + llama = callPackage ../applications/misc/llama { + buildGoModule = buildGo117Module; + }; malcontent = callPackage ../development/libraries/malcontent { }; @@ -19444,7 +19600,9 @@ with pkgs; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; - protolock = callPackage ../development/libraries/protolock { }; + protolock = callPackage ../development/libraries/protolock { + buildGoModule = buildGo117Module; + }; protozero = callPackage ../development/libraries/protozero { }; @@ -20263,7 +20421,9 @@ with pkgs; vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; - vale = callPackage ../tools/text/vale { }; + vale = callPackage ../tools/text/vale { + buildGoModule = buildGo117Module; + }; valhalla = callPackage ../development/libraries/valhalla { boost = boost.override { enablePython = true; python = python38; }; @@ -20534,9 +20694,13 @@ with pkgs; yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; - yubikey-agent = callPackage ../tools/security/yubikey-agent { }; + yubikey-agent = callPackage ../tools/security/yubikey-agent { + buildGoModule = buildGo117Module; + }; - yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { }; + yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { + buildGoModule = buildGo117Module; + }; zchunk = callPackage ../development/libraries/zchunk { }; @@ -20674,9 +20838,6 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo115Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_15; - }; buildGo116Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_16; }; @@ -20691,9 +20852,6 @@ with pkgs; buildGoPackage = buildGo116Package; - buildGo115Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_15; - }; buildGo116Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_16; }; @@ -20828,7 +20986,9 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - alps = callPackage ../servers/alps {}; + alps = callPackage ../servers/alps { + buildGoModule = buildGo117Module; + }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -20944,7 +21104,9 @@ with pkgs; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; - clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; + clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { + buildGoModule = buildGo117Module; + }; couchdb3 = callPackage ../servers/http/couchdb/3.nix { erlang = erlangR22; @@ -20995,7 +21157,7 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; envoy = callPackage ../servers/http/envoy { - go = go_1_15; + go = go_1_17; jdk = openjdk11; gn = gn1924; }; @@ -21123,7 +21285,9 @@ with pkgs; https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; - hydron = callPackage ../servers/hydron { }; + hydron = callPackage ../servers/hydron { + buildGoModule = buildGo117Module; + }; hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; @@ -21191,7 +21355,9 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; - livepeer = callPackage ../servers/livepeer { }; + livepeer = callPackage ../servers/livepeer { + buildGoModule = buildGo117Module; + }; lwan = callPackage ../servers/http/lwan { }; @@ -21283,7 +21449,9 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mycorrhiza = callPackage ../servers/mycorrhiza { }; + mycorrhiza = callPackage ../servers/mycorrhiza { + buildGoModule = buildGo116Module; + }; myserver = callPackage ../servers/http/myserver { }; @@ -21353,7 +21521,9 @@ with pkgs; nsq = callPackage ../servers/nsq { }; - oauth2-proxy = callPackage ../servers/oauth2-proxy { }; + oauth2-proxy = callPackage ../servers/oauth2-proxy { + buildGoModule = buildGo117Module; + }; openbgpd = callPackage ../servers/openbgpd { }; @@ -21410,7 +21580,9 @@ with pkgs; quark = callPackage ../servers/http/quark { }; - soft-serve = callPackage ../servers/soft-serve { }; + soft-serve = callPackage ../servers/soft-serve { + buildGoModule = buildGo117Module; + }; sympa = callPackage ../servers/mail/sympa { }; @@ -21834,7 +22006,9 @@ with pkgs; sambaFull = samba4Full; - sampler = callPackage ../applications/misc/sampler { }; + sampler = callPackage ../applications/misc/sampler { + buildGoModule = buildGo116Module; + }; shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; @@ -21952,10 +22126,14 @@ with pkgs; urserver = callPackage ../servers/urserver { }; - vouch-proxy = callPackage ../servers/vouch-proxy { }; + vouch-proxy = callPackage ../servers/vouch-proxy { + buildGoModule = buildGo116Module; + }; victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + virtiofsd = callPackage ../servers/misc/virtiofsd { }; + virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; virtualenv = with python3Packages; toPythonApplication virtualenv; @@ -22155,7 +22333,9 @@ with pkgs; cachefilesd = callPackage ../os-specific/linux/cachefilesd { }; - cariddi = callPackage ../tools/security/cariddi { }; + cariddi = callPackage ../tools/security/cariddi { + buildGoModule = buildGo117Module; + }; checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; @@ -22178,7 +22358,9 @@ with pkgs; coredns = callPackage ../servers/dns/coredns { }; - corerad = callPackage ../tools/networking/corerad { }; + corerad = callPackage ../tools/networking/corerad { + buildGoModule = buildGo117Module; + }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -22299,7 +22481,9 @@ with pkgs; gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - gmailctl = callPackage ../applications/networking/gmailctl {}; + gmailctl = callPackage ../applications/networking/gmailctl { + buildGoModule = buildGo117Module; + }; gomp = callPackage ../applications/version-management/gomp { }; @@ -22704,7 +22888,9 @@ with pkgs; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; - air = callPackage ../development/tools/air { }; + air = callPackage ../development/tools/air { + buildGoModule = buildGo117Module; + }; delve = callPackage ../development/tools/delve { }; @@ -22768,7 +22954,9 @@ with pkgs; gotools = callPackage ../development/tools/gotools { }; - gotop = callPackage ../tools/system/gotop { }; + gotop = callPackage ../tools/system/gotop { + buildGoModule = buildGo117Module; + }; go-migrate = callPackage ../development/tools/go-migrate { }; @@ -23630,6 +23818,8 @@ with pkgs; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; + kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -23818,7 +24008,9 @@ with pkgs; nuclear = callPackage ../applications/audio/nuclear { }; - nuclei = callPackage ../tools/security/nuclei { }; + nuclei = callPackage ../tools/security/nuclei { + buildGoModule = buildGo117Module; + }; nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; @@ -23933,6 +24125,8 @@ with pkgs; publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; + phinger-cursors = callPackage ../data/icons/phinger-cursors { }; + qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; qogir-theme = callPackage ../data/themes/qogir { }; @@ -24751,6 +24945,8 @@ with pkgs; boops = callPackage ../applications/audio/boops { }; + ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; + ChowKick = callPackage ../applications/audio/ChowKick { }; CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; @@ -24872,9 +25068,7 @@ with pkgs; coursera-dl = callPackage ../applications/misc/coursera-dl {}; - coyim = callPackage ../applications/networking/instant-messengers/coyim { - buildGoPackage = buildGo115Package; - }; + coyim = callPackage ../applications/networking/instant-messengers/coyim { }; cozy-drive = callPackage ../applications/networking/cozy-drive {}; @@ -25082,12 +25276,12 @@ with pkgs; inherit (gnome2) libgnomeui; }; - dyff = callPackage ../development/tools/dyff {}; - - dwl = callPackage ../applications/window-managers/dwl { - wlroots = wlroots_0_14; + dyff = callPackage ../development/tools/dyff { + buildGoModule = buildGo117Module; }; + dwl = callPackage ../applications/window-managers/dwl { }; + dwm = callPackage ../applications/window-managers/dwm { # dwm is configured entirely through source modification. Allow users to # specify patches through nixpkgs.config.dwm.patches @@ -25248,7 +25442,9 @@ with pkgs; exercism = callPackage ../applications/misc/exercism { }; - expenses = callPackage ../applications/misc/expenses { }; + expenses = callPackage ../applications/misc/expenses { + buildGoModule = buildGo117Module; + }; fnott = callPackage ../applications/misc/fnott { }; @@ -25917,7 +26113,9 @@ with pkgs; withPortAudio = stdenv.isDarwin; }; - limesctl = callPackage ../applications/misc/limesctl { }; + limesctl = callPackage ../applications/misc/limesctl { + buildGoModule = buildGo117Module; + }; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; @@ -26196,7 +26394,9 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; - hugo = callPackage ../applications/misc/hugo { }; + hugo = callPackage ../applications/misc/hugo { + buildGoModule = buildGo117Module; + }; go-org = callPackage ../applications/misc/go-org { }; @@ -26251,11 +26451,15 @@ with pkgs; pixeluvo = callPackage ../applications/graphics/pixeluvo { }; + pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; - skate = callPackage ../applications/misc/skate { }; + skate = callPackage ../applications/misc/skate { + buildGoModule = buildGo117Module; + }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -26309,6 +26513,8 @@ with pkgs; swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; + swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; + tiramisu = callPackage ../applications/misc/tiramisu { }; rootbar = callPackage ../applications/misc/rootbar {}; @@ -26768,13 +26974,17 @@ with pkgs; kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { }; - k9s = callPackage ../applications/networking/cluster/k9s { }; + k9s = callPackage ../applications/networking/cluster/k9s { + buildGoModule = buildGo117Module; + }; pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; popeye = callPackage ../applications/networking/cluster/popeye { }; - kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { }; + kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { + buildGoModule = buildGo117Module; + }; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; @@ -26841,7 +27051,7 @@ with pkgs; lame = callPackage ../development/libraries/lame { }; labwc = callPackage ../applications/window-managers/labwc { - wlroots = wlroots_0_14; + wlroots = wlroots_0_15; }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -26886,8 +27096,10 @@ with pkgs; boost = boost175; }; - libreoffice = hiPrio libreoffice-still; - libreoffice-unwrapped = libreoffice.libreoffice; + libreoffice = if stdenv.isDarwin + then callPackage ../applications/office/libreoffice/darwin.nix {} + else hiPrio libreoffice-still; + libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice; libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; @@ -27326,6 +27538,8 @@ with pkgs; mozjpeg = callPackage ../applications/graphics/mozjpeg { }; + edgetx = libsForQt5.callPackage ../applications/misc/edgetx { }; + easytag = callPackage ../applications/audio/easytag { }; mp3gain = callPackage ../applications/audio/mp3gain { }; @@ -27511,7 +27725,9 @@ with pkgs; nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; - nwg-menu = callPackage ../applications/misc/nwg-menu { }; + nwg-menu = callPackage ../applications/misc/nwg-menu { + buildGoModule = buildGo117Module; + }; nwg-panel = callPackage ../applications/misc/nwg-panel { }; @@ -27971,7 +28187,9 @@ with pkgs; pdfchain = callPackage ../tools/typesetting/pdfchain { }; - pdfcpu = callPackage ../applications/graphics/pdfcpu { }; + pdfcpu = callPackage ../applications/graphics/pdfcpu { + buildGoModule = buildGo117Module; + }; pdftk = callPackage ../tools/typesetting/pdftk { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -28112,8 +28330,7 @@ with pkgs; plexamp = callPackage ../applications/audio/plexamp { }; - # Upstream says it supports only qt5.9 which is not packaged, and building with qt newer than 5.12 fails - plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; + plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; @@ -28533,6 +28750,8 @@ with pkgs; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + seahub = callPackage ../applications/networking/seahub { }; + seatd = callPackage ../applications/misc/seatd { }; secretscanner = callPackage ../tools/security/secretscanner { }; @@ -28553,7 +28772,9 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { }; + shadowfox = callPackage ../tools/networking/shadowfox { + buildGoModule = buildGo117Module; + }; shfmt = callPackage ../tools/text/shfmt { }; @@ -28936,7 +29157,9 @@ with pkgs; tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { }; - tanka = callPackage ../applications/networking/cluster/tanka { }; + tanka = callPackage ../applications/networking/cluster/tanka { + buildGoModule = buildGo117Module; + }; teams = callPackage ../applications/networking/instant-messengers/teams { }; @@ -29060,7 +29283,9 @@ with pkgs; ticpp = callPackage ../development/libraries/ticpp { }; - ticker = callPackage ../applications/misc/ticker { }; + ticker = callPackage ../applications/misc/ticker { + buildGoModule = buildGo117Module; + }; tickrs = callPackage ../applications/misc/tickrs { inherit (darwin.apple_sdk.frameworks) Security; @@ -30209,7 +30434,9 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon.nix { }; + erigon = callPackage ../applications/blockchains/erigon.nix { + buildGoModule = buildGo117Module; + }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -30343,7 +30570,9 @@ with pkgs; scaleft = callPackage ../applications/networking/scaleft { }; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { + buildGoModule = buildGo117Module; + }; beancount = with python3.pkgs; toPythonApplication beancount; @@ -31735,7 +31964,9 @@ with pkgs; conglomerate = callPackage ../applications/science/biology/conglomerate { }; - dalfox = callPackage ../tools/security/dalfox { }; + dalfox = callPackage ../tools/security/dalfox { + buildGoModule = buildGo117Module; + }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; @@ -32136,6 +32367,8 @@ with pkgs; sherpa = callPackage ../applications/science/physics/sherpa {}; + shtns = callPackage ../applications/science/physics/shtns { }; + xfitter = callPackage ../applications/science/physics/xfitter {}; xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; @@ -32959,7 +33192,9 @@ with pkgs; helmfile = callPackage ../applications/networking/cluster/helmfile { }; - helmsman = callPackage ../applications/networking/cluster/helmsman { }; + helmsman = callPackage ../applications/networking/cluster/helmsman { + buildGoModule = buildGo117Module; + }; velero = callPackage ../applications/networking/cluster/velero { }; @@ -33328,6 +33563,8 @@ with pkgs; nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; + alejandra = callPackage ../tools/nix/alejandra { }; + nixfmt = haskell.lib.compose.justStaticExecutables haskellPackages.nixfmt; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; @@ -33665,7 +33902,9 @@ with pkgs; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; - stern = callPackage ../applications/networking/cluster/stern { }; + stern = callPackage ../applications/networking/cluster/stern { + buildGoModule = buildGo117Module; + }; streamripper = callPackage ../applications/audio/streamripper { }; @@ -33677,7 +33916,9 @@ with pkgs; go-swag = callPackage ../development/tools/go-swag { }; - go-swagger = callPackage ../development/tools/go-swagger { }; + go-swagger = callPackage ../development/tools/go-swagger { + buildGoModule = buildGo117Module; + }; jx = callPackage ../applications/networking/cluster/jx {}; @@ -33828,7 +34069,9 @@ with pkgs; vice = callPackage ../misc/emulators/vice { }; - viddy = callPackage ../tools/misc/viddy { }; + viddy = callPackage ../tools/misc/viddy { + buildGoModule = buildGo117Module; + }; ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; @@ -33946,8 +34189,6 @@ with pkgs; wraith = callPackage ../applications/networking/irc/wraith { }; - wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; - wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { wxGTK = wxGTK30; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -34164,7 +34405,9 @@ with pkgs; zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { }; + wtf = callPackage ../applications/misc/wtf { + buildGoModule = buildGo117Module; + }; zk-shell = callPackage ../applications/misc/zk-shell { }; @@ -34386,7 +34629,9 @@ with pkgs; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli {}; + kcli = callPackage ../development/tools/kcli { + buildGoModule = buildGo117Module; + }; pxlib = callPackage ../development/libraries/pxlib {}; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 2e031e27307..ff23949ae4f 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -154,8 +154,6 @@ impure-cmds // appleSourcePackages // chooseLibs // { trash = callPackage ../os-specific/darwin/trash { }; - usr-include = callPackage ../os-specific/darwin/usr-include { }; - xattr = pkgs.python3Packages.callPackage ../os-specific/darwin/xattr { }; inherit (pkgs.callPackages ../os-specific/darwin/xcode { }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 132105fabe5..7ba2001fae7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -12,10 +12,14 @@ let "ghcjs810" "integer-simple" "native-bignum" + "ghc902" + "ghc921" "ghcHEAD" ]; nativeBignumIncludes = [ + "ghc902" + "ghc921" "ghcHEAD" ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7707b992ca1..3fcf3717353 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -729,11 +729,20 @@ let Appcpanminus = buildPerlPackage { pname = "App-cpanminus"; - version = "1.7044"; + version = "1.7045"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz"; - sha256 = "9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3"; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7045.tar.gz"; + sha256 = "1779w07zxlgfk35s24ksr7k9azd5yl8sbb48y1aaph7y4gf4lkmc"; }; + # Use TLS endpoints for downloads and metadata by default + preConfigure = '' + substituteInPlace bin/cpanm \ + --replace http://www.cpan.org https://www.cpan.org \ + --replace http://backpan.perl.org https://backpan.perl.org \ + --replace http://fastapi.metacpan.org https://fastapi.metacpan.org \ + --replace http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org + ''; + propagatedBuildInputs = [ IOSocketSSL ]; meta = { homepage = "https://github.com/miyagawa/cpanminus"; description = "Get, unpack, build and install modules from CPAN"; @@ -4043,12 +4052,12 @@ let CPAN = buildPerlPackage { pname = "CPAN"; - version = "2.28"; + version = "2.29"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.28.tar.gz"; - sha256 = "39d357489283d479695027640d7fc25b42ec3c52003071d1ec94496e34af5974"; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.29.tar.gz"; + sha256 = "1f55672efd505a9baacfa1924d115362120aa6bf8efab7a17c7cb090b17ccc41"; }; - propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; + propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases CompressBzip2 Expect FileHomeDir FileWhich LWP LogLog4perl ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck IOSocketSSL ]; meta = { description = "Query, download and build perl modules from CPAN sites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11402,11 +11411,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.29"; + version = "12.39"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - sha256 = "09yszwhirprqr94jwrsr9kyav5syv0mjmnjngqn20fn7m135wv95"; + sha256 = "sha256-QDq1KTpEcl8EWj9a/bxF0TwghUulH30O5yDV0wsxy6I="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca29dee206f..0536f366d50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6321,6 +6321,8 @@ in { prettytable = callPackage ../development/python-modules/prettytable { }; + primecountpy = callPackage ../development/python-modules/primecountpy { }; + primer3 = callPackage ../development/python-modules/primer3 { }; priority = callPackage ../development/python-modules/priority { }; @@ -8378,6 +8380,8 @@ in { qscintilla = self.qscintilla-qt5; + qt5reactor = callPackage ../development/python-modules/qt5reactor { }; + qtawesome = callPackage ../development/python-modules/qtawesome { }; qtconsole = callPackage ../development/python-modules/qtconsole { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 2c2aecff4a6..f006d5b2f11 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -398,8 +398,8 @@ let jobs.pkgsMusl.haskell.compiler.ghc921 jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc902 - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc921 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc921 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; |