diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b9f69a6ce7b8..c7aa63d40f43 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -252,9 +252,8 @@ # Go /doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq +/pkgs/build-support/go @kalbasit @Mic92 @zowoq /pkgs/development/compilers/go @kalbasit @Mic92 @zowoq -/pkgs/development/go-modules @kalbasit @Mic92 @zowoq -/pkgs/development/go-packages @kalbasit @Mic92 @zowoq # GNOME /pkgs/desktops/gnome @jtojnar diff --git a/.github/labeler.yml b/.github/labeler.yml index a48f60e77638..94dfec05c9fd 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -40,9 +40,8 @@ "6.topic: golang": - doc/languages-frameworks/go.section.md + - pkgs/build-support/go/**/* - pkgs/development/compilers/go/**/* - - pkgs/development/go-modules/**/* - - pkgs/development/go-packages/**/* "6.topic: haskell": - doc/languages-frameworks/haskell.section.md diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 7df8464917cf..7fb8ba2e7c27 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1664,6 +1664,26 @@ self: super: { } ``` +### How to override a Python package for all Python versions using extensions? {#how-to-override-a-python-package-for-all-python-versions-using-extensions} + +The following overlay overrides the call to `buildPythonPackage` for the +`foo` package for all interpreters by appending a Python extension to the +`pythonPackagesExtensions` list of extensions. + +```nix +final: prev: { + pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ + ( + python-final: python-prev: { + foo = python-prev.foo.overridePythonAttrs (oldAttrs: { + ... + }); + } + ) + ]; +} +``` + ### How to use Intel’s MKL with numpy and scipy? {#how-to-use-intels-mkl-with-numpy-and-scipy} MKL can be configured using an overlay. See the section "[Using overlays to diff --git a/lib/modules.nix b/lib/modules.nix index 1e48f5440798..7f1646e9b8bc 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -266,6 +266,15 @@ rec { turned off. ''; }; + + _module.specialArgs = mkOption { + readOnly = true; + internal = true; + description = '' + Externally provided module arguments that can't be modified from + within a configuration, but can be used in module imports. + ''; + }; }; config = { @@ -273,6 +282,7 @@ rec { inherit extendModules; moduleType = type; }; + _module.specialArgs = specialArgs; }; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab372e9926c0..2847b88ac057 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -923,6 +923,15 @@ name = "Anselm Schüler"; matrix = "@schuelermine:matrix.org"; }; + anthonyroussel = { + email = "anthony@roussel.dev"; + github = "anthonyroussel"; + githubId = 220084; + name = "Anthony Roussel"; + keys = [{ + fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E"; + }]; + }; antoinerg = { email = "roygobeil.antoine@gmail.com"; github = "antoinerg"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 691c0edd9bb8..349238b625cb 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -71,6 +71,7 @@ luasql-sqlite3,,,,,,vyp luassert,,,,,, luasystem,,,,,, luaunbound,,,,, +luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 2e3dfea8cb6e..db5d2d44e1b0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -95,6 +95,11 @@ PHP now defaults to PHP 8.1, updated from 8.0. + + + Cinnamon has been updated to 5.4. + + hardware.nvidia has a new option @@ -126,6 +131,14 @@ services.dragonflydb. + + + HBase + cluster, a distributed, scalable, big data store. + Available as + services.hadoop.hbase. + + infnoise, @@ -252,6 +265,14 @@ with Google Chrome and the Google Cast extension. + + + services.hbase has been renamed to + services.hbase-standalone. For production + HBase clusters, use services.hadoop.hbase + instead. + + PHP 7.4 is no longer supported due to upstream not supporting diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 6bc7d1917cae..37d53841b76b 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -46,6 +46,8 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP now defaults to PHP 8.1, updated from 8.0. +- Cinnamon has been updated to 5.4. + - `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement. @@ -56,6 +58,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable). +- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). + - [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). @@ -98,6 +102,9 @@ In addition to numerous new and upgraded packages, this release has the followin as it requires `qt4`, which reached its end-of-life 2015 and will no longer be supported by nixpkgs. [According to Barco](https://www.barco.com/de/support/knowledge-base/4380-can-i-use-linux-os-with-clickshare-base-units) many of their base unit models can be used with Google Chrome and the Google Cast extension. +- `services.hbase` has been renamed to `services.hbase-standalone`. + For production HBase clusters, use `services.hadoop.hbase` instead. + - PHP 7.4 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 22.11 release. diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index b031ff2f2be2..09f6d8443bbc 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, utils, modules, baseModules, extraModules, modulesPath, ... }: +{ config, options, lib, pkgs, utils, modules, baseModules, extraModules, modulesPath, specialArgs, ... }: with lib; @@ -7,9 +7,6 @@ let cfg = config.documentation; allOpts = options; - /* Modules for which to show options even when not imported. */ - extraDocModules = [ ../virtualisation/qemu-vm.nix ]; - canCacheDocs = m: let f = import m; @@ -23,7 +20,7 @@ let docModules = let - p = partition canCacheDocs (baseModules ++ extraDocModules); + p = partition canCacheDocs (baseModules ++ cfg.nixos.extraModules); in { lazy = p.right; @@ -41,7 +38,7 @@ let modules = [ { _module.check = false; } ] ++ docModules.eager; - specialArgs = { + specialArgs = specialArgs // { pkgs = scrubDerivations "pkgs" pkgs; # allow access to arbitrary options for eager modules, eg for getting # option types from lazy modules @@ -145,6 +142,12 @@ in { imports = [ + ./man-db.nix + ./mandoc.nix + ./assertions.nix + ./meta.nix + ../config/system-path.nix + ../system/etc/etc.nix (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ]) (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ]) (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ]) @@ -236,6 +239,14 @@ in ''; }; + nixos.extraModules = mkOption { + type = types.listOf types.raw; + default = []; + description = '' + Modules for which to show options even when not imported. + ''; + }; + nixos.options.splitBuild = mkOption { type = types.bool; default = true; @@ -327,10 +338,6 @@ in environment.systemPackages = [] ++ optional cfg.man.enable manual.manpages ++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ]; - - services.getty.helpLine = mkIf cfg.doc.enable ( - "\nRun 'nixos-help' for the NixOS manual." - ); }) ]); diff --git a/nixos/modules/misc/documentation/test-dummy.chapter.xml b/nixos/modules/misc/documentation/test-dummy.chapter.xml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/nixos/modules/misc/documentation/test.nix b/nixos/modules/misc/documentation/test.nix new file mode 100644 index 000000000000..1eaa63b1fb6c --- /dev/null +++ b/nixos/modules/misc/documentation/test.nix @@ -0,0 +1,49 @@ +{ nixosLib, pkgsModule, runCommand }: + +let + sys = nixosLib.evalModules rec { + modules = [ + pkgsModule + ../documentation.nix + ../version.nix + + ({ lib, someArg, ... }: { + # Make sure imports from specialArgs are respected + imports = [ someArg.myModule ]; + + # TODO test this + meta.doc = ./test-dummy.chapter.xml; + }) + + { + _module.args = { + baseModules = [ + ../documentation.nix + ../version.nix + ]; + extraModules = [ ]; + inherit modules; + }; + documentation.nixos.includeAllModules = true; + } + ]; + specialArgs.someArg.myModule = { lib, ... }: { + options.foobar = lib.mkOption { + type = lib.types.str; + description = "The foobar option was added via specialArgs"; + default = "qux"; + }; + }; + }; + +in +runCommand "documentation-check" +{ + inherit (sys.config.system.build.manual) optionsJSON; +} '' + json="$optionsJSON/share/doc/nixos/options.json" + echo checking $json + + grep 'The foobar option was added via specialArgs' <"$json" >/dev/null + touch $out +'' diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index bdc3e5623be6..b3cdaf5568d4 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -38,12 +38,19 @@ let in { imports = [ + ./label.nix (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ]) (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ]) (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ]) ]; + options.boot.initrd.osRelease = mkOption { + internal = true; + readOnly = true; + default = initrdRelease; + }; + options.system = { nixos.version = mkOption { @@ -142,11 +149,6 @@ in "os-release".text = attrsToText osReleaseContents; }; - boot.initrd.systemd.contents = { - "/etc/os-release".source = initrdRelease; - "/etc/initrd-release".source = initrdRelease; - }; - # We have to use `warnings` because when warning in the default of the option # the warning would also be shown when building the manual since the manual # has to evaluate the default. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2ae463190fb5..4c51210bc200 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -357,7 +357,7 @@ ./services/databases/dgraph.nix ./services/databases/firebird.nix ./services/databases/foundationdb.nix - ./services/databases/hbase.nix + ./services/databases/hbase-standalone.nix ./services/databases/influxdb.nix ./services/databases/influxdb2.nix ./services/databases/memcached.nix @@ -1287,4 +1287,5 @@ ./virtualisation/waydroid.nix ./virtualisation/xen-dom0.nix ./virtualisation/xe-guest-utilities.nix + { documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix ]; } ] diff --git a/nixos/modules/services/cluster/hadoop/conf.nix b/nixos/modules/services/cluster/hadoop/conf.nix index e3c26a0d5505..388eaafcc362 100644 --- a/nixos/modules/services/cluster/hadoop/conf.nix +++ b/nixos/modules/services/cluster/hadoop/conf.nix @@ -33,6 +33,7 @@ pkgs.runCommand "hadoop-conf" {} (with cfg; '' mkdir -p $out/ cp ${siteXml "core-site.xml" (coreSite // coreSiteInternal)}/* $out/ cp ${siteXml "hdfs-site.xml" (hdfsSiteDefault // hdfsSite // hdfsSiteInternal)}/* $out/ + cp ${siteXml "hbase-site.xml" (hbaseSiteDefault // hbaseSite // hbaseSiteInternal)}/* $out/ cp ${siteXml "mapred-site.xml" (mapredSiteDefault // mapredSite)}/* $out/ cp ${siteXml "yarn-site.xml" (yarnSiteDefault // yarnSite // yarnSiteInternal)}/* $out/ cp ${siteXml "httpfs-site.xml" httpfsSite}/* $out/ @@ -40,5 +41,5 @@ pkgs.runCommand "hadoop-conf" {} (with cfg; '' cp ${pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions}/* $out/ cp ${pkgs.writeTextDir "hadoop-env.sh" hadoopEnv}/* $out/ cp ${log4jProperties} $out/log4j.properties - ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") extraConfDirs} + ${lib.concatMapStringsSep "\n" (dir: "cp -f -r ${dir}/* $out/") extraConfDirs} '') diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index a4fdea81037c..a3a28eb7184a 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -5,7 +5,7 @@ let in with lib; { - imports = [ ./yarn.nix ./hdfs.nix ]; + imports = [ ./yarn.nix ./hdfs.nix ./hbase.nix ]; options.services.hadoop = { coreSite = mkOption { diff --git a/nixos/modules/services/cluster/hadoop/hbase.nix b/nixos/modules/services/cluster/hadoop/hbase.nix new file mode 100644 index 000000000000..246775dc8987 --- /dev/null +++ b/nixos/modules/services/cluster/hadoop/hbase.nix @@ -0,0 +1,196 @@ +{ config, lib, pkgs, ...}: + +with lib; +let + cfg = config.services.hadoop; + hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; + mkIfNotNull = x: mkIf (x != null) x; +in +{ + options.services.hadoop = { + + gatewayRole.enableHbaseCli = mkEnableOption "HBase CLI tools"; + + hbaseSiteDefault = mkOption { + default = { + "hbase.regionserver.ipc.address" = "0.0.0.0"; + "hbase.master.ipc.address" = "0.0.0.0"; + "hbase.master.info.bindAddress" = "0.0.0.0"; + "hbase.regionserver.info.bindAddress" = "0.0.0.0"; + + "hbase.cluster.distributed" = "true"; + }; + type = types.attrsOf types.anything; + description = '' + Default options for hbase-site.xml + ''; + }; + hbaseSite = mkOption { + default = {}; + type = with types; attrsOf anything; + example = literalExpression '' + ''; + description = '' + Additional options and overrides for hbase-site.xml + + ''; + }; + hbaseSiteInternal = mkOption { + default = {}; + type = with types; attrsOf anything; + internal = true; + description = '' + Internal option to add configs to hbase-site.xml based on module options + ''; + }; + + hbase = { + + package = mkOption { + type = types.package; + default = pkgs.hbase; + defaultText = literalExpression "pkgs.hbase"; + description = "HBase package"; + }; + + rootdir = mkOption { + description = '' + This option will set "hbase.rootdir" in hbase-site.xml and determine + the directory shared by region servers and into which HBase persists. + The URL should be 'fully-qualified' to include the filesystem scheme. + If a core-site.xml is provided, the FS scheme defaults to the value + of "fs.defaultFS". + + Filesystems other than HDFS (like S3, QFS, Swift) are also supported. + ''; + type = types.str; + example = "hdfs://nameservice1/hbase"; + default = "/hbase"; + }; + zookeeperQuorum = mkOption { + description = '' + This option will set "hbase.zookeeper.quorum" in hbase-site.xml. + Comma separated list of servers in the ZooKeeper ensemble. + ''; + type = with types; nullOr commas; + example = "zk1.internal,zk2.internal,zk3.internal"; + default = null; + }; + master = { + enable = mkEnableOption "HBase Master"; + initHDFS = mkEnableOption "initialization of the hbase directory on HDFS"; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open firewall ports for HBase master. + ''; + }; + }; + regionServer = { + enable = mkEnableOption "HBase RegionServer"; + + overrideHosts = mkOption { + type = types.bool; + default = true; + description = '' + Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix + Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records + or /etc/hosts entries. + + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open firewall ports for HBase master. + ''; + }; + }; + }; + }; + + config = mkMerge [ + (mkIf cfg.hbase.master.enable { + services.hadoop.gatewayRole = { + enable = true; + enableHbaseCli = mkDefault true; + }; + + systemd.services.hbase-master = { + description = "HBase master"; + wantedBy = [ "multi-user.target" ]; + + preStart = mkIf cfg.hbase.master.initHDFS '' + HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfsadmin -safemode wait + HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -mkdir -p ${cfg.hbase.rootdir} + HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -chown hbase ${cfg.hbase.rootdir} + ''; + + serviceConfig = { + User = "hbase"; + SyslogIdentifier = "hbase-master"; + ExecStart = "${cfg.hbase.package}/bin/hbase --config ${hadoopConf} " + + "master start"; + Restart = "always"; + }; + }; + + services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir; + + networking.firewall.allowedTCPPorts = (mkIf cfg.hbase.master.openFirewall [ + 16000 16010 + ]); + + }) + + (mkIf cfg.hbase.regionServer.enable { + services.hadoop.gatewayRole = { + enable = true; + enableHbaseCli = mkDefault true; + }; + + systemd.services.hbase-regionserver = { + description = "HBase RegionServer"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "hbase"; + SyslogIdentifier = "hbase-regionserver"; + ExecStart = "${cfg.hbase.package}/bin/hbase --config /etc/hadoop-conf/ " + + "regionserver start"; + Restart = "always"; + }; + }; + + services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir; + + networking = { + firewall.allowedTCPPorts = (mkIf cfg.hbase.regionServer.openFirewall [ + 16020 16030 + ]); + hosts = mkIf cfg.hbase.regionServer.overrideHosts { + "127.0.0.2" = mkForce [ ]; + "::1" = mkForce [ ]; + }; + }; + }) + + (mkIf cfg.gatewayRole.enable { + + environment.systemPackages = mkIf cfg.gatewayRole.enableHbaseCli [ cfg.hbase.package ]; + + services.hadoop.hbaseSiteInternal = with cfg.hbase; { + "hbase.zookeeper.quorum" = mkIfNotNull zookeeperQuorum; + }; + + users.users.hbase = { + description = "Hadoop HBase user"; + group = "hadoop"; + isSystemUser = true; + }; + }) + ]; +} diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix index 6c185b9cd245..75a97e535479 100644 --- a/nixos/modules/services/cluster/hadoop/hdfs.nix +++ b/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -158,8 +158,8 @@ in 50010 # datanode.address 50020 # datanode.ipc.address ]; - extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = let d = cfg.hdfs.datanode.dataDirs; in - if (d!= null) then (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs) else d; + extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = mkIf (cfg.hdfs.datanode.dataDirs!= null) + (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs); }) (hadoopServiceConfig { diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix index 0a03fe6dab69..be0b9c13cd35 100644 --- a/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/nixos/modules/services/cluster/hadoop/yarn.nix @@ -178,18 +178,18 @@ in services.hadoop.gatewayRole.enable = true; - services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; { - "yarn.nodemanager.local-dirs" = localDir; + services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; mkMerge [ ({ + "yarn.nodemanager.local-dirs" = mkIf (localDir!= null) (concatStringsSep "," localDir); "yarn.scheduler.maximum-allocation-vcores" = resource.maximumAllocationVCores; "yarn.scheduler.maximum-allocation-mb" = resource.maximumAllocationMB; "yarn.nodemanager.resource.cpu-vcores" = resource.cpuVCores; "yarn.nodemanager.resource.memory-mb" = resource.memoryMB; - } // mkIf useCGroups { + }) (mkIf useCGroups { "yarn.nodemanager.linux-container-executor.cgroups.hierarchy" = "/hadoop-yarn"; "yarn.nodemanager.linux-container-executor.resources-handler.class" = "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler"; "yarn.nodemanager.linux-container-executor.cgroups.mount" = "true"; "yarn.nodemanager.linux-container-executor.cgroups.mount-path" = "/run/wrappers/yarn-nodemanager/cgroup"; - }; + })]; networking.firewall.allowedTCPPortRanges = [ (mkIf (cfg.yarn.nodemanager.openFirewall) {from = 1024; to = 65535;}) diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase-standalone.nix similarity index 88% rename from nixos/modules/services/databases/hbase.nix rename to nixos/modules/services/databases/hbase-standalone.nix index 5cc5d97e7984..ca891fe8a5cd 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase-standalone.nix @@ -3,8 +3,8 @@ with lib; let - cfg = config.services.hbase; - opt = options.services.hbase; + cfg = config.services.hbase-standalone; + opt = options.services.hbase-standalone; buildProperty = configAttr: (builtins.concatStringsSep "\n" @@ -32,19 +32,19 @@ let in { + imports = [ + (mkRenamedOptionModule [ "services" "hbase" ] [ "services" "hbase-standalone" ]) + ]; + ###### interface options = { + services.hbase-standalone = { - services.hbase = { - - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to run HBase. - ''; - }; + enable = mkEnableOption '' + HBase master in standalone mode with embedded regionserver and zookeper. + Do not use this configuration for production nor for evaluating HBase performance. + ''; package = mkOption { type = types.package; @@ -108,12 +108,11 @@ in { }; }; - }; ###### implementation - config = mkIf config.services.hbase.enable { + config = mkIf cfg.enable { systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -" diff --git a/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix index c7cd3c9d2eb9..ccba87531e66 100644 --- a/nixos/modules/services/hardware/kanata.nix +++ b/nixos/modules/services/hardware/kanata.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -7,10 +7,20 @@ let keyboard = { options = { - device = mkOption { - type = types.str; - example = "/dev/input/by-id/usb-0000_0000-event-kbd"; - description = lib.mdDoc "Path to the keyboard device."; + devices = mkOption { + type = types.addCheck (types.listOf types.str) + (devices: (length devices) > 0); + example = [ "/dev/input/by-id/usb-0000_0000-event-kbd" ]; + # TODO replace note with tip, which has not been implemented yet in + # nixos/lib/make-options-doc/mergeJSON.py + description = mdDoc '' + Paths to keyboard devices. + + ::: {.note} + To avoid unnecessary triggers of the service unit, unplug devices in + the order of the list. + ::: + ''; }; config = mkOption { type = types.lines; @@ -33,18 +43,32 @@ let ;; tap within 100ms for capslk, hold more than 100ms for lctl cap (tap-hold 100 100 caps lctl)) ''; - description = lib.mdDoc '' - Configuration other than defcfg. - See for more information. + description = mdDoc '' + Configuration other than `defcfg`. See [example config + files](https://github.com/jtroo/kanata) for more information. ''; }; extraDefCfg = mkOption { type = types.lines; default = ""; example = "danger-enable-cmd yes"; - description = lib.mdDoc '' - Configuration of defcfg other than linux-dev. - See for more information. + description = mdDoc '' + Configuration of `defcfg` other than `linux-dev`. See [example + config files](https://github.com/jtroo/kanata) for more information. + ''; + }; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + description = mdDoc "Extra command line arguments passed to kanata."; + }; + port = mkOption { + type = types.nullOr types.port; + default = null; + example = 6666; + description = mdDoc '' + Port to run the notification server on. `null` will not run the + server. ''; }; }; @@ -52,16 +76,18 @@ let mkName = name: "kanata-${name}"; + mkDevices = devices: concatStringsSep ":" devices; + mkConfig = name: keyboard: pkgs.writeText "${mkName name}-config.kdb" '' (defcfg ${keyboard.extraDefCfg} - linux-dev ${keyboard.device}) + linux-dev ${mkDevices keyboard.devices}) ${keyboard.config} ''; mkService = name: keyboard: nameValuePair (mkName name) { - description = "kanata for ${keyboard.device}"; + description = "kanata for ${mkDevices keyboard.devices}"; # Because path units are used to activate service units, which # will start the old stopped services during "nixos-rebuild @@ -72,10 +98,14 @@ let serviceConfig = { ExecStart = '' ${cfg.package}/bin/kanata \ - --cfg ${mkConfig name keyboard} + --cfg ${mkConfig name keyboard} \ + --symlink-path ''${RUNTIME_DIRECTORY}/${name} \ + ${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \ + ${utils.escapeSystemdExecArgs keyboard.extraArgs} ''; DynamicUser = true; + RuntimeDirectory = mkName name; SupplementaryGroups = with config.users.groups; [ input.name uinput.name @@ -83,15 +113,16 @@ let # hardening DeviceAllow = [ - "/dev/uinput w" + "/dev/uinput rw" "char-input r" ]; - CapabilityBoundingSet = ""; + CapabilityBoundingSet = [ "" ]; DevicePolicy = "closed"; - IPAddressDeny = "any"; + IPAddressAllow = optional (keyboard.port != null) "localhost"; + IPAddressDeny = [ "any" ]; LockPersonality = true; MemoryDenyWriteExecute = true; - PrivateNetwork = true; + PrivateNetwork = keyboard.port == null; PrivateUsers = true; ProcSubset = "pid"; ProtectClock = true; @@ -102,10 +133,11 @@ let ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - RestrictAddressFamilies = "none"; + RestrictAddressFamilies = + if (keyboard.port == null) then "none" else [ "AF_INET" ]; RestrictNamespaces = true; RestrictRealtime = true; - SystemCallArchitectures = "native"; + SystemCallArchitectures = [ "native" ]; SystemCallFilter = [ "@system-service" "~@privileged" @@ -115,13 +147,32 @@ let }; }; - mkPath = name: keyboard: nameValuePair (mkName name) { - description = "kanata trigger for ${keyboard.device}"; - wantedBy = [ "multi-user.target" ]; - pathConfig = { - PathExists = keyboard.device; + mkPathName = i: name: "${mkName name}-${toString i}"; + + mkPath = name: n: i: device: + nameValuePair (mkPathName i name) { + description = + "${toString (i+1)}/${toString n} kanata trigger for ${name}, watching ${device}"; + wantedBy = optional (i == 0) "multi-user.target"; + pathConfig = { + PathExists = device; + # (ab)use systemd.path to construct a trigger chain so that the + # service unit is only started when all paths exist + # however, manual of systemd.path says Unit's suffix is not ".path" + Unit = + if (i + 1) == n + then "${mkName name}.service" + else "${mkPathName (i + 1) name}.path"; + }; + unitConfig.StopPropagatedFrom = optional (i > 0) "${mkName name}.service"; }; - }; + + mkPaths = name: keyboard: + let + n = length keyboard.devices; + in + imap0 (mkPath name n) keyboard.devices + ; in { options.services.kanata = { @@ -131,15 +182,19 @@ in default = pkgs.kanata; defaultText = lib.literalExpression "pkgs.kanata"; example = lib.literalExpression "pkgs.kanata-with-cmd"; - description = lib.mdDoc '' - kanata package to use. - If you enable danger-enable-cmd, pkgs.kanata-with-cmd should be used. + description = mdDoc '' + The kanata package to use. + + ::: {.note} + If `danger-enable-cmd` is enabled in any of the keyboards, the + `kanata-with-cmd` package should be used. + ::: ''; }; keyboards = mkOption { type = types.attrsOf (types.submodule keyboard); default = { }; - description = lib.mdDoc "Keyboard configurations."; + description = mdDoc "Keyboard configurations."; }; }; @@ -147,7 +202,11 @@ in hardware.uinput.enable = true; systemd = { - paths = mapAttrs' mkPath cfg.keyboards; + paths = trivial.pipe cfg.keyboards [ + (mapAttrsToList mkPaths) + concatLists + listToAttrs + ]; services = mapAttrs' mkService cfg.keyboards; }; }; diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 266149cf2211..7a0b5b4d3d4c 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -132,8 +132,9 @@ in { systemd.services.yggdrasil = { description = "Yggdrasil Network Service"; - bindsTo = [ "network-online.target" ]; - after = [ "network-online.target" ]; + after = [ "network-pre.target" ]; + wants = [ "network.target" ]; + before = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index d2bebb9c245b..e8efe72577c5 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -104,6 +104,7 @@ in # Note: this is set here rather than up there so that changing # nixos.label would not rebuild manual pages services.getty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>''; + services.getty.helpLine = mkIf (config.documentation.nixos.enable && config.documentation.doc.enable) "\nRun 'nixos-help' for the NixOS manual."; systemd.services."getty@" = { serviceConfig.ExecStart = [ diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index d54f99c2cd5c..5a7d9e28b5c7 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -82,6 +82,7 @@ in ''; # Default services + services.blueman.enable = mkDefault true; hardware.bluetooth.enable = mkDefault true; hardware.pulseaudio.enable = mkDefault true; security.polkit.enable = true; @@ -91,7 +92,7 @@ in cinnamon-common cinnamon-screensaver nemo - xapps + xapp ]; services.cinnamon.apps.enable = mkDefault true; services.gnome.glib-networking.enable = true; @@ -199,13 +200,12 @@ in environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ # cinnamon team apps bulky - blueberry warpinator - # cinnamon xapps + # cinnamon xapp xviewer xreader - xed + xed-editor xplayer pix diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 0351453a6587..888653469ed7 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -374,6 +374,9 @@ in { ''; "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; + "/etc/os-release".source = config.boot.initrd.osRelease; + "/etc/initrd-release".source = config.boot.initrd.osRelease; + }; storePaths = [ diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 06210095cfce..affb179a92d3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -127,6 +127,7 @@ in { docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {}; docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; documize = handleTest ./documize.nix {}; + documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; }; doh-proxy-rust = handleTest ./doh-proxy-rust.nix {}; dokuwiki = handleTest ./dokuwiki.nix {}; domination = handleTest ./domination.nix {}; diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 9bb78a97f36d..3f9cea6662fb 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -8,7 +8,7 @@ let firefoxPackage' = firefoxPackage.override (args: { in { - name = firefoxPackage'.unwrapped.binaryName; + name = firefoxPackage'.unwrapped.pname; meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; diff --git a/nixos/tests/hadoop/default.nix b/nixos/tests/hadoop/default.nix index d2a97cbeffb8..479690adc064 100644 --- a/nixos/tests/hadoop/default.nix +++ b/nixos/tests/hadoop/default.nix @@ -4,4 +4,5 @@ all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop.nix { inherit package; }; hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hdfs.nix { inherit package; }; yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./yarn.nix { inherit package; }; + hbase = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hbase.nix { inherit package; }; } diff --git a/nixos/tests/hadoop/hbase.nix b/nixos/tests/hadoop/hbase.nix new file mode 100644 index 000000000000..d9d2dac0f658 --- /dev/null +++ b/nixos/tests/hadoop/hbase.nix @@ -0,0 +1,84 @@ +# Test a minimal hbase cluster +{ pkgs, ... }: +import ../make-test-python.nix ({ hadoop ? pkgs.hadoop, hbase ? pkgs.hbase, ... }: +with pkgs.lib; +{ + name = "hadoop-hbase"; + + nodes = let + coreSite = { + "fs.defaultFS" = "hdfs://namenode:8020"; + }; + defOpts = { + enable = true; + openFirewall = true; + }; + zookeeperQuorum = "zookeeper"; + in { + zookeeper = { ... }: { + services.zookeeper.enable = true; + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + namenode = { ... }: { + services.hadoop = { + hdfs = { + namenode = defOpts // { formatOnInit = true; }; + }; + inherit coreSite; + }; + }; + datanode = { ... }: { + virtualisation.diskSize = 8192; + services.hadoop = { + hdfs.datanode = defOpts; + inherit coreSite; + }; + }; + + master = { ... }:{ + services.hadoop = { + inherit coreSite; + hbase = { + inherit zookeeperQuorum; + master = defOpts // { initHDFS = true; }; + }; + }; + }; + regionserver = { ... }:{ + services.hadoop = { + inherit coreSite; + hbase = { + inherit zookeeperQuorum; + regionServer = defOpts; + }; + }; + }; + }; + + testScript = '' + start_all() + + # wait for HDFS cluster + namenode.wait_for_unit("hdfs-namenode") + namenode.wait_for_unit("network.target") + namenode.wait_for_open_port(8020) + namenode.wait_for_open_port(9870) + datanode.wait_for_unit("hdfs-datanode") + datanode.wait_for_unit("network.target") + datanode.wait_for_open_port(9864) + datanode.wait_for_open_port(9866) + datanode.wait_for_open_port(9867) + + # wait for ZK + zookeeper.wait_for_unit("zookeeper") + zookeeper.wait_for_open_port(2181) + + # wait for HBase to start up + master.wait_for_unit("hbase-master") + regionserver.wait_for_unit("hbase-regionserver") + + assert "1 active master, 0 backup masters, 1 servers" in master.succeed("echo status | HADOOP_USER_NAME=hbase hbase shell -n") + regionserver.wait_until_succeeds("echo \"create 't1','f1'\" | HADOOP_USER_NAME=hbase hbase shell -n") + assert "NAME => 'f1'" in regionserver.succeed("echo \"describe 't1'\" | HADOOP_USER_NAME=hbase hbase shell -n") + ''; +}) diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix index 1bf8e3831f67..08c8ff857d8c 100644 --- a/nixos/tests/hadoop/yarn.nix +++ b/nixos/tests/hadoop/yarn.nix @@ -19,7 +19,7 @@ import ../make-test-python.nix ({ package, ... }: { enable = true; openFirewall = true; }; - yarnSite = options.services.hadoop.yarnSite.default // { + yarnSite = { "yarn.resourcemanager.hostname" = "resourcemanager"; "yarn.nodemanager.log-dirs" = "/tmp/userlogs"; }; diff --git a/nixos/tests/hbase.nix b/nixos/tests/hbase.nix index a449d24dd6fd..7d8e32f81603 100644 --- a/nixos/tests/hbase.nix +++ b/nixos/tests/hbase.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.hbase, ... }: { - name = "hbase"; + name = "hbase-standalone"; meta = with lib.maintainers; { maintainers = [ illustris ]; @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.hbase, ... }: nodes = { hbase = { pkgs, ... }: { - services.hbase = { + services.hbase-standalone = { enable = true; inherit package; # Needed for standalone mode in hbase 2+ diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index 757c3dcf5db3..0c5523c0a359 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - hash = "sha256-27jXpx79JNF5FjVKERNrQFS7VHZHWh57jjBWvX5IRio="; + hash = "sha256-/kZYzUzycHKre6/dvZgeqXu6mrkblftV51Z7866fZVY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-M5T+imP7up3RRiXOJRrqimcjs8r81V5jfQMjR02skko="; + hash = "sha256-1+RWL9MD6aX+zI2rtQUQCqemCephLKGEAf5xNCb+jo4="; }; postPatch = '' diff --git a/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch b/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch new file mode 100644 index 000000000000..49f1208eb117 --- /dev/null +++ b/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch @@ -0,0 +1,25 @@ +From b64b03be9edf23a80fce0c76de61ffff0914ddce Mon Sep 17 00:00:00 2001 +From: Thiago Kenji Okada +Date: Mon, 8 Aug 2022 10:28:33 +0100 +Subject: [PATCH] Set plugindir to $PREFIX/lib/audacious + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3f7996f72..ab09d6476 100644 +--- a/meson.build ++++ b/meson.build +@@ -160,7 +160,7 @@ if (cxx.has_header('libintl.h')) + endif + + +-install_plugindir = audacious_dep.get_variable(pkgconfig: 'plugin_dir') ++install_plugindir = join_paths(get_option('prefix'), 'lib/audacious') + + + conf.set_quoted('INSTALL_PLUGINDIR', install_plugindir) +-- +2.36.0 + diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 7ccdc4eced67..eb404041d973 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,15 +1,16 @@ -{ - mkDerivation, lib, fetchurl, fetchpatch, - gettext, pkg-config, - qtbase, - alsa-lib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, - libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, - libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, - libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, - wavpack, libopenmpt +{ lib +, stdenv +, audacious-plugins +, fetchurl +, gettext +, meson +, ninja +, pkg-config +, qtbase +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "audacious"; version = "4.2"; @@ -17,54 +18,39 @@ mkDerivation rec { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; sha256 = "sha256-/rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM="; }; - pluginsSrc = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8="; - }; - nativeBuildInputs = [ gettext pkg-config ]; - - buildInputs = [ - # Core dependencies - qtbase - - # Plugin dependencies - alsa-lib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb - libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli - libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile - libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack - libopenmpt + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + wrapQtAppsHook ]; - configureFlags = [ "--disable-gtk" ]; + buildInputs = [ + qtbase + ]; - # Here we build both audacious and audacious-plugins in one - # derivation, since they really expect to be in the same prefix. - # This is slighly tricky. - builder = builtins.toFile "builder.sh" '' - # First build audacious. - ( - source $stdenv/setup - genericBuild - ) - # Then build the plugins. - ( - nativeBuildInputs="$out $nativeBuildInputs" # to find audacious - source $stdenv/setup - rm -rfv audacious-* - src=$pluginsSrc - genericBuild - ) + mesonFlags = [ + "-Dgtk=false" + "-Dbuildstamp=NixOS" + ]; + + postInstall = lib.optionalString (audacious-plugins != null) '' + ln -s ${audacious-plugins}/lib/audacious $out/lib ''; meta = with lib; { - description = "Audio player"; + description = "A lightweight and versatile audio player"; homepage = "https://audacious-media-player.org/"; - maintainers = with maintainers; [ eelco ramkromberg ttuegel ]; + maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ]; platforms = with platforms; linux; license = with licenses; [ - bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING - gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46 + bsd2 + bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING + gpl2 + gpl3 + lgpl2Plus #http://redmine.audacious-media-player.org/issues/46 ]; }; } diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix new file mode 100644 index 000000000000..902140465334 --- /dev/null +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -0,0 +1,111 @@ +{ stdenv +, fetchurl +, alsa-lib +, audacious +, curl +, faad2 +, ffmpeg +, flac +, fluidsynth +, gdk-pixbuf +, gettext +, lame +, libbs2b +, libcddb +, libcdio +, libcdio-paranoia +, libcue +, libjack2 +, libmad +, libmms +, libmodplug +, libmowgli +, libnotify +, libogg +, libopenmpt +, libpulseaudio +, libsamplerate +, libsidplayfp +, libsndfile +, libvorbis +, libxml2 +, lirc +, meson +, mpg123 +, neon +, ninja +, pkg-config +, qtbase +, qtmultimedia +, qtx11extras +, soxr +, wavpack +}: + +stdenv.mkDerivation rec { + pname = "audacious-plugins"; + version = "4.2"; + + src = fetchurl { + url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; + sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8="; + }; + + patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + ]; + + buildInputs = [ + audacious + alsa-lib + curl + faad2 + ffmpeg + flac + fluidsynth + gdk-pixbuf + lame + libbs2b + libcddb + libcdio + libcdio-paranoia + libcue + libjack2 + libmad + libmms + libmodplug + libmowgli + libnotify + libogg + libpulseaudio + libsamplerate + libsidplayfp + libsndfile + libvorbis + libxml2 + lirc + mpg123 + neon + qtbase + qtmultimedia + qtx11extras + soxr + wavpack + libopenmpt + ]; + + mesonFlags = [ + "-Dgtk=false" + ]; + + dontWrapQtApps = true; + + meta = audacious.meta // { + description = "Plugins for Audacious music player"; + }; +} diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 37bb05d90387..b4961384080e 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-N/HDwfJn7Py4y/GZcIDbeoMEqG+SuRGO23ITZMot8cc="; + sha256 = "sha256-R4Xv+PmzKZQF1tFtSQTFjaisGug2EKM6mPVoGutNnok="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix index 9a2a2f109b02..bcd2f8e4c42a 100644 --- a/pkgs/applications/audio/noise-repellent/default.nix +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "noise-repellent"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "lucianodato"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hMNVzhJZFGFeu5aygLkfq495O0zpaIk41ddzejvDITE="; + sha256 = "sha256-d8csYC3z3vXdmN/G6mAK+H8ia0vOCsoUpoA3W8/OADc="; }; mesonFlags = [ diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 65db24062620..61964370b3e2 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -10,18 +10,18 @@ , libgee , util-linux , vte -, xapps +, xapp }: stdenv.mkDerivation rec { pname = "timeshift"; - version = "22.06.1"; + version = "22.06.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; - rev = "v${version}"; - sha256 = "XcxwVBKMv2YwbrI3FFWDQFs8hHruhkZq3YqzkptE6KE="; + rev = version; + sha256 = "IHX/F3tnl3ckX20mnPHmuK/W4pRTFHzBUfaJg2sMpqc="; }; patches = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { json-glib libgee vte - xapps + xapp ]; preBuild = '' diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 0a8414a96643..942c411762b7 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.6.1"; + version = "1.6.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lz42emfVBWas1A2YuEkjGAX8V1Qe2YAZMEgMYwIhhKM="; + sha256 = "sha256-790/XBeFS1iM73WuBMXcEoB3gjBlU1dMPRwtQNB7taE="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index a99f04a4f90f..4dcbafb87d0e 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -106,18 +106,18 @@ }) (fetchNuGet { pname = "Fido2.AspNet"; - version = "2.0.1"; - sha256 = "1d6bjyck3mlhb9b4c75xhzr2pcs47vdqg2ayi5wnjh1aszyam3nq"; + version = "2.0.2"; + sha256 = "0x2k1wyd0p7cy4ir15m2bxiggckl98znc65b4vq75ckjyd6dm1a1"; }) (fetchNuGet { pname = "Fido2.Models"; - version = "2.0.1"; - sha256 = "0llpzkik82n5gpgjawx181j85d2lizimkbdkxj1wyrjvxb2xbg3q"; + version = "2.0.2"; + sha256 = "1vk4h9sv2dhdr0jvh2a7yk6v9rhxk9y8hxz4mkal8vd9psajz5cg"; }) (fetchNuGet { pname = "Fido2"; - version = "2.0.1"; - sha256 = "1s829n970lxngbhac9lvarwa9n9hqxr79kwv8i12amnmg6ir8ny5"; + version = "2.0.2"; + sha256 = "1wqlk48apm7h637da7sav0r1a8yz2yy2gxhifpvydjqk1n3qybz4"; }) (fetchNuGet { pname = "Google.Api.Gax.Rest"; @@ -209,11 +209,6 @@ version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) - (fetchNuGet { - pname = "Microsoft.AspNet.WebApi.Client"; - version = "5.2.7"; - sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; - }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; @@ -226,13 +221,13 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; - version = "6.0.1"; - sha256 = "1mj04ynr6bxvmq9nrggi832n8hbcr9j9kjr9y2rgiq91y6skzg37"; + version = "6.0.7"; + sha256 = "0g9n5f0p9grjl1fzd7h6dd4ywkc1r7irqyjslkrrvnjqzqg7a2mp"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; - version = "6.0.1"; - sha256 = "0aqaviwbnwg0vpwwdbif7b9ncpckwpclm77l3ac11s8fsq3vb3sm"; + version = "6.0.7"; + sha256 = "0n6l22yp6qrq3wjgkgrlxf5zmpcx0cz8s9hh99g6i88fmhav7dxh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; @@ -271,33 +266,33 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; - version = "6.0.1"; - sha256 = "1j9z0xzj2hlffhg28ijp33flljq75js8dvlchbpggvvd789hm4il"; + version = "6.0.7"; + sha256 = "1sygbi88w9kkypq3nr7i81mxll8xdnjw9dp6h1dyyr7wr37yhr81"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; - version = "6.0.1"; - sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r"; + version = "6.0.7"; + sha256 = "0l235hs1j24iqvk79p95sfrsfbj6l2kb10x9zi34jinvldyn5ln6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "6.0.1"; - sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1"; + version = "6.0.7"; + sha256 = "08g3aq8gn917r55hnx1i36jfwy51311yns0x6wpvs9d2y4ncygk4"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; - version = "6.0.1"; - sha256 = "1grhlksdd7mwv72g78kx86mzba8mgza3i53x9jv16bkc1wxqwfcd"; + version = "6.0.7"; + sha256 = "0zsyqfywa6c01aflqdj4bc8cdwlcz4xiafkn6f07xbsl3p9v0lk5"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; - version = "6.0.1"; - sha256 = "0778xw230flwqkjjydp73gb6r3brrlqwqdrf4m0b92b083bysh59"; + version = "6.0.7"; + sha256 = "1bfrdwvz12fs31pdjxhj8arjw8pvawsp64wlj2sfmll7q3618jgp"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Language"; - version = "6.0.1"; - sha256 = "11spvrnp2mz5kc11ycv2wpgn8bilwpinbl6vkvvr7jjrqlm36lk1"; + version = "6.0.7"; + sha256 = "0757507ivh8q6xfrbihnhnfya0g4wd5j033i2fcsinfyn576wc8c"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; @@ -324,6 +319,11 @@ version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.3.3"; + sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; + }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.0"; @@ -331,8 +331,8 @@ }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; - version = "4.0.1"; - sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"; + version = "4.2.0"; + sha256 = "0ld6xxgaqc3c6zgyimlvpgrxncsykbz8irqs01jyj40rv150kp8s"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; @@ -341,18 +341,18 @@ }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; - version = "4.0.1"; - sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"; + version = "4.2.0"; + sha256 = "0i1c7055j3f5k1765bl66amp72dcw0zapczfszdldbg91iqmmkxg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; - version = "6.0.1"; - sha256 = "0dwwhiv28wyzq3177qg961ll2q3ggiw2k0zdashgym5cl67p93lm"; + version = "6.0.7"; + sha256 = "1jnwch6vb7v95q005wq2z7fv5pisbdi2yn0n9hmxwz3kaiqcqjdm"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "17.0.0"; - sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; + version = "17.2.0"; + sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; @@ -371,8 +371,8 @@ }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; - version = "6.0.1"; - sha256 = "0gzn3rynp9k6mx4h4dhq124b7ra8m11rkjh40r2r8z4gkr0shjv1"; + version = "6.0.7"; + sha256 = "0r5njqyl10dv0akwl5y32ik0rpzs9lwj151j6ayz358pn4x26akk"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; @@ -386,43 +386,53 @@ }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "6.0.1"; - sha256 = "15mx86i7gqlak604vr853x7a4b4l48wz5vqh9qbib7wh4pkf4rp3"; + version = "6.0.5"; + sha256 = "1vziijdf6kmv61i09bk0yxnbn08b48dy1jn4qbmhxaka745z1w6x"; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "6.0.7"; + sha256 = "0xhkh9k3xpgjdsizg1wdncwz4rdjvffq3x0sfcarscmg2j5fa4yj"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "6.0.1"; - sha256 = "16739crhjky22j53v8varninz9bqdmdfwjnzj6xvfxqfl858jja5"; + version = "6.0.7"; + sha256 = "0fdh0w5c51kkpvh1p5f0dn90kikh3zdyc1k4hjvv1z8kr603nd1b"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; - version = "6.0.1"; - sha256 = "13bi91lkasy4qj04jn2hmbwpsc6fybgllwsr87qhz5p86ig9ryq9"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Relational"; - version = "6.0.0"; - sha256 = "1v2r8004isvz4d8qxh5clgkbnlwivjlsqhn7skw0y9b5i61y2mwk"; + version = "6.0.7"; + sha256 = "0mdb2gqmb94sw38cpqm972vdhh88n7q81xhq4gq771hp2wspn5ap"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "6.0.1"; sha256 = "0224qas1rl3jv02ribb2lwfqcd64ij40v6q10369h4mrwr071zr2"; }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Relational"; + version = "6.0.5"; + sha256 = "027j472gmqkrazy7b044qllsh8zbvl7lv3mdgnbghrhj06jfasm6"; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Relational"; + version = "6.0.7"; + sha256 = "1kx0ac7jgf8nmp5nra4cd6h2xbwvb3zkyzx7cds60y1j9nm7lx1g"; + }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "6.0.1"; - sha256 = "1snpa3pzpqfsnf2dpmvhv08lzcdiqcl5af6aldlxrm82dpif95q5"; + version = "6.0.7"; + sha256 = "15l36dgq6rzvgx7i9g9jm3298p9g1pdahwa2dxblmm0gzsp65wpl"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "6.0.1"; - sha256 = "14r1j8bamfwnjzx6igc5nzqvp5gzl2wyfbi53pznkw61xcf6hnch"; + version = "6.0.7"; + sha256 = "1mam4qg6yq6qnlkx3i45gs3nwgd7njfm9r5gjs1p9wm6bm953dad"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; - version = "6.0.1"; - sha256 = "0ynspdv0f199ppwcg7hnjv6hp01qyaxfcmh1phy9nwjjxlrkwkjc"; + version = "6.0.7"; + sha256 = "1wcjjn70v8cyy5flga0nlnhg973s6pzb3rpnzv905ix3g70zdp4k"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; @@ -436,8 +446,8 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; - version = "6.0.0"; - sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; + version = "6.0.1"; + sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; @@ -606,13 +616,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; - version = "6.0.1"; - sha256 = "1kwn30a024fqi9gpap8g2wifjzij0bcz70lgz7bdz4vy3sp9mn99"; + version = "6.0.7"; + sha256 = "1xxqqh3flx0g8fzi9v0565amfvc72ci8vkya08gf2h67syn63s6l"; }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; - version = "6.0.1"; - sha256 = "1l2njmcg4fvg6jr9gjvcr7yfj0r0ndwsa8r1dwlaciz3a2x2pfg8"; + version = "6.0.7"; + sha256 = "0lsvbbfppxkz5xxq9q77k7222szy7g5974q7nr1c39gwdsy0j22d"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; @@ -756,8 +766,8 @@ }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "17.0.0"; - sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; + version = "17.2.0"; + sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) (fetchNuGet { pname = "Microsoft.NetCore.Analyzers"; @@ -796,13 +806,13 @@ }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; - version = "17.0.0"; - sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; + version = "17.2.0"; + sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "17.0.0"; - sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; + version = "17.2.0"; + sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -821,8 +831,8 @@ }) (fetchNuGet { pname = "MySqlConnector"; - version = "2.0.0"; - sha256 = "0l0r4wr1h176w6hcsfjp5kx05fpzhhgzxcmirv8zfyk899vfgqkz"; + version = "2.1.2"; + sha256 = "12wgwns172vjldp1cvcq212zizpw18za7z3438rdh40zkq55s5yz"; }) (fetchNuGet { pname = "NBitcoin.Altcoins"; @@ -849,6 +859,11 @@ version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) + (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.10"; + sha256 = "1yp43n18b9qwh1ck3hxkarncbfn7r3indfdyjimapxibk3f8jm1v"; + }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; @@ -926,13 +941,13 @@ }) (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; - version = "6.0.3"; - sha256 = "0mgwm9psxvrq6vs2cy7m72wnknydgrs71hir2jqal5wbdh8g01np"; + version = "6.0.5"; + sha256 = "0b50hzzhd8igibxm3vkmq0h7cljx13l1fxrgznh6k2v57r0vvfnq"; }) (fetchNuGet { pname = "Npgsql"; - version = "6.0.3"; - sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q"; + version = "6.0.5"; + sha256 = "1555xj2725kkg4jyxhz6pkqwirdqyw5j5h1q3vaykpns61i2h48q"; }) (fetchNuGet { pname = "NSec.Cryptography"; @@ -941,8 +956,8 @@ }) (fetchNuGet { pname = "NuGet.Frameworks"; - version = "5.0.0"; - sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + version = "5.11.0"; + sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NUglify"; @@ -966,8 +981,8 @@ }) (fetchNuGet { pname = "Pomelo.EntityFrameworkCore.MySql"; - version = "6.0.0"; - sha256 = "0qvm5rh9kv8znsp8wbss81w5a2afh0dl13pwkc824j7ywklz0gzz"; + version = "6.0.1"; + sha256 = "1g212yfzlphn97gn7v4zcpi4ihfk1xp014kw498pcma49dqirn54"; }) (fetchNuGet { pname = "Portable.BouncyCastle"; @@ -1341,8 +1356,8 @@ }) (fetchNuGet { pname = "System.IO.Pipelines"; - version = "6.0.1"; - sha256 = "0b6zvhhfdxx0wx3bzyvxbq0mk8l5lbjak5124sn0gkif5jb388w4"; + version = "6.0.3"; + sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) (fetchNuGet { pname = "System.IO"; @@ -1719,6 +1734,11 @@ version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "6.0.0"; + sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; + }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; @@ -1921,8 +1941,8 @@ }) (fetchNuGet { pname = "xunit.runner.visualstudio"; - version = "2.4.3"; - sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; + version = "2.4.5"; + sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; }) (fetchNuGet { pname = "xunit"; diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix index 1571e09e3e9a..83b3c0c29b39 100644 --- a/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.2.4"; + version = "0.2.12"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "1d1cbpmpppp7z1bmsarwfs314c7ypchlyr4calx0fzxfpxzfks5k"; + sha256 = "uiXmLdQAglgLxOX6IoF1iNZvje4EM7Tr25Okx9TPyzI="; }; propagatedBuildInputs = with python3Packages; [ @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { ]; postInstall = '' - install README.md charge.config.example -Dt $out/share/doc/charge-lnd + install README.md -Dt $out/share/doc/charge-lnd ''; doInstallCheck = true; @@ -34,6 +34,6 @@ python3Packages.buildPythonApplication rec { description = "Simple policy-based fee manager for lightning network daemon"; homepage = "https://github.com/accumulator/charge-lnd"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ mmilata ]; + maintainers = with maintainers; [ mmilata mariaa144 ]; }; } diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 0f127c4f0d47..e17baf49dc71 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "erigon"; - version = "2022.07.02"; + version = "2022.07.03"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/aT8E60dCk5spj5l5Zw/8FL1LfzXWYi7agiLflLYI5c="; + sha256 = "sha256-zWygG06H5+QuG11klRq+7T2v40FNMxmYENdsK3KB+ko="; fetchSubmodules = true; }; - vendorSha256 = "sha256-NBWK0wsUbv4bFbmW3xGaQ7LCgmgfRF5zbc/awm8ZZZY="; + vendorSha256 = "sha256-vxLe8uEjuQ96JiIDxlSrpVATScNl2fscXVUqFKmMPxs="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/applications/blockchains/framesh/default.nix index 098d56ec4a71..a1ded4cc7cce 100644 --- a/pkgs/applications/blockchains/framesh/default.nix +++ b/pkgs/applications/blockchains/framesh/default.nix @@ -2,10 +2,10 @@ let pname = "framesh"; - version = "0.5.0-beta.21"; + version = "0.5.0-beta.22"; src = fetchurl { url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; - sha256 = "sha256-rWZ7oC74qrylNPIfBzHnNMcsYjccGL2zeXFab9OwBNA="; + sha256 = "sha256-/y7Pf1ADtz0CBeKKCHtSPOYvU7HCpq7hM/J4Ddq1XiA="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index 728f28dee866..a563703c6bcb 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lndhub-go"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = "${version}"; - sha256 = "sha256-QtLSI5xjXevTTr85Zsylabhay52ul8jFq1j6WzgSLcs="; + sha256 = "sha256-f/CkmO0KHupmi4XZDWRbvesLnYIxT6DlThgX3S/kdJ8="; }; - vendorSha256 = "sha256-12RTaXStvx29JjE1u3AjBTrPf6gKfLHJHMJpbQysEew="; + vendorSha256 = "sha256-SWQudULFRMrKmxY6ZgH0NL8d6UPxowQnovhRx+209D4="; doCheck = false; # tests require networking diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index e9b9d1044107..a42e474c258a 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "namecoin" + lib.optionalString (!withGui) "d"; - version = "22.0"; + version = "23.0"; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = "nc${version}"; - sha256 = "sha256-Z3CLDe0c4IpFPPTie8yoh0kcuvGmiegSgl4ITNSDkgY="; + sha256 = "sha256-MfqJ7EcJvlQ01Mr1RQpXVNUlGIwNqFTxrVwGa+Hus+A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 17cf43f8af0a..9ff2a65acfb9 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.28"; + version = "2.3.33"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-4KedlU+TMwO6C/dgNa23N4uPk8gPq2SQKzYkCZS508I="; + sha256 = "sha256-yvnWSmf4FJoZ7ajZQQJFLleIQ/hmHD+rDoktJeIll+U="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index 3bc5e06a1593..76fd74f6c597 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -11,13 +11,13 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; - version = "6.0.1"; - sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r"; + version = "6.0.7"; + sha256 = "0l235hs1j24iqvk79p95sfrsfbj6l2kb10x9zi34jinvldyn5ln6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "6.0.1"; - sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1"; + version = "6.0.7"; + sha256 = "08g3aq8gn917r55hnx1i36jfwy51311yns0x6wpvs9d2y4ncygk4"; }) (fetchNuGet { pname = "Microsoft.Azure.Amqp"; @@ -36,8 +36,8 @@ }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "16.11.0"; - sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv"; + version = "17.2.0"; + sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; @@ -56,43 +56,43 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.1.0"; - sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + version = "6.0.0"; + sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; - version = "2.1.0"; - sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; + version = "6.0.0"; + sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; - version = "2.1.0"; - sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; + version = "6.0.0"; + sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; - version = "2.1.0"; - sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; + version = "6.0.0"; + sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; - version = "2.1.0"; - sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; + version = "6.0.0"; + sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.1.0"; - sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + version = "6.0.0"; + sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; - version = "2.1.0"; - sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; + version = "6.0.0"; + sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; - version = "2.1.0"; - sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; + version = "6.0.0"; + sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; @@ -101,13 +101,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.1.0"; - sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + version = "6.0.0"; + sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; - version = "2.1.0"; - sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + version = "6.0.0"; + sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; @@ -131,8 +131,8 @@ }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "16.11.0"; - sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl"; + version = "17.2.0"; + sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; @@ -161,13 +161,13 @@ }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; - version = "16.11.0"; - sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; + version = "17.2.0"; + sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "16.11.0"; - sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; + version = "17.2.0"; + sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -186,29 +186,29 @@ }) (fetchNuGet { pname = "NBitcoin.Altcoins"; - version = "3.0.8"; - sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618"; + version = "3.0.11"; + sha256 = "1l8v07k862apyfr7h37jl7nrlr8mlscsqdqsmp2qdl0502x0gms3"; }) (fetchNuGet { pname = "NBitcoin.TestFramework"; - version = "3.0.9"; - sha256 = "08pwab9f2565day9b0fjzfv5ik3pbwvgvl190gh0bmwi5xv4vq93"; + version = "3.0.11"; + sha256 = "1v3g323vs65qk190dgcm3v6lzhq1ng9p1ywd39jq53hcny76fgcb"; }) (fetchNuGet { pname = "NBitcoin"; - version = "7.0.8"; - sha256 = "0h76a5wha3rqchjzhvslmm8f7qkya77n8avh5i05nvnrigf0bj5q"; + version = "7.0.10"; + sha256 = "1yp43n18b9qwh1ck3hxkarncbfn7r3indfdyjimapxibk3f8jm1v"; + }) + (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.9"; + sha256 = "0bdw54q4d5vbyrgj7r4rs8322z1knl79hmhzmq3knqf68yidi87g"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; @@ -236,28 +236,28 @@ }) (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; - version = "1.0.0.3"; - sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; + version = "2.0.0"; + sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) (fetchNuGet { pname = "NicolasDorier.CommandLine"; - version = "1.0.0.2"; - sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; + version = "2.0.0"; + sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; - version = "1.0.0.18"; - sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; + version = "2.0.0"; + sha256 = "0058dx34ja2idw468bmw7l3w21wr2am6yx57sqp7llhjl5ayy0wv"; }) (fetchNuGet { pname = "Npgsql"; - version = "6.0.3"; - sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q"; + version = "6.0.5"; + sha256 = "1555xj2725kkg4jyxhz6pkqwirdqyw5j5h1q3vaykpns61i2h48q"; }) (fetchNuGet { pname = "NuGet.Frameworks"; - version = "5.0.0"; - sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + version = "5.11.0"; + sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "RabbitMQ.Client"; @@ -374,16 +374,6 @@ version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.4.0"; - sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.5.0"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; @@ -579,11 +569,6 @@ version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.5.0"; - sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; - }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; @@ -644,11 +629,6 @@ version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) - (fetchNuGet { - pname = "System.Numerics.Vectors"; - version = "4.4.0"; - sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; - }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; @@ -754,11 +734,6 @@ version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.0"; - sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; - }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; @@ -1081,8 +1056,8 @@ }) (fetchNuGet { pname = "xunit.runner.visualstudio"; - version = "2.4.3"; - sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; + version = "2.4.5"; + sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; }) (fetchNuGet { pname = "xunit"; diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index 2bcc6c62be94..fb9fc3dc4bac 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.19.2.14"; + version = "0.19.2.20"; src = fetchFromGitHub { owner = "particl"; repo = "particl-core"; rev = "v${version}"; - sha256 = "sha256-gJLEMfEvQ35xjKt8iN/FXi2T/GBMSS7eUqOC8XHKPBg="; + sha256 = "sha256-gvpqOCJTUIhzrNbOaYFftx/G/dO0BCfHAMUrBk6pczc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 6d4ca5ced053..abf56d54fe6b 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.26"; + version = "0.9.27"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-f/E4aK7eUlNgd9kEDjYAiNaeMTlKu1aqo8IjB++/Yts="; + sha256 = "sha256-abDkDkFXBG4C7lvE9g6cvUYTfQt7ObZ+Ya8V0W7ASBE="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-tQ5XFv5P5EE33mKsQCBqAlJFu4+uG6ArVV17W8qbyLg="; + cargoSha256 = "sha256-xDjHu6JARIFy2fVQMGhkdU9Qcz/aqumBFe4MjlH0TCY="; buildInputs = lib.optional stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index f89ad0eb7800..d57b94e653df 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "18.5.0"; + version = "19.3.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wEi22R4zb8d5CJV5eWb776Yob8B6Ok4FrbYI0SGM0H8="; + sha256 = "sha256-6untHS4+2CyYfGQdbACjEbE+aSirjNk7LxOO2BWDZEM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 71ee38328239..70c67db31c99 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.13.1"; + version = "2.0.1.3"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-AtsNbUqEBQx0DPWR2LjNl7pdviYmvkv3bYKNBoeJHbw="; + sha256 = "sha256-cATqg/n4/BDQtuCVjHAx3EfMLmlX5EjeQ01gavy/L8o="; }; dontBuild = true; diff --git a/pkgs/applications/blockchains/zecwallet-lite/default.nix b/pkgs/applications/blockchains/zecwallet-lite/default.nix new file mode 100644 index 000000000000..2a15d2fa9233 --- /dev/null +++ b/pkgs/applications/blockchains/zecwallet-lite/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchurl, appimageTools }: + +appimageTools.wrapType2 rec { + pname = "zecwallet-lite"; + version = "1.7.13"; + + src = fetchurl { + url = "https://github.com/adityapk00/zecwallet-lite/releases/download/v${version}/Zecwallet.Lite-${version}.AppImage"; + hash = "sha256-uBiLGHBgm0vurfvOJjJ+RqVoGnVccEHTFO2T7LDqUzU="; + }; + + extraInstallCommands = + let contents = appimageTools.extract { inherit pname version src; }; + in '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${contents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A fully featured shielded wallet for Zcash"; + homepage = "https://www.zecwallet.co/"; + license = licenses.mit; + maintainers = with maintainers; [ colinsane ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index d9805cbb36a9..bace622004a8 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,22 +2,27 @@ buildGoModule rec { pname = "micro"; - version = "2.0.10"; + version = "2.0.11"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hVFmViwGXuYVAKaCkzK/LHjCi8AtLu0tsPpT61glxys="; + sha256 = "sha256-3Rppi8UcAc4zdXOd81Y+sb5Psezx2TQsNw73WdPVMgE="; }; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/micro" ]; - vendorSha256 = "sha256-YcAKl4keizkbgQLAZGiCG3CGpNTNad8EvOJEXLX2s0s="; + vendorSha256 = "sha256-/bWIn5joZOTOtuAbljOc0NgBfjrFkbFZih+cPNHnS9w="; - ldflags = [ "-s" "-w" "-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" "-X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; + ldflags = let t = "github.com/zyedidia/micro/v2/internal"; in [ + "-s" + "-w" + "-X ${t}/util.Version=${version}" + "-X ${t}/util.CommitHash=${src.rev}" + ]; postInstall = '' installManPage assets/packaging/micro.1 diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index a3454180b0e0..eca556fa86a8 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { pname = "pinegrow"; - version = "6.6"; + # deactivate auto update, because an old 6.21 version is getting mixed up + # see e.g. https://github.com/NixOS/nixpkgs/pull/184460 + version = "6.6"; # nixpkgs-update: no auto update src = fetchurl { url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 02a1e4f8ed81..9155a9fe279a 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0kvmnayrwpz82jxhvi69r45nyq74v5qyx5nn8b6kz23ma02nm4y6"; - x86_64-darwin = "0w6qbybzvpb886z1y5w7q36xy176f5hagzgqddzgwbzlv3lc9i9j"; - aarch64-linux = "194bnz4rg6lpi1pcl3yknap2n1p9vyi86wd5rq4m0h8kmqg1i21w"; - aarch64-darwin = "1vhb85zbpp399qxn7b7gdvsij174x5nzp84xw57kw9pzs5dkw12g"; - armv7l-linux = "1cr3vqxl0h8a4mg920a90ykdvb3vzf8cyxls1w8m84k3b53m5qdi"; + x86_64-linux = "0vwnx7fs46fkas75pnhjc81wy3hr24k2gs82i30ailaxw5r63j81"; + x86_64-darwin = "0bxc74vfkw9zhxfahzhcghlnybvj8k15jbni489lf636a45xrlcc"; + aarch64-linux = "10z6nv67yjd15ilxgfpjf07qbdp0cbd5761a5gcymiam4r22l6hq"; + aarch64-darwin = "133nccm0hcgcd2503psxwaaq4v4l16q7w7kbcz1y5lynlvwazjrx"; + armv7l-linux = "1sx3l42ls62v3apjap25ccg4mcbi71spfj5xh7y6rffzi65xwdrv"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.69.2"; + version = "1.70.0"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 7e36aeccdec7..0cbca2ea2bde 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -1,39 +1,40 @@ { stdenv , lib , fetchFromGitHub -, cmake , libxml2 , libpeas , glib , gtk3 , gtksourceview4 , gspell -, xapps +, xapp , pkg-config +, python3 , meson , ninja , wrapGAppsHook , intltool -, itstool }: +, itstool +}: stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.2.2"; + version = "3.2.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-PW7y3+Sa9FH5r5xvziysvxM08RJCPvnLs3wsm5IqToQ="; + sha256 = "sha256-aO5ilmlkSAxlkWYdSLmrcm7pC8GbITpCitd4TXp5tfY="; }; nativeBuildInputs = [ meson - cmake pkg-config intltool itstool ninja + python3 wrapGAppsHook ]; @@ -44,13 +45,9 @@ stdenv.mkDerivation rec { gtksourceview4 libpeas gspell - xapps + xapp ]; - postInstall = '' - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - doInstallCheck = true; installCheckPhase = '' if [[ "$($out/bin/xed --version)" == "xed - Version ${version}" ]] ; then diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 0a078f68c7a3..4a8c762b6a93 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -5,6 +5,7 @@ , withVulkan ? stdenv.isLinux , alsa-lib , AppKit +, dbus , fetchFromGitHub , ffmpeg_4 , Foundation @@ -80,6 +81,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ lib.optionals stdenv.isLinux [ alsa-lib + dbus libX11 libXdmcp libXext @@ -95,7 +97,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; + configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" "--enable-dbus" ]; postInstall = '' mkdir -p $out/share/libretro/info diff --git a/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch b/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch new file mode 100644 index 000000000000..5553f80fbc5b --- /dev/null +++ b/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake +index b51fd0075e..87ee317e05 100644 +--- a/cmake/FindPyQt5.cmake ++++ b/cmake/FindPyQt5.cmake +@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT5_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _pyqt5_metadata "${Python_SITEARCH}/PyQt5-*.dist-info/METADATA") ++ FILE(GLOB _pyqt5_metadata "@pyQt5PackageDir@/PyQt5-*.dist-info/METADATA") + IF(_pyqt5_metadata) + FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents}) +@@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR) + ENDIF(_pyqt5_metadata) + + IF(PYQT5_VERSION_STR) +- SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5") +- SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings") ++ SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5") ++ SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings") + FIND_PROGRAM(__pyuic5 "pyuic5") + GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY) + +diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake +index 69e41c1fe9..5456c3d59b 100644 +--- a/cmake/FindQsci.cmake ++++ b/cmake/FindQsci.cmake +@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA") ++ FILE(GLOB _qsci_metadata "@qsciPackageDir@/QScintilla*.dist-info/METADATA") + IF(_qsci_metadata) + FILE(READ ${_qsci_metadata} _qsci_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents}) +@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR) + ENDIF(_qsci_metadata) + + IF(QSCI_MOD_VERSION_STR) +- SET(QSCI_SIP_DIR "${PYQT5_SIP_DIR}") ++ SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") + SET(QSCI_FOUND TRUE) + ENDIF(QSCI_MOD_VERSION_STR) + +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 4cd19c3af4..668cc6a5e6 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -206,7 +206,7 @@ if (WITH_GUI) + install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) + endif() + if(QSCI_SIP_DIR) +- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR}) ++ set(SIP_BUILD_EXTRA_OPTIONS ${SIP_BUILD_EXTRA_OPTIONS} --include-dir=${QSCI_SIP_DIR}) + else() + message(STATUS "Qsci sip file not found - disabling bindings for derived classes") + set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index e079d347181c..b5a407ef5335 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -38,6 +38,8 @@ , pdal , zstd , makeWrapper +, wrapGAppsHook +, substituteAll }: let @@ -64,7 +66,9 @@ let urllib3 pygments pyqt5 - sip_4 + pyqt-builder + sip + setuptools owslib six ]; @@ -116,29 +120,31 @@ in mkDerivation rec { ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper cmake flex bison ninja ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 - # - # TODO: Correct PyQt5 to provide the expected directory and fix - # build to use PYQT5_SIP_DIR consistently. - postPatch = '' - substituteInPlace cmake/FindPyQt5.py \ - --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"' - ''; + patches = [ + (substituteAll { + src = ./set-pyqt-package-dirs.patch; + pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; + qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; + }) + ]; cmakeFlags = [ "-DWITH_3D=True" "-DWITH_PDAL=TRUE" - "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" - "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + dontWrapGApps = true; # wrapper params passed below + postFixup = lib.optionalString withGrass '' # grass has to be availble on the command line even though we baked in - # the path at build time using GRASS_PREFIX + # the path at build time using GRASS_PREFIX. + # using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS wrapProgram $out/bin/qgis \ + "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} ''; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index fe53f0726b4e..ae35fb2ec269 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -38,6 +38,8 @@ , pdal , zstd , makeWrapper +, wrapGAppsHook +, substituteAll }: let @@ -64,7 +66,9 @@ let urllib3 pygments pyqt5 - sip_4 + pyqt-builder + sip + setuptools owslib six ]; @@ -116,29 +120,31 @@ in mkDerivation rec { ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper cmake flex bison ninja ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 - # - # TODO: Correct PyQt5 to provide the expected directory and fix - # build to use PYQT5_SIP_DIR consistently. - postPatch = '' - substituteInPlace cmake/FindPyQt5.py \ - --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"' - ''; + patches = [ + (substituteAll { + src = ./set-pyqt-package-dirs.patch; + pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; + qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; + }) + ]; cmakeFlags = [ "-DWITH_3D=True" "-DWITH_PDAL=TRUE" - "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" - "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + dontWrapGApps = true; # wrapper params passed below + postFixup = lib.optionalString withGrass '' # grass has to be availble on the command line even though we baked in - # the path at build time using GRASS_PREFIX + # the path at build time using GRASS_PREFIX. + # using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS wrapProgram $out/bin/qgis \ + "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} ''; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 85d201f32dcd..1080f56ebe91 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "19.0.3"; + version = "20.2.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "be456d396a19dcb8881ad4bff315197306ae05cca5e47332a1e5ad572948614e"; + sha256 = "sha256-O/gzXAzvaYJXpexjBSc6jNW1wX0ukwQcpFU8fq4qM4k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/nsxiv/default.nix b/pkgs/applications/graphics/nsxiv/default.nix index c1ebbd57c0d6..019aaf86dc3b 100644 --- a/pkgs/applications/graphics/nsxiv/default.nix +++ b/pkgs/applications/graphics/nsxiv/default.nix @@ -1,43 +1,58 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitea +, fetchpatch , giflib , imlib2 , libXft , libexif , libwebp +, libinotify-kqueue , conf ? null }: stdenv.mkDerivation rec { pname = "nsxiv"; - version = "29"; + version = "30"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "nsxiv"; - repo = pname; + repo = "nsxiv"; rev = "v${version}"; - hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE="; + hash = "sha256-swzTdQ6ow1At4bKRORqz6fb0Ej92yU9rlI/OgcinPu4="; }; + patches = [ + # Fix build failure when _SC_PHYS_PAGES is not defined + (fetchpatch { + url = "https://codeberg.org/nsxiv/nsxiv/commit/1a50bff9f300f84e93a6e7035657e6029e7e8183.patch"; + hash = "sha256-PpUqGVWaJ06EVu3tBKVzOh8HYvT6wAG3bvY6wUD+dTM="; + }) + ]; + buildInputs = [ giflib imlib2 libXft libexif libwebp - ]; + ] ++ lib.optional stdenv.isDarwin libinotify-kqueue; preBuild = lib.optionalString (conf!=null) '' cp ${(builtins.toFile "config.def.h" conf)} config.def.h ''; - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify"; + + makeFlags = [ "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; + + installTargets = [ "install-all" ]; meta = with lib; { - homepage = "https://nsxiv.github.io/nsxiv/"; + homepage = "https://nsxiv.codeberg.page/"; description = "New Suckless X Image Viewer"; longDescription = '' nsxiv is a fork of now unmaintained sxiv with the purpose of being a @@ -54,8 +69,7 @@ stdenv.mkDerivation rec { - Display image name/path in X title ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres sikmir ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 025d89e41387..4a506aed9e17 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -21,7 +21,7 @@ }: let - version = "4.2.2"; + version = "4.3.0"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -30,6 +30,7 @@ let libzbar_name = if stdenv.isLinux then "libzbar.so.0" + else if stdenv.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -37,7 +38,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-bFceOu+3SLtD2eY+aSBEn13xJw7a3aVwX39QfAuqVSo="; + sha256 = "sha256-/bYz2KB9Fggo6cnKM3hvwL/Jy4Xsw2phx1sInuqZpFg="; postFetch = '' mv $out ./all @@ -53,7 +54,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-ucLLfqmTKO5Qpg+PnmcdQwht7cWMWJoFjQWnDecEtVs="; + sha256 = "sha256-E941wseIQEn1+d06NWKQLQM0C+A8a0+Xxl+LzBTwEcw="; }; postUnpack = '' @@ -90,7 +91,6 @@ python3.pkgs.buildPythonApplication { ]; preBuild = '' - sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py substituteInPlace ./electrum/ecc_fast.py \ --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' @@ -101,17 +101,11 @@ python3.pkgs.buildPythonApplication { ''); postInstall = lib.optionalString stdenv.isLinux '' - # Despite setting usr_share above, these files are installed under - # $out/nix ... - mv $out/${python3.sitePackages}/nix/store"/"*/share $out - rm -rf $out/${python3.sitePackages}/nix - substituteInPlace $out/share/applications/electrum.desktop \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \ "Exec=$out/bin/electrum %u" \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \ "Exec=$out/bin/electrum --testnet %u" - ''; postFixup = lib.optionalString enableQt '' diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 5f65fd4a368a..c9332be23094 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -20,7 +20,7 @@ }: let - version = "4.0.9.3"; + version = "4.2.2.1"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -36,7 +36,7 @@ let owner = "pooler"; repo = "electrum-ltc"; rev = version; - sha256 = "sha256-oZjQnrnj8nCaQjrIz8bWNt6Ib8Wu2ZMXHEPfCCy2fjk="; + sha256 = "sha256-qu72LIV07pgHqvKv+Kcw9ZmNk6IBz+4/vdJELlT5tE4="; postFetch = '' mv $out ./all @@ -44,19 +44,6 @@ let ''; }; - py = python3.override { - packageOverrides = self: super: { - - aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { - version = "0.18.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; - }; - }); - }; - }; - in python3.pkgs.buildPythonApplication { @@ -65,7 +52,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "sha256-+oox0BGqkvj0OGOKJF8tUoKdsZFeffNb6rTF8E8mo08="; + sha256 = "sha256-7F28cve+HD5JDK5igfkGD/NvTCfA33g+DmQJ5mwPM9Q="; }; postUnpack = '' @@ -73,19 +60,9 @@ python3.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/electrum_ltc/tests ''; - prePatch = '' - substituteInPlace contrib/requirements/requirements.txt \ - --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" - - # according to upstream, this is fine - # https://github.com/spesmilo/electrum/issues/7361 - substituteInPlace contrib/requirements/requirements.txt \ - --replace "qdarkstyle<2.9" "qdarkstyle>=2.7" - ''; - nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index fa3b360b1cb2..5a680cc76b54 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18513"; + version = "18531"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-rKBDKPq6hn4VGlzW4ad/gBU4eCVRF9JgRLrDaTKjCbI="; + sha256 = "sha256-/esGbLbidQ60+auMC1W2GwH7V5qdTVzblDNsskuhcjs="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-M8ZV3FXZJHqaegPKQnjQkMYMWt2BUiKzM8Tit4NqtU4="; + sha256 = "sha256-ldcTuacUUxsssJqJ8cRjbP+TWlxQdcNtVbj8clDNEGw="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-cguvKl9yvthNWcLD6YDLKiialJmutJTa9egMdfKHRpU="; + sha256 = "sha256-Cga17ymUROJb5scpyOlo6JIgQ77yHavI0ciUpZN+jLk="; }; }; in diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/applications/misc/jquake/default.nix index f68a584fe83f..ba10ce019a0a 100644 --- a/pkgs/applications/misc/jquake/default.nix +++ b/pkgs/applications/misc/jquake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jquake"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip"; - sha256 = "1k12yw9fwq1z3gg0d38dxs4mmyn912zfcm6zsbjkv27q6lvhvwng"; + sha256 = "sha256-Y7yjjpptaScThiU8rHdV6cJ6FaTHOtKdsnO5y/HzoDA="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 0a7b4bc7933c..27f4afb435f8 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -1,23 +1,37 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, SystemConfiguration, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, SystemConfiguration +, installShellFiles +, libiconv +, rustPlatform +}: rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Nukesor"; - repo = pname; + repo = "pueue"; rev = "v${version}"; - sha256 = "sha256-eFO9v+CZ3sFJJ0Ksa2sV5snjBz9lUkElGSj4DfEUebs="; + hash = "sha256-xUTkjj/PdlgDEp2VMwBuRtF/9iGGiN4FZizdOdcbTag="; }; - cargoSha256 = "sha256-cyuDXMmVrVx3kluumR6WleMzuoV+261f47rpkVYHzZA="; + cargoSha256 = "sha256-7VdPu+9RYoj4Xfb3J6GLOji7Fqxkk+Fswi4C4q33+jk="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ + SystemConfiguration + libiconv + ]; - checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ]; + checkFlags = [ + "--test client_tests" + "--skip=test_single_huge_payload" + "--skip=test_create_unix_socket" + ]; postInstall = '' for shell in bash fish zsh; do @@ -27,10 +41,21 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A daemon for managing long running shell commands"; homepage = "https://github.com/Nukesor/pueue"; + description = "A daemon for managing long running shell commands"; + longDescription = '' + Pueue is a command-line task management tool for sequential and parallel + execution of long-running tasks. + + Simply put, it's a tool that processes a queue of shell commands. On top + of that, there are a lot of convenient features and abstractions. + + Since Pueue is not bound to any terminal, you can control your tasks from + any terminal on the same machine. The queue will be continuously + processed, even if you no longer have any active ssh sessions. + ''; changelog = "https://github.com/Nukesor/pueue/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix new file mode 100644 index 000000000000..bc0fd96730b5 --- /dev/null +++ b/pkgs/applications/misc/rusty-psn/default.nix @@ -0,0 +1,80 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, pkg-config +, openssl +, xorg +, libGL +, withGui ? false # build GUI version +}: + +rustPlatform.buildRustPackage rec { + pname = "rusty-psn"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "RainbowCookie32"; + repo = "rusty-psn"; + rev = "v${version}"; + sha256 = "14li5fsaj4l5al6lcxy07g3gzmi0l3cyiczq44q7clq4myhykhhb"; + }; + + cargoSha256 = "0kjaq3ik3lwaz7rjb5jaxavpahzp33j7vln3zyifql7j7sbr300f"; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; + + buildInputs = if withGui then [ + openssl + xorg.libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXi + xorg.libxcb + libGL + libGL.dev + ] else [ + openssl + ]; + + buildNoDefaultFeatures = true; + buildFeatures = [ (if withGui then "egui" else "cli") ]; + + postFixup = '' + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/rusty-psn + '' + lib.optionalString withGui '' + mv $out/bin/rusty-psn $out/bin/rusty-psn-gui + ''; + + desktopItem = lib.optionalString withGui (makeDesktopItem { + name = "rusty-psn"; + desktopName = "rusty-psn"; + exec = "rusty-psn-gui"; + comment = "A simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API."; + categories = [ + "Network" + ]; + keywords = [ + "psn" + "ps3" + "sony" + "playstation" + "update" + ]; + }); + desktopItems = lib.optionals withGui [ desktopItem ]; + + meta = with lib; { + description = "Simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API"; + homepage = "https://github.com/RainbowCookie32/rusty-psn/"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ AngryAnt ]; + }; +} diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 7f2e4207d0be..3d750d8b0fd6 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -25,12 +25,19 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "udev" ]; - nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; - buildInputs = [ libappindicator librsvg ]; + nativeBuildInputs = [ + gdk-pixbuf + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + libappindicator + librsvg + ]; propagatedBuildInputs = with python3Packages; [ evdev - gobject-introspection gtk3 psutil pygobject3 @@ -47,6 +54,17 @@ python3Packages.buildPythonApplication rec { install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "solaar" ]; + meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 9039854f74e3..a66fecd83b76 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.8"; + version = "1.11"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-VSD/QsG7G9hji5m6NSEkCoVM+XK3t4KmCqbocTbZwE4="; + hash = "sha256-PXJpNKzF9goQvfh3lUUfOaZFessFNrWtg8nMDxPxRMo="; }; postPatch = '' @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib gobject-introspection - cinnamon.xapps + cinnamon.xapp gspell ]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c3d2aa5a2e47..32e63410bc5b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,15 +19,15 @@ } }, "beta": { - "version": "104.0.5112.79", - "sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw", - "sha256bin64": "1vagpsnjrdjcisgg7i56l3zcgvb5sg4pkaq5li500vmgcjin8irq", + "version": "105.0.5195.19", + "sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7", + "sha256bin64": "15rhslgq77wiwiycf6m89vi3f5vry286b7kqfk0v5ibmcsf6clgf", "deps": { "gn": { - "version": "2022-06-08", + "version": "2022-07-11", "url": "https://gn.googlesource.com/gn", - "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", - "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" + "rev": "9ef321772ecc161937db69acb346397e0ccc484d", + "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" } } }, diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6ea82d80853e..7f9e1c27f5d5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -27,7 +27,7 @@ rec { }; firefox-esr-102 = buildMozillaMach rec { - pname = "firefox-esr"; + pname = "firefox-esr-102"; version = "102.1.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { @@ -54,7 +54,7 @@ rec { }; firefox-esr-91 = buildMozillaMach rec { - pname = "firefox-esr"; + pname = "firefox-esr-91"; version = "91.12.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 1b8cba11c7ba..1d9b10bfc39b 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -26,13 +26,13 @@ with lib; assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; let - common = { pname, versions, untarDir ? "${pname}-${version}", hash, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: + common = { pname, platformAttrs, untarDir ? "${pname}-${version}", jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: stdenv.mkDerivation rec { inherit pname jdk libPatches untarDir openssl; - version = versions.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}"); src = fetchurl { url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; - hash = hash.${stdenv.system}; + inherit (platformAttrs.${stdenv.system}) hash; }; doCheck = true; @@ -51,7 +51,8 @@ let makeWrapper "$n" "$out/bin/$(basename $n)"\ --set-default JAVA_HOME ${jdk.home}\ --set-default HADOOP_HOME $out/lib/${untarDir}\ - --set-default HADOOP_CONF_DIR /etc/hadoop-conf/\ + --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\ + --set-default HADOOP_CONF_DIR $out/lib/${untarDir}/etc/hadoop/\ --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath buildInputs}" done @@ -62,7 +63,7 @@ let passthru = { inherit tests; }; - meta = { + meta = recursiveUpdate { homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = licenses.asl20; @@ -80,8 +81,8 @@ let computers, each of which may be prone to failures. ''; maintainers = with maintainers; [ illustris ]; - platforms = attrNames hash; - }; + platforms = attrNames platformAttrs; + } (attrByPath [ stdenv.system "meta" ] {} platformAttrs); }; in { @@ -89,19 +90,20 @@ in # https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions hadoop_3_3 = common rec { pname = "hadoop"; - versions = rec { - x86_64-linux = "3.3.3"; - x86_64-darwin = x86_64-linux; - aarch64-linux = "3.3.1"; - aarch64-darwin = aarch64-linux; - }; - untarDir = "${pname}-${version}"; - hash = rec { - x86_64-linux = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q="; - x86_64-darwin = x86_64-linux; - aarch64-linux = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI="; - aarch64-darwin = aarch64-linux; + platformAttrs = rec { + x86_64-linux = { + version = "3.3.3"; + hash = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q="; + }; + x86_64-darwin = x86_64-linux; + aarch64-linux = { + version = "3.3.1"; + hash = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI="; + meta.knownVulnerabilities = [ "CVE-2021-37404" "CVE-2021-33036" ]; + }; + aarch64-darwin = aarch64-linux; }; + untarDir = "${pname}-${platformAttrs.${stdenv.system}.version}"; jdk = jdk11_headless; inherit openssl; # TODO: Package and add Intel Storage Acceleration Library @@ -122,8 +124,10 @@ in }; hadoop_3_2 = common rec { pname = "hadoop"; - versions.x86_64-linux = "3.2.3"; - hash.x86_64-linux = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU="; + platformAttrs.x86_64-linux = { + version = "3.2.3"; + hash = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU="; + }; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency # can be manually overriden @@ -131,8 +135,10 @@ in }; hadoop2 = common rec { pname = "hadoop"; - versions.x86_64-linux = "2.10.2"; - hash.x86_64-linux = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo="; + platformAttrs.x86_64-linux = { + version = "2.10.2"; + hash = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo="; + }; jdk = jdk8_headless; tests = nixosTests.hadoop2; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 09de0219c7e8..64fa0f35e543 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.1.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h26EOjKNrlcrs2DAYj0NmDRgNRKozjfw5DtxUgHNTa4="; + sha256 = "sha256-evFdMM2AilKQPdSCUzKo6RuC4OC4zfjj+JzFvtkSrdk="; }; - vendorSha256 = "sha256-+n/QBuZqtdgUkaBG7iqSuBfljn+AdEzDoIo5SI8ErQA="; + vendorSha256 = "sha256-9i4ryBpaK7mMbsOpIaaZWBRjewD1MtTpf4zJ0yU0KMg="; # NOTE: Remove the install and upgrade hooks. postPatch = '' @@ -27,7 +27,7 @@ buildGoModule rec { meta = with lib; { description = "A Helm plugin that shows a diff"; - inherit (src.meta) homepage; + homepage = "https://github.com/databus23/helm-diff"; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index 05ded10444ba..d72b152cc5bf 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Helm downloader plugin that provides GIT protocol support"; - inherit (src.meta) homepage; + homepage = "https://github.com/aslafy-z/helm-git"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index b6a47ec9dd5c..bbfff3fd5f34 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -30,7 +30,7 @@ buildGoModule rec { meta = with lib; { description = "A Helm plugin that shows a diff"; - inherit (src.meta) homepage; + homepage = "https://github.com/hypnoglow/helm-s3"; license = licenses.mit; maintainers = with maintainers; [ yurrriq ]; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index a16472413f31..7d9135045f17 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Helm plugin that helps manage secrets"; - inherit (src.meta) homepage; + homepage = "https://github.com/jkroepke/helm-secrets"; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; - platforms = platforms.all; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index dc3c99878004..0aeb54948a3a 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "sha256-4R7Zpz90Bcj/OqxR+ahvYk3VsJ1R+k9q36Q77JsXJ1w="; + sha256 = "sha256-WbFY1tBwq0DjJqM5ld7W9GkhPQDsGUQCwEe42XkJlfQ="; }; - vendorSha256 = "sha256-ppeasqyr2Ow8d52P01IEf42+KTFXTEPv/giKPjTORwE="; + vendorSha256 = "sha256-tz0SHAl9SwppjA8s0m4gJOh6rf8F+kRc2HnNMjO+blQ="; subPackages = ["cmd"]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 34ee492b42f1..bcf25a84ba10 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -114,19 +114,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.26.1", - "sha256": "sha256-9S+J0z9ilRqfpZv3aZe6Fv1Jyo2ShRQzeoMuRsDBiUo=", + "rev": "v2.27.0", + "sha256": "sha256-E8O0+OblKl1aSOXB5fnc34m+pUsfIZ6eHWoAq6HkKHs=", "vendorSha256": null, - "version": "2.26.1" + "version": "2.27.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.16.0", - "sha256": "sha256-b4aMwU9vDQ3t5fske5MZm5i9DJehy1WFySsJbowRjbc=", + "rev": "v3.17.0", + "sha256": "sha256-XeZwQxK0WhLv2Y7PFADsv4f6vO4E3/j/9HM1wJ8LXKE=", "vendorSha256": null, - "version": "3.16.0" + "version": "3.17.0" }, "azurestack": { "owner": "hashicorp", @@ -411,13 +411,15 @@ "version": "1.31.1" }, "fortios": { + "deleteVendor": true, "owner": "fortinetdev", "provider-source-address": "registry.terraform.io/fortinetdev/fortios", + "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "v1.14.1", - "sha256": "sha256-9e1PEg8RtJa7DR5g3cCdAhubFxt7vN5dPjaBA+F7Y4E=", - "vendorSha256": null, - "version": "1.14.1" + "rev": "v1.15.0", + "sha256": "sha256-jXaEGWt/O0Cv15ksFax571f6aoDhVpNZSbvbOFj6TZ4=", + "vendorSha256": "sha256-WkF2mVDrDlCefM4pjADoXsVwpa7E02c6kUyOgHxNFpo=", + "version": "1.15.0" }, "gandi": { "owner": "go-gandi", @@ -677,10 +679,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.28.1", - "sha256": "sha256-w7PvzcgyzrkxQ+I8Bjw5C3MqMmiJS5neuGipC+H+mEM=", - "vendorSha256": "sha256-c0NtM3TkkSjrwQ9fj0XiH0BYnSsE8uzirkTv2QHzPOg=", - "version": "1.28.1" + "rev": "v1.29.1", + "sha256": "sha256-eZ13kVQplnIQNT4KecUeLAfrCime1WNEdG0yuv3dBWk=", + "vendorSha256": "sha256-PBnMIEuMGcb+qeFO4e17e9sg58DmL6BEAZJeTTVjS1g=", + "version": "1.29.1" }, "linuxbox": { "owner": "numtide", @@ -1012,10 +1014,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.6", - "sha256": "sha256-YrCpZCQGm8yFCxJRClrQJ1axFDBradJireMAW0ViLvc=", + "rev": "v2.2.7", + "sha256": "sha256-W100EYLKaFH9KGmSkgk0Ig2Z0R+RvYijrm3ikhEvBe8=", "vendorSha256": "sha256-zswPGl4a/V8tOMMUWCjxY8ubSy5GT9pP6eBpqSrAg/k=", - "version": "2.2.6" + "version": "2.2.7" }, "secret": { "owner": "numtide", diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 40e49ff3296a..7ac58abd530c 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.60.1"; + version = "3.60.2"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-gflsY2OMrxg44MY+WHT2AZISCWXYJSlKiUoit9QgZq8="; + hash = "sha256-5AfbrRaZU/+VFFK8vxONlTo6MCNfirsD0nHHEsx+V5I="; }; configureFlags = [ diff --git a/pkgs/applications/networking/gopher/geomyidae/default.nix b/pkgs/applications/networking/gopher/geomyidae/default.nix index c9aa26ad9874..197cdaca00c4 100644 --- a/pkgs/applications/networking/gopher/geomyidae/default.nix +++ b/pkgs/applications/networking/gopher/geomyidae/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "geomyidae"; - version = "0.50.1"; + version = "0.51"; src = fetchurl { url = "gopher://bitreich.org/9/scm/geomyidae/tag/geomyidae-v${version}.tar.gz"; - sha512 = "2a71b12f51c2ef8d6e791089f9eea49eb90a36be45b874d4234eba1e673186be945711be1f92508190f5c0a6f502f132c4b7cb82caf805a39a3f31903032ac47"; + sha512 = "3lGAa7BCrspGBcQqjduBkIACpf3u/CkeSCBnaJ3rrz3OIidn4o4dNwZNe7u8swaJxN2dhDSKKeVT3RnFQUaXdg=="; }; buildInputs = [ libressl ]; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 3f3d71a33718..f9a2f42c5517 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.0.4"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "0p5s25nkjs9514a16c7kl0m78vn5f14mv6nbi79yz0sxb7hc12qg"; + sha256 = "0qzg790yd23ja3a782ga085vgd5vvh7rgmdy8kpvc3wf8plvw5nm"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 980ff7e9b548..df97777409cd 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,6 +1,7 @@ { lib , copyDesktopItems , electron_18 +, buildGoModule , esbuild , fetchFromGitHub , libdeltachat @@ -35,15 +36,18 @@ let "${electron_18}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron_18}/bin/electron"; - esbuild' = esbuild.overrideAttrs (old: rec { - version = "0.12.29"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; - }; - }); + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.12.29"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; + }; + vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; + }); + }; in nodePackages.deltachat-desktop.override rec { pname = "deltachat-desktop"; version = "1.30.1"; diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 664fe622ac3b..c6a64212b558 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2022-06-27"; + version = "unstable-2022-08-07"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "6f7505fb91a07035d3661a3a7bf68b3018ddfd82"; - sha256 = "2tb6OgYOnpryiyk7UH39sgzwtGJf9hNOpy74YqLI+Uk="; + rev = "e0870784008a584229d3094e0988f5da155c7fd7"; + hash = "sha256-t0b2SFlDDBSQEkOCQME0jsLJ8NvoXROTxoQgnoXM9eQ="; }; postPatch = '' diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 3873740ef6a4..b4b46f36b3fc 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.98.15"; + version = "3.98.17"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-yuSFDLQ7ckuZYuXREbW0VvMapzO2VhVIH1Ccr1uQHmo="; + sha256 = "sha256-rVAiutjFI3/KJZeiTy6H2IdMh+SFz9+NvEoriPTnW2w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 99a81fd1a809..c769b7de6c86 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0="; + sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0="; }; postPatch = '' diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/applications/science/astronomy/gprojector/default.nix index 37d20b585a08..f5fa5f1d1e4b 100644 --- a/pkgs/applications/science/astronomy/gprojector/default.nix +++ b/pkgs/applications/science/astronomy/gprojector/default.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "gprojector"; - version = "3.0.3"; + version = "3.0.4"; src = fetchzip { url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz"; - sha256 = "sha256-60UT6z5aQ3Tk4EujEUp4ntB5GakFVhJzk5eytoIwf78="; + sha256 = "sha256-6EixVNRgYnuY9INb7gAyBzo125DhPEUPD+pGxjzmhy8="; }; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/applications/science/biology/mafft/default.nix index 764a0f0da83a..7b1a3c68072c 100644 --- a/pkgs/applications/science/biology/mafft/default.nix +++ b/pkgs/applications/science/biology/mafft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mafft"; - version = "7.490"; + version = "7.505"; src = fetchurl { url = "https://mafft.cbrc.jp/alignment/software/mafft-${version}-with-extensions-src.tgz"; - sha256 = "0hb5jzcqdnjn3micm5z301lrnyvmn9pnnnxjz4h2wa4yicyz7vnn"; + sha256 = "sha256-9Up4Zw/NmWAjO8w7PdNZ85WnHAztRae+HP6uGZUM5v8="; }; preBuild = '' diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/applications/science/electronics/xschem/default.nix index 646f374ba48e..456b939c60ad 100644 --- a/pkgs/applications/science/electronics/xschem/default.nix +++ b/pkgs/applications/science/electronics/xschem/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xschem"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "StefanSchippers"; repo = "xschem"; rev = version; - sha256 = "sha256-C57jo8tAbiqQAgf4Xp2lpFGOr6F1knPpFcYxPiqSM4k="; + sha256 = "sha256-SHpESg5mn9lSDOURQusQUsug8Jqin/W5rqkVgmseSgA="; }; nativeBuildInputs = [ bison flex pkg-config ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 3316284349bc..b4e0a35184a8 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -56,11 +56,11 @@ in stdenv.mkDerivation rec { pname = "root"; - version = "6.26.04"; + version = "6.26.06"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-onHPgngtbtLIfqXu9mgYA/LmnhezA2352GNjbpNYQh4="; + hash = "sha256-sfc8l2pYClxWyMigFSWCod/FYLTdgOG3VFI3tl5sics="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index abcea5f69a06..02c035914f3a 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.12.1"; + version = "1.13.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "14jqs4sarxbrgi5pxz0afqa9jxq90cb5ayqd21qj2n65whqa5bpk"; + sha256 = "0cc262jpqp8l25p04pcqh3w671gw0p1d2zrr3d34ch8k9c6s4nzq"; }; depsBuildBuild = [ @@ -144,7 +144,6 @@ stdenv.mkDerivation rec { mesonBuildType = "release"; # See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options - # TODO(@sternenseemann): install systemd user units mesonFlags = [ # Use lto "-Db_lto=true" @@ -154,6 +153,8 @@ stdenv.mkDerivation rec { "-Ddefault-terminfo=foot" # Tell foot to set TERMINFO and where to install the terminfo files "-Dcustom-terminfo-install-location=${terminfoDir}" + # Install systemd user units for foot-server + "-Dsystemd-units-dir=${placeholder "out"}/lib/systemd/user" ]; # build and run binary generating PGO profiles, diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 4fed03db0dd0..7a39a487e5f8 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -22,6 +22,7 @@ , Cocoa , Foundation , libiconv +, UserNotifications , nixosTests , runCommand }: @@ -71,6 +72,7 @@ rustPlatform.buildRustPackage rec { CoreGraphics Foundation libiconv + UserNotifications ]; postInstall = '' @@ -119,7 +121,5 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; - # Fails on missing UserNotifications framework while linking - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 867efc6ecebb..ab610624f371 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.18"; + version = "2.19"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; - sha256 = "0iimdzfdl5687xyqxfadbn640x45n3933q1nfx7b32rl4v3vk778"; + sha256 = "sha256-RZ9/7b4lRJqFVyfXwzutO8C/Pa6XPyxtvpp7gmEGoj4="; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index ced8244256a6..2e467b657d64 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-wVHL2+didmiN7UlEeIuSr+8LhkFKCOD3of4rKVg1i1o="; + sha256 = "sha256-lRONRLTByhMalN9BKilCcQn2c9f4cxOnHJLL0l0jaOs="; }; - cargoSha256 = "sha256-5jhloUnaGXXDu2LCO86SMJo8ETIxLAivv3hx9gEqtJ4="; + cargoSha256 = "sha256-1r/k3DQ/vjIjMpOHYCRRosbZ22iAFkuq4EbZUcZoWn0="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 6287f2820194..606045d0b803 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.23.1"; + version = "1.24.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-23s5mYwoIUiBs1MXGJVepycGj8e1xCuFAgim5NHKZRc="; + sha256 = "sha256-sQ8Qorf74ypMmpRd9b/wrqg28TZ295t6qkKosxyaG1I="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 6fd7a2036c56..6390558013f5 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -41,5 +41,14 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; + knownVulnerabilities = [ + "CVE-2022-1035" + "CVE-2022-1172" + "CVE-2022-1222" + "CVE-2022-1795" + "CVE-2022-2453" + "CVE-2022-2454" + "CVE-2022-2549" + ]; }; } diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index ad149b947e48..af6d9fe702c4 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-uj5Bn3K9SCKE4p1jylfQ8XnAwNnN4VXHLMLrwhKhzsk="; + hash = "sha256-jjCyO6lyhqH4xeNp5uy/KqNr5Mvv+45pJGHFOXNi0rk="; }; patches = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; buildInputs = [ - cinnamon.xapps + cinnamon.xapp ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index 9d6a5e18ad5d..3bbbb115fbea 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -22,7 +22,7 @@ , pkg-config , python3 , wrapGAppsHook -, xapps +, xapp , yelp-tools }: let @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "xplayer"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-qoBJKY0CZyhp9foUehq5hInEENRGZuy1D6jAMjbjYhA="; + sha256 = "sha256-0hQHhf2me28YTTKOzEkzoxRoSoHLwtiaHPKNPJ/Fg+0="; }; # configure wants to find gst-inspect-1.0 via pkgconfig but @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { libxml2 libxplayer-plparser pythonenv - xapps + xapp # to satisfy configure script pythonenv.pkgs.pygobject3 ]; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 272e10318ef6..65bd4bcecb44 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -64,6 +64,10 @@ python3.pkgs.buildPythonApplication rec { gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ cpio e2fsprogs file findutils gzip ]}") makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + + # Fixes testCLI0051virt_install_initrd_inject on Darwin: "cpio: root:root: invalid group" + substituteInPlace virtinst/install/installerinject.py \ + --replace "'--owner=root:root'" "'--owner=0:0'" ''; checkInputs = with python3.pkgs; [ @@ -95,8 +99,7 @@ python3.pkgs.buildPythonApplication rec { manages Xen and LXC (linux containers). ''; license = licenses.gpl2; - # exclude Darwin since libvirt-glib currently doesn't build there - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ qknight offline fpletz globin ]; }; } diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/applications/window-managers/fvwm/2.6.nix index 2cecb81ea04b..44dde60ac05d 100644 --- a/pkgs/applications/window-managers/fvwm/2.6.nix +++ b/pkgs/applications/window-managers/fvwm/2.6.nix @@ -17,6 +17,7 @@ , libxslt , perl , pkg-config +, python3Packages , readline , enableGestures ? false }: @@ -32,7 +33,11 @@ stdenv.mkDerivation rec { hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3Packages.wrapPython + ]; buildInputs = [ cairo @@ -48,14 +53,25 @@ stdenv.mkDerivation rec { librsvg libxslt perl + python3Packages.python readline ] ++ lib.optional enableGestures libstroke; + pythonPath = [ + python3Packages.pyxdg + ]; + configureFlags = [ "--enable-mandoc" "--disable-htmldoc" ]; + postFixup = '' + wrapPythonPrograms + ''; + + enableParallelBuilding = true; + meta = with lib; { homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix index f3862f9ac0d8..e68f93bf836c 100644 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ b/pkgs/applications/window-managers/fvwm/3.nix @@ -25,7 +25,7 @@ , libxslt , perl , pkg-config -, python3 +, python3Packages , readline , sharutils }: @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook asciidoctor pkg-config + python3Packages.wrapPython ]; buildInputs = [ @@ -69,15 +70,25 @@ stdenv.mkDerivation (finalAttrs: { libstroke libxslt perl - python3 + python3Packages.python readline sharutils ]; + pythonPath = [ + python3Packages.pyxdg + ]; + configureFlags = [ "--enable-mandoc" ]; + postFixup = '' + wrapPythonPrograms + ''; + + enableParallelBuilding = true; + meta = with lib; { homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager - Version 3"; diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix new file mode 100644 index 000000000000..0528553b1894 --- /dev/null +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchzip, meson, ninja, pkg-config, wayland-scanner +, libxkbcommon, mesa, pixman, xorg, wayland, gtest +}: + +stdenv.mkDerivation { + pname = "sommelier"; + version = "104.0"; + + src = fetchzip rec { + url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; + passthru.rev = "af5434fd9903936a534e1316cbd22361e67949ec"; + stripRoot = false; + sha256 = "LungQqHQorHIKpye2SDBLuMHPt45C1cPYcs9o5Hc3cw="; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; + + doCheck = true; + checkInputs = [ gtest ]; + + postInstall = '' + rm $out/bin/sommelier_test # why does it install the test binary? o_O + ''; + + passthru.updateScript = ./update.py; + + meta = with lib; { + homepage = "https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/main/vm_tools/sommelier/"; + description = "Nested Wayland compositor with support for X11 forwarding"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/sommelier/update.py b/pkgs/applications/window-managers/sommelier/update.py new file mode 100755 index 000000000000..03898c9ccdd8 --- /dev/null +++ b/pkgs/applications/window-managers/sommelier/update.py @@ -0,0 +1,58 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p common-updater-scripts python3 +#! nix-shell -i python + +import csv +import json +import re +import shlex +import subprocess +from os.path import abspath, dirname, splitext +from urllib.request import urlopen + +# CrOS version numbers look like this: +# [.].. +# +# As far as I can tell, branches are where internal Google +# modifications are added to turn Chromium OS into Chrome OS, and +# branch branches are used for fixes for specific devices. So for +# Chromium OS they will always be 0. This is a best guess, and is not +# documented. +with urlopen('https://chromiumdash.appspot.com/cros/download_serving_builds_csv?deviceCategory=ChromeOS') as resp: + reader = csv.reader(map(bytes.decode, resp)) + header = reader.__next__() + cr_stable_index = header.index('cr_stable') + cros_stable_index = header.index('cros_stable') + chrome_version = [] + platform_version = [] + + for line in reader: + this_chrome_version = list(map(int, line[cr_stable_index].split('.'))) + this_platform_version = list(map(int, line[cros_stable_index].split('.'))) + chrome_version = max(chrome_version, this_chrome_version) + platform_version = max(platform_version, this_platform_version) + +chrome_major_version = chrome_version[0] +chromeos_tip_build = platform_version[0] +release_branch = f'release-R{chrome_major_version}-{chromeos_tip_build}.B' + +# Determine the git revision. +with urlopen(f'https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/{release_branch}?format=JSON') as resp: + resp.readline() # Remove )]}' header + rev = json.load(resp)['commit'] + +# Determine the patch version by counting the commits that have been +# added to the release branch since it forked off the chromeos branch. +with urlopen(f'https://chromium.googlesource.com/chromiumos/platform2/+log/refs/heads/main..{rev}/vm_tools/sommelier?format=JSON') as resp: + resp.readline() # Remove )]}' header + branch_commits = json.load(resp)['log'] + version = f'{chrome_major_version}.{len(branch_commits)}' + +# Update the version, git revision, and hash in sommelier's default.nix. +subprocess.run(['update-source-version', 'sommelier', f'--rev={rev}', version]) + +# Find the path to sommelier's default.nix, so Cargo.lock can be written +# into the same directory. +argv = ['nix-instantiate', '--eval', '--json', '-A', 'sommelier.meta.position'] +position = json.loads(subprocess.check_output(argv).decode('utf-8')) +filename = re.match(r'[^:]*', position)[0] diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/build-support/go/module.nix similarity index 100% rename from pkgs/development/go-modules/generic/default.nix rename to pkgs/build-support/go/module.nix diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/build-support/go/package.nix similarity index 100% rename from pkgs/development/go-packages/generic/default.nix rename to pkgs/build-support/go/package.nix diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 4980f36312c1..880fc6f42341 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenvNoCC, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }: stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20220710"; + version = "20220808"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-CInoUlWMmLwc4mMi1krmXr2a2JCWZ7XcPe20wFSNjqk="; + sha256 = "sha256-eOsqBIo7Bs/5mbD8x2Q+RO49Cqxd1KoqNbTsiV9RDWg="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; diff --git a/pkgs/data/themes/omni-gtk-theme/default.nix b/pkgs/data/themes/omni-gtk-theme/default.nix new file mode 100644 index 000000000000..b216eff6193a --- /dev/null +++ b/pkgs/data/themes/omni-gtk-theme/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation { + pname = "omni-gtk-theme"; + version = "unstable-2021-03-30"; + + src = fetchFromGitHub { + owner = "getomni"; + repo = "gtk"; + rev = "e81b3fbebebf53369cffe1fb662abc400edb04f7"; + sha256 = "sha256-NSZjkG+rY6h8d7FYq5kipPAjMDAgyaYAgOOOJlfqBCI="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/themes/Omni + cp -a {assets,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,metacity-1,unity,xfwm4} $out/share/themes/Omni + + runHook postInstall + ''; + + meta = with lib; { + description = "Dark theme created by Rocketseat"; + homepage = "https://github.com/getomni/gtk"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ zoedsoupe ]; + }; +} diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 56cf5a0ff515..bc60bc6bf9d1 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , wrapGAppsHook , python3 +, gobject-introspection , gsettings-desktop-schemas , gettext , gtk3 @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.9"; + version = "2.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-OCBFhlnEXZROp47KDiy7Y6l4GDVCCP+i1IFYQa7esyg="; + hash = "sha256-ynPorkhT/LUkFGNRG6JLDYaQjNPm2vMzthvl0wr7J/M="; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ])) + gobject-introspection gsettings-desktop-schemas gtk3 glib @@ -50,6 +52,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + meta = with lib; { description = "Bulk rename app"; homepage = "https://github.com/linuxmint/bulky"; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 303443cc5f9e..87d500cf617b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -1,6 +1,5 @@ { atk , cacert -, fetchpatch , dbus , cinnamon-control-center , cinnamon-desktop @@ -8,11 +7,13 @@ , cinnamon-session , cinnamon-translations , cjs +, clutter , fetchFromGitHub , gdk-pixbuf , libgnomekbd , glib , gobject-introspection +, gsound , gtk3 , intltool , json-glib @@ -34,7 +35,7 @@ , python3 , keybinder3 , cairo -, xapps +, xapp , upower , nemo , libnotify @@ -47,41 +48,51 @@ , meson , ninja , gst_all_1 +, perl }: stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.2.0"; + version = "5.4.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-B2Du2zis0xWeeyh3kSyz1doWImk9Fuk4qQ8HNZZdqdw="; + hash = "sha256-Z+BbvLgH4gOsLMSC0r5Hp9yDZz4XMH7NR/A9to+/djA="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch - - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/77ed66050f7df889fcb7a10b702c7b8bcdeaa130.patch"; - sha256 = "sha256-OegLxz6Xr/nxVwVOAd2oOY62ohZ3r6uYn1+YED5EBHQ="; - }) ]; buildInputs = [ - # TODO: review if we really need this all - (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro requests ])) + (python3.withPackages (pp: with pp; [ + dbus-python + setproctitle + pygobject3 + pycairo + python3.pkgs.xapp # The scope prefix is required + pillow + pytz + tinycss2 + python-pam + pexpect + distro + requests + ])) atk cacert cinnamon-control-center cinnamon-desktop cinnamon-menus cjs + clutter dbus gdk-pixbuf glib + gsound gtk3 json-glib libsoup @@ -101,7 +112,7 @@ stdenv.mkDerivation rec { gnome.caribou keybinder3 upower - xapps + xapp timezonemap nemo libnotify @@ -120,6 +131,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool gtk-doc + perl ]; # use locales from cinnamon-translations (not using --localedir because datadir is used) @@ -135,8 +147,8 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py - sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py - sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|/usr/bin/upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings # this one really IS optional @@ -151,6 +163,8 @@ stdenv.mkDerivation rec { sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop + + patchShebangs src/data-to-c.pl ''; passthru = { diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index a105f39ac46a..6a8e344ba47c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , glib , gettext @@ -14,7 +15,6 @@ , polkit , libxkbfile , cinnamon-menus -, dbus-glib , libgnomekbd , libxklavier , networkmanager @@ -31,17 +31,27 @@ , ninja , cinnamon-translations , python3 +, upower }: stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.2.0"; + version = "5.4.4"; + + patches = [ + # Add missing gio-unix-2.0 dependency, can be removed on next update + # https://github.com/linuxmint/cinnamon-control-center/pull/294 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon-control-center/commit/7f5ba6e7a691547840f8482445c09c729e10a397.patch"; + sha256 = "sha256-xcf/O/DfhOvCpWJl0XZD+xAwWs4STAeCaFMZ9Lftv2w="; + }) + ]; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-j7+2uLcHr7bO7i8OGqkw3ifawZULNyihhJ+h2D5gx/k="; + hash = "sha256-c2JbRAMcTnqaqt8MXQl4AxnENVmfYyHcCteWBWQUSO0="; }; buildInputs = [ @@ -51,7 +61,6 @@ stdenv.mkDerivation rec { libnotify cinnamon-menus libxml2 - dbus-glib polkit libgnomekbd libxklavier @@ -66,6 +75,7 @@ stdenv.mkDerivation rec { xorg.libXxf86misc xorg.libxkbfile gdk-pixbuf + upower ]; /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" @@ -88,8 +98,6 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index ec786c7bacb9..0b9e10e74027 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "5.2.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-gOlSmcHjBjnLdDpgC5mZ4M3eUBTG3BuET6Kr/Xby14A="; + hash = "sha256-U05JiW6PaRAEEQ/uq3wmZSQGohMz4M86Ji9pBl2Azg8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 3066d7fcd807..a3456755045f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -10,7 +10,7 @@ , muffin , nemo -, xapps +, xapp , cinnamon-desktop , cinnamon-session , cinnamon-settings-daemon @@ -28,7 +28,7 @@ let bulky muffin nemo - xapps + xapp cinnamon-desktop cinnamon-session cinnamon-settings-daemon diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 99008b4726ee..c3a60d684781 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ioluv/GdWCNGP2jQqsyEbHncCFm8iu69yR8QVKQTJk8="; + hash = "sha256-Q4bgaX8nGSWHKHR3+hFTlHtNhSmZW8ZEHi8DaXKQ+fM="; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 3d84a6a0622c..23be4175ab6d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , meson , ninja @@ -21,20 +22,30 @@ , pam , accountsservice , cairo -, xapps +, xapp +, xdotool , xorg , iso-flags-png-320x420 }: stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.2.0"; + version = "5.4.1"; + + patches = [ + # Add missing gio-unix-2.0 dependency, can be removed on next update + # https://github.com/linuxmint/cinnamon-screensaver/pull/411 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon-screensaver/commit/8d658e7f313879579322dce666551f132795540b.patch"; + sha256 = "sha256-HjVQSX2yYqgZVIio2I8GBWLYOddvaFiqZzf0zaYf+OE="; + }) + ]; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-weQ5sw5SY89JFIxamCeLiSLy8xCXGg0Yxj/5Ca5r+6o="; + hash = "sha256-PpBtLAIboXMnX5V/u06aoZ6WfPrn4mdCu0NXTGb6pAE="; }; nativeBuildInputs = [ @@ -60,8 +71,14 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXrandr - (python3.withPackages (pp: with pp; [ pygobject3 setproctitle xapp pycairo ])) - xapps + (python3.withPackages (pp: with pp; [ + pygobject3 + setproctitle + python3.pkgs.xapp # The scope prefix is required + pycairo + ])) + xapp + xdotool pam accountsservice cairo @@ -74,11 +91,6 @@ stdenv.mkDerivation rec { iso-flags-png-320x420 ]; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - postPatch = '' # cscreensaver hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 91c03796a888..261433e65872 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -3,8 +3,6 @@ , cinnamon-settings-daemon , cinnamon-translations , dbus-glib -, docbook_xsl -, docbook_xml_dtd_412 , glib , gsettings-desktop-schemas , gtk3 @@ -19,8 +17,7 @@ , stdenv , systemd , wrapGAppsHook -, xapps -, xmlto +, xapp , xorg , libexecinfo , pango @@ -28,13 +25,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-E5ascwLnpa5NSBAPo9dXRhoraUntzDPHVV32uDU4U8k="; + hash = "sha256-m16nf3eC15ZT8eDvRTylBfxsnShkU1Sm8J9qcRGeGQo="; }; patches = [ @@ -49,7 +46,7 @@ stdenv.mkDerivation rec { pango xorg.libX11 xorg.libXext - xapps + xapp xorg.libXau xorg.libXcomposite @@ -73,18 +70,12 @@ stdenv.mkDerivation rec { ninja wrapGAppsHook libexecinfo - docbook_xsl - docbook_xml_dtd_412 python3 pkg-config libxslt - xmlto ]; mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - "-Dgconf=false" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index bf83c3d9f594..d4d05df8f558 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -12,7 +12,6 @@ , libxklavier , wrapGAppsHook , pkg-config -, pulseaudio , lib , stdenv , systemd @@ -30,28 +29,17 @@ , libgudev , meson , ninja -, dbus -, dbus-glib }: stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "5.2.0"; - - /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory - #include "csd-power-proxy.h" - ^~~~~~~~~~~~~~~~~~~ - compilation terminated. */ - - # but this occurs only sometimes, so disabling parallel building - # also see https://github.com/linuxmint/cinnamon-settings-daemon/issues/248 - enableParallelBuilding = false; + version = "5.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-6omif4UxMrXWxL+R9lQ8ogxotW+3E9Kp99toH3PJtaU="; + hash = "sha256-3ELsb0hH7GjMjwjsIg2m8k/EBCHIQGW3O7eDaqT2V7I="; }; patches = [ @@ -59,8 +47,6 @@ stdenv.mkDerivation rec { ./use-sane-install-dir.patch ]; - mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - buildInputs = [ cinnamon-desktop colord @@ -72,7 +58,6 @@ stdenv.mkDerivation rec { libgnomekbd libnotify libxklavier - pulseaudio systemd upower dconf @@ -89,8 +74,6 @@ stdenv.mkDerivation rec { fontconfig nss libgudev - dbus - dbus-glib ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index f9337f764926..195d0268f3b1 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "5.2.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-t3PydmS2+LU++2NcosgMr9KTXW0Qy1Re9+YcS3KMDi8="; + hash = "sha256-vt60qarNfTX9R5kGOeUBCskKK2zLdEE+ACT0EGvUeao="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 3ac4483c5c9a..74b105381836 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -8,7 +8,7 @@ , python3 , cairo , gnome -, xapps +, xapp , keybinder3 , upower , callPackage @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "5.2.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-06sTk513qVMdznSHJzzB3XIPTcfjgxTB2o+ALqwPpHM="; + hash = "sha256-8LIVM9+Wt9V7iKUwqTBUTf8LiQ16NE3CYtCJknjl56o="; }; outputs = [ "out" "dev" ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { gnome.caribou keybinder3 upower - xapps + xapp ]; mesonFlags = [ diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 7f9d332ed140..5a803c6d487c 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ config, pkgs, lib }: lib.makeScope pkgs.newScope (self: with self; { iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // { @@ -31,8 +31,11 @@ lib.makeScope pkgs.newScope (self: with self; { mint-y-icons = callPackage ./mint-y-icons { }; muffin = callPackage ./muffin { }; pix = callPackage ./pix { }; - xapps = callPackage ./xapps { }; + xapp = callPackage ./xapp { }; warpinator = callPackage ./warpinator { }; xreader = callPackage ./xreader { }; xviewer = callPackage ./xviewer { }; -}) +}) // lib.optionalAttrs config.allowAliases { + # Aliases need to be outside the scope or they will shadow the attributes from parent scope. + xapps = pkgs.cinnamon.xapp; # added 2022-07-27 +} diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index abc7c172cb77..16ad17294071 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { url = "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"; - hash = "sha256-ZRJK1fzIF36BdUlVhLwdFdfgQvN2ashzjgpCxoOIbK8="; + hash = "sha256-un5T56zzN2vRVp42RHczDEKwrweSeygASkFJU5LXCDo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index f25cb9df2fdd..db57de2aee07 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "mint-themes"; - version = "1.8.8"; + version = "2.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "a833fba6917043bf410dee4364c9a36af1ce4c83"; - hash = "sha256-8abjjD0XoApvqB8SNlWsqIEp7ozgiERGS0kWglw2DWA="; + rev = "38b5606c3889a9a0bac0e2ab39196f675496982c"; + hash = "sha256-Cc5p9WWLFPQ8K0CpL236LilAgBuO6HdfGt/rb0wiVpc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index bfcc95c4ff93..2a57e0571ed2 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "mint-x-icons"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "286eb4acdfc3e3c77572dfd0cd70ffd4208d3a35"; - hash = "sha256-mZkCEBC1O2mW8rM1kpOWdC5CwIeafyBS95cMY6x1yco="; + rev = "4ab3c314db1b3751d87d5769629b28ac0ca3c671"; + hash = "sha256-cPRae3EjzVtAL1Ei2LB4UNUU/m87mFT94xY/NnNR6JM="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index c1afd2828d2c..48df2b260ca7 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "mint-y-icons"; - version = "1.5.8"; + version = "1.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "9489bd161e9503d071227dd36057386a34cfc0a3"; - hash = "sha256-53yTCWNSJjCpVvrxLfsiaCPNDEZWxJgGVAmVNMNql2M="; + rev = "6294c4538a08a2a6c5fd68e223472d9c144ff8b0"; + hash = "sha256-6tR3OFvU1ID61n4gr0R6pJyo3CjKvu8mgtXzMOINgq0="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 6f35d6b5901d..c7d803ed5aca 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -1,100 +1,104 @@ -{ fetchFromGitHub +{ stdenv +, lib +, fetchFromGitHub +, substituteAll +, cairo , cinnamon-desktop +, dbus +, desktop-file-utils , glib -, file , gnome -, gnome-doc-utils -, fetchpatch , gobject-introspection +, graphene , gtk3 -, intltool , json-glib +, libcanberra +, libdrm +, libgnomekbd +, libgudev , libinput , libstartup_notification -, libXtst +, libwacom +, libXdamage , libxkbcommon +, libXtst +, mesa +, meson +, ninja +, pipewire , pkg-config -, lib -, stdenv +, python3 , udev -, xorg , wrapGAppsHook -, pango -, cairo -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 -, docbook_xml_dtd_42 -, docbook_xml_dtd_412 -, autoconf -, automake -, gettext -, libtool +, xorgserver }: -# it's a frankensteins monster with some cinnamon sparkles added on top of it - stdenv.mkDerivation rec { pname = "muffin"; - version = "5.2.0"; + version = "5.4.4"; + + outputs = [ "out" "dev" "man" ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + zenity = gnome.zenity; + }) + ]; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-WAp0HbfRtwsPjJX1kPBqUStqLaudQPZ8E+h4jmggmw8="; + hash = "sha256-u3PNSyjxtPLFdA+2Iz+NuqlcQC9IwsFb7Tb5eVAJunY="; }; - buildInputs = [ - gtk3 - glib - pango - cairo - json-glib - cinnamon-desktop - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libxkbfile - xorg.xkeyboardconfig + nativeBuildInputs = [ + desktop-file-utils + mesa # needed for gbm + meson + ninja + pkg-config + python3 + wrapGAppsHook + xorgserver # for cvt command + ]; - libxkbcommon - gnome.zenity + buildInputs = [ + cairo + cinnamon-desktop + dbus + glib + gobject-introspection + gtk3 + libcanberra + libdrm + libgnomekbd + libgudev libinput libstartup_notification - libXtst + libwacom + libXdamage + libxkbcommon + pipewire udev - gobject-introspection ]; - nativeBuildInputs = [ - autoconf - automake - gettext - libtool - wrapGAppsHook - pkg-config - intltool - - gnome-doc-utils - gtk-doc - docbook_xsl - docbook_xml_dtd_43 - docbook_xml_dtd_42 - docbook_xml_dtd_412 + propagatedBuildInputs = [ + # required for pkg-config to detect muffin-clutter + json-glib + libXtst + graphene ]; - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py ''; meta = with lib; { homepage = "https://github.com/linuxmint/muffin"; description = "The window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = teams.cinnamon.members; }; diff --git a/pkgs/desktops/cinnamon/muffin/fix-paths.patch b/pkgs/desktops/cinnamon/muffin/fix-paths.patch new file mode 100644 index 000000000000..6ac0a431f61f --- /dev/null +++ b/pkgs/desktops/cinnamon/muffin/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 57b73747d..f424cc81c 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index e8bf145e5028..4b013050ad84 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -10,10 +10,9 @@ , wrapGAppsHook , libxml2 , gtk3 -, libnotify , gvfs , cinnamon-desktop -, xapps +, xapp , libexif , exempi , intltool @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.2.4"; + version = "5.4.2"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-v63dFiBKtLCmRnwJ6u814lSv+tfPG+IIJtcWCnOEZjk="; + sha256 = "sha256-Xn9CgGe7j2APaJRLvx58z2w+sN7ZeDScQz53ZBBnsQs="; }; outputs = [ "out" "dev" ]; @@ -40,10 +39,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - libnotify cinnamon-desktop libxml2 - xapps + xapp libexif exempi gvfs @@ -61,8 +59,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index b5477cfeb0d8..ebd116882a8c 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -16,7 +16,7 @@ , pkg-config , shared-mime-info , wrapGAppsHook -, xapps +, xapp , yelp-tools , libsecret , webkitgtk @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "2.8.4"; + version = "2.8.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-yB8nLGvJZOViD+i4IkKN0yCDl5wRCvEbjzPDs7ZRMNA="; + sha256 = "sha256-aID0jxOMFegkcAflTY0VevZyN1HFivkTFi3has8MOY0="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - xapps + xapp libsecret webkitgtk libwebp diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 8ed66dc54d55..ecd4aeec16c9 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.2.5"; + version = "1.2.13"; format = "other"; @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-pTLM4CrkBLEZS9IdM9IBSGH0WPOj1rlAgvWLOUy6MxY="; + hash = "sha256-iLImyfUsfn+mWrgMv5NnbOvvOlJnwJG4Btx1wwlgTeM="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix similarity index 77% rename from pkgs/desktops/cinnamon/xapps/default.nix rename to pkgs/desktops/cinnamon/xapp/default.nix index 7927026166a1..655284f20d82 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , glib , gobject-introspection , gtk3 @@ -21,23 +22,27 @@ }: stdenv.mkDerivation rec { - pname = "xapps"; - version = "2.2.8"; + pname = "xapp"; + version = "2.2.14"; outputs = [ "out" "dev" ]; + patches = [ + # Add missing gio-unix-2.0 dependency, can be removed on next update + # https://github.com/linuxmint/xapp/pull/156 + (fetchpatch { + url = "https://github.com/linuxmint/xapp/commit/052081f75d1c1212aeb6a913772723c81607bcb3.patch"; + sha256 = "sha256-VL70Y1FIa7lQ/zKjEx0GhaU1QRu4z6Yu400/bDbgZgM="; + }) + ]; + src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-70troRGklu5xGjBIrGvshcOX/UT96hIEFXyo4yj2GT4="; + hash = "sha256-BebsS7y/hRQSc4rYOIWJ+sSJ5fLZaCpNAE48JnviUUc="; }; - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - NIX_CFLAGS_COMPILE = [ - "-I${glib.dev}/include/gio-unix-2.0" - ]; - nativeBuildInputs = [ meson ninja @@ -91,7 +96,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/linuxmint/xapps"; + homepage = "https://github.com/linuxmint/xapp"; description = "Cross-desktop libraries and common resources"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 9864e1c0e18b..67983d505694 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -8,7 +8,7 @@ , gtk3 , wrapGAppsHook , libxml2 -, xapps +, xapp , meson , pkg-config , cairo @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.3.0"; + version = "3.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-wBrP5SHGPvH/Gz9QY253zQuf8WSjV19oNB5aIqXGLZ8="; + sha256 = "sha256-GkJo/wc5StyeQv0pv5XK0Qy3o8EGpfPYY8gOMq0Afgs="; }; nativeBuildInputs = [ @@ -47,13 +47,12 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dmathjax-directory=${nodePackages.mathjax}" - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ] ++ (map (x: "-D${x}=true") backends); buildInputs = [ glib gtk3 - xapps + xapp cairo libxml2 libsecret diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 5f5720c253b0..c0dc50182c01 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -1,64 +1,67 @@ { stdenv , lib , fetchFromGitHub -, autoreconfHook , cinnamon-desktop -, file +, docbook_xsl +, exempi , gdk-pixbuf , glib , gobject-introspection -, gtk-doc , gtk3 -, intltool +, gtk-doc , itstool , lcms2 , libexif , libjpeg , libpeas -, libtool +, librsvg , libxml2 +, meson +, ninja , pkg-config -, shared-mime-info +, python3 , wrapGAppsHook -, xapps +, xapp , yelp-tools }: stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.4"; + version = "3.2.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-OyHSBXtJ/TExl06NLUAaIZq4u0+fI3YGQ37HRZeNP+0="; + sha256 = "sha256-sDDQ/LGhHH13gRjVfpTyHYsYhelp80KNE75I8AlskoU="; }; nativeBuildInputs = [ - wrapGAppsHook - autoreconfHook cinnamon-desktop + docbook_xsl gdk-pixbuf gobject-introspection gtk-doc - intltool itstool - libtool + meson + ninja pkg-config + python3 + wrapGAppsHook yelp-tools ]; buildInputs = [ + exempi glib gtk3 + lcms2 libexif libjpeg libpeas + librsvg libxml2 - shared-mime-info - xapps - lcms2 + xapp ]; meta = with lib; { diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/development/compilers/bupc/default.nix index e8b6e5debb4e..947a154a3d3c 100644 --- a/pkgs/development/compilers/bupc/default.nix +++ b/pkgs/development/compilers/bupc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "berkeley_upc"; - version = "2.22.0"; + version = "2020.12.0"; src = fetchurl { url = "http://upc.lbl.gov/download/release/berkeley_upc-${version}.tar.gz"; - sha256 = "041l215x8z1cvjcx7kwjdgiaf9rl2d778k6kiv8q09bc68nwd44m"; + sha256 = "sha256-JdpFORlXHpCQE+TivoQQnjQlxQN7C8BNfHvTOSwXbYQ="; }; postPatch = '' diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index d7a7e981e086..4e1301e47a95 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnatboot"; - version = "11.2.0-4"; + version = "12.1.0-2"; src = fetchzip { url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-${version}/gnat-x86_64-linux-${version}.tar.gz"; - hash = "sha256-8fMBJp6igH+Md5jE4LMubDmC4GLt4A+bZG/Xcz2LAJQ="; + hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index e2db700494e9..d1dd64eca153 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -17,15 +17,11 @@ , runtimeShell , buildPackages , pkgsBuildTarget -, callPackage -, threadsCross ? null # for MinGW +, threadsCross }: -# threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; - let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { }; goBootstrap = runCommand "go-bootstrap" { } '' mkdir $out @@ -36,19 +32,19 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; "aarch64" = "arm64"; "arm" = "arm"; "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "i686" = "386"; "mips" = "mips"; + "mips64el" = "mips64le"; "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; "riscv64" = "riscv64"; "s390x" = "s390x"; - "powerpc64le" = "ppc64le"; - "mips64el" = "mips64le"; + "x86_64" = "amd64"; }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, @@ -57,7 +53,6 @@ let isCross = stdenv.buildPlatform != stdenv.targetPlatform; in - stdenv.mkDerivation rec { pname = "go"; version = "1.17.13"; @@ -80,7 +75,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional (threadsCross != null) threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; hardeningDisable = [ "all" ]; @@ -283,10 +278,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with lib; { - homepage = "https://go.dev/"; description = "The Go Programming language"; + homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index f21ee87ad4c4..489ed133c611 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -18,15 +18,11 @@ , runtimeShell , buildPackages , pkgsBuildTarget -, callPackage -, threadsCross ? null # for MinGW +, threadsCross }: -# threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; - let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { }; goBootstrap = runCommand "go-bootstrap" { } '' mkdir $out @@ -37,19 +33,19 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; "aarch64" = "arm64"; "arm" = "arm"; "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "i686" = "386"; "mips" = "mips"; + "mips64el" = "mips64le"; "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; "riscv64" = "riscv64"; "s390x" = "s390x"; - "powerpc64le" = "ppc64le"; - "mips64el" = "mips64le"; + "x86_64" = "amd64"; }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, @@ -58,7 +54,6 @@ let isCross = stdenv.buildPlatform != stdenv.targetPlatform; in - stdenv.mkDerivation rec { pname = "go"; version = "1.18.4"; @@ -81,7 +76,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional (threadsCross != null) threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; hardeningDisable = [ "all" ]; @@ -288,10 +283,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with lib; { - homepage = "https://go.dev/"; description = "The Go Programming language"; + homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 1df70649f43d..f5b511633465 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -17,15 +17,11 @@ , runtimeShell , buildPackages , pkgsBuildTarget -, callPackage -, threadsCross ? null # for MinGW +, threadsCross }: -# threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; - let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { }; goBootstrap = runCommand "go-bootstrap" { } '' mkdir $out @@ -36,19 +32,19 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; "aarch64" = "arm64"; "arm" = "arm"; "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "i686" = "386"; "mips" = "mips"; + "mips64el" = "mips64le"; "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; "riscv64" = "riscv64"; "s390x" = "s390x"; - "powerpc64le" = "ppc64le"; - "mips64el" = "mips64le"; + "x86_64" = "amd64"; }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, @@ -57,7 +53,6 @@ let isCross = stdenv.buildPlatform != stdenv.targetPlatform; in - stdenv.mkDerivation rec { pname = "go"; version = "1.19"; @@ -80,7 +75,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional (threadsCross != null) threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; hardeningDisable = [ "all" ]; @@ -276,10 +271,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with lib; { - homepage = "https://go.dev/"; description = "The Go Programming language"; + homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/development/compilers/go/bootstrap.nix b/pkgs/development/compilers/go/bootstrap116.nix similarity index 100% rename from pkgs/development/compilers/go/bootstrap.nix rename to pkgs/development/compilers/go/bootstrap116.nix diff --git a/pkgs/development/compilers/go/bootstrap117.nix b/pkgs/development/compilers/go/bootstrap117.nix new file mode 100644 index 000000000000..3afa2ba9a10f --- /dev/null +++ b/pkgs/development/compilers/go/bootstrap117.nix @@ -0,0 +1,15 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.17.13"; + hashes = { + # Use `print-hashes.sh ${version}` to generate the list below + darwin-amd64 = "c101beaa232e0f448fab692dc036cd6b4677091ff89c4889cc8754b1b29c6608"; + darwin-arm64 = "e4ccc9c082d91eaa0b866078b591fc97d24b91495f12deb3dd2d8eda4e55a6ea"; + linux-386 = "5e02f35aecc6b89679f631e0edf12c49922dd31c8140cf8dd725c5797a9f2425"; + linux-amd64 = "4cdd2bc664724dc7db94ad51b503512c5ae7220951cac568120f64f8e94399fc"; + linux-arm64 = "914daad3f011cc2014dea799bb7490442677e4ad6de0b2ac3ded6cee7e3f493d"; + linux-armv6l = "260431d7deeb8893c21e71fcbbb1fde3258616d8eba584c8d72060228ab42c86"; + linux-ppc64le = "bd0763fb130f8412672ffe1e4a8e65888ebe2419e5caa9a67ac21e8c298aa254"; + linux-s390x = "08f6074e1e106cbe5d78622357db71a93648c7a4c4e4b02e3b5f2a1828914c76"; + }; +} diff --git a/pkgs/development/compilers/go/print-hashes.sh b/pkgs/development/compilers/go/print-hashes.sh index f095b67c627b..ed3e62b941b8 100755 --- a/pkgs/development/compilers/go/print-hashes.sh +++ b/pkgs/development/compilers/go/print-hashes.sh @@ -1,15 +1,16 @@ -#!/usr/bin/env bash +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq +# shellcheck shell=bash set -euo pipefail BASEURL=https://go.dev/dl/ VERSION=${1:-} -if [[ -z $VERSION ]] -then - echo "No version supplied" - exit -1 +if [[ -z ${VERSION} ]]; then + echo "No version supplied" + exit 1 fi -curl -s "${BASEURL}?mode=json&include=all" | \ - jq '.[] | select(.version == "go'${VERSION}'")' | \ - jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' +curl -s "${BASEURL}?mode=json&include=all" | + jq '.[] | select(.version == "go'"${VERSION}"'")' | + jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 9ac9e654261a..2031935e6189 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -27,14 +27,14 @@ let in buildPythonPackage rec { pname = "vyper"; - version = "0.3.3"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BAnNj27B1HAb9VVDA69bFGbQjeOpl0g5EB2juajqBAw="; + sha256 = "sha256-ldNuADfWy1OWTPD7pTcpU5dX/mX2pV/QqSjJxkc5S28="; }; nativeBuildInputs = [ @@ -69,8 +69,5 @@ buildPythonPackage rec { homepage = "https://github.com/vyperlang/vyper"; license = licenses.asl20; maintainers = with maintainers; [ siraben ]; - knownVulnerabilities = [ - "CVE-2022-29255" - ]; }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a7711011d44f..c45f2f7a6847 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -58,16 +58,15 @@ broken-packages: - adaptive-containers - adaptive-tuple - adb + - addy - adobe-swatch-exchange - ADPfusion - adp-multi - adtrees - advent-of-code-ocr - - aern2-fun - AERN-Basics - aeson-applicative - aeson-bson - - AesonBson - aeson-decode - aeson-default - aeson-deriving @@ -76,9 +75,7 @@ broken-packages: - aeson-flat - aeson-flatten - aeson-flowtyped - - aeson-helper - aeson-injector - - aeson-iproute - aeson-json-ast - aeson-lens - aeson-match-qq @@ -87,7 +84,6 @@ broken-packages: - aeson-parsec-picky - aeson-picker - aeson-prefix - - aeson-quick - aeson-schema - aeson-schemas - aeson-smart @@ -95,7 +91,6 @@ broken-packages: - aeson-t - aeson-toolkit - aeson-utils - - aeson-via - aeson-with - affection - affine-invariant-ensemble-mcmc @@ -165,10 +160,9 @@ broken-packages: - anydbm - Aoide - aosd - - aos-signature - apart - api-builder - - api-tools + - api-rpc-factom - apns-http2 - appc - app-lens @@ -188,7 +182,6 @@ broken-packages: - arbor-monad-logger - arbor-monad-metric - arbor-postgres - - arch-hs - archiver - archlinux - archnews @@ -216,12 +209,12 @@ broken-packages: - asap - ascii85-conduit - ascii-flatten - - ascii-numbers - ascii-string - ascii-vector-avc - asil - asn1-codec - asn1-data + - AspectAG - assert - assert4hs - assert4hs-core @@ -283,7 +276,6 @@ broken-packages: - aws-performance-tests - aws-route53 - aws-sdk-text-converter - - aws-xray-client - axel - azubi - azure-acs @@ -298,7 +290,6 @@ broken-packages: - Baggins - bake - Bang - - ban-instance - banwords - barchart - barcodes-code128 @@ -316,7 +307,6 @@ broken-packages: - base-io-access - basen - basex-client - - basic - basic-sop - baskell - battlenet @@ -342,7 +332,6 @@ broken-packages: - besout - bet - betacode - - betris - bgmax - bgzf - bhoogle @@ -368,7 +357,6 @@ broken-packages: - bindings-apr - bindings-bfd - bindings-cctools - - bindings-common - bindings-dc1394 - bindings-eskit - bindings-EsounD @@ -432,12 +420,11 @@ broken-packages: - blaze-textual-native - blindpass - bliplib - - blizzard-html - blockchain - - blockfrost-api - blockhash - Blogdown - bloomfilter-redis + - blosum - blubber-server - bludigon - Blueprint @@ -525,13 +512,11 @@ broken-packages: - cabal2doap - cabal2ebuild - cabal2ghci - - cabal2json - cabal-audit - cabal-auto-expose - cabal-bundle-clib - cabal-constraints - cabal-db - - cabal-debian - cabal-dependency-licenses - cabal-detailed-quickcheck - cabal-dev @@ -587,7 +572,6 @@ broken-packages: - canteven-log - canteven-parsedate - cantor - - cantor-pairing - capped-list - capri - caps @@ -708,10 +692,12 @@ broken-packages: - clexer - CLI - cli-builder - - cli-extras + - clickhouse-haskell - clif - clifm + - cli-git - clingo + - cli-nix - clippard - clipper - clisparkline @@ -734,6 +720,7 @@ broken-packages: - cmonad - c-mosquitto - cmph + - CMQ - cmt - coalpit - cobot-tools @@ -779,7 +766,6 @@ broken-packages: - compact-socket - compact-string - compact-string-fix - - compaREST - comparse - compdata - compdoc @@ -792,11 +778,8 @@ broken-packages: - composite-aeson-path - composite-cassava - composite-dhall - - composite-ekg - composite-lens-extra - - composite-opaleye - composition-tree - - comprehensions-ghc - compressed - compression - computational-geometry @@ -843,13 +826,11 @@ broken-packages: - console-program - const-math-ghc-plugin - constrained-categories - - constrained-category - constrained-dynamic - constrained-monads - ConstraintKinds - constraints-emerge - constr-eq - - construct - constructive-algebra - consul-haskell - Consumer @@ -869,7 +850,8 @@ broken-packages: - control-monad-failure-mtl - Control-Monad-ST2 - contstuff - - copilot-core + - copilot-c99 + - copilot-sbv - copr - coquina - COrdering @@ -880,14 +862,12 @@ broken-packages: - core-haskell - corenlp-parser - core-telemetry - - core-webserver-warp - Coroutine - coroutine-object - CouchDB - couchdb-conduit - couch-hs - counter - - country - courier - court - coverage @@ -897,7 +877,7 @@ broken-packages: - cpuid - cpuperf - cpython - - cql + - cql-io - cqrs-core - cr - crack @@ -921,6 +901,7 @@ broken-packages: - crunghc - crypto-cipher-benchmarks - cryptocompare + - cryptoconditions - cryptoids-types - crypto-keys-ssh - crypto-multihash @@ -944,14 +925,13 @@ broken-packages: - ctemplate - ctkl - cuboid - - cuckoo - cuckoo-filter - curl-aeson - curl-runnings - currency-convert - curry-base - - currycarbon - CurryDB + - curryer-rpc - curry-frontend - curryrs - curves @@ -1038,9 +1018,6 @@ broken-packages: - DBlimited - dbm - dbmigrations - - dbmigrations-mysql - - dbmigrations-postgresql - - dbmigrations-sqlite - dbmonitor - d-bus - DBus @@ -1055,7 +1032,6 @@ broken-packages: - dead-code-detection - Deadpan-DDP - dead-simple-json - - debug-me - debug-tracy - decepticons - decimal-literals @@ -1067,7 +1043,6 @@ broken-packages: - deepseq-instances - deepseq-magic - deepseq-th - - deep-transformations - definitive-base - deka - Delta-Lambda @@ -1079,7 +1054,6 @@ broken-packages: - dependent-hashmap - dependent-monoidal-map - dep-t - - dep-t-dynamic - deptrack-core - derangement - derivation-trees @@ -1104,6 +1078,7 @@ broken-packages: - dhall-fly - dhall-text - dhall-to-cabal + - dhcp-lease-parser - dhrun - dia-base - diagrams-boolean @@ -1119,7 +1094,6 @@ broken-packages: - dictionaries - dictparser - diet - - diff - diffcabal - DifferentialEvolution - diff-gestalt @@ -1136,8 +1110,8 @@ broken-packages: - dijkstra-simple - DimensionalHash - dimensional-tf - - dino - diophantine + - diplomacy - direct-binary-files - directed-cubical - direct-fastcgi @@ -1171,7 +1145,6 @@ broken-packages: - dobutokO-frequency - doccheck - docidx - - docker - docker-build-cacher - dockercook - dockerfile-creator @@ -1182,7 +1155,7 @@ broken-packages: - docvim - DOH - doi - - domain-optics + - dom-parser - domplate - dom-selector - do-notation @@ -1191,6 +1164,7 @@ broken-packages: - do-spaces - dotfs - dot-linker + - doublezip - doublify-toolkit - downhill - downloader @@ -1220,7 +1194,6 @@ broken-packages: - dstring - DTC - dtd-text - - dual-game - dualizer - duckling - duet @@ -1258,16 +1231,14 @@ broken-packages: - easytest - ebeats - ebnf-bff - - eccrypto + - eccrypto-ed25519-bindings - ecma262 - - ecta - ecu - eddie - ede - edenmodules - edis - EdisonAPI - - EdisonCore - edit - edit-lenses - editline @@ -1302,7 +1273,6 @@ broken-packages: - elm-street - elm-websocket - elocrypt - - emacs-module - emailaddress - email-header - email-postmark @@ -1328,7 +1298,6 @@ broken-packages: - enum-text - enum-utf8 - envelope - - env-extra - env-parser - envstatus - epanet-haskell @@ -1416,7 +1385,6 @@ broken-packages: - ez-couch - Facebook-Password-Hacker-Online-Latest-Version - faceted - - factor - facts - fadno-braids - fadno-xml @@ -1435,11 +1403,11 @@ broken-packages: - FastPush - FastxPipe - fathead-util - - fb - fbmessenger-api + - fb-persistent - fca - fcache - - fcf-containers + - fcf-composite - fcg - fckeditor - fclabels-monadlib @@ -1451,12 +1419,12 @@ broken-packages: - feed-collect - feed-crawl - fei-cocoapi + - fenfire - fernet - FerryCore - Feval - fez-conf - ffeed - - fficxx - ffunctor - fgl-extras-decompositions - fib @@ -1477,7 +1445,6 @@ broken-packages: - filesystem-trees - file-templates - fillit - - Fin - final-pretty-printer - Finance-Quote-Yahoo - find-conduit @@ -1509,7 +1476,6 @@ broken-packages: - flamethrower - flamingra - flat-maybe - - flat-tex - flay - flexible-time - flickr @@ -1530,7 +1496,6 @@ broken-packages: - fmark - FModExRaw - fn-extra - - foldable-ix - foldl-incremental - foldl-statistics - folds-common @@ -1600,7 +1565,6 @@ broken-packages: - funbot-client - functional-arrow - function-instances-algebra - - functor - functor-combinators - functor-friends - functor-infix @@ -1629,7 +1593,7 @@ broken-packages: - gamma - Ganymede - garepinoh - - gargoyle + - gargoyle-postgresql-nix - gas - gather - gc-monitoring-wai @@ -1664,6 +1628,7 @@ broken-packages: - generic-storable - generic-tree - generic-trie + - generic-xml - generic-xmlpickler - genetics - genifunctors @@ -1674,7 +1639,6 @@ broken-packages: - gentlemark - geocode-google - GeocoderOpenCage - - geodetics - geodetic-types - GeoIp - geojson-types @@ -1691,7 +1655,6 @@ broken-packages: - ghc-core-smallstep - ghc-datasize - ghc-debug-convention - - ghc-dump-core - ghc-dump-tree - ghc-dup - ghc-events-analyze @@ -1717,7 +1680,6 @@ broken-packages: - ghc-pkg-lib - ghc-plugin-non-empty - ghc-plugs-out - - ghc-prof - ghc-proofs - ghc-simple - ghc-srcspan-plugin @@ -1729,7 +1691,6 @@ broken-packages: - ghcup - ghc-usage - gh-labeler - - gi-adwaita - giak - gi-cogl - Gifcurry @@ -1744,7 +1705,6 @@ broken-packages: - ginsu - gi-pangocairo - giphy-api - - gi-rsvg - gist - GiST - git @@ -1835,8 +1795,8 @@ broken-packages: - graph-matchings - graphmod-plugin - graphql-api - - graphql-parser - graphql-spice + - graphql-utils - graphql-w-persistent - graph-rewriting - graph-serialize @@ -1862,7 +1822,6 @@ broken-packages: - group-theory - group-with - growler - - grow-vector - grpc-api-etcd - gsl-random - gstreamer @@ -1912,6 +1871,7 @@ broken-packages: - hadoop-formats - hadoop-rpc - hafar + - Haggressive - hahp - haiji - hail @@ -1949,7 +1909,6 @@ broken-packages: - HandlerSocketClient - handsy - Hangman - - HangmanAscii - hannahci - hans - hanspell @@ -1963,7 +1922,6 @@ broken-packages: - happstack-hamlet - happstack-heist - happstack-hstringtemplate - - happstack-lite - happstack-monad-peel - happstack-server-tls-cryptonite - happstack-util @@ -1978,13 +1936,11 @@ broken-packages: - HARM - HarmTrace-Base - haroonga - - harp - harpy - harvest-api - has - HasCacBDD - hascar - - hascard - hascas - hash - hashable-extras @@ -2034,7 +1990,6 @@ broken-packages: - haskell-mpfr - haskell-names - haskell-neo4j-client - - HaskellNet - HaskellNN - Haskelloids - haskell-openflow @@ -2062,13 +2017,13 @@ broken-packages: - haskell-type-exts - haskell-typescript - haskell-tyrant - - haskell-xmpp - haskelzinc - haskeme - haskey - haskheap - haskhol-core - haskmon + - haskoin - haskoin-core - haskoin-util - haskore @@ -2090,11 +2045,9 @@ broken-packages: - hasql-resource-pool - hasql-simple - hasql-streams-example - - hasql-url - hastache - haste - haste-prim - - hasura-ekg-json - hat - hatex-guide - hats @@ -2103,7 +2056,7 @@ broken-packages: - haven - haverer - hax - - haxl + - haxl-facebook - haxparse - haxr-th - hayland @@ -2163,7 +2116,6 @@ broken-packages: - hein - heist-async - heist-emanote - - helic - helisp - helix - hell @@ -2216,7 +2168,6 @@ broken-packages: - hgeometry-ipe - hgettext - hgis - - hgmp - hgom - hgopher - h-gpgme @@ -2355,11 +2306,9 @@ broken-packages: - houseman - hp2any-core - hpack-convert - - hpapi - hpasteit - HPath - hpc-coveralls - - hpc-lcov - hpg - HPi - hpio @@ -2374,13 +2323,14 @@ broken-packages: - hpyrg - hq - HQu - - hquantlib-time + - hquantlib - hquery - hR - hreq-core - h-reversi - hricket - Hricket + - HROOT-core - hruby - hs2bf - hs2ps @@ -2457,11 +2407,11 @@ broken-packages: - hsns - hsntp - hs-openmoji-data - - hs-opentelemetry-api - hsoptions - hsoz - hsparql - hs-pattrans + - hsp-cgi - hspear - hspec2 - hspec-expectations-match @@ -2505,7 +2455,6 @@ broken-packages: - hs-vcard - hs-watchman - hsx - - hsx2hs - hsXenCtrl - hsyscall - hsyslog-tcp @@ -2574,19 +2523,15 @@ broken-packages: - hutton - huttons-razor - hVOIDP - - hw-aeson - hwall-auth-iitk - hw-ci-assist - - hw-conduit - hweblib - - hw-fingertree-strict - hwhile + - hw-json-demo - hw-lazy - - hw-mquery - hworker - hw-playground-linear - hwsl2 - - hw-streams - hx - HXQ - hxt-cache @@ -2614,6 +2559,7 @@ broken-packages: - iban - ib-api - ical + - icepeak - icfpc2020-galaxy - IcoGrid - iconv-typed @@ -2639,6 +2585,8 @@ broken-packages: - illuminate - imagemagick - imagepaste + - imapget + - imgur - imj-prelude - immortal-worker - imperative-edsl @@ -2656,6 +2604,7 @@ broken-packages: - indexed-do-notation - indextype - indices + - infernal - infer-upstream - inf-interval - infix @@ -2672,6 +2621,7 @@ broken-packages: - instana-haskell-trace-sdk - instance-map - instant-generics + - instapaper-sender - instinct - intcode - integer-pure @@ -2689,12 +2639,9 @@ broken-packages: - interpolator - interruptible - interval - - interval-algebra - - interval-patterns - interval-tree-clock - IntFormats - int-multimap - - intricacy - intrinsic-superclasses - introduction - intro-prelude @@ -2709,7 +2656,6 @@ broken-packages: - iostring - iothread - iotransaction - - ip - ip2location - ip2proxy - ipa @@ -2722,6 +2668,7 @@ broken-packages: - irc-dcc - irc-fun-types - ireal + - iri - iridium - iron-mq - irt @@ -2740,7 +2687,6 @@ broken-packages: - ivory - ixdopp - ixmonad - - ixset-typed - ixshader - j - jack-bindings @@ -2771,12 +2717,8 @@ broken-packages: - joinlist - joint - jonathanscard - - jordan - jort - - jose-jwt - - joy-rewrite - jpeg - - jsaddle-clib - jsaddle-wkwebview - js-good-parts - json2 @@ -2799,14 +2741,12 @@ broken-packages: - json-python - json-qq - jsonresume - - json-rpc - json-rpc-generic - json-rpc-server - jsonrpc-tinyclient - json-schema - jsonschema-gen - jsonsql - - json-stream - json-syntax - json-tools - json-tracer @@ -2837,6 +2777,7 @@ broken-packages: - katip-elasticsearch - katip-kafka - katip-logzio + - katip-raven - katip-scalyr-scribe - katip-syslog - katt @@ -2844,13 +2785,12 @@ broken-packages: - kawaii - Kawaii-Parser - kawhi - - kazura-queue - kdesrc-build-extra - - kdt - kd-tree - keccak - keera-hails-reactivevalues - - keid-core + - keid-render-basic + - keid-ui-dearimgui - keiretsu - kempe - kerry @@ -2859,6 +2799,7 @@ broken-packages: - kewar - keycloak-hs - keyed + - keystore - khph - kickass-torrents-dump-parser - kickchan @@ -2886,7 +2827,6 @@ broken-packages: - kure - KyotoCabinet - labeled-graph - - lackey - lagrangian - lambda2js - lambdaBase @@ -2943,7 +2883,6 @@ broken-packages: - latex-formulae-image - latex-svg-image - LATS - - launchdarkly-server-sdk - launchpad-control - lawless-concurrent-machines - layers @@ -3008,7 +2947,6 @@ broken-packages: - libpq - librandomorg - librarian - - libsecp256k1 - libsystemd-daemon - libsystemd-journal - libtagc @@ -3060,17 +2998,15 @@ broken-packages: - list-mux - list-prompt - list-remote-forwards - - lists-flines - - ListT - list-t-http-client - list-tries - list-t-text - list-zip-def - list-zipper + - liszt - lit - literals - LiterateMarkdown - - little-logger - ll-picosat - llsd - llvm-base @@ -3081,13 +3017,13 @@ broken-packages: - llvm-pretty - lmdb-high-level - lmonad + - load-balancing - load-font - local-address - located - located-monad-logger - loch - log2json - - log-base - logentries - logger - logging-effect-extra-file @@ -3105,7 +3041,6 @@ broken-packages: - lookup-tables - loopbreaker - loop-dsl - - looper - loops - loop-while - loopy @@ -3120,6 +3055,7 @@ broken-packages: - lscabal - L-seed - lsfrom + - lti13 - ltiv1p1 - ltk - LTS @@ -3167,10 +3103,8 @@ broken-packages: - make-hard-links - make-monofoldable-foldable - mallard - - managed-functions - mandulia - mangopay - - Map - mapalgebra - map-classes - map-exts @@ -3228,7 +3162,6 @@ broken-packages: - medium-sdk-haskell - meep - megalisp - - melf - mellon-core - melody - membrain @@ -3242,9 +3175,8 @@ broken-packages: - memo-sqlite - menoh - menshen - - mergeful + - mergeful-persistent - mergeless-persistent - - merkle-tree - messagepack-rpc - messente - metadata @@ -3261,7 +3193,6 @@ broken-packages: - MHask - mi - miconix-test - - microaeson - microgroove - microlens-each - micro-recursion-schemes @@ -3280,7 +3211,6 @@ broken-packages: - miniforth - minilens - minilight - - minio-hs - minions - miniplex - ministg @@ -3298,7 +3228,6 @@ broken-packages: - mltool - ml-w - mm2 - - mmark-ext - mmsyn2 - mmsyn3 - mmtf @@ -3306,7 +3235,6 @@ broken-packages: - Mobile-Legends-Hack-Cheats - mockazo - mock-httpd - - mock-time - modelicaparser - modular-prelude - module-management @@ -3373,7 +3301,6 @@ broken-packages: - monopati - monus - monzo - - moo-nad - morfette - morfeusz - morloc @@ -3401,6 +3328,7 @@ broken-packages: - msh - msi-kb-backlit - MTGBuilder + - mtgoxapi - mtl-c - mtl-evil-instances - mtl-extras @@ -3450,7 +3378,6 @@ broken-packages: - mzv - n2o-protocols - nagios-plugin-ekg - - namecoin-update - named-lock - named-servant - named-sop @@ -3497,7 +3424,6 @@ broken-packages: - netclock - netcore - netease-fm - - net-mqtt - netrium - NetSNMP - netspec @@ -3547,12 +3473,9 @@ broken-packages: - nice-html - nitro - nix-delegate - - nix-deploy - nix-eval - nix-freeze-tree - nixfromnpm - - nix-graph - - nix-linter - nixpkgs-update - nix-tools - nlp-scores @@ -3576,7 +3499,6 @@ broken-packages: - not-gloss-examples - NoTrace - notzero - - np-extras - np-linear - nptools - nri-prelude @@ -3607,7 +3529,6 @@ broken-packages: - oauthenticated - Object - ObjectIO - - oblivious-transfer - ocaml-export - Octree - OddWord @@ -3641,7 +3562,6 @@ broken-packages: - open-adt - OpenAFP - openai-servant - - openapi3-code-generator - openapi-petstore - openapi-typed - opench-meteo @@ -3670,7 +3590,6 @@ broken-packages: - open-typerep - OpenVGRaw - openweathermap - - open-witness - Operads - operate-do - operational-extra @@ -3692,14 +3611,11 @@ broken-packages: - ordrea - oref - organize-imports - - org-mode - orgmode - origami - orion-hs - orizentic - OrPatterns - - ory-hydra-client - - ory-kratos - osc - oscpacking - oset @@ -3739,7 +3655,6 @@ broken-packages: - pandoc-filter-indent - pandoc-include - pandoc-lens - - pandoc-link-context - pandoc-markdown-ghci-filter - pandoc-placetable - pandoc-plantuml-diagrams @@ -3749,6 +3664,7 @@ broken-packages: - pandora - pang-a-lambda - pangraph + - pan-os-syslog - panpipe - pansite - pantry-tmp @@ -3794,6 +3710,7 @@ broken-packages: - parser-unbiased-choice-monad-embedding - parsimony - parsley-core + - partage - partial-records - partial-semigroup-hedgehog - partly @@ -3810,7 +3727,6 @@ broken-packages: - Pathfinder - pathfindingcore - PathTree - - patrol - patronscraper - paypal-adaptive-hoops - paypal-api @@ -3820,7 +3736,7 @@ broken-packages: - PBKDF2 - pb-next - pcd-loader - - pcf-font + - pcf-font-embed - pcgen - PCLT - pcre2 @@ -3833,7 +3749,6 @@ broken-packages: - pdynload - PeanoWitnesses - pecoff - - pedersen-commitment - pedestrian-dag - peg - peggy @@ -3863,7 +3778,6 @@ broken-packages: - persistent-ratelimit - persistent-stm - persistent-template-classy - - persistent-typed-db - persistent-zookeeper - persona - pesca @@ -3884,7 +3798,6 @@ broken-packages: - phone-numbers - phone-push - phonetic-languages-constaints - - phonetic-languages-rhythmicity - phonetic-languages-vector - phraskell - Phsu @@ -3900,7 +3813,6 @@ broken-packages: - pi-forall - pig - pi-hoole - - pinboard - pinch-gen - pinchot - pine @@ -3918,11 +3830,12 @@ broken-packages: - pipes-interleave - pipes-io - pipes-network + - pipes-protolude - pipes-rt - pipes-s3 - pipes-shell - pipes-sqlite-simple - - pipes-text + - pipes-transduce - pipes-vector - pipes-zeromq4 - pipes-zlib @@ -3932,7 +3845,6 @@ broken-packages: - pixela - pixelated-avatar-generator - pixel-printer - - pixiv - pkcs10 - pkcs7 - pkggraph @@ -3947,7 +3859,6 @@ broken-packages: - platinum-parsing - PlayingCards - playlists - - plex - plist - plist-buddy - plivo @@ -3982,19 +3893,15 @@ broken-packages: - poly-control - polydata-core - polynom - - polynomial-algebra - polysemy-check - - polysemy-http - polysemy-keyed-state - polysemy-kvstore-jsonfile - polysemy-managed - polysemy-mocks - polysemy-readline - - polysemy-req - polysemy-scoped-fs - polysemy-zoo - polytypeable - - polyvariadic - pomaps - pomohoro - ponder @@ -4050,7 +3957,6 @@ broken-packages: - precis - precursor - predicate-class - - predicate-transformers - predicate-typed - prednote - pregame @@ -4075,7 +3981,6 @@ broken-packages: - prim-instances - PrimitiveArray-Pretty - primitive-atomic - - primitive-checked - primitive-containers - primitive-convenience - primitive-foreign @@ -4100,9 +4005,9 @@ broken-packages: - process-leksah - process-listlike - processmemory - - procex - procrastinating-variable - procstat + - product-isomorphic - prof2pretty - prof-flamegraph - profunctor-monad @@ -4117,6 +4022,7 @@ broken-packages: - promise - pronounce - proof-combinators + - PropaFP - Proper - properties - property-list @@ -4125,9 +4031,7 @@ broken-packages: - protocol - protocol-buffers-fork - proto-lens-combinators - - proto-lens-jsonpb - protolude-lifted - - proton - proton-haskell - prototype - prove-everywhere-server @@ -4136,7 +4040,6 @@ broken-packages: - proxy-mapping - psc-ide - pseudo-trie - - PSQueue - PTQ - publicsuffix - publicsuffixlistcreate @@ -4148,9 +4051,7 @@ broken-packages: - pugs-HsSyck - PUH-Project - Pup-Events-Server - - purebred-email - pure-io - - purenix - pure-priority-queue - purescript-tsd-gen - pure-zlib @@ -4176,6 +4077,7 @@ broken-packages: - QLearn - qlinear - qnap-decrypt + - qr-imager - qsem - qt - QuadEdge @@ -4215,7 +4117,6 @@ broken-packages: - radium - radium-formula-parser - radix - - radixtree - rados-haskell - raft - rakhana @@ -4236,13 +4137,12 @@ broken-packages: - rangemin - rank1dynamic - rank-product - - rapid - rapid-term - Rasenschach - rational-list - rattle - rattletrap - - raven-haskell + - raven-haskell-scotty - raz - rbst - rclient @@ -4298,14 +4198,12 @@ broken-packages: - reflex-dom-helpers - reflex-dom-retractable - reflex-dom-svg - - reflex-dom-th - reflex-external-ref - reflex-fsnotify - reflex-gadt-api - reflex-gi-gtk - reflex-gloss - reflex-jsx - - reflex-libtelnet - reflex-orphans - reflex-sdl2 - reflex-test-host @@ -4363,12 +4261,12 @@ broken-packages: - replica - ReplicateEffects - repl-toolkit + - repo-based-blog - representable-functors - reproject - req-conduit - request - request-monad - - requirements - req-url-extra - reservoir - resolve @@ -4392,6 +4290,7 @@ broken-packages: - rhbzquery - riak - riak-protobuf-lens + - rib - ribbit - RichConditional - ridley @@ -4406,6 +4305,7 @@ broken-packages: - rivers - rivet-migration - rivet-simple-deploy + - RJson - Rlang-QQ - rlglue - RLP @@ -4428,7 +4328,6 @@ broken-packages: - rounding - roundtrip-aeson - rowrecord - - row-types-aeson - R-pandoc - rpc-framework - rpm @@ -4472,7 +4371,6 @@ broken-packages: - salvia-protocol - sandlib - sandman - - sandwich-hedgehog - sarasvati - sat - satchmo @@ -4569,10 +4467,9 @@ broken-packages: - servant-generic - servant-github - servant-github-webhook + - servant-haxl-client - servant-hmac-auth - servant-htmx - - servant-iCalendar - - servant-jsonrpc - servant-kotlin - servant-mock - servant-namedargs @@ -4597,14 +4494,11 @@ broken-packages: - servant-zeppelin - server-generic - serversession-backend-persistent - - serversession-backend-redis - - serversession-frontend-yesod - services - ses-html-snaplet - SessionLogger - sessions - sessiontypes - - Set - setgame - set-of - setoid @@ -4650,11 +4544,8 @@ broken-packages: - shorten-strings - short-vec - show-prettyprint - - Shpadoinkle-backend-pardiff - Shpadoinkle-backend-snabbdom - - Shpadoinkle-backend-static - Shpadoinkle-console - - Shpadoinkle-html - Shpadoinkle-isreal - shwifty - sifflet @@ -4688,7 +4579,6 @@ broken-packages: - simpleprelude - simple-rope - simple-server - - SimpleServer - simplesmtpclient - simple-sql-parser - simple-stacked-vm @@ -4698,7 +4588,6 @@ broken-packages: - simple-templates - simple-ui - simple-units - - simple-vec3 - simplexmq - simple-zipper - simplistic-generics @@ -4706,10 +4595,10 @@ broken-packages: - singleton-typelits - single-tuple - singnal + - singular-factory - sink - sitepipe - sixfiguregroup - - sized - sized-grid - sized-types - sized-vector @@ -4722,7 +4611,6 @@ broken-packages: - skulk - skylighting-extensions - skylighting-format-ansi - - skylighting-lucid - skype4hs - slack - slack-api @@ -4748,9 +4636,6 @@ broken-packages: - smartcheck - smartconstructor - smartGroup - - smash-aeson - - smash-lens - - smash-optics - sme - smerdyakov - smiles @@ -4781,7 +4666,6 @@ broken-packages: - snaplet-influxdb - snaplet-mandrill - snaplet-mongodb-minimalistic - - snaplet-persistent - snaplet-postgresql-simple - snaplet-purescript - snaplet-redis @@ -4789,6 +4673,7 @@ broken-packages: - snaplet-scoped-session - snaplet-ses-html - snaplet-sqlite-simple + - snaplet-typed-sessions - snap-predicates - snappy-conduit - snap-routes @@ -4798,7 +4683,6 @@ broken-packages: - SNet - snipcheck - snorkels - - snowchecked - snowtify - socket-activation - socketed @@ -4859,6 +4743,7 @@ broken-packages: - sql-simple - sqlvalue-list - srcinst + - sr-extra - sscan - ssh - ssh-tunnel @@ -4911,7 +4796,6 @@ broken-packages: - stemmer - stemmer-german - stepwise - - stern-brocot - stgi - STL - stm-chunked-queues @@ -4920,7 +4804,6 @@ broken-packages: - stm-stats - stochastic - Stomp - - stooq-api - storable - storable-static-array - stp @@ -4929,7 +4812,6 @@ broken-packages: - Strafunski-StrategyLib - StrappedTemplates - StrategyLib - - stratosphere - stratux-types - stream - streamdeck @@ -4947,6 +4829,7 @@ broken-packages: - streaming-png - streaming-postgresql-simple - streaming-sort + - streaming-utils - streamly-binary - streamly-cassava - streamly-examples @@ -4966,7 +4849,6 @@ broken-packages: - string-quote - stringtable-atom - stripe - - stripeapi - stripe-core - stripe-servant - strongweak @@ -4976,7 +4858,7 @@ broken-packages: - stunclient - stylish-cabal - stylized - - subG + - subG-instances - subleq-toolchain - sublists - subsample @@ -4994,7 +4876,6 @@ broken-packages: - superbubbles - superevent - supermonad - - supernova - supero - superrecord - super-user-spark @@ -5004,6 +4885,7 @@ broken-packages: - surjective - sv2v - sv-core + - SVD2HS - svfactor - svg-builder-fork - svgutils @@ -5021,12 +4903,8 @@ broken-packages: - SWMMoutGetMB - sws - syb-extras - - syb-with-class - - sydtest-hedis - - sydtest-mongo - - sydtest-persistent-postgresql - - sydtest-rabbitmq - - sydtest-yesod + - SybWidget + - syb-with-class-instances-text - syfco - sym - symantic @@ -5080,7 +4958,6 @@ broken-packages: - takahashi - Takusen - takusen-oracle - - talash - tamarin-prover-utils - Tape - tapioca @@ -5127,7 +5004,6 @@ broken-packages: - tensorflow - tensorflow-opgen - tensor-safe - - termbox-banana - termbox-bindings - termination-combinators - termplot @@ -5159,6 +5035,7 @@ broken-packages: - text-containers - text-format - text-format-heavy + - text-generic-pretty - text-icu-normalized - text-lens - text-lips @@ -5180,10 +5057,8 @@ broken-packages: - tga - thank-you-stars - th-build - - th-data-compat - th-dict-discovery - THEff - - themoviedb - thentos-cookie-session - Theora - theoremquest @@ -5285,7 +5160,6 @@ broken-packages: - tracetree - tracked-files - tracker - - trackit - traction - tracy - traildb @@ -5299,7 +5173,6 @@ broken-packages: - transient - translatable-intset - translate - - traversal-template - travis - travis-meta-yaml - trawl @@ -5320,6 +5193,7 @@ broken-packages: - tripLL - trivia - tropical + - tropical-geometry - true-name - trust-chain - tsession @@ -5329,6 +5203,7 @@ broken-packages: - tsuntsun - tsvsql - ttask + - ttn-client - tttool - tubes - tuntap @@ -5341,13 +5216,13 @@ broken-packages: - turing-machines - turing-music - turtle-options - - twain - tweak - twentefp-websockets - twfy-api-client - twilio - twiml - twine + - twirp - twisty - twitter - twitter-feed @@ -5372,13 +5247,11 @@ broken-packages: - type-indexed-queues - type-int - type-interpreter - - typelet - type-level-bst - type-level-natural-number-induction - type-level-natural-number-operations - typelevel-tensor - type-list - - TypeNat - type-of-html-static - typeparams - type-prelude @@ -5393,7 +5266,6 @@ broken-packages: - uAgda - uberlast - ucam-webauth-types - - ucd - uconv - udbus - udp-conduit @@ -5402,10 +5274,7 @@ broken-packages: - uhexdump - uhttpc - ui-command - - ukrainian-phonetics-basic-array - - ulid - unamb-custom - - unbeliever - unbounded-delays-units - unboxed-containers - unboxed-references @@ -5424,7 +5293,6 @@ broken-packages: - uniqueness-periods-general - uniqueness-periods-vector - uniqueness-periods-vector-common - - uniqueness-periods-vector-stats - units-attoparsec - unittyped - unitym-yesod @@ -5445,7 +5313,6 @@ broken-packages: - unordered-intmap - unpacked-either - unpacked-maybe - - unpacked-maybe-numeric - unpack-funcs - unroll-ghc-plugin - unsafely @@ -5474,7 +5341,6 @@ broken-packages: - useragents - users-persistent - utc - - utf - utf8-conversions - utf8-prelude - utf8-validator @@ -5488,7 +5354,6 @@ broken-packages: - uu-cco - uuid-aeson - uuid-bytes - - uuid-orphans - uvector - uxadt - vabal-lib @@ -5507,7 +5372,6 @@ broken-packages: - variadic - variation - vaultaire-common - - vaultenv - vault-tool - vcache - vcatt @@ -5545,6 +5409,7 @@ broken-packages: - vhdl - vicinity - ViennaRNA-extras + - viewprof - views - vimus - vintage-basic @@ -5561,7 +5426,6 @@ broken-packages: - VKHS - vowpal-utils - voyeur - - vpq - VRML - vte - vtegtk3 @@ -5629,7 +5493,6 @@ broken-packages: - webapp - webauthn - WebBits - - webby - webcloud - webcrank - webcrank-dispatch @@ -5640,7 +5503,6 @@ broken-packages: - WeberLogic - webex-teams-pipes - webfinger-client - - web-inv-route - webkitgtk3 - webkit-javascriptcore - webmention @@ -5649,7 +5511,6 @@ broken-packages: - web-rep - Webrexp - web-routes-quasi - - web-routes-th - web-routes-transformers - webshow - websockets-rpc @@ -5673,7 +5534,7 @@ broken-packages: - windns - windowslive - winerror - - winery + - wireguard-hs - wires - wiring - witness @@ -5701,6 +5562,7 @@ broken-packages: - workflow-windows - work-time - wp-archivebot + - wreq-helper - wreq-patchable - wreq-sb - writer-cps-lens @@ -5741,7 +5603,6 @@ broken-packages: - xml-conduit-selectors - xml-html-conduit-lens - XmlHtmlWriter - - xml-lens - xml-parsec - xml-prettify - xml-query-xml-types @@ -5792,7 +5653,6 @@ broken-packages: - yampa-glut - yampa-sdl2 - YampaSynth - - yampa-test - yandex-translate - yaop - yapb @@ -5811,6 +5671,7 @@ broken-packages: - yesod-auth-bcrypt - yesod-auth-bcryptdb - yesod-auth-deskcom + - yesod-auth-fb - yesod-auth-hmac-keccak - yesod-auth-kerberos - yesod-auth-ldap-mediocre @@ -5821,8 +5682,10 @@ broken-packages: - yesod-auth-smbclient - yesod-auth-zendesk - yesod-bootstrap + - yesod-comments - yesod-content-pdf - yesod-crud + - yesod-crud-persist - yesod-csp - yesod-datatables - yesod-dsl @@ -5832,11 +5695,11 @@ broken-packages: - yesod-form-richtext - yesod-gitrev - yesod-goodies + - yesod-ip - yesod-job-queue - yesod-katip - yesod-links - yesod-lucid - - yesod-markdown - yesod-paginate - yesod-pagination - yesod-pnotify @@ -5862,12 +5725,12 @@ broken-packages: - yi-core - yoda - Yogurt - - yst - yu-core - yuiGrid - yu-tool - yxdb-utils - z3-encoding + - z85 - zabt - zampolit - Z-Data @@ -5876,9 +5739,7 @@ broken-packages: - zeno - zeolite-lang - zephyr - - zeromq4-clone-pattern - zeromq4-conduit - - zeromq4-patterns - zeromq-haskell - zettelkast - ZFS @@ -5899,8 +5760,7 @@ broken-packages: - zsh-battery - zsyntax - ztar - - zuul - Zwaluw - - zxcvbn-hs + - zxcvbn-dvorak - zydiskell - zyre2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3fefcc56b46e..ba0b7e8090d5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -451,17 +451,11 @@ unsupported-platforms: hidapi: [ platforms.darwin ] hinotify-bytestring: [ platforms.darwin ] honk: [ platforms.darwin ] - HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms HSoM: [ platforms.darwin ] iwlib: [ platforms.darwin ] Jazzkell: [ platforms.darwin ] # depends on Euterpea jsaddle-hello: [ platforms.darwin ] # depends on jsaddle-webkit2gtk jsaddle-webkit2gtk: [ platforms.darwin ] - keid-core: [ aarch64-linux ] - keid-geometry: [ aarch64-linux ] - keid-render-basic: [ aarch64-linux ] - keid-sound-openal: [ aarch64-linux ] - keid-ui-dearimgui: [ aarch64-linux ] Kulitta: [ platforms.darwin ] # depends on Euterpea LambdaHack: [ platforms.darwin ] large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17 @@ -485,8 +479,6 @@ unsupported-platforms: oculus: [ platforms.darwin ] pam: [ platforms.darwin ] parport: [ platforms.darwin ] - password: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 - password-instances: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128 piyo: [ platforms.darwin ] PortMidi-simple: [ platforms.darwin ] @@ -499,8 +491,6 @@ unsupported-platforms: reflex-localize-dom: [ platforms.darwin, aarch64-linux ] rtlsdr: [ platforms.darwin ] rubberband: [ platforms.darwin ] - scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 - scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8 sdl2-mixer: [ platforms.darwin ] sdl2-ttf: [ platforms.darwin ] sensei: [ platforms.darwin ] @@ -545,8 +535,14 @@ supported-platforms: hpapi: [ platforms.linux ] # limited by pkgs.papi hsignal: [ platforms.x86 ] # -msse2 HFuse: [ platforms.linux ] + HQu: [ platforms.x86 ] # vendored C++ library needs i686/x86_64 hw-prim-bits: [ platforms.x86 ] # x86 assembler inline-asm: [ platforms.x86 ] # x86 assembler + keid-core: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) + keid-geometry: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) + keid-render-basic: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) + keid-sound-openal: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) + keid-ui-dearimgui: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) kqueue: [ platforms.netbsd, platforms.freebsd, platforms.openbsd, platforms.darwin ] linux-evdev: [ platforms.linux ] linux-file-extents: [ platforms.linux ] @@ -555,7 +551,12 @@ supported-platforms: linux-namespaces: [ platforms.linux ] lxc: [ platforms.linux ] midi-alsa: [ platforms.linux ] + password: [ platforms.x86 ] # uses scrypt, which requries x86 + password-instances: [ platforms.x86 ] # uses scrypt, which requries x86 reactivity: [ platforms.windows ] + reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux + scat: [ platforms.x86 ] # uses scrypt, which requries x86 + scrypt: [ platforms.x86 ] # https://github.com/informatikr/scrypt/issues/8 seqalign: [ platforms.x86 ] # x86 intrinsics udev: [ platforms.linux ] Win32-console: [ platforms.windows ] @@ -569,6 +570,7 @@ supported-platforms: Win32-services: [ platforms.windows ] Win32-services-wrapper: [ platforms.windows ] XInput: [ platforms.windows ] + yesod-auth-simple: [ platforms.x86 ] # requires scrypt which only supports x86 dont-distribute-packages: # Depends on shine, which is a ghcjs project. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index a623f3919c58..4585584c1d9c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -25,7 +25,6 @@ dont-distribute-packages: - AndroidViewHierarchyImporter - Annotations - ApplePush - - AspectAG - AttoJson - AutoForms - AvlTree @@ -52,7 +51,6 @@ dont-distribute-packages: - CBOR - CC-delcont-alt - CMCompare - - CMQ - CPBrainfuck - CSPM-Interpreter - CSPM-ToProlog @@ -87,6 +85,7 @@ dont-distribute-packages: - Dust-tools-pcap - DysFRP-Cairo - DysFRP-Craftwerk + - EdisonCore - EditTimeReport - EntrezHTTP - EsounD @@ -103,6 +102,7 @@ dont-distribute-packages: - FermatsLastMargin - FieldTrip - FilePather + - Fin - Finance-Treasury - FiniteMap - FirstOrderTheory @@ -177,7 +177,6 @@ dont-distribute-packages: - HPlot - HPong - HROOT - - HROOT-core - HROOT-graf - HROOT-hist - HROOT-io @@ -196,12 +195,10 @@ dont-distribute-packages: - HaTeX-qq - HaVSA - Hach - - Haggressive - HarmTrace - HasGP - Haschoo - Hashell - - HaskellNet-SSL - Hate - Hawk - Hayoo @@ -245,6 +242,7 @@ dont-distribute-packages: - Lattices - LinearSplit - LinkChecker + - ListT - LogicGrowsOnTrees - LogicGrowsOnTrees-MPI - LogicGrowsOnTrees-network @@ -257,6 +255,7 @@ dont-distribute-packages: - MIP-glpk - MSQueue - MailchimpSimple + - Map - MaybeT-transformers - MetaObject - Metrics @@ -304,13 +303,11 @@ dont-distribute-packages: - PlslTools - Printf-TH - ProbabilityMonads - - PropaFP - Pugs - Pup-Events - Pup-Events-Demo - Quelea - RESTng - - RJson - RMP - RNAFold - RNAFoldProgs @@ -328,25 +325,29 @@ dont-distribute-packages: - SGdemo - STLinkUSB - STM32-Zombie - - SVD2HS - SVG2Q - SciFlow - SciFlow-drmaa - Scurry - SelectSequencesFromMSA + - Set - Shellac-compatline - Shellac-editline - Shellac-haskeline - Shellac-readline - ShortestPathProblems + - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-static - Shpadoinkle-developer-tools - Shpadoinkle-disembodied - Shpadoinkle-examples + - Shpadoinkle-html - Shpadoinkle-router - Shpadoinkle-template - Shpadoinkle-widgets - SimpleGL - SimpleLog + - SimpleServer - Smooth - Snusmumrik - SoccerFun @@ -356,7 +357,6 @@ dont-distribute-packages: - SpinCounter - StockholmAlignment - Strafunski-Sdf2Haskell - - SybWidget - SyntaxMacros - Taxonomy - TaxonomyTools @@ -423,14 +423,11 @@ dont-distribute-packages: - activehs - actor - acts - - addy - adhoc-network - adict - adjunction - adp-multi-monadiccp - - aern2-mfun - aeson-native - - aeson-result - affine - afv - agda-server @@ -624,7 +621,6 @@ dont-distribute-packages: - antlrc - apelsin - api-rpc-accumulate - - api-rpc-factom - api-rpc-pegnet - api-yoti - apiary @@ -657,10 +653,8 @@ dont-distribute-packages: - arithmetic-circuits - array-forth - arraylist - - ascii - ascii-cows - ascii-table - - ascii_1_2_3_0 - asic - asif - assert4hs-hspec @@ -677,10 +671,8 @@ dont-distribute-packages: - ats-format - ats-pkg - attoparsec-enumerator - - attoparsec-ip - attoparsec-iteratee - attoparsec-text-enumerator - - attoparsec-uri - atuin - audiovisual - aura @@ -715,8 +707,6 @@ dont-distribute-packages: - aws-sign4 - aws-simple - aws-sns - - aws-xray-client-persistent - - aws-xray-client-wai - axiom - azimuth-hs - azure-functions-worker @@ -739,6 +729,7 @@ dont-distribute-packages: - base32-bytestring - base64-bytes - baserock-schema + - basic - batchd - batchd-core - batchd-docker @@ -749,8 +740,6 @@ dont-distribute-packages: - battleships - bayes-stack - bbi - - bcp47 - - bcp47-orphans - bdcs - bdcs-api - beam-automigrate @@ -815,12 +804,8 @@ dont-distribute-packages: - ble - blink1 - blip - - blockfrost-client - - blockfrost-client-core - - blockfrost-pretty - blogination - bloodhound-amazonka-auth - - blosum - bloxorz - blubber - bluetile @@ -858,7 +843,6 @@ dont-distribute-packages: - buster-network - butterflies - bytable - - bytehash - bytelog - bytepatch - bytestring-builder-varword @@ -870,6 +854,7 @@ dont-distribute-packages: - cabal-query - cabal-test - cabal2arch + - cabal2json - cabalmdvrpm - cabalrpmdeps - cabocha @@ -973,10 +958,7 @@ dont-distribute-packages: - clckwrks-theme-geo-bootstrap - cless - cleveland - - cli-git - - cli-nix - click-clack - - clickhouse-haskell - clifford - clippings - clocked @@ -999,7 +981,6 @@ dont-distribute-packages: - coformat - cognimeta-utils - coinbase-exchange - - coincident-root-loci - colada - colchis - collapse-duplication @@ -1017,6 +998,7 @@ dont-distribute-packages: - commodities - commsec-keyexchange - comonad-random + - compaREST - compact-mutable - compactable - compdata-automata @@ -1024,6 +1006,7 @@ dont-distribute-packages: - compdata-param - compdoc-dhall-decoder - complexity + - comprehensions-ghc - compstrat - comptrans - computational-algebra @@ -1046,7 +1029,7 @@ dont-distribute-packages: - config-select - configifier - configurator-ng - - conic-graphs + - constrained-category - constraint - constraint-manip - constraint-reflection @@ -1069,21 +1052,19 @@ dont-distribute-packages: - convertible-text - coordinate - copilot - - copilot-c99 - copilot-cbmc - copilot-frp-sketch - copilot-language - copilot-libraries - - copilot-sbv - copilot-theorem - core-webserver-servant + - core-webserver-warp - coroutine-enumerator - coroutine-iteratee - couch-simple - couchdb-enumerator - cpkg - cprng-aes-effect - - cql-io - cql-io-tinylog - cqrs-example - cqrs-memory @@ -1108,7 +1089,6 @@ dont-distribute-packages: - crypto-conduit - crypto-pubkey - cryptocipher - - cryptoconditions - cryptoids - cryptoids-class - cryptol @@ -1117,7 +1097,7 @@ dont-distribute-packages: - csv-enumerator - ctpl - cube - - curryer-rpc + - cuckoo - cursedcsv - cv-combinators - cypher @@ -1150,6 +1130,9 @@ dont-distribute-packages: - datasets - date-conversions - dbjava + - dbmigrations-mysql + - dbmigrations-postgresql + - dbmigrations-sqlite - dbus-client - ddate - ddc-build @@ -1186,6 +1169,7 @@ dont-distribute-packages: - delta - delta-h - dep-t-advice + - dep-t-dynamic - dep-t-value - dependent-literals-plugin - dependent-state @@ -1201,7 +1185,6 @@ dont-distribute-packages: - dewdrop - dfinity-radix-tree - dhall-recursive-adt - - dhcp-lease-parser - dia-functions - diagrams-haddock - diagrams-html5 @@ -1210,13 +1193,13 @@ dont-distribute-packages: - diagrams-reflex - diagrams-wx - dialog + - diff - difference-monoid - differential - digestive-functors-hsp - dingo-core - dingo-example - dingo-widgets - - diplomacy - diplomacy-server - direct-rocksdb - directory-contents @@ -1251,7 +1234,6 @@ dont-distribute-packages: - distributed-process-zookeeper - distributed-static - distribution-plot - - diversity - dixi - dl-fedora - dmenu-pkill @@ -1266,13 +1248,12 @@ dont-distribute-packages: - dobutokO3 - dobutokO4 - doc-review - - dom-parser - domain - domain-aeson - domain-cereal + - domain-optics - dormouse-client - dotparse - - doublezip - dovetail - dovetail-aeson - dow @@ -1300,7 +1281,6 @@ dont-distribute-packages: - dynamodb-simple - dynobud - ec2-unikernel - - eccrypto-ed25519-bindings - ecdsa - edenskel - edentv @@ -1395,9 +1375,7 @@ dont-distribute-packages: - fair - fallingblocks - family-tree - - fast-arithmetic - fast-bech32 - - fasta - fastirc - fastly - fastparser @@ -1414,11 +1392,8 @@ dont-distribute-packages: - fay-text - fay-uri - fay-websockets - - fb-persistent - fbrnch - fcd - - fcf-composite - - fcf-graphs - feature-flipper-postgres - fedora-img-dl - feed-gipeda @@ -1434,7 +1409,6 @@ dont-distribute-packages: - fei-nn - feldspar-compiler - feldspar-language - - fenfire - festung - ffmpeg-tutorials - ficketed @@ -1514,6 +1488,7 @@ dont-distribute-packages: - funcons-simple - funcons-tools - function-combine + - functor - functor-combo - funflow - funflow-nix @@ -1527,9 +1502,7 @@ dont-distribute-packages: - g2q - gact - galois-fft - - gargoyle-postgresql - gargoyle-postgresql-connect - - gargoyle-postgresql-nix - gbu - gdax - gdiff-ig @@ -1543,7 +1516,6 @@ dont-distribute-packages: - gelatin-shaders - gemini-textboard - generic-override-aeson - - generic-xml - generics-mrsop-gdiff - genesis - genesis-test @@ -1551,7 +1523,6 @@ dont-distribute-packages: - geni-util - geniconvert - geniserver - - genvalidity-mergeful - genvalidity-network-uri - genvalidity-sydtest - genvalidity-sydtest-aeson @@ -1565,7 +1536,6 @@ dont-distribute-packages: - ghc-debug-client - ghc-debug-common - ghc-debug-stub - - ghc-dump-util - ghc-imported-from - ghc-instances - ghc-mod @@ -1575,7 +1545,6 @@ dont-distribute-packages: - ghcjs-dom-webkit - ghcjs-fetch - ghcjs-hplay - - ghcprofview - ght - gi-cairo-again - gi-clutter @@ -1834,7 +1803,6 @@ dont-distribute-packages: - graphicsFormats - graphicstools - graphql-client - - graphql-utils - graphtype - greencard-lib - gridbounds @@ -1864,7 +1832,6 @@ dont-distribute-packages: - guarded-rewriting - hArduino - hOff-display - - hOpenPGP - hPDB - hPDB-examples - habit @@ -1916,9 +1883,7 @@ dont-distribute-packages: - happstack-facebook - happstack-fay - happstack-fay-ajax - - happstack-foundation - happstack-helpers - - happstack-hsp - happstack-ixset - happstack-jmacro - happstack-plugins @@ -1943,8 +1908,6 @@ dont-distribute-packages: - haskades - haskdeep - haskeem - - haskell-admin - - haskell-admin-managed-functions - haskell-aliyun - haskell-bitmex-client - haskell-docs @@ -1993,7 +1956,6 @@ dont-distribute-packages: - haskey-mtl - haskgame - hasklepias - - haskoin - haskoin-bitcoind - haskoin-crypto - haskoin-node @@ -2032,7 +1994,6 @@ dont-distribute-packages: - hatexmpp3 - hawitter - haxl-amazonka - - haxl-facebook - haxy - hback - hbayes @@ -2057,7 +2018,6 @@ dont-distribute-packages: - hdph - heart-app - heatitup - - heatitup-complete - heavy-log-shortcuts - heavy-logger - heavy-logger-amazon @@ -2067,6 +2027,7 @@ dont-distribute-packages: - hedgehog-gen-json - hedis-pile - heist-aeson + - helic - helics - helics-wai - helium @@ -2152,7 +2113,6 @@ dont-distribute-packages: - hoodle-publish - hoodle-render - hoovie - - hopenpgp-tools - hoppy-docs - hotswap - hout @@ -2169,27 +2129,14 @@ dont-distribute-packages: - hps - hps-cairo - hpython - - hquantlib - hranker - hreq-client - hreq-conduit - - hriemann - hs - hs-blake2 - hs-ffmpeg - hs-gen-iface - hs-ix - - hs-opentelemetry-exporter-in-memory - - hs-opentelemetry-exporter-otlp - - hs-opentelemetry-instrumentation-cloudflare - - hs-opentelemetry-instrumentation-conduit - - hs-opentelemetry-instrumentation-http-client - - hs-opentelemetry-instrumentation-persistent - - hs-opentelemetry-instrumentation-postgresql-simple - - hs-opentelemetry-instrumentation-wai - - hs-opentelemetry-instrumentation-yesod - - hs-opentelemetry-propagator-w3c - - hs-opentelemetry-sdk - hs-pkpass - hs-profunctors - hs-sdl-term-emulator @@ -2217,7 +2164,6 @@ dont-distribute-packages: - hsinspect-lsp - hslogstash - hsnsq - - hsp-cgi - hspec-expectations-pretty - hspec-pg-transact - hspec-setup @@ -2242,7 +2188,6 @@ dont-distribute-packages: - hsx-jmacro - hsx-xhtml - html-kure - - html-presentation-text - htoml-parse - hts - htsn-import @@ -2267,9 +2212,6 @@ dont-distribute-packages: - huzzy - hw-all - hw-aws-sqs-conduit - - hw-json - - hw-json-demo - - hw-json-lens - hw-uri - hworker-ses - hwormhole @@ -2297,21 +2239,17 @@ dont-distribute-packages: - hyloutils - hyperpublic - iException - - icepeak - ide-backend - ide-backend-server - ideas-math - ideas-math-types - ideas-statistics - - identicon-style-squares - ige-mac-integration - ihaskell-inline-r - ihaskell-rlangqq - ihttp - imap - - imapget - imbib - - imgur - imgurder - imj-animation - imj-base @@ -2331,7 +2269,6 @@ dont-distribute-packages: - indexation - indieweb-algorithms - indigo - - infernal - infernu - infinity - inline-java @@ -2342,7 +2279,6 @@ dont-distribute-packages: - instant-deepseq - instant-hashable - instant-zipper - - instapaper-sender - integreat - interpolatedstring-qq - interpolatedstring-qq-mwotton @@ -2358,7 +2294,6 @@ dont-distribute-packages: - irc-fun-client - irc-fun-color - irc-fun-messages - - iri - ironforge - isevaluated - ismtp @@ -2384,11 +2319,6 @@ dont-distribute-packages: - ivory-stdlib - ivy-web - ix - - ixset - - ixset-typed-binary-instance - - ixset-typed-cassava - - ixset-typed-conversions - - ixset-typed-hashable-instance - iyql - j2hs - jacinda @@ -2407,11 +2337,6 @@ dont-distribute-packages: - jmonkey - jobqueue - join - - jordan-openapi - - jordan-servant - - jordan-servant-client - - jordan-servant-openapi - - jordan-servant-server - jsc - jsmw - json-ast-json-encoder @@ -2446,7 +2371,6 @@ dont-distribute-packages: - kansas-lava-shake - karakuri - karps - - katip-raven - katip-rollbar - keenser - keera-hails-i18n @@ -2465,17 +2389,11 @@ dont-distribute-packages: - keera-hails-reactive-yampa - keera-hails-reactivelenses - keera-posture - - keid-frp-banana - - keid-geometry - - keid-render-basic - keid-resource-gltf - - keid-sound-openal - - keid-ui-dearimgui - kevin - key-vault - keyring - keysafe - - keystore - keyvaluehash - keyword-args - kicad-data @@ -2529,7 +2447,6 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling - - large-anon - lat - latest-npm-version - latex-formulae-hakyll @@ -2602,8 +2519,6 @@ dont-distribute-packages: - list-tuple - list-witnesses - listenbrainz-client - - liszt - - little-rio_1_0_1 - live-sequencer - llvm - llvm-analysis @@ -2623,12 +2538,10 @@ dont-distribute-packages: - lnd-client - lnurl - lnurl-authenticator - - load-balancing - local-search - localize - locked-poll - log - - log-elasticsearch - log-postgres - log-utils - log4hs @@ -2646,6 +2559,7 @@ dont-distribute-packages: - lol-typing - loli - loop-effin + - looper - lorentz - lostcities - loup @@ -2654,7 +2568,6 @@ dont-distribute-packages: - ls-usb - lsystem - ltext - - lti13 - luachunk - lucid-colonnade - lucienne @@ -2675,13 +2588,10 @@ dont-distribute-packages: - magicbane - mahoro - maid - - mail-pool - mailgun - majordomo - majority - make-package - - managed-functions-http-connector - - managed-functions-json - manatee - manatee-all - manatee-anything @@ -2706,7 +2616,6 @@ dont-distribute-packages: - markdown-pap - markdown2svg - markov-processes - - markup - marmalade-upload - marquise - marvin @@ -2729,7 +2638,6 @@ dont-distribute-packages: - memcache-conduit - memis - memory-hexstring - - mergeful-persistent - merkle-patricia-db - meta-par-accelerate - metaplug @@ -2760,7 +2668,6 @@ dont-distribute-packages: - mixed-strategies - mkbndl - mlist - - mmark-cli - mmsyn4 - mmsyn6ukr - mmsyn6ukr-array @@ -2789,6 +2696,7 @@ dont-distribute-packages: - monky - monte-carlo - moo + - moo-nad - moonshine - morley - morley-client @@ -2818,7 +2726,6 @@ dont-distribute-packages: - msgpack-idl - msgpack-rpc - msgpack-rpc-conduit - - mtgoxapi - mu-avro - mu-graphql - mu-grpc-client @@ -2881,8 +2788,6 @@ dont-distribute-packages: - nero-wai - nero-warp - nested-routes - - net-mqtt-lens - - net-mqtt-rpc - net-spider-cli - net-spider-pangraph - net-spider-rpl @@ -2957,14 +2862,15 @@ dont-distribute-packages: - odd-jobs - off-simple - ohloh-hs - - oidc-client - ois-input-manager - olwrapper - online - online-csv - opc-xml-da-client - open-adt-tutorial + - open-witness - openai-hs + - openapi3-code-generator - opencv-extra - openpgp-Crypto - openpgp-crypto-api @@ -2976,7 +2882,6 @@ dont-distribute-packages: - orchid - orchid-demo - order-maintenance - - org-mode-lucid - orgmode-parse - orgstat - osm-download @@ -2985,7 +2890,6 @@ dont-distribute-packages: - package-o-tron - padKONTROL - pairing - - pan-os-syslog - panda - pandoc-highlighting-extensions - pandoc-japanese-filters @@ -3007,7 +2911,6 @@ dont-distribute-packages: - parsestar - parsley - parsley-garnish - - partage - partial-lens - partial-semigroup-test - passman-cli @@ -3016,7 +2919,6 @@ dont-distribute-packages: - pcap-enumerator - pcapng - pcf - - pcf-font-embed - pdf-slave - peakachu - pec @@ -3038,7 +2940,6 @@ dont-distribute-packages: - persistable-types-HDBC-pg - persistent-audit - persistent-hssqlppp - - persistent-iproute - persistent-map - persistent-mysql-haskell - persistent-relational-record @@ -3049,24 +2950,16 @@ dont-distribute-packages: - pgsql-simple - phonetic-languages-common - phonetic-languages-constraints - - phonetic-languages-constraints-array - phonetic-languages-examples - phonetic-languages-general - phonetic-languages-permutations - - phonetic-languages-permutations-array - phonetic-languages-phonetics-basics - - phonetic-languages-plus - phonetic-languages-properties - - phonetic-languages-simplified-base - phonetic-languages-simplified-common - - phonetic-languages-simplified-examples-array - phonetic-languages-simplified-generalized-examples-array - phonetic-languages-simplified-generalized-examples-common - phonetic-languages-simplified-generalized-properties-array - phonetic-languages-simplified-lists-examples - - phonetic-languages-simplified-properties-array - - phonetic-languages-simplified-properties-array-common - - phonetic-languages-simplified-properties-array-old - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double - phonetic-languages-ukrainian @@ -3091,8 +2984,6 @@ dont-distribute-packages: - pipes-network-tls - pipes-p2p - pipes-p2p-examples - - pipes-protolude - - pipes-transduce - pisigma - pitchtrack - pkgtreediff @@ -3108,9 +2999,9 @@ dont-distribute-packages: - pointless-rewrite - poke - polh-lexicon - - poly-rec - polydata - polysemy-RandomFu + - polysemy-http - polysemy-optics - polyseq - polytypeable-utils @@ -3147,7 +3038,6 @@ dont-distribute-packages: - primal-memory - primula-board - primula-bot - - priority-sync - proc - process-iterio - process-progress @@ -3157,10 +3047,7 @@ dont-distribute-packages: - procrastinating-structure - producer - product - - product-isomorphic - prof2dot - - profiterole - - profiteur - progressbar - project-m36 - prolog-graph @@ -3177,6 +3064,7 @@ dont-distribute-packages: - proto3-wire - protobuf-native - protocol-buffers-descriptor-fork + - proton - psql - ptera - ptera-core @@ -3200,7 +3088,6 @@ dont-distribute-packages: - qd-vec - qhs - qhull - - qr-imager - qr-repa - qtah-examples - qtah-qt5 @@ -3242,7 +3129,6 @@ dont-distribute-packages: - quiver-interleave - quiver-sort - qux - - r-glpk-phonetic-languages-ukrainian-durations - rail-compiler-editor - rails-session - rainbow-tests @@ -3268,7 +3154,6 @@ dont-distribute-packages: - rasa-ext-vim - rascal - rating-chgk-info - - raven-haskell-scotty - raw-feldspar - rawr - razom-text-util @@ -3295,7 +3180,6 @@ dont-distribute-packages: - records-th - redHandlers - reddit - - rediscaching-haxl - reduce-equations - refh - reflex-animation @@ -3308,7 +3192,6 @@ dont-distribute-packages: - reflex-localize-dom - reflex-monad-auth - reflex-process - - reform-hsp - refractor - refurb - reg-alloc-graph-color @@ -3350,7 +3233,6 @@ dont-distribute-packages: - repa-stream - repa-v4l2 - replicant - - repo-based-blog - repr - representable-tries - resin @@ -3378,7 +3260,6 @@ dont-distribute-packages: - rfc-redis - rfc-servant - rhythm-game-tutorial - - rib - ribosome - ribosome-root - ribosome-test @@ -3405,11 +3286,9 @@ dont-distribute-packages: - ron-rdt - ron-schema - ron-storage - - rosa - rose-trie - roshask - rosmsg-bin - - rounded - roundtrip-xml - route-generator - route-planning @@ -3475,8 +3354,6 @@ dont-distribute-packages: - scope-cairo - scotty-fay - scotty-hastache - - scotty-haxl - - scotty-utils - scp-streams - scrabble-bot - scrapbook @@ -3517,12 +3394,9 @@ dont-distribute-packages: - servant-ekg - servant-event-stream - servant-examples - - servant-haxl-client - servant-http2-client - servant-jquery - servant-js - - servant-jsonrpc-client - - servant-jsonrpc-server - servant-matrix-param - servant-oauth2 - servant-oauth2-examples @@ -3553,7 +3427,6 @@ dont-distribute-packages: - shake-ats - shake-bindist - shake-minify-css - - shake-plus-extended - shakebook - shaker - shapefile @@ -3572,7 +3445,6 @@ dont-distribute-packages: - sigma-ij - signals - signature - - signify-hs - silvi - simgi - simple @@ -3586,7 +3458,6 @@ dont-distribute-packages: - simple-session - simpleirc-lens - simseq - - singular-factory - siphon - siren-json - sirkel @@ -3637,7 +3508,6 @@ dont-distribute-packages: - snaplet-sqlite-simple-jwt-auth - snaplet-stripe - snaplet-tasks - - snaplet-typed-sessions - snaplet-wordpress - snappy-iteratee - sndfile-enumerators @@ -3664,7 +3534,6 @@ dont-distribute-packages: - sparser - spata - specialize-th - - species - spectral-clustering - speculation-transformers - speechmatics @@ -3680,7 +3549,6 @@ dont-distribute-packages: - sql-simple-sqlite - sqlite-simple-typed - sqsd-local - - sr-extra - sscgi - sshd-lint - sssp @@ -3703,6 +3571,7 @@ dont-distribute-packages: - static-closure - statsd-client - statsdi + - stern-brocot - stmcontrol - storablevector-streamfusion - stratum-tool @@ -3712,7 +3581,6 @@ dont-distribute-packages: - stratux-websockets - streaming-fft - streaming-process - - streaming-utils - strelka - strict-data - string-typelits @@ -3727,7 +3595,6 @@ dont-distribute-packages: - stunts - stutter - stylist - - subG-instances - subhask - substring-parser - sugar-data @@ -3740,6 +3607,7 @@ dont-distribute-packages: - supercollider-ht - supercollider-midi - superconstraints + - supernova - sv - sv-cassava - sv-svfactor @@ -3748,21 +3616,25 @@ dont-distribute-packages: - swapper - sweet-egison - switch - - syb-with-class-instances-text - sydtest - sydtest-aeson - sydtest-amqp - sydtest-hedgehog + - sydtest-hedis - sydtest-hspec + - sydtest-mongo - sydtest-persistent + - sydtest-persistent-postgresql - sydtest-persistent-sqlite - sydtest-process + - sydtest-rabbitmq - sydtest-servant - sydtest-typed-process - sydtest-wai - sydtest-webdriver - sydtest-webdriver-screenshot - sydtest-webdriver-yesod + - sydtest-yesod - sylvia - sym-plot - symantic-atom @@ -3790,6 +3662,7 @@ dont-distribute-packages: - tagsoup-navigate - tak-ai - tal + - talash - tamarin-prover - tamarin-prover-term - tamarin-prover-theory @@ -3825,7 +3698,6 @@ dont-distribute-packages: - testbench - text-all - text-builder-dev_0_3_3 - - text-generic-pretty - text-json-qq - text-locale-encoding - text-plus @@ -3902,6 +3774,7 @@ dont-distribute-packages: - trasa-reflex - trasa-server - trasa-th + - traversal-template - treemap-html-tools - treersec - trek-app @@ -3909,12 +3782,10 @@ dont-distribute-packages: - triangulation - tries - trimpolya - - tropical-geometry - truelevel - trurl - tsession-happstack - tsweb - - ttn-client - tuntap-simple - tup-functor - tuple-ops @@ -3929,7 +3800,6 @@ dont-distribute-packages: - twidge - twilight-stm - twill - - twirp - twitter-conduit - twitter-enumerator - twitter-types-lens @@ -3950,7 +3820,6 @@ dont-distribute-packages: - typed-streams - typelevel - typelevel-rewrite-rules - - typesafe-precure - typescript-docs - typson-beam - typson-esqueleto @@ -3958,11 +3827,13 @@ dont-distribute-packages: - u2f - uber - ucam-webauth + - ucd - udbus-model - uhc-light - uhc-util - ukrainian-phonetics-basic - unagi-bloomfilter + - unbeliever - unbound - unfoldable-restricted - uni-events @@ -3994,15 +3865,14 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file - - urlpath - usb - usb-enumerator - usb-hid - usb-id-database - usb-iteratee - usb-safe - - userid - users-mysql-haskell + - utf - util-exception - util-primitive-control - util-universe @@ -4034,7 +3904,6 @@ dont-distribute-packages: - vessel - vflow-types - vfr-waypoints - - viewprof - vigilance - vimeta - vinyl-operational @@ -4045,6 +3914,7 @@ dont-distribute-packages: - vocoder-conduit - vocoder-dunai - voicebase + - vpq - vty-ui-extras - waargonaut - wahsp @@ -4052,12 +3922,10 @@ dont-distribute-packages: - wai-dispatch - wai-handler-snap - wai-hastache - - wai-log - wai-middleware-brotli - wai-middleware-cache - wai-middleware-cache-redis - wai-middleware-consul - - wai-middleware-content-type - wai-middleware-rollbar - wai-middleware-route - wai-middleware-throttle @@ -4093,7 +3961,6 @@ dont-distribute-packages: - whitespace - wikipedia4epub - winio - - wireguard-hs - wl-pprint-ansiterm - wl-pprint-terminfo - wlc-hs @@ -4106,10 +3973,8 @@ dont-distribute-packages: - wraxml - wrecker - wrecker-ui - - wreq-helper - wright - writer-cps-full - - ws - wtk-gtk - wu-wei - wumpus-basic @@ -4168,18 +4033,12 @@ dont-distribute-packages: - yeamer - yeshql - yesod-articles - - yesod-auth-fb - yesod-auth-ldap - yesod-auth-lti13 - - yesod-auth-simple - yesod-colonnade - - yesod-comments - yesod-continuations - - yesod-crud-persist - yesod-examples - yesod-fay - - yesod-fb - - yesod-ip - yesod-mangopay - yesod-paypal-rest - yesod-platform @@ -4214,7 +4073,6 @@ dont-distribute-packages: - yql - yu-launch - yuuko - - z85 - zasni-gerna - zephyr-copilot - zeromq3-conduit @@ -4236,4 +4094,3 @@ dont-distribute-packages: - zoom-cache-sndfile - zoovisitor - zuramaru - - zxcvbn-dvorak diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 81fa5b7f7c34..833c8eaba091 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -788,8 +788,6 @@ self: { ]; description = "Mapping between Aeson's JSON and Bson objects"; license = "unknown"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Agata" = callPackage @@ -1160,6 +1158,7 @@ self: { description = "Strongly typed Attribute Grammars implemented using type-level programming"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "AttoBencode" = callPackage @@ -2553,6 +2552,7 @@ self: { description = "cwmwl udp message queue"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "COrdering" = callPackage @@ -5328,7 +5328,6 @@ self: { description = "A library of efficient, purely-functional data structures (Core Implementations)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "EditTimeReport" = callPackage @@ -6189,7 +6188,6 @@ self: { description = "Finite totally-ordered sets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Finance-Quote-Yahoo" = callPackage @@ -9279,7 +9277,7 @@ self: { benchmarkHaskellDepends = [ base gauge ]; description = "quantitative finance library"; license = lib.licenses.mit; - badPlatforms = [ "aarch64-linux" "armv7l-linux" ]; + platforms = lib.platforms.x86; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gsl;}; @@ -9314,6 +9312,7 @@ self: { description = "Haskell binding to ROOT Core modules"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "HROOT-graf" = callPackage @@ -10089,6 +10088,7 @@ self: { description = "Aggression analysis for Tweets on Twitter"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "HandlerSocketClient" = callPackage @@ -10156,9 +10156,7 @@ self: { ]; description = "Yet another Hangman game"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hangman-ascii"; - broken = true; }) {}; "HappyTree" = callPackage @@ -10412,8 +10410,6 @@ self: { ]; description = "Client support for POP3, SMTP, and IMAP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaskellNet-SSL" = callPackage @@ -10431,7 +10427,6 @@ self: { ]; description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "HaskellTorrent" = callPackage @@ -13127,7 +13122,6 @@ self: { description = "List transformer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ListTree" = callPackage @@ -13617,7 +13611,6 @@ self: { description = "Class of key-value maps"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MapWith" = callPackage @@ -15917,8 +15910,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Priority Search Queue"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "PTQ" = callPackage @@ -16715,6 +16706,7 @@ self: { description = "Auto-active verification of floating-point programs"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Proper" = callPackage @@ -17168,6 +17160,7 @@ self: { description = "A reflective JSON serializer/parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "RLP" = callPackage @@ -18338,6 +18331,7 @@ self: { description = "translate a SVD of a Microcontroller to Haskell tables"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "SVG2Q" = callPackage @@ -18734,7 +18728,6 @@ self: { description = "See README for more info"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ShellCheck_0_7_2" = callPackage @@ -18933,7 +18926,6 @@ self: { description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-backend-snabbdom" = callPackage @@ -18965,7 +18957,6 @@ self: { description = "A backend for rendering Shpadoinkle as Text"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-console" = callPackage @@ -19086,7 +19077,6 @@ self: { description = "A typed, template generated Html DSL, and helpers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-isreal" = callPackage @@ -19330,7 +19320,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "simpleserver"; - broken = true; }) {}; "SimpleTableGenerator" = callPackage @@ -20084,6 +20073,7 @@ self: { description = "Library which aids constructing generic (SYB3-based) widgets"; license = "LGPL"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "SyntaxMacros" = callPackage @@ -21001,8 +20991,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Some Nat-indexed types for GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "TypingTester" = callPackage @@ -24817,6 +24805,7 @@ self: { description = "A full-featured library for parsing, validating, and rendering email addresses"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "adhoc-network" = callPackage @@ -25056,8 +25045,6 @@ self: { ]; description = "Generic operations for real functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aern2-mfun" = callPackage @@ -25078,7 +25065,6 @@ self: { ]; description = "Multi-variate real function optimisation and proving"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "aern2-mfun-benchmark-optimisation"; }) {}; @@ -25649,8 +25635,6 @@ self: { libraryHaskellDepends = [ aeson base text vector ]; description = "Aeson helper func"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-injector" = callPackage @@ -25687,8 +25671,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Aeson instances for iproute types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-json-ast" = callPackage @@ -25953,8 +25935,6 @@ self: { ]; description = "Quick JSON extractions with Aeson"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-result" = callPackage @@ -25966,7 +25946,6 @@ self: { libraryHaskellDepends = [ aeson aeson-helper base text ]; description = "API Result for aeson"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson-schema" = callPackage @@ -26241,8 +26220,6 @@ self: { ]; description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-with" = callPackage @@ -32176,8 +32153,6 @@ self: { ]; description = "An implementation of the AOS signatures"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aosd" = callPackage @@ -32529,6 +32504,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "factom-app"; + broken = true; }) {}; "api-rpc-pegnet" = callPackage @@ -32588,8 +32564,6 @@ self: { benchmarkHaskellDepends = [ base criterion text time ]; description = "DSL for generating API boilerplate and docs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "api-yoti" = callPackage @@ -33749,8 +33723,6 @@ self: { ]; description = "Distribute hackage packages to archlinux"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arch-web" = callPackage @@ -34871,7 +34843,6 @@ self: { testHaskellDepends = [ base hedgehog text ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii_1_2_3_0" = callPackage @@ -35008,8 +34979,6 @@ self: { ]; description = "ASCII representations of numbers"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ascii-numbers_1_1_0_0" = callPackage @@ -35030,7 +34999,6 @@ self: { description = "ASCII representations of numbers"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ascii-predicates" = callPackage @@ -36845,7 +36813,6 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-iso8601" = callPackage @@ -36996,7 +36963,6 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-varword" = callPackage @@ -38827,8 +38793,6 @@ self: { benchmarkHaskellDepends = [ async base criterion random time ]; description = "A client for AWS X-Ray"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-xray-client-persistent" = callPackage @@ -38845,7 +38809,6 @@ self: { ]; description = "A client for AWS X-Ray integration with Persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "aws-xray-client-wai" = callPackage @@ -38863,7 +38826,6 @@ self: { ]; description = "A client for AWS X-Ray integration with WAI"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "axel" = callPackage @@ -39637,8 +39599,6 @@ self: { testHaskellDepends = [ base ]; description = "For when a type should never be an instance of a class"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bank-holiday-usa" = callPackage @@ -40593,7 +40553,6 @@ self: { description = "Lifting values from base types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "basic-cpuid" = callPackage @@ -41037,7 +40996,6 @@ self: { ]; description = "Language tags as specified by BCP 47"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "bcp47-orphans" = callPackage @@ -41057,7 +41015,6 @@ self: { ]; description = "BCP47 orphan instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "bcrypt" = callPackage @@ -41941,9 +41898,7 @@ self: { ]; description = "A horizontal version of tetris for braille users"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "betris"; - broken = true; }) {}; "between" = callPackage @@ -43313,8 +43268,6 @@ self: { libraryHaskellDepends = [ base ]; description = "This package is obsolete. Look for bindings-DSL instead."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bindings-dc1394" = callPackage @@ -46194,8 +46147,6 @@ self: { libraryHaskellDepends = [ base blaze-html text ]; description = "An HTML renderer for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blockchain" = callPackage @@ -46246,8 +46197,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "API definitions for blockfrost.io"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blockfrost-client" = callPackage @@ -46273,7 +46222,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "blockfrost.io basic client"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sorki ]; }) {}; @@ -46296,7 +46244,6 @@ self: { ]; description = "blockfrost.io common client definitions / instances"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "blockfrost-pretty" = callPackage @@ -46314,7 +46261,6 @@ self: { ]; description = "blockfrost.io pretty-printing utilities"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "blockhash" = callPackage @@ -46489,6 +46435,7 @@ self: { license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; mainProgram = "blosum"; + broken = true; }) {}; "bloxorz" = callPackage @@ -49996,7 +49943,6 @@ self: { ]; description = "Universal hashing of bytes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytelog" = callPackage @@ -51349,9 +51295,7 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty ]; description = "Create a Debianization for a Cabal package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-debian"; - broken = true; }) {}; "cabal-dependency-licenses" = callPackage @@ -52327,7 +52271,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "cabal2json"; - broken = true; }) {}; "cabal2nix" = callPackage @@ -53669,8 +53612,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert data to and from a natural number representation"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cao" = callPackage @@ -59643,8 +59584,6 @@ self: { ]; description = "Miscellaneous utilities for building and working with command line interfaces"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cli-git" = callPackage @@ -59662,6 +59601,7 @@ self: { description = "Bindings to the git command-line interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cli-nix" = callPackage @@ -59679,6 +59619,7 @@ self: { description = "Bindings to the nix command-line interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cli-setup" = callPackage @@ -59747,6 +59688,7 @@ self: { description = "A Haskell library as database client for Clickhouse"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clientsession" = callPackage @@ -61759,7 +61701,6 @@ self: { ]; description = "Equivariant CSM classes of coincident root loci"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cointracking-imports" = callPackage @@ -63022,7 +62963,6 @@ self: { description = "Compatibility checker for OpenAPI"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compact" = callPackage @@ -63793,8 +63733,6 @@ self: { ]; description = "EKG Metrics for Vinyl records"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "composite-hashable" = callPackage @@ -63859,8 +63797,6 @@ self: { ]; description = "Opaleye SQL for Vinyl records"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "composite-swagger" = callPackage @@ -64019,7 +63955,6 @@ self: { description = "Plugin to generalize comprehensions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compressed" = callPackage @@ -66052,7 +65987,6 @@ self: { ]; description = "Vinyl-style extensible graphs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "conjugateGradient" = callPackage @@ -66354,7 +66288,6 @@ self: { description = "Constrained Categories"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "constrained-dynamic" = callPackage @@ -66588,8 +66521,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Haskell version of the Construct library for easy specification of file formats"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "constructible" = callPackage @@ -67703,6 +67634,7 @@ self: { description = "A compiler for Copilot targeting C99"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "copilot-cbmc" = callPackage @@ -67737,8 +67669,6 @@ self: { ]; description = "An intermediate representation for Copilot"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "copilot-frp-sketch" = callPackage @@ -67808,6 +67738,7 @@ self: { description = "A compiler for CoPilot targeting SBV"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "copilot-theorem" = callPackage @@ -68095,7 +68026,6 @@ self: { description = "Interoperability with Wai/Warp"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "corebot-bliki" = callPackage @@ -68430,8 +68360,6 @@ self: { ]; description = "Country data type and functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "country-codes" = callPackage @@ -68850,8 +68778,6 @@ self: { ]; description = "Cassandra CQL binary protocol"; license = "unknown"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cql-io" = callPackage @@ -68880,6 +68806,7 @@ self: { description = "Cassandra CQL client"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cql-io-tinylog" = callPackage @@ -70402,6 +70329,7 @@ self: { description = "Interledger Crypto-Conditions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cryptohash" = callPackage @@ -71434,7 +71362,6 @@ self: { description = "Haskell Implementation of Cuckoo Filters"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cuckoo-filter" = callPackage @@ -71792,9 +71719,7 @@ self: { executableHaskellDepends = [ base filepath optparse-applicative ]; description = "A package for simple, fast radiocarbon calibration"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "currycarbon"; - broken = true; }) {}; "curryer" = callPackage @@ -71843,6 +71768,7 @@ self: { description = "Fast, Haskell RPC"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "curryrs" = callPackage @@ -75363,7 +75289,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "moo-mysql"; - broken = true; }) {}; "dbmigrations-postgresql" = callPackage @@ -75384,7 +75309,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "moo-postgresql"; - broken = true; }) {}; "dbmigrations-sqlite" = callPackage @@ -75401,7 +75325,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "moo-sqlite"; - broken = true; }) {}; "dbmonitor" = callPackage @@ -76195,9 +76118,7 @@ self: { ]; description = "secure remote debugging"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "debug-me"; - broken = true; }) {}; "debug-pp" = callPackage @@ -76488,8 +76409,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Deep natural and unnatural tree transformations, including attribute grammars"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "deepcontrol" = callPackage @@ -77209,7 +77128,6 @@ self: { description = "A dynamic environment for dependency injection"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dep-t-value" = callPackage @@ -79103,6 +79021,7 @@ self: { description = "Parse a DHCP lease file"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dhrun" = callPackage @@ -80097,7 +80016,6 @@ self: { description = "Diff and patch"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diff-gestalt" = callPackage @@ -80789,8 +80707,6 @@ self: { ]; description = "A convenient tagless EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diohsc" = callPackage @@ -80848,6 +80764,7 @@ self: { description = "Diplomacy board game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "diplomacy-server" = callPackage @@ -82501,7 +82418,6 @@ self: { ]; description = "Quantify the diversity of a population"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "diversity"; }) {}; @@ -83253,8 +83169,6 @@ self: { ]; description = "An API client for docker written in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "docker-build-cacher" = callPackage @@ -83965,6 +83879,7 @@ self: { description = "Simple monadic DOM parser"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dom-selector" = callPackage @@ -84105,7 +84020,6 @@ self: { description = "Integration of domain with optics"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dominion" = callPackage @@ -84444,6 +84358,7 @@ self: { description = "Some special functions to work with lists (with zip)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "doublify-toolkit" = callPackage @@ -85520,9 +85435,7 @@ self: { ]; description = "Network multiplayer 2D shooting game"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "dual"; - broken = true; }) {}; "dual-tree" = callPackage @@ -86917,8 +86830,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Elliptic Curve Cryptography for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eccrypto-ed25519-bindings" = callPackage @@ -86931,6 +86842,7 @@ self: { description = "provides \"ed25519\" API using \"eccrypto\""; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ecdsa" = callPackage @@ -87032,9 +86944,7 @@ self: { pretty-simple text time unordered-containers vector ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hectare"; - broken = true; }) {}; "ecu" = callPackage @@ -89347,8 +89257,6 @@ self: { ]; description = "Utilities to write Emacs dynamic modules"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "email" = callPackage @@ -90321,8 +90229,6 @@ self: { ]; description = "Safe helpers for accessing and modifying environment variables"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "env-guard" = callPackage @@ -94596,9 +94502,7 @@ self: { ]; description = "Factoring integers and polynomials"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "factor"; - broken = true; }) {}; "factory" = callPackage @@ -95092,7 +94996,6 @@ self: { doHaddock = false; description = "Fast functions on integers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fast-bech32" = callPackage @@ -95313,7 +95216,6 @@ self: { ]; description = "A simple, mindless parser for fasta files"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "fastbayes" = callPackage @@ -95710,8 +95612,6 @@ self: { ]; description = "Bindings to Facebook's API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fb-persistent" = callPackage @@ -95724,6 +95624,7 @@ self: { description = "Provides Persistent instances to Facebook types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fbmessenger-api" = callPackage @@ -95863,6 +95764,7 @@ self: { description = "Type-level computation for composite using first-class-families"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fcf-containers" = callPackage @@ -95881,8 +95783,6 @@ self: { ]; description = "Data structures and algorithms for first-class-families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fcf-graphs" = callPackage @@ -95901,7 +95801,6 @@ self: { ]; description = "Type-level version of algebraic-graphs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "fcf-vinyl" = callPackage @@ -96742,6 +96641,7 @@ self: { description = "Graph-based notetaking system"; license = "GPL"; hydraPlatforms = lib.platforms.none; + broken = true; }) {raptor = null;}; "fernet" = callPackage @@ -96852,8 +96752,6 @@ self: { ]; description = "Automatic C++ binding generation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fficxx-runtime" = callPackage @@ -99060,9 +98958,7 @@ self: { executableHaskellDepends = [ base directory parsec ]; description = "flatten a latex multi-file latex document and remove all comments"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "flat-tex"; - broken = true; }) {}; "flatbuffers" = callPackage @@ -100214,8 +100110,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Functions to find out the indices of the elements in the Foldable structures"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "foldable1" = callPackage @@ -103588,7 +103482,6 @@ self: { description = "Functors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "functor-apply" = callPackage @@ -104882,8 +104775,6 @@ self: { ]; description = "Automatically spin up and spin down local daemons"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gargoyle-postgresql" = callPackage @@ -104905,7 +104796,6 @@ self: { ]; description = "Manage PostgreSQL servers with gargoyle"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "gargoyle-postgresql-connect" = callPackage @@ -104945,6 +104835,7 @@ self: { description = "Manage PostgreSQL servers with gargoyle and nix"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "garlic-bread" = callPackage @@ -106310,6 +106201,7 @@ self: { description = "Marshalling Haskell values to/from XML"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "generic-xmlpickler" = callPackage @@ -106974,7 +106866,6 @@ self: { base criterion genvalidity-criterion mergeful ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-mergeless" = callPackage @@ -107460,8 +107351,6 @@ self: { ]; description = "Terrestrial coordinate systems and geodetic calculations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "geohash" = callPackage @@ -108157,8 +108046,6 @@ self: { ]; description = "An AST and compiler plugin for dumping GHC's Core representation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-dump-tree" = callPackage @@ -108210,7 +108097,6 @@ self: { ]; description = "Handy tools for working with ghc-dump dumps"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ghc-dump"; }) {}; @@ -108992,8 +108878,6 @@ self: { ]; description = "Library for parsing GHC time and allocation profiling reports"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-prof-aeson" = callPackage @@ -110027,7 +109911,6 @@ self: { ]; description = "GHC .prof files viewer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ghcprofview"; }) {}; @@ -110156,8 +110039,6 @@ self: { description = "Adwaita bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libadwaita;}; "gi-atk" = callPackage @@ -111262,8 +111143,6 @@ self: { libraryPkgconfigDepends = [ librsvg ]; description = "librsvg bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) librsvg;}; "gi-secret" = callPackage @@ -118493,6 +118372,7 @@ self: { description = "GraphQL Utils"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "graphql-w-persistent" = callPackage @@ -119486,8 +119366,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Mutable vector with efficient appends"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "growler" = callPackage @@ -120859,7 +120737,6 @@ self: { ]; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hPDB" = callPackage @@ -124563,7 +124440,6 @@ self: { ]; description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "happstack-hamlet" = callPackage @@ -124635,7 +124511,6 @@ self: { ]; description = "Support for using HSP templates in Happstack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "happstack-hstringtemplate" = callPackage @@ -124703,8 +124578,6 @@ self: { ]; description = "Happstack minus the useless stuff"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-monad-peel" = callPackage @@ -125295,8 +125168,6 @@ self: { libraryHaskellDepends = [ base ]; description = "HaRP allows pattern-matching with regular expressions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "harpy" = callPackage @@ -125510,9 +125381,7 @@ self: { ]; description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hascard"; - broken = true; }) {}; "hascas" = callPackage @@ -126388,7 +126257,6 @@ self: { ]; description = "Remote Management Platform for Haskell Applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "haskell-admin-core" = callPackage @@ -126450,7 +126318,6 @@ self: { ]; description = "Managed Functions integration for Haskell Admin"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "haskell-aliyun" = callPackage @@ -128461,9 +128328,7 @@ self: { executableToolDepends = [ hspec-discover ]; description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "haskell-xmpp-io-test"; - broken = true; }) {}; "haskell2010" = callPackage @@ -129255,6 +129120,7 @@ self: { description = "Implementation of the Bitcoin protocol"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskoin-bitcoind" = callPackage @@ -131019,8 +130885,6 @@ self: { testHaskellDepends = [ base hasql tasty tasty-quickcheck ]; description = "Parse PostgreSQL connection URI into Hasql.Connection Settings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasqlator-mysql" = callPackage @@ -131584,8 +131448,6 @@ self: { ]; description = "A Haskell library for efficient, concurrent, and concise data access"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haxl-amazonka" = callPackage @@ -131626,6 +131488,7 @@ self: { description = "An example Haxl data source for accessing the Facebook Graph API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haxparse" = callPackage @@ -133072,7 +132935,6 @@ self: { ]; description = "Find and annotate ITDs with assembly or read pair joining"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "heatitup-complete"; }) {}; @@ -133964,7 +133826,6 @@ self: { license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; mainProgram = "hel"; - broken = true; }) {}; "helics" = callPackage @@ -136129,8 +135990,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hgom" = callPackage @@ -142184,7 +142043,6 @@ self: { executableToolDepends = [ alex happy ]; description = "hOpenPGP-based command-line tools"; license = lib.licenses.agpl3Plus; - hydraPlatforms = lib.platforms.none; }) {}; "hopenssl" = callPackage @@ -143048,8 +142906,6 @@ self: { description = "Binding for the PAPI library"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) papi;}; "hpaste" = callPackage @@ -143271,9 +143127,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Convert HPC output into LCOV format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hpc-lcov"; - broken = true; }) {}; "hpc-strobe" = callPackage @@ -143807,6 +143661,7 @@ self: { license = "LGPL"; hydraPlatforms = lib.platforms.none; mainProgram = "mctest"; + broken = true; }) {}; "hquantlib-time" = callPackage @@ -143818,8 +143673,6 @@ self: { libraryHaskellDepends = [ base time ]; description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hquery" = callPackage @@ -144018,7 +143871,6 @@ self: { ]; description = "A Riemann Client for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "hriemann-exe"; }) {}; @@ -144602,8 +144454,6 @@ self: { ]; description = "OpenTelemetry API for use by libraries for direct instrumentation or wrapper packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hs-opentelemetry-exporter-in-memory" = callPackage @@ -144619,7 +144469,6 @@ self: { async base hs-opentelemetry-api unagi-chan ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-exporter-otlp" = callPackage @@ -144644,7 +144493,6 @@ self: { ]; description = "OpenTelemetry exporter supporting the standard OTLP protocol"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-instrumentation-cloudflare" = callPackage @@ -144666,7 +144514,6 @@ self: { hs-opentelemetry-instrumentation-wai http-types text wai ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-instrumentation-conduit" = callPackage @@ -144678,7 +144525,6 @@ self: { libraryHaskellDepends = [ base conduit hs-opentelemetry-api text ]; testHaskellDepends = [ base conduit hs-opentelemetry-api text ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-instrumentation-http-client" = callPackage @@ -144702,7 +144548,6 @@ self: { http-client-tls http-conduit http-types text unliftio ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-instrumentation-persistent" = callPackage @@ -144722,7 +144567,6 @@ self: { vault ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-instrumentation-postgresql-simple" = callPackage @@ -144742,7 +144586,6 @@ self: { postgresql-libpq postgresql-simple text unliftio ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-instrumentation-wai" = callPackage @@ -144763,7 +144606,6 @@ self: { ]; description = "WAI instrumentation middleware for OpenTelemetry"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-instrumentation-yesod" = callPackage @@ -144785,7 +144627,6 @@ self: { ]; description = "Yesod middleware for providing OpenTelemetry instrumentation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-otlp" = callPackage @@ -144815,7 +144656,6 @@ self: { ]; description = "Trace propagation via HTTP headers following the w3c tracestate spec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-opentelemetry-sdk" = callPackage @@ -144843,7 +144683,6 @@ self: { ]; description = "OpenTelemetry SDK for use in applications"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-pattrans" = callPackage @@ -147883,6 +147722,7 @@ self: { description = "Facilitates running Haskell Server Pages web pages as CGI programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsparklines" = callPackage @@ -149839,9 +149679,7 @@ self: { ]; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hsx2hs"; - broken = true; }) {}; "hsyscall" = callPackage @@ -150297,7 +150135,6 @@ self: { executableHaskellDepends = [ base cli-arguments lists-flines ]; description = "Simple tool to create html presentation for text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "htmlpt"; }) {}; @@ -152822,8 +152659,6 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Convenience functions for Aeson"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-all" = callPackage @@ -152978,8 +152813,6 @@ self: { ]; description = "Conduits for tokenizing streams"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-conduit-merges" = callPackage @@ -153189,8 +153022,6 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Generic strict finger-tree structure"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-hedgehog" = callPackage @@ -153318,7 +153149,6 @@ self: { doHaddock = false; description = "Memory efficient JSON parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hw-json"; }) {}; @@ -153340,6 +153170,7 @@ self: { description = "Memory efficient JSON parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hw-json-lens" = callPackage @@ -153369,7 +153200,6 @@ self: { ]; description = "Lens for hw-json"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hw-json-simd" = callPackage @@ -153606,9 +153436,7 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Monadic query DSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hw-mquery-example"; - broken = true; }) {}; "hw-packed-vector" = callPackage @@ -153891,8 +153719,6 @@ self: { ]; description = "Primitive functions and data types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-string-parse" = callPackage @@ -155661,6 +155487,7 @@ self: { description = "A fast JSON document store with push notification support"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "icfpc2020-galaxy" = callPackage @@ -155951,7 +155778,6 @@ self: { ]; description = "Squares style for the identicon package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "identifiers" = callPackage @@ -156879,6 +156705,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "imapget"; + broken = true; }) {}; "imbib" = callPackage @@ -156917,6 +156744,7 @@ self: { description = "A function to post an image to imgur"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "imgurder" = callPackage @@ -158219,6 +158047,7 @@ self: { description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "infernu" = callPackage @@ -159003,6 +158832,7 @@ self: { license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "instapaper-sender"; + broken = true; }) {}; "instinct" = callPackage @@ -159772,9 +159602,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "An implementation of Allen's interval algebra for temporal logic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "tutorial"; - broken = true; }) {}; "interval-functor" = callPackage @@ -159806,8 +159634,6 @@ self: { ]; description = "Intervals, and monoids thereof"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "interval-tree-clock" = callPackage @@ -159868,9 +159694,7 @@ self: { executablePkgconfigDepends = [ ncurses ]; description = "A game of competitive puzzle-design"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "intricacy"; - broken = true; }) {inherit (pkgs) ncurses;}; "intrinsic-superclasses" = callPackage @@ -160518,8 +160342,6 @@ self: { ]; description = "Library for IP and MAC addresses"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ip-quoter" = callPackage @@ -161158,6 +160980,7 @@ self: { description = "RFC-based resource identifier library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "iridium" = callPackage @@ -162250,7 +162073,6 @@ self: { ]; description = "Efficient relational queries on Haskell sets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ixset-typed" = callPackage @@ -162270,8 +162092,6 @@ self: { ]; description = "Efficient relational queries on Haskell sets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ixset-typed-binary-instance" = callPackage @@ -162283,7 +162103,6 @@ self: { libraryHaskellDepends = [ base binary ixset-typed ]; description = "Binary instance for ixset-typed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ixset-typed-cassava" = callPackage @@ -162299,7 +162118,6 @@ self: { ]; description = "cassava encoding and decoding via ixset-typed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ixset-typed-conversions" = callPackage @@ -162316,7 +162134,6 @@ self: { ]; description = "Conversions from ixset-typed to other containers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ixset-typed-hashable-instance" = callPackage @@ -162328,7 +162145,6 @@ self: { libraryHaskellDepends = [ base hashable ixset-typed ]; description = "Hashable instance for ixset-typed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ixshader" = callPackage @@ -163499,8 +163315,6 @@ self: { ]; description = "JSON with Structure"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jordan-openapi" = callPackage @@ -163522,7 +163336,6 @@ self: { ]; description = "OpenAPI Definitions for Jordan, Automatically"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jordan-servant" = callPackage @@ -163545,7 +163358,6 @@ self: { ]; description = "Servant Combinators for Jordan"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jordan-servant-client" = callPackage @@ -163569,7 +163381,6 @@ self: { ]; description = "Servant Client Instances for Jordan Servant Types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jordan-servant-openapi" = callPackage @@ -163594,7 +163405,6 @@ self: { ]; description = "OpenAPI schemas for Jordan-Powered Servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jordan-servant-server" = callPackage @@ -163616,7 +163426,6 @@ self: { ]; description = "Servers for Jordan-Based Servant Combinators"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jort" = callPackage @@ -163684,8 +163493,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; description = "JSON Object Signing and Encryption Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jot" = callPackage @@ -163720,8 +163527,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Transform Joy code using conditional rewrite rules"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jpeg" = callPackage @@ -163867,8 +163672,6 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jsaddle-dom" = callPackage @@ -164573,8 +164376,6 @@ self: { ]; description = "Fully-featured JSON-RPC 2.0 library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-rpc-client" = callPackage @@ -164734,8 +164535,6 @@ self: { ]; description = "Incremental applicative JSON parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-syntax" = callPackage @@ -166420,6 +166219,7 @@ self: { description = "Katip scribe for raven (https://sentry.io)"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "katip-rollbar" = callPackage @@ -166651,8 +166451,6 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kbq-gu" = callPackage @@ -166760,8 +166558,6 @@ self: { ]; description = "Fast and flexible k-d trees for various types of point queries"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keccak" = callPackage @@ -167212,9 +167008,7 @@ self: { ]; description = "Core parts of Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ "x86_64-linux" ]; }) {}; "keid-frp-banana" = callPackage @@ -167230,7 +167024,6 @@ self: { ]; description = "Reactive Banana integration for Keid engine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "keid-geometry" = callPackage @@ -167246,8 +167039,7 @@ self: { ]; description = "Geometry primitives for Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; - hydraPlatforms = lib.platforms.none; + platforms = [ "x86_64-linux" ]; }) {}; "keid-render-basic" = callPackage @@ -167268,8 +167060,9 @@ self: { ]; description = "Basic rendering programs for Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; + platforms = [ "x86_64-linux" ]; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "keid-resource-gltf" = callPackage @@ -167303,8 +167096,7 @@ self: { ]; description = "OpenAL sound system for Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; - hydraPlatforms = lib.platforms.none; + platforms = [ "x86_64-linux" ]; }) {}; "keid-ui-dearimgui" = callPackage @@ -167322,8 +167114,9 @@ self: { ]; description = "DearImGui elements for Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; + platforms = [ "x86_64-linux" ]; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "keiretsu" = callPackage @@ -167712,6 +167505,7 @@ self: { description = "Managing stores of secret things"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "keyvaluehash" = callPackage @@ -169037,8 +168831,6 @@ self: { testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lacroix" = callPackage @@ -171594,7 +171386,6 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "large-generics" = callPackage @@ -171966,8 +171757,6 @@ self: { ]; description = "Server-side SDK for integrating with LaunchDarkly"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "launchpad-control" = callPackage @@ -174948,8 +174737,6 @@ self: { ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) secp256k1;}; "libsodium" = callPackage @@ -177633,8 +177420,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Additional data and structures to some 'String'-related lists"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "listsafe" = callPackage @@ -177682,6 +177467,7 @@ self: { description = "Append only key-list database"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lit" = callPackage @@ -177777,8 +177563,6 @@ self: { ]; description = "Basic logging based on monad-logger"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "little-rio" = callPackage @@ -178583,6 +178367,7 @@ self: { description = "Client-side load balancing utilities"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "load-env" = callPackage @@ -178935,8 +178720,6 @@ self: { ]; description = "Structured logging solution (base package)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "log-domain" = callPackage @@ -179014,7 +178797,6 @@ self: { ]; description = "Structured logging solution (Elasticsearch back end)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "log-postgres" = callPackage @@ -179986,7 +179768,6 @@ self: { testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "loops" = callPackage @@ -180641,6 +180422,7 @@ self: { description = "Core functionality for LTI 1.3."; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ltiv1p1" = callPackage @@ -182332,7 +182114,6 @@ self: { ]; description = "Preconfigured email connection pool on top of smtp"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "exe"; }) {}; @@ -182658,8 +182439,6 @@ self: { testHaskellDepends = [ base containers deepseq exceptions hspec ]; description = "Remote Management Framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "managed-functions-http-connector" = callPackage @@ -182676,7 +182455,6 @@ self: { ]; description = "Simple HTTP-Based Connector for Managed Functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "managed-functions-json" = callPackage @@ -182688,7 +182466,6 @@ self: { libraryHaskellDepends = [ aeson base managed-functions ]; description = "JSON Support for the Managed Functions Framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "manatee" = callPackage @@ -183646,7 +183423,6 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -185714,8 +185490,6 @@ self: { ]; description = "An Elf parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mellon-core" = callPackage @@ -186341,8 +186115,6 @@ self: { validity-containers validity-time ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mergeful-persistent" = callPackage @@ -186368,6 +186140,7 @@ self: { description = "Support for using mergeful from persistent-based databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mergeless" = callPackage @@ -186493,8 +186266,6 @@ self: { ]; description = "An implementation of a Merkle tree and merkle tree proofs of inclusion"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mersenne-random" = callPackage @@ -187095,8 +186866,6 @@ self: { ]; description = "A tiny JSON library with light dependency footprint"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "microbase" = callPackage @@ -188318,8 +188087,6 @@ self: { ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "minions" = callPackage @@ -189140,7 +188907,6 @@ self: { ]; description = "Command line interface to the MMark markdown processor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "mmark"; }) {}; @@ -189162,8 +188928,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mmorph_1_1_3" = callPackage @@ -189587,8 +189351,6 @@ self: { ]; description = "Mock time in tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mockazo" = callPackage @@ -192461,7 +192223,6 @@ self: { description = "Invocation helpers for the ReaderT-record-of-functions style"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "moonshine" = callPackage @@ -194174,6 +193935,7 @@ self: { description = "Library to communicate with Mt.Gox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mtl_2_2_2" = callPackage @@ -197052,9 +196814,7 @@ self: { executableHaskellDepends = [ base text ]; description = "Tool to keep namecoin names updated and well"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "namecoin-update"; - broken = true; }) {}; "named" = callPackage @@ -198342,8 +198102,6 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-mqtt-lens" = callPackage @@ -198360,7 +198118,6 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "net-mqtt-rpc" = callPackage @@ -198382,7 +198139,6 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "mqtt-rpc"; }) {}; @@ -201009,9 +200765,7 @@ self: { ]; description = "Deploy Nix-built software to a NixOS machine"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "nix-deploy"; - broken = true; }) {}; "nix-derivation" = callPackage @@ -201135,9 +200889,7 @@ self: { ]; description = "Reify the Nix build graph into a Haskell graph data structure"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "nix-graph"; - broken = true; }) {}; "nix-narinfo" = callPackage @@ -202557,8 +202309,6 @@ self: { libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "np-linear" = callPackage @@ -204158,8 +203908,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "An implementation of the Oblivious Transfer protocol in Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "observable" = callPackage @@ -204629,7 +204377,6 @@ self: { ]; description = "OpenID Connect 1.0 library for RP"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ois-input-manager" = callPackage @@ -205507,7 +205254,6 @@ self: { description = "open witnesses"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "openai-hs" = callPackage @@ -205692,7 +205438,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "openapi3-code-generator-exe"; - broken = true; }) {}; "opencc" = callPackage @@ -207708,8 +207453,6 @@ self: { ]; description = "Parser for Emacs org-mode files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "org-mode-lucid" = callPackage @@ -207724,7 +207467,6 @@ self: { ]; description = "Lucid integration for org-mode"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "org2anki" = callPackage @@ -208051,8 +207793,6 @@ self: { ]; description = "Auto-generated ory-hydra API Client"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ory-kratos" = callPackage @@ -208073,8 +207813,6 @@ self: { ]; description = "API bindings for Ory Kratos"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "os-release" = callPackage @@ -209132,6 +208870,7 @@ self: { description = "Parse syslog traffic from PAN-OS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "panda" = callPackage @@ -209586,8 +209325,6 @@ self: { ]; description = "Extract \"contextual links\" from Pandoc"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pandoc-lua-marshal" = callPackage @@ -211759,6 +211496,7 @@ self: { description = "Parsing factorized"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "partial" = callPackage @@ -212050,7 +211788,7 @@ self: { ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" "armv7l-linux" ]; + platforms = lib.platforms.x86; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -212075,7 +211813,7 @@ self: { ]; description = "typeclass instances for password package"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" "armv7l-linux" ]; + platforms = lib.platforms.x86; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -212636,8 +212374,6 @@ self: { ]; description = "Sentry SDK"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "patronscraper" = callPackage @@ -213012,8 +212748,6 @@ self: { ]; description = "PCF font parsing and rendering library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pcf-font-embed" = callPackage @@ -213030,6 +212764,7 @@ self: { description = "Template Haskell for embedding text rendered using PCF fonts"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pcg-random" = callPackage @@ -213580,8 +213315,6 @@ self: { ]; description = "An implementation of Pedersen commitment schemes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pedestrian-dag" = callPackage @@ -214746,7 +214479,6 @@ self: { ]; description = "Persistent instances for types in iproute"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-lens" = callPackage @@ -215329,8 +215061,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Type safe access to multiple database schemata"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "persistent-vector" = callPackage @@ -216067,7 +215797,6 @@ self: { libraryHaskellDepends = [ base subG ]; description = "Constraints to filter the needed permutations"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-examples" = callPackage @@ -216153,7 +215882,6 @@ self: { libraryHaskellDepends = [ base subG ]; description = "Permutations and universal set related functions for the phonetic-languages series"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-phonetics-basics" = callPackage @@ -216198,7 +215926,6 @@ self: { ]; description = "Some common shared between different packages functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "distributionTextG"; }) {}; @@ -216229,8 +215956,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "phonetic-languages-simplified-base" = callPackage @@ -216247,7 +215972,6 @@ self: { ]; description = "A basics of the phonetic-languages functionality that can be groupped"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-common" = callPackage @@ -216314,7 +216038,6 @@ self: { ]; description = "Helps to create Ukrainian texts with the given phonetic properties"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-examples-common" = callPackage @@ -216449,7 +216172,6 @@ self: { ]; description = "Some properties of the data related to rhythmicity"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-properties-array-common" = callPackage @@ -216465,7 +216187,6 @@ self: { ]; description = "Common functionality for 'with-tuples' and old version of properties"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-properties-array-old" = callPackage @@ -216487,7 +216208,6 @@ self: { ]; description = "Some properties of the data related to rhythmicity"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-properties-lists" = callPackage @@ -217088,8 +216808,6 @@ self: { ]; description = "Access to the Pinboard API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pinboard-notes-backup" = callPackage @@ -218285,6 +218003,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "pipes-protolude-exe"; + broken = true; }) {}; "pipes-pulse-simple" = callPackage @@ -218422,8 +218141,6 @@ self: { ]; description = "properly streaming text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-transduce" = callPackage @@ -218448,6 +218165,7 @@ self: { description = "Interfacing pipes with foldl folds"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pipes-vector" = callPackage @@ -218726,8 +218444,6 @@ self: { ]; description = "Pixiv API binding based on servant-client"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "piyo" = callPackage @@ -219198,8 +218914,6 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "plist" = callPackage @@ -220307,7 +220021,6 @@ self: { libraryHaskellDepends = [ base requirements ]; description = "Polykinded extensible records"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "polyToMonoid" = callPackage @@ -220422,8 +220135,6 @@ self: { ]; description = "Multivariate polynomial rings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polynomials-bernstein" = callPackage @@ -220672,7 +220383,6 @@ self: { description = "Polysemy Effects for HTTP clients"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-keyed-state" = callPackage @@ -221014,8 +220724,6 @@ self: { libraryHaskellDepends = [ base polysemy req ]; description = "Polysemy effect for req"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-resume" = callPackage @@ -221293,8 +221001,6 @@ self: { testHaskellDepends = [ base ]; description = "Creation and application of polyvariadic functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pomaps" = callPackage @@ -224002,8 +223708,6 @@ self: { libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "predicate-typed" = callPackage @@ -225288,8 +224992,6 @@ self: { libraryHaskellDepends = [ base primitive ]; description = "primitive functions with bounds-checking"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "primitive-containers" = callPackage @@ -225730,7 +225432,6 @@ self: { executableHaskellDepends = [ base ]; description = "Cooperative task prioritization"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "_PrioritySync_Internal_Tests"; }) {}; @@ -226196,8 +225897,6 @@ self: { testHaskellDepends = [ async base bytestring hspec unix ]; description = "Ergonomic process launching with extreme flexibility and speed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "procrastinating-structure" = callPackage @@ -226300,6 +225999,7 @@ self: { description = "Weaken applicative functor on products"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "product-profunctors" = callPackage @@ -226389,7 +226089,6 @@ self: { ]; description = "Restructure GHC profile reports"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "profiterole"; }) {}; @@ -226411,7 +226110,6 @@ self: { ]; description = "Treemap visualiser for GHC prof files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "profiteur"; }) {}; @@ -227451,8 +227149,6 @@ self: { ]; description = "JSON protobuf encoding for proto-lens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "proto-lens-optparse" = callPackage @@ -227842,7 +227538,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "proton-haskell" = callPackage @@ -228861,8 +228556,6 @@ self: { ]; description = "types and parser for email messages (including MIME)"; license = lib.licenses.agpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "purenix" = callPackage @@ -228883,10 +228576,8 @@ self: { executableHaskellDepends = [ base ]; description = "Nix backend for PureScript. Transpile PureScript code to Nix."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "purenix"; maintainers = [ lib.maintainers.cdepillabout ]; - broken = true; }) {}; "purescheme-wai-routing-core" = callPackage @@ -230020,6 +229711,7 @@ self: { description = "Library to generate images"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) qrencode;}; "qr-repa" = callPackage @@ -231879,7 +231571,6 @@ self: { ]; description = "Can be used to calculate the durations of the approximations of the Ukrainian phonemes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "pldUkr"; }) {}; @@ -232098,8 +231789,6 @@ self: { attoparsec base criterion deepseq ghc-compact QuasiText text vector ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rados-haskell" = callPackage @@ -233025,8 +232714,6 @@ self: { ]; description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rapid-term" = callPackage @@ -233532,8 +233219,6 @@ self: { ]; description = "Haskell client for Sentry logging service"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "raven-haskell-scotty" = callPackage @@ -233550,6 +233235,7 @@ self: { description = "Sentry http interface for Scotty web server"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "raw-feldspar" = callPackage @@ -235448,7 +235134,6 @@ self: { ]; description = "Combine redis caching and haxl"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "redland" = callPackage @@ -236323,8 +236008,6 @@ self: { ]; description = "reflex-dom-th transpiles HTML templates to haskell code for reflex-dom"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reflex-dynamic-containers" = callPackage @@ -236545,8 +236228,7 @@ self: { ]; description = "Reflex bindings for libtelnet"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = lib.platforms.linux; }) {}; "reflex-localize" = callPackage @@ -236795,7 +236477,6 @@ self: { libraryHaskellDepends = [ base hsp hsx2hs reform text ]; description = "Add support for using HSP with Reform"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reform-lucid" = callPackage @@ -239217,6 +238898,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "rbb"; + broken = true; }) {}; "repr" = callPackage @@ -239549,8 +239231,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Abstraction to manage user defined Type Errors"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rere" = callPackage @@ -241182,6 +240862,7 @@ self: { description = "Static site generator based on Shake"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rib-core" = callPackage @@ -242703,7 +242384,6 @@ self: { ]; description = "Query the namecoin blockchain"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "rosa"; }) {}; @@ -242967,7 +242647,6 @@ self: { testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; "rounded-hw" = callPackage @@ -243159,8 +242838,6 @@ self: { libraryHaskellDepends = [ aeson base row-types text ]; description = "aeson instances for Open Records and Variants"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "row-types-barbies" = callPackage @@ -245441,8 +245118,6 @@ self: { ]; description = "Sandwich integration with Hedgehog"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sandwich-quickcheck" = callPackage @@ -246378,7 +246053,7 @@ self: { ]; description = "Generates unique passwords for various websites from a single password"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" "armv7l-linux" ]; + platforms = lib.platforms.x86; mainProgram = "scat"; }) {}; @@ -247233,7 +246908,6 @@ self: { libraryHaskellDepends = [ base haxl scotty text ]; description = "Combine scotty and haxl"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "scotty-params-parser" = callPackage @@ -247358,7 +247032,6 @@ self: { ]; description = "Scotty utils library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "scotty-view" = callPackage @@ -247626,7 +247299,7 @@ self: { ]; description = "Stronger password hashing via sequential memory-hard functions"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" "armv7l-linux" ]; + platforms = lib.platforms.x86; }) {}; "scrz" = callPackage @@ -251084,6 +250757,7 @@ self: { description = "automatical derivation of querying functions for servant webservices"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-hmac-auth" = callPackage @@ -251204,8 +250878,6 @@ self: { ]; description = "Servant support for iCalendar"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-jquery" = callPackage @@ -251262,8 +250934,6 @@ self: { libraryHaskellDepends = [ aeson base http-media servant text ]; description = "JSON-RPC messages and endpoints"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-jsonrpc-client" = callPackage @@ -251281,7 +250951,6 @@ self: { ]; description = "Generate JSON-RPC servant clients"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-jsonrpc-server" = callPackage @@ -251297,7 +250966,6 @@ self: { ]; description = "JSON-RPC servant servers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-kotlin" = callPackage @@ -253051,8 +252719,6 @@ self: { ]; description = "Storage backend for serversession using Redis"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serversession-frontend-snap" = callPackage @@ -253105,8 +252771,6 @@ self: { ]; description = "Yesod bindings for serversession"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "services" = callPackage @@ -254307,7 +253971,6 @@ self: { ]; description = "Experimental extensions to shake-plus"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "shakebook" = callPackage @@ -255909,7 +255572,6 @@ self: { ]; description = "A Haskell clone of OpenBSD signify"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "signify-hs"; }) {}; @@ -256953,8 +256615,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Three-dimensional vectors of doubles with basic operations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simple-zipper" = callPackage @@ -257575,6 +257235,7 @@ self: { description = "Multivariate polynomial factorization via bindings to Singular-factory"; license = "GPL"; hydraPlatforms = lib.platforms.none; + broken = true; }) {singular-factory = null;}; "sink" = callPackage @@ -257837,8 +257498,6 @@ self: { ]; description = "Sized sequence data-types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sized-grid" = callPackage @@ -258343,8 +258002,6 @@ self: { ]; description = "Lucid support for Skylighting"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "skylighting-modding" = callPackage @@ -259261,8 +258918,6 @@ self: { libraryHaskellDepends = [ aeson base smash unordered-containers ]; description = "Aeson support for the smash library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smash-lens" = callPackage @@ -259275,8 +258930,6 @@ self: { testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smash-microlens" = callPackage @@ -259300,8 +258953,6 @@ self: { libraryHaskellDepends = [ base optics-core smash ]; description = "Optics for the `smash` library using `optics-core`"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smawk" = callPackage @@ -260725,8 +260376,6 @@ self: { ]; description = "persistent snaplet for the Snap Framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-postgresql-simple" = callPackage @@ -261061,6 +260710,7 @@ self: { description = "Typed session snaplets and continuation-based programming for the Snap web framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snaplet-wordpress" = callPackage @@ -261352,8 +261002,6 @@ self: { ]; description = "A checksummed variation on Twitter's Snowflake UID generation algorithm"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snowflake" = callPackage @@ -263062,7 +262710,6 @@ self: { ]; description = "Computational combinatorial species"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "spectacle" = callPackage @@ -264383,6 +264030,7 @@ self: { description = "Module limbo"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "srcinst" = callPackage @@ -266838,7 +266486,6 @@ self: { description = "Positive rational numbers represented as paths in the Stern-Brocot tree"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stgi" = callPackage @@ -267364,8 +267011,6 @@ self: { doHaddock = false; description = "A simple wrapper around stooq.pl API for downloading market data."; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stopwatch" = callPackage @@ -267673,8 +267318,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "EDSL for AWS CloudFormation"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stratum-tool" = callPackage @@ -268377,6 +268020,7 @@ self: { description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) zlib;}; "streaming-wai" = callPackage @@ -269715,8 +269359,6 @@ self: { ]; description = "Stripe-Library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "strips" = callPackage @@ -270266,8 +269908,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Some extension to the Foldable and Monoid classes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "subG-instances" = callPackage @@ -270280,6 +269920,7 @@ self: { description = "Additional instances for the InsertLeft class from subG package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "subcategories" = callPackage @@ -271065,7 +270706,6 @@ self: { description = "Apache Pulsar client for Haskell"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "supero" = callPackage @@ -271933,8 +271573,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Scrap Your Boilerplate With Class"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syb-with-class-instances-text" = callPackage @@ -271947,6 +271585,7 @@ self: { description = "Scrap Your Boilerplate With Class Text instance"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sydtest" = callPackage @@ -272071,7 +271710,6 @@ self: { description = "An hedis companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sydtest-hspec" = callPackage @@ -272110,7 +271748,6 @@ self: { description = "An mongoDB companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sydtest-persistent" = callPackage @@ -272149,7 +271786,6 @@ self: { description = "An persistent-postgresql companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sydtest-persistent-sqlite" = callPackage @@ -272205,7 +271841,6 @@ self: { description = "An rabbitmq companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sydtest-servant" = callPackage @@ -272366,7 +272001,6 @@ self: { description = "A yesod companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syfco" = callPackage @@ -274866,7 +274500,6 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "talash"; - broken = true; }) {}; "tamarin-prover" = callPackage @@ -277883,8 +277516,6 @@ self: { libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "termbox-bindings" = callPackage @@ -279375,6 +279006,7 @@ self: { description = "A generic, derivable, haskell pretty printer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "text-icu" = callPackage @@ -280456,8 +280088,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "th-desugar" = callPackage @@ -281042,9 +280672,7 @@ self: { ]; description = "Haskell API bindings for http://themoviedb.org"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "tmdb"; - broken = true; }) {}; "themplate" = callPackage @@ -285460,9 +285088,7 @@ self: { ]; description = "A command-line tool for live monitoring"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "trackit"; - broken = true; }) {}; "traction" = callPackage @@ -286213,7 +285839,6 @@ self: { description = "See README for more info"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "traverse-code" = callPackage @@ -287162,6 +286787,7 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "tropical-geometry"; + broken = true; }) {}; "true-name" = callPackage @@ -287621,6 +287247,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "ttnc"; maintainers = [ lib.maintainers.sorki ]; + broken = true; }) {}; "ttrie" = callPackage @@ -288118,8 +287745,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Tiny web application framework for WAI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tweak" = callPackage @@ -288537,6 +288162,7 @@ self: { description = "Haskell twirp foundations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "twisty" = callPackage @@ -289916,8 +289542,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typelevel" = callPackage @@ -290111,7 +289735,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "typescript-docs" = callPackage @@ -290531,7 +290154,6 @@ self: { description = "Unicode Character Database — Predicates on characters specified by Unicode"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ucl" = callPackage @@ -290829,8 +290451,6 @@ self: { ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ukrainian-phonetics-basic-array-bytestring" = callPackage @@ -290881,9 +290501,7 @@ self: { ]; description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ulid-exe"; - broken = true; }) {}; "una" = callPackage @@ -291002,7 +290620,6 @@ self: { description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unbound" = callPackage @@ -292254,8 +291871,6 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; description = "A very basic descriptive statistics"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unit" = callPackage @@ -293266,8 +292881,6 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "maybes of numeric values with fewer indirections"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unpacked-maybe-text" = callPackage @@ -294141,7 +293754,6 @@ self: { ]; description = "Painfully simple URL deployment"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "urn" = callPackage @@ -294338,7 +293950,6 @@ self: { ]; description = "The UserId type and useful instances for web development"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "users" = callPackage @@ -294460,7 +294071,6 @@ self: { description = "UTF-8"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "utf8-conversions" = callPackage @@ -294984,8 +294594,6 @@ self: { ]; description = "Orphan instances for the UUID datatype"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uuid-quasi" = callPackage @@ -297464,6 +297072,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "viewprof"; + broken = true; }) {}; "views" = callPackage @@ -298229,7 +297838,6 @@ self: { description = "Priority queue based on vector"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vrpn" = callPackage @@ -299295,7 +298903,6 @@ self: { ]; description = "A logging middleware for WAI applications"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wai-logger" = callPackage @@ -299652,7 +299259,6 @@ self: { ]; description = "Route to different middlewares based on the incoming Accept header"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wai-middleware-crowd" = callPackage @@ -301293,8 +300899,6 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "web-mongrel2" = callPackage @@ -301541,8 +301145,6 @@ self: { testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; description = "Support for deriving PathInfo using Template Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "web-routes-transformers" = callPackage @@ -301886,8 +301488,6 @@ self: { ]; description = "A super-simple web server framework"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "webcloud" = callPackage @@ -303482,9 +303082,7 @@ self: { ]; description = "A compact, well-typed seralisation format for Haskell values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "winery"; - broken = true; }) {}; "winio" = callPackage @@ -303546,6 +303144,7 @@ self: { description = "API for Linux Kernel Wireguard device management"; license = "LGPL"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wires" = callPackage @@ -304832,6 +304431,7 @@ self: { description = "HTTP/HTTPS response process"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wreq-patchable" = callPackage @@ -305115,7 +304715,6 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ws"; }) {}; @@ -306786,8 +306385,6 @@ self: { ]; description = "Lenses, traversals, and prisms for xml-conduit"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-monad" = callPackage @@ -308976,8 +308573,6 @@ self: { ]; description = "Testing library for Yampa"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yampa2048" = callPackage @@ -309764,6 +309359,7 @@ self: { description = "Authentication backend for Yesod using Facebook"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yesod-auth-hashdb" = callPackage @@ -310069,7 +309665,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Traditional email/pass auth for Yesod"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + platforms = lib.platforms.x86; mainProgram = "yesod-auth-simple-test"; }) {}; @@ -310215,6 +309811,7 @@ self: { description = "A generic comments interface for a Yesod application"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yesod-content-pdf" = callPackage @@ -310333,6 +309930,7 @@ self: { description = "Flexible CRUD subsite usable with Yesod and Persistent"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yesod-csp" = callPackage @@ -310536,7 +310134,6 @@ self: { ]; description = "Useful glue functions between the fb library and Yesod"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-filter" = callPackage @@ -310745,6 +310342,7 @@ self: { description = "Code for using the ip package with yesod"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yesod-job-queue" = callPackage @@ -310864,8 +310462,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-media-simple" = callPackage @@ -312508,9 +312104,7 @@ self: { ]; description = "Builds a static website from templates and data in YAML or CSV files"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "yst"; - broken = true; }) {}; "ytl" = callPackage @@ -312758,6 +312352,7 @@ self: { description = "Implementation of the z85 binary codec"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "zabt" = callPackage @@ -313163,9 +312758,7 @@ self: { ]; description = "Haskell implementation of the ZeroMQ clone pattern"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-clone-pattern-exe"; - broken = true; }) {}; "zeromq4-conduit" = callPackage @@ -313230,9 +312823,7 @@ self: { ]; description = "Haskell implementation of several ZeroMQ patterns"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-patterns-exe"; - broken = true; }) {}; "zeromq4-simple" = callPackage @@ -314286,9 +313877,7 @@ self: { testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "A zuul client library"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "zuul-cli"; - broken = true; }) {}; "zxcvbn-c" = callPackage @@ -314319,6 +313908,7 @@ self: { description = "Password strength estimation based on zxcvbn"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "zxcvbn-hs" = callPackage @@ -314355,9 +313945,7 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "zxcvbn-example"; - broken = true; }) {}; "zydiskell" = callPackage diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix new file mode 100644 index 000000000000..5b605c6564b3 --- /dev/null +++ b/pkgs/development/interpreters/kerf/default.nix @@ -0,0 +1,92 @@ +{ lib, stdenv, fetchFromGitHub +, libedit, zlib, ncurses, expect + +# darwin only below +, Accelerate, CoreGraphics, CoreVideo +}: + +stdenv.mkDerivation rec { + pname = "kerf"; + version = "unstable-2022-08-05"; + + src = fetchFromGitHub { + owner = "kevinlawler"; + repo = "kerf1"; + rev = "4ec5b592b310b96d33654d20d6a511e6fffc0f9d"; + hash = "sha256-0sU2zOk5I69lQyrn1g0qsae7S/IBT6eA/911qp0GNkk="; + }; + + sourceRoot = "source/src"; + buildInputs = [ libedit zlib ncurses ] + ++ lib.optional stdenv.isDarwin ([ + Accelerate + ] ++ lib.optional stdenv.isx86_64 /* && isDarwin */ [ + CoreGraphics CoreVideo + ]); + + checkInputs = [ expect ]; + doCheck = true; + + makeFlags = [ "kerf" "kerf_test" ]; + + # avoid a huge amount of warnings to make failures clearer + NIX_CFLAGS_COMPILE = map (x: "-Wno-${x}") [ + "void-pointer-to-int-cast" + "format" + "implicit-function-declaration" + "gnu-variable-sized-type-not-at-end" + "unused-result" + ] ++ lib.optional stdenv.isDarwin [ "-fcommon" ]; + + patchPhase = '' + substituteInPlace ./Makefile \ + --replace 'CPUS ?=' 'CPUS = $(NIX_BUILD_CORES) #' \ + --replace 'termcap' 'ncurses' + ''; + + # the kerf executable uses ncurses to create a fancy terminal for input and + # reads terminal keystrokes directly, so it doesn't read from stdin as + # expected, hence why we use this fancy expect script to run the test exe and + # send 'quit' to the prompt after it finishes. + checkPhase = '' + expect < " {send "quit\r"} + timeout { exit 1 } + } + expect { + "\[DEBUG\] OK: Done OK." {} + "\[DEBUG\] FAILED: Debug failure." { exit 1 } + timeout { exit 1 } + } + exit 0 + EOD + ''; + + installPhase = "install -D kerf $out/bin/kerf"; + + meta = with lib; { + description = "Columnar tick database and time-series language"; + longDescription = '' + Kerf is a columnar tick database and small programming + language that is a superset of JSON and SQL. It can be + used for local analytics, timeseries, logfile processing, + and more. + ''; + license = with licenses; [ bsd2 ]; + homepage = "https://github.com/kevinlawler/kerf1"; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + + # aarch64-linux seems hopeless, with over 2,000 warnings + # generated? + broken = (stdenv.isLinux && stdenv.isAarch64); + }; +} diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 193eabe6c01f..5e346788ee48 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.21"; - hash = "sha256-HLd2LR/+zOruuvufbiQTLKI/sUQ8tWMND8z1PwTPoSY="; + version = "8.0.22"; + hash = "sha256-40KRjT7NQi8QAy3wrD/7Dhf1aPrWz44jK296ah/cPJw="; }); in diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index e56ff13864bb..37e471601ddb 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.8"; - hash = "sha256-uIFaWgJDFFPUJh41mL0fKFFuTANU8yjBKJDyV4cOTAE="; + version = "8.1.9"; + hash = "sha256-nrsOLlcdtv1ZMEKNyy0Z7T4FAzjsHxNHwoLK6S/Ahv8="; }); in diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index fd7e684113e7..25446f5fca89 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -68,7 +68,7 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch; + inherit hasDistutilsCxxPatch pythonAttr; pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index a52935c69dfd..dca7d9bb0db5 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -91,7 +91,7 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch; + inherit hasDistutilsCxxPatch pythonAttr; pythonOnBuildForBuild = override pkgsBuildBuild.${pythonAttr}; pythonOnBuildForHost = override pkgsBuildHost.${pythonAttr}; pythonOnBuildForTarget = override pkgsBuildTarget.${pythonAttr}; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5593158e7f36..471f96b51887 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -19,9 +19,14 @@ with pkgs; , pythonOnBuildForTarget , pythonOnHostForHost , pythonOnTargetForTarget + , pythonAttr ? null , self # is pythonOnHostForTarget }: let pythonPackages = callPackage + # Function that when called + # - imports python-packages.nix + # - adds spliced package sets to the package set + # - applies overrides from `packageOverrides` and `pythonPackagesOverlays`. ({ pkgs, stdenv, python, overrides }: let pythonPackagesFun = import ../../../top-level/python-packages.nix { inherit stdenv pkgs lib; @@ -74,7 +79,7 @@ with pkgs; extra = _: {}; optionalExtensions = cond: as: if cond then as else []; python2Extension = import ../../../top-level/python2-packages.nix; - extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]); + extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pkgs.pythonPackagesExtensions ++ [ overrides ]); aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super); in lib.makeScopeWithSplicing pkgs.splicePackages @@ -117,6 +122,8 @@ with pkgs; tests = callPackage ./tests.nix { python = self; }; + + inherit pythonAttr; }; sources = { diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 668a4e24b39e..e8c7d3ba65e5 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -30,6 +30,7 @@ let executable = "pypy${if isPy3k then "3" else ""}"; sitePackages = "site-packages"; hasDistutilsCxxPatch = false; + inherit pythonAttr; pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 49dfe0e4644e..037c8f87b8ba 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -11,6 +11,7 @@ , substituteAll , lib , callPackage +, pkgs }: let @@ -133,6 +134,17 @@ let # test-overrideScope = let # myPackages = python.pkgs.overrideScope extension; # in assert myPackages.foobar == myPackages.numpy; myPackages.python.withPackages(ps: with ps; [ foobar ]); + } // lib.optionalAttrs (python ? pythonAttr) { + # Test applying overrides using pythonPackagesOverlays. + test-pythonPackagesExtensions = let + pkgs_ = pkgs.extend(final: prev: { + pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ + (python-final: python-prev: { + foo = python-prev.setuptools; + }) + ]; + }); + in pkgs_.${python.pythonAttr}.pkgs.foo; }; condaTests = let diff --git a/pkgs/development/libraries/audio/libspecbleach/default.nix b/pkgs/development/libraries/audio/libspecbleach/default.nix index f9f147ab11a2..b1065561e1c6 100644 --- a/pkgs/development/libraries/audio/libspecbleach/default.nix +++ b/pkgs/development/libraries/audio/libspecbleach/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libspecbleach"; - version = "0.1.2"; + version = "0.1.6"; src = fetchFromGitHub { owner = "lucianodato"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WmUl8rA/+V+hv7FPG/5Or6aAQVqt1rIJtdb53KhSmuo="; + sha256 = "sha256-Tw5nrGVAeoiMH00efJwcU+QLmKDZZTXHQPSV9x789TM="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 3fe78e6d02e9..7675ddae378e 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,29 +1,40 @@ -{ fetchFromGitHub, lib, stdenv, boost, cmake, libX11, libGL, libGLU }: +{ lib +, stdenv +, fetchFromGitHub +, boost +, cmake +, libGL +, libGLU +, libX11 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coin"; - version = "2020-12-07-unstable"; + version = "unstable-2022-07-27"; src = fetchFromGitHub { owner = "coin3d"; repo = "coin"; - # rev = "Coin-${version}"; - rev = "d5539998aff272b349590fe74d068659682ecd0d"; - sha256 = "11jaz8p9nn8jpd6dsgwgkldwr7z829gyf64g014qyyh8l6p7jzzd"; + rev = "4c67945a58d2a6e5adb4d2332ab08007769130ef"; + hash = "sha256-lXS7GxtoPsZe2SJfr0uY99Q0ZtYG0KFlauY1PBuFleo="; }; - postPatch = '' - sed -i /cpack.d/d CMakeLists.txt - ''; - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost libX11 libGL libGLU ]; + + buildInputs = [ + boost + libGL + libGLU + libX11 + ]; + + cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ]; meta = with lib; { homepage = "https://github.com/coin3d/coin"; - license = licenses.bsd3; description = "High-level, retained-mode toolkit for effective 3D graphics development"; + license = licenses.bsd3; maintainers = with maintainers; [ gebner viric ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 13e23b0fa4b5..6fc48c2d4e44 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { disallowedReferences = [ stdenv.cc.cc ]; meta = with lib; { - homepage = "https://www.exiv2.org/"; + homepage = "https://exiv2.org"; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 006e4602fde9..55f1fb2790e6 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -16,6 +16,7 @@ # tests , python3 +, arrow-cpp }: stdenv.mkDerivation rec { @@ -92,6 +93,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (python3.pkgs) grpcio-status grpcio-tools; + inherit arrow-cpp; }; meta = with lib; { diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 54bf20601560..f36c88593155 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -1,10 +1,7 @@ { lib , stdenv , fetchFromGitLab -, docbook-xsl-nons , gi-docgen -, gtk-doc -, libxml2 , meson , ninja , pkg-config @@ -37,10 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - docbook-xsl-nons gi-docgen - gtk-doc - libxml2 # for xmllint meson ninja pkg-config @@ -99,8 +93,9 @@ stdenv.mkDerivation rec { runHook postCheck ''; - postInstall = '' - mv $out/share/{doc,gtk-doc} + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 1c5acd2a1401..6bf670a40382 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -1,23 +1,42 @@ -{ lib, stdenv, fetchurl, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libiconv +, libintl +}: stdenv.mkDerivation rec { pname = "libiptcdata"; - version = "1.0.4"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "ianw"; + repo = pname; + rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-ZjokepDAHiSEwXrkvM9qUAPcpIiRQoOsv7REle7roPU="; + }; + + postPatch = '' + # gtk-doc doesn't build without network access + sed -i '/GTK_DOC_CHECK/d;/docs/d' configure.ac + sed -i 's/docs//' Makefile.am + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv + libintl ]; - src = fetchurl { - url = "mirror://sourceforge/libiptcdata/${pname}-${version}.tar.gz"; - sha256 = "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr"; - }; - - meta = { + meta = with lib; { description = "Library for reading and writing the IPTC metadata in images and other files"; - homepage = "http://libiptcdata.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ wegank ]; + homepage = "https://github.com/ianw/libiptcdata"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ wegank ]; }; } diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index 9abe32241207..3ad5c16d352d 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -51,10 +51,10 @@ let in stdenv.mkDerivation rec { pname = "libpulsar"; - version = "2.9.1"; + version = "2.10.1"; src = fetchurl { - hash = "sha512-NKHiL7D/Lmnn6ICpQyUmmQYQETz4nZPJU9/4LMRDUQ3Pck6qDh+t6CRk+b9UQ2Vb0jvPIGTjEsSp2nC7TJk3ug=="; + hash = "sha256-qMj76jnxRH68DE6JkZjQrLSNzgXGnO7HjPjlaFavaUY="; url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; }; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 748fcfcb22fd..0142ac4505f9 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -136,9 +136,12 @@ stdenv.mkDerivation rec { '' + optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build sed -i '/vircryptotest/d' tests/meson.build + '' + optionalString (isDarwin && isx86_64) '' + sed -i '/qemucaps2xmltest/d' tests/meson.build + sed -i '/qemuhotplugtest/d' tests/meson.build + sed -i '/virnetdaemontest/d' tests/meson.build ''; - nativeBuildInputs = [ meson diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index e0392901eccf..41bf84c5b69b 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EEwo4KIBNVb/O1htUN8GkuiU/P3r/DyEn6L9l1r1I6E="; + sha256 = "sha256-q9rXvMeCXhyytiaGekRlowCYKzvq8aktfN0lk+VPG78="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 9fec80aa56ea..f3c5ac668cff 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -3,6 +3,7 @@ , fetchurl , CoreServices , buildPackages +, nixosTests }: stdenv.mkDerivation rec { @@ -44,6 +45,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) firefox firefox-esr-91 firefox-esr-102; + }; + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 9a3d7bdfe270..febc2423388e 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -15,6 +15,7 @@ , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false +, nixosTests }: let @@ -186,6 +187,12 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; + passthru.tests = lib.optionalAttrs (lib.versionOlder version "3.69") { + inherit (nixosTests) firefox-esr-91; + } // lib.optionalAttrs (lib.versionAtLeast version "3.69") { + inherit (nixosTests) firefox firefox-esr-102; + }; + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 17a1717812fe..8d2e91513f1e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "22.06.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-oPmqo5GLrXgQOfwwemNWUqFNGzkc1Vm2bt7Evtujxdc="; + sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 313d82c5928c..b80e93622d94 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; broken = lib.versionOlder qtbase.version "5.14"; - maintainers = [ maintainers.bugworm ]; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 0e3285657866..cce0afc55e1b 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.6.2"; + version = "6.7.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zt/d6V1/6Kqh0ZdJX3dLkj36NHlvlmFSxPPqcNyC6ZM="; + sha256 = "sha256-RjVmrdUHDBelwagWD5Mx+S3tdFO7I0+8RmFR7hwoe8o="; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index ed2819e88c17..64746d84572a 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "tachyon"; - version = "0.99.4"; + version = "0.99.5"; src = fetchurl { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-vJvDHhLDp5rpH9KhXUtQaqfjyai0e3NMKOEkbhYuaA0="; + sha256 = "sha256-CSA8ECMRFJ9d9cw2dAn5bHJXQmZtGcJNtbqZTVqBpvU="; }; buildInputs = lib.optionals stdenv.isDarwin [ Carbon diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 1e2eea7ac899..c576405bb3b6 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple, small, efficient, C++ XML parser"; - homepage = "http://www.grinninglizard.com/tinyxml2/index.html"; + homepage = "https://www.grinninglizard.com/tinyxml2/index.html"; platforms = lib.platforms.unix; license = lib.licenses.zlib; }; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 40f954a1ff8c..3c146f50b00a 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2172,6 +2172,32 @@ buildLuarocksPackage { }; }) {}; +luaunit = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { + pname = "luaunit"; + version = "3.4-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaunit-3.4-1.rockspec"; + sha256 = "111435fa8p2819vcvg76qmknj0wqk01gy9d1nh55c36616xnj54n"; + }).outPath; + src = fetchurl { + url = "https://github.com/bluebird75/luaunit/releases/download/LUAUNIT_V3_4/rock-luaunit-3.4.zip"; + sha256 = "1v8nkiwz2nr242h5cl4af6vmn5gxmn94skps1qhb55ak60j20nvr"; + }; + + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua lua ]; + + meta = { + homepage = "http://github.com/bluebird75/luaunit"; + description = "A unit testing framework for Lua"; + maintainers = with lib.maintainers; [ lockejan ]; + license.fullName = "BSD"; + }; +}) {}; + luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchurl, lua }: diff --git a/pkgs/development/nim-packages/flatty/default.nix b/pkgs/development/nim-packages/flatty/default.nix index 5e542d22e4a5..31abbfbdd21e 100644 --- a/pkgs/development/nim-packages/flatty/default.nix +++ b/pkgs/development/nim-packages/flatty/default.nix @@ -2,13 +2,13 @@ buildNimPackage rec { pname = "flatty"; - version = "0.2.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "treeform"; repo = pname; rev = version; - hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA="; + hash = "sha256-ZmhjehmEJHm5qNlsGQvyYLajUdwhWt1+AtRppRrNtgA="; }; doCheck = true; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 3441e4cff46e..7182222db5a2 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.6.8"; + version = "0.6.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cWq9CZNQqIot/QfT42VtJemJNrFtgQG3XZR+itV+sHI="; + sha256 = "sha256-QCdOiCmo21P9vjKPWAV6Wrfi664Hx3uJ8V44B2mLtbw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 83019e202e5f..ff637dd4979e 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.6"; + version = "0.4.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DDp9gtKavO3LCDnaZsYYLTWwoy0kQaTitJeALSPlXaQ="; + hash = "sha256-Dm05DCNPyQW62RRIVf995jEa5A6kqYyhsUNn+XCjSSI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix new file mode 100644 index 000000000000..32a6152efc12 --- /dev/null +++ b/pkgs/development/python-modules/aioecowitt/default.nix @@ -0,0 +1,46 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, meteocalc +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioecowitt"; + version = "2022.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-GALBhapE31CM2mqBrgcdQf5SJV+edN3kj35r0cf7BcU="; + }; + + propagatedBuildInputs = [ + aiohttp + meteocalc + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aioecowitt" + ]; + + meta = with lib; { + description = "Wrapper for the EcoWitt protocol"; + homepage = "https://github.com/home-assistant-libs/aioecowitt"; + changelog = "https://github.com/home-assistant-libs/aioecowitt/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 890a37e24dd3..3e3148fce7c2 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,22 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }: +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, jinja2 +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "aiohttp-jinja2"; version = "1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7c3ba5eac060b691f4e50534af2d79fca2a75712ebd2b25e6fcb1295859f910b"; + hash = "sha256-fDul6sBgtpH05QU0ry15/KKnVxLr0rJeb8sSlYWfkQs="; }; - propagatedBuildInputs = [ aiohttp jinja2 ]; + propagatedBuildInputs = [ + aiohttp + jinja2 + ]; - checkInputs = [ pytest pytest-aiohttp pytest-cov ]; + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; - checkPhase = '' - pytest -W ignore::DeprecationWarning + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=aiohttp_jinja2 --cov-report xml --cov-report html --cov-report term" "" ''; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + + pythonImportsCheck = [ + "aiohttp_jinja2" + ]; + + # Tests are outdated (1.5) + # pytest.PytestUnhandledCoroutineWarning: async def functions... + doCheck = false; + meta = with lib; { description = "Jinja2 support for aiohttp"; homepage = "https://github.com/aio-libs/aiohttp_jinja2"; diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 68a630a96ee7..62aeb1fd9996 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w6d2qpU8jPrE2Dtuq4825qOCU1SoIpkEjOEX+BYxhuU="; + hash = "sha256-k47cXi2CDtFIV3gzfdYU4i17ry0ABXcWK5CcWhwTdT0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 69932532efa2..a3dfa62705a5 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "2.0.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BUKuZza9Jer334LUmU5zmfjg1ISuxg7HETEbUMB80KY="; + hash = "sha256-Id4qg7uSvpjXpEx0/EvSMvFxgkR78/NOoOmmwngj7Qw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 45354defe174..5c1b779b79e0 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.9.9"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a6PQ6DB+JkfDJA7BoNVXHzpFP5FD2Ug07LAmYLDo0kQ="; + hash = "sha256-llOQAzH4vR9O+pzaLCueJ7aar7Kt8UsrzmV5f3UzOss="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index a607fe965827..4e91aafde6da 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "v${version}"; - hash = "sha256-9tSGfF/Ezuya4pEyr1XolWXvSO/F/UrobRVlyHITNTU="; + hash = "sha256-TpUiUW9ntrpuT/rUhucedl+DM5X88Mislrd+3D5/TUE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 4319b8abf435..d2583b157f76 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-trIM1TL86kEg0ycPbTEThh0Bw/MtDyNE5U+X1biTSUE="; + hash = "sha256-rwUhKm9arvUW3EWAgv3+SdJYR54Hob2RmMDA6IjEpn4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 0e33258abee3..c187ae5a59e0 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-WjjpehrYy9187C3wUDR3sfQG+2p6YbQfp4EwC5FbzGU="; + hash = "sha256-vp+tZIDFuO41r34z8+aUf3dhYhaUeLZ3l9JNvjsqKc4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index c56c377b299b..236f481df2ee 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.19.1"; + version = "0.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-29wfdRbJ4U3ou/4jkpWBE2FrUuo09k4hTYLnIP1S3uU="; + hash = "sha256-depaXtbXo5F1JC3M24i6ynWhpm9x9O7UCjkoSzFaSZI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index ecdd74f9d37b..43e4d0029afa 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "catalogue"; - version = "2.1.0"; + version = "2.0.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oczi8XOKMd6yqiSz5Kieb7PoUlVcGDsOzaiivMHq7y4="; + sha256 = "sha256-syXHdlkgi/tq8bDZOxoapBEuG7KaTFztgWdYpyLw44g="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ @@ -29,11 +29,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/explosion/catalogue/issues/27 - "test_entry_points" - ]; - pythonImportsCheck = [ "catalogue" ]; @@ -43,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/catalogue"; changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ onny ]; }; } diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 9e6d383db203..890c20b0d25a 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -1,5 +1,13 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pyyaml, openssh -, nose, bc, hostname, coreutils, bash, gnused +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pyyaml +, openssh +, nose +, bc +, hostname +, bash }: buildPythonPackage rec { @@ -11,8 +19,6 @@ buildPythonPackage rec { sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081"; }; - propagatedBuildInputs = [ pyyaml ]; - postPatch = '' substituteInPlace lib/ClusterShell/Worker/Ssh.py \ --replace '"ssh"' '"${openssh}/bin/ssh"' \ @@ -20,29 +26,40 @@ buildPythonPackage rec { substituteInPlace lib/ClusterShell/Worker/fastsubprocess.py \ --replace '"/bin/sh"' '"${bash}/bin/sh"' + + for f in tests/*; do + substituteInPlace $f \ + --replace '/bin/hostname' '${hostname}/bin/hostname' \ + --replace '/bin/sleep' 'sleep' \ + --replace '/bin/echo' 'echo' \ + --replace '/bin/uname' 'uname' \ + --replace '/bin/false' 'false' \ + --replace '/bin/true' 'true' \ + --replace '/usr/bin/printf' 'printf' + done + + # Fix warnings + substituteInPlace lib/ClusterShell/Task.py \ + --replace "notifyAll" "notify_all" + substituteInPlace tests/TaskPortTest.py lib/ClusterShell/Task.py \ + --replace "currentThread" "current_thread" ''; - checkInputs = [ nose bc hostname coreutils gnused ]; + propagatedBuildInputs = [ pyyaml ]; + + checkInputs = [ + bc + hostname + nose + ]; + + pythonImportsCheck = [ "ClusterShell" ]; # Many tests want to open network connections # https://github.com/cea-hpc/clustershell#test-suite # # Several tests fail on Darwin checkPhase = '' - for f in tests/*; do - substituteInPlace $f \ - --replace '/bin/hostname' '${hostname}/bin/hostname' \ - --replace '/bin/sleep' '${coreutils}/bin/sleep' \ - --replace '"sleep' '"${coreutils}/bin/sleep' \ - --replace '/bin/echo' '${coreutils}/bin/echo' \ - --replace '/bin/uname' '${coreutils}/bin/uname' \ - --replace '/bin/false' '${coreutils}/bin/false' \ - --replace '/bin/true' '${coreutils}/bin/true' \ - --replace '/usr/bin/printf' '${coreutils}/bin/printf' \ - --replace '"sed' '"${gnused}/bin/sed' \ - --replace ' sed ' ' ${gnused}/bin/sed ' - done - rm tests/CLIClushTest.py rm tests/TreeWorkerTest.py rm tests/TaskDistantMixin.py diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 2da762f26d7d..f3a24d70fbf0 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: buildPythonPackage rec { - version = "1.9.0"; + version = "1.9.2"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L4cARHNxjRl29XyeIzB8IW2vjL1H/6cRXvDOSJY8nGk="; + sha256 = "sha256-L7l70l1Da9Wf4HmIWqd6Oi8jz6zpxjWdRwAFNmWEkmI="; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index 00dae814b1c2..1dcf4e9b7a72 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "container-inspector"; - version = "31.1.0"; + version = "32.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "nexB"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-44sTZelCT6sGPyMteJZBcPRReTHuO1ZUxeQ0Vp7Zmqo="; + hash = "sha256-J9glnfs6l36/IQoIvE8a+Cw4B8x/6r5UeAU8+T/OiQg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix new file mode 100644 index 000000000000..2fd90b23bee0 --- /dev/null +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, certvalidator +, attrs +, six +, urllib3 +, cryptoparser +, requests +}: + +buildPythonPackage rec { + pname = "cryptolyzer"; + version = "0.8.1"; + + src = fetchPypi { + pname = "CryptoLyzer"; + inherit version; + sha256 = "sha256-FbxSjKxhzlpj3IezuLCQvoeZMG1q+OE/yn5vB/XE1rI="; + }; + + propagatedBuildInputs = [ + certvalidator + attrs + six + urllib3 + cryptoparser + requests + ]; + + doCheck = false; # Tests require networking + + pythonImportsCheck = [ "cryptolyzer" ]; + + meta = with lib; { + description = "Fast and flexible cryptographic protocol analyzer"; + homepage = "https://gitlab.com/coroner/cryptolyzer"; + license = licenses.mpl20; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix new file mode 100644 index 000000000000..cfac7f20376e --- /dev/null +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, six +, asn1crypto +, python-dateutil +}: + +buildPythonPackage rec { + pname = "cryptoparser"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-kJg8d1PoGIC0feefbJM8oyXcRyMGdg1wWkQUl/nSNCo="; + }; + + propagatedBuildInputs = [ + attrs + six + asn1crypto + python-dateutil + ]; + + pythonImportsCheck = [ "cryptoparser" ]; + + meta = with lib; { + description = "Fast and flexible security protocol parser and generator"; + homepage = "https://gitlab.com/coroner/cryptoparser"; + license = licenses.mpl20; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index f4bb93610266..ffe017698df1 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -70,5 +70,8 @@ in buildPythonPackage rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ hyphon81 ]; + + # See https://github.com/NixOS/nixpkgs/pull/179912#issuecomment-1206265922. + broken = true; }; } diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index fc275b16dfeb..cd69d5b1b5ed 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "2.7.0"; + version = "2.7.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Imn9wl5I7dzkUnVBzK2vhWOrf89FycVW4GvEYFeSujU="; + hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index a4f93c6ce2da..2932eb31e114 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 = "5.0.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-orJqS4SxEzgTbKnWRXpK8wcJkseoliOzSQCaEj8o6h0="; + sha256 = "sha256-JDoS7k4EwWEcDwdvv8MHTxrUCvxFrcZN5bokFMxOryk="; }; # tests assume the availability of a mysql/postgresql database diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 25a6e561789a..93498a35329c 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,20 +1,42 @@ { lib, buildPythonPackage, fetchPypi , django + +, azure-storage-blob +, boto3 +, dropbox +, google-cloud-storage +, libcloud +, paramiko }: buildPythonPackage rec { pname = "django-storages"; - version = "1.12.3"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "a475edb2f0f04c4f7e548919a751ecd50117270833956ed5bd585c0575d2a5e7"; + sha256 = "sha256-1P7Zi7+1NHCW3frCpmZdUTPHiLnsMsFW7F9/sCrlczU="; }; propagatedBuildInputs = [ django ]; - # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. - doCheck = false; + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + # timezone issues https://github.com/jschneier/django-storages/issues/1171 + substituteInPlace tests/test_sftp.py \ + --replace 'test_accessed_time' 'dont_test_accessed_time' \ + --replace 'test_modified_time' 'dont_test_modified_time' + ''; + checkInputs = [ + azure-storage-blob + boto3 + dropbox + google-cloud-storage + libcloud + paramiko + ]; + + pythonImportsCheck = [ "storages" ]; meta = with lib; { description = "Collection of custom storage backends for Django"; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 9d8c4633067b..f5fc366c5f58 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.1.5"; + version = "0.1.13"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SQ4w2Yqho5kbM4fRQkji69wOV8rYAIyFFve7pTEjgMM="; + hash = "sha256-dKqn7dMwPxKnLLBPJGgmD/2MFzdzrw7W9+w9Zi/9hsA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 916ddf52797f..7e6a37a12d90 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.1.5"; + version = "0.1.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vRQhlxaNy0bJTkNVlGZ+c9ocnzG/jeZYCxCabMuI5Ag="; + hash = "sha256-Edp2MRhe/eTUosL4XQfVbtwFWBg3D5RDWRb6r1C4MgE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 4b4397029dac..b6da5663f41a 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "0.0.8"; + version = "0.0.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pn1dmCyDxbMgXwUj9o//X3FZ/x0jz5ZKdTcEuKkeJ1s="; + hash = "sha256-ZUIyNg+PTj5CWC65RqB1whnB+pUp1yNJQj43iSBcyvU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Library for rendering DVC plots"; homepage = "https://github.com/iterative/dvc-render"; license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix new file mode 100644 index 000000000000..b71cf3175e2b --- /dev/null +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools-scm +, kombu +, shortuuid +, celery +, funcy +, pytest-celery +, pytest-mock +, pytest-test-utils +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dvc-task"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = version; + hash = "sha256-LXjfFuLifgzU+3/EevycVCR7LhYBOoN6xg4YeNo5R4M="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + kombu + shortuuid + celery + funcy + ]; + + checkInputs = [ + pytest-celery + pytest-mock + pytest-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dvc_task" + ]; + + meta = with lib; { + description = "Celery task queue used in DVC"; + homepage = "https://github.com/iterative/dvc-task"; + license = licenses.asl20; + maintainers = with maintainers; [ anthonyroussel ]; + }; +} diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 7b4c8151b234..23755f10652b 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -4,24 +4,26 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, tabulate }: buildPythonPackage rec { pname = "dvclive"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3kbP8eL/cO/aSAIVrbfGS+vwCTsWoCbNS2orExYt4aw="; + hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8="; }; propagatedBuildInputs = [ dvc-render + tabulate # will be available as dvc-render.optional-dependencies.table ]; # Circular dependency with dvc diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index f4fea05b4110..67195732e2d8 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.10.1"; + version = "6.10.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "v${version}"; - hash = "sha256-ql6qBnZXa0JL1qEXj2OzzP3onjYrMx6+Be6K3SDuWf4="; + hash = "sha256-Ru/yGND7xkpO3QH/cTMu4rxWUXSMsFx5u/V/rHY8k1E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix new file mode 100644 index 000000000000..25f956480681 --- /dev/null +++ b/pkgs/development/python-modules/etils/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, flit-core + + # tests +, chex +, jaxlib +, pytest-subtests +, pytest-xdist +, pytestCheckHook +, yapf + + # optional +, jupyter +, mediapy +, numpy +, importlib-resources +, typing-extensions +, zipp +, absl-py +, tqdm +, dm-tree +, jax +, tensorflow +}: + +buildPythonPackage rec { + pname = "etils"; + version = "0.6.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ZnckEFGDXQ2xHElHvK2Tj1e1HqECKQYk+JLx5OUbcOU="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + passthru.optional-dependencies = rec { + array-types = enp; + ecolab = [ jupyter numpy mediapy ] ++ enp ++ epy; + edc = epy; + enp = [ numpy ] ++ epy; + epath = [ importlib-resources typing-extensions zipp ] ++ epy; + epy = [ typing-extensions ]; + etqdm = [ absl-py tqdm ] ++ epy; + etree = array-types ++ epy ++ enp ++ etqdm; + etree-dm = [ dm-tree ] ++ etree; + etree-jax = [ jax ] ++ etree; + etree-tf = [ tensorflow etree ] ++ etree; + all = array-types ++ ecolab ++ edc ++ enp ++ epath ++ epy ++ etqdm + ++ etree ++ etree-dm ++ etree-jax ++ etree-tf; + }; + + doCheck = false; # disable tests until https://github.com/NixOS/nixpkgs/issues/185273 is resolved + + pythonImportsCheck = [ + "etils" + ]; + + checkInputs = [ + chex + jaxlib + pytest-subtests + pytest-xdist + pytestCheckHook + yapf + ] + ++ passthru.optional-dependencies.all; + + disabledTests = [ + "test_repr" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143 + "test_public_access" # requires network access + "test_resource_path" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143 + ]; + + meta = with lib; { + description = "Collection of eclectic utils for python"; + homepage = "https://github.com/google/etils"; + license = licenses.asl20; + maintainers = with maintainers; [ mcwitt ]; + }; +} diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 0c776abb4dbd..0a8db8611921 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -1,14 +1,14 @@ { lib -, fetchPypi , buildPythonPackage +, extractcode-7z +, extractcode-libarchive +, fetchPypi +, patch +, pytest-xdist +, pytestCheckHook +, pythonOlder , setuptools-scm , typecode -, patch -, extractcode-libarchive -, extractcode-7z -, pytestCheckHook -, pytest-xdist -, pythonOlder }: buildPythonPackage rec { @@ -41,21 +41,23 @@ buildPythonPackage rec { pytest-xdist ]; - # CLI test tests the cli which we can't do until after install disabledTestPaths = [ + # CLI test tests the CLI which we can't do until after install "tests/test_extractcode_cli.py" ]; - # test_uncompress_* wants to use a binary to extract instead of the provided library disabledTests = [ + # test_uncompress_* wants to use a binary to extract instead of the provided library "test_uncompress_lz4_basic" "test_extract_tarlz4_basic" "test_extract_rar_with_trailing_data" - # tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox + # Tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox "test_can_extract_qcow2_vm_image_as_tarball" "test_can_extract_qcow2_vm_image_not_as_tarball" "test_can_listfs_from_qcow2_image" "test_get_extractor_qcow2" + # WARNING patch:patch.py:450 inconsistent line ends in patch hunks + "test_patch_info_patch_patches_windows_plugin_explorer_patch" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 49f2eaed0c60..9e49e4a2239a 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.8.2"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-T8A6vU1m7nlHpTMC62IpgsQGh3ksuBp1ty4GkjN+2T8="; + hash = "sha256-HmCF1CNZOCdvuJv3qr3qAWIP9wYr6053FToQyJ1MpmQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index dea9e8a33970..ead7e92f09c6 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.11"; + version = "1.5.15"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-VEiG2m9rCla6i8Q2KrO+0pnhxyFh4o/eCU5rDlbTAbs="; + sha256 = "sha256-HseJoQBgwi00u/0FDAN6i+tL0DWxvDN2XvQl6WDyNoA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index d4748b6b119a..67cd4093374b 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fonttools , openstep-plist , ufoLib2 @@ -16,22 +16,21 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.0.6"; + version = "6.0.7"; format = "pyproject"; - src = fetchPypi { - pname = "glyphsLib"; - inherit version; - sha256 = "sha256-F4ev+o6vwDjV2H3z+DrwQZ7VLc1cSIjCWhgY7pcse1M="; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "glyphsLib"; + rev = "v${version}"; + sha256 = "sha256-PrHK9uEgs0DcNYW6EQ5Qw29CN4R2OcxOHrMeIswsxdA="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "glyphsLib" ]; - propagatedBuildInputs = [ fonttools openstep-plist @@ -44,6 +43,10 @@ buildPythonPackage rec { skia-pathops ]; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "glyphsLib" ]; + disabledTestPaths = [ "tests/builder/designspace_gen_test.py" # this test tries to use non-existent font "CoolFoundry Examplary Serif" "tests/builder/interpolation_test.py" # this test tries to use a font that previous test should made diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index ff684d597c30..f3ad7c4bfaa3 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f4wMYlmex0QrcJrl33VyOZgbURYnIjeWDR7rz4MzMJw="; + hash = "sha256-WI/mUT5UxVkA5h4gndEkTWtxgOXK5LHqmweiRVzb+5A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 7afa664c1a85..cf4b9671b731 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw="; + hash = "sha256-iAih4JXwEitPtAjMmMYK3zmb1X/vSNHKfN9M2h0Ka0o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 28e81a51d1cb..3b82086bf1ce 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.2"; + version = "2022.8.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-eFWjzp1WCPZM2BTmPeUgo4QF5c6RU9Z7OQ87t9d3vPI="; + sha256 = "sha256-9pQjo4FiHAD3EwWFL/LCxauUU0AbbvFR6OIi7iBYPPU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index 4ae01488db69..e6a8a68ddb9e 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json-stream"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J5DBa8zeandkDIXpEaRN6cneZIIG2aRHS5zjmM/H0Uw="; + hash = "sha256-ebB8l8H6yPLoCXmVOy60IijdBI61SEzJInC30aMe9Bk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 2cf5a6d4678d..9b188f9c2a59 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.0.3"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-cM8u27XSN4VzXONk+tQElZgT5XdShWXq0UtDg5JbF9o="; + hash = "sha256-CejgiCiW7an1GpKB5MUiA1Alkigv3RmfTq0um9pc93E="; }; propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; diff --git a/pkgs/development/python-modules/meteocalc/default.nix b/pkgs/development/python-modules/meteocalc/default.nix new file mode 100644 index 000000000000..6b18bba979ca --- /dev/null +++ b/pkgs/development/python-modules/meteocalc/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "meteocalc"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "malexer"; + repo = pname; + rev = version; + hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "meteocalc" + ]; + + meta = with lib; { + description = "Module for calculation of meteorological variables"; + homepage = "https://github.com/malexer/meteocalc"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index ec71527fa033..4e01e3ed6e8d 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , jinja2 , poetry-core , pytestCheckHook @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - hash = "sha256-rTSesG7XmIzu2DcJMVgZMlh0kRQ8jEB3t++rgf63Flw="; + hash = "sha256-6FoadV5QMZCJnF/eD3FXRsyP4MymO5nayJ/54PJXOB4="; }; nativeBuildInputs = [ @@ -36,15 +35,6 @@ buildPythonPackage rec { toml ]; - patches = [ - # Switch to poetry-core, https://github.com/networktocode/netutils/pull/115 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/networktocode/netutils/commit/edc8b06686db4e5b4c8c4deb6d0effbc22177b31.patch"; - sha256 = "sha256-K5oSbtOJYeKbxzbaZQBXcl6LsHQAK8CxBLfkak15V6M="; - }) - ]; - pythonImportsCheck = [ "netutils" ]; @@ -59,10 +49,10 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Library that is a collection of objects for common network automation tasks"; homepage = "https://github.com/networktocode/netutils"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix new file mode 100644 index 000000000000..c99e7c909cbb --- /dev/null +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -0,0 +1,49 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, orjson +, pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nextdns"; + version = "1.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-joPg5XZ5qEDnON96XCy5j4/OC+EkFw09Db4TH+ThsTY="; + }; + + propagatedBuildInputs = [ + aiohttp + orjson + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-error-for-skips + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nextdns" + ]; + + meta = with lib; { + description = "Module for the NextDNS API"; + homepage = "https://github.com/bieniu/nextdns"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 90b49e5e77dd..3706a4577bf5 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "4.5.1"; + version = "5.0.0"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - sha256 = "sha256-aGm5Rrk9lbq/IM0Wvgb8NaXsFNB+osHzFfSsbqXw2hc="; + sha256 = "sha256-n0aUbp+KcqBvFP49xBiaTT3TmGKDFSU5OjEZvbvniX4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index a2473ead5c30..89e708727311 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "4.0.1"; + version = "4.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iCHXiGKg3ENqw4cX1iNpVZAA944siKbFGKooo+KswsY="; + hash = "sha256-B0t9kNl55VsPC8ZXP7/lRDJ0Hfm4uhSEMGX9To4fjAU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index d6030f7d39c8..1a1fa63ff486 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.102"; + version = "2.1.103"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+jTO8IO+3j6kVBNjjCToRpiUmQTvBVmZTnNLbSHeNjw="; + hash = "sha256-B7zWM2Jrf9bRjrDWMDrP0KT7yzFpLnN7FXlGJtqJa/A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index f4082ad41257..0f450360301f 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.8.0"; + version = "9.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-iILDOpajLdTi+yPBNIr2+Sb1qBl0KCoSow2XBmDpFSI="; + hash = "sha256-uvozG1l+aGDs4nzOOjKUPScLLMNVop5u2Y89se8GvtY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 16f777aad94c..ef9fb2eff9be 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.21.0"; + version = "0.21.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-pw1apxqjKKv05Qw2VFN0cKit/3fas7PUb1wS/XsJruY="; + sha256 = "sha256-9tnLUzr7FWZlpN6mLLv1Q5EZ4wgquCC5nxGNyT63dzY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index d474306d2a3d..80db92ca6b2b 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.5.0"; + version = "6.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-zY40VLjjb9VBbw2579UPD/csk9o0AWIZMWRKxo78NrE="; + hash = "sha256-+x58aEvemav0Pz2jeICLFG36FTtZCu5dk/arb+j5nmo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-tree-sitter/default.nix b/pkgs/development/python-modules/py-tree-sitter/default.nix new file mode 100644 index 000000000000..9d7b82986976 --- /dev/null +++ b/pkgs/development/python-modules/py-tree-sitter/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "py-tree-sitter"; + version = "unstable-2022-02-08"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "py-tree-sitter"; + rev = "9c8261d36e55d9e4a6543dc9e570bfd7911ed7bf"; + sha256 = "sha256-YDe9m85LIPNumo9mrhMMotUspq/8B3t5kt2ScMJI+hY="; + fetchSubmodules = true; + }; + + pythonImportsCheck = [ "tree_sitter" ]; + + meta = with lib; { + homepage = "https://github.com/tree-sitter/py-tree-sitter"; + description = "Python bindings for tree-sitter"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix index d13a141e7e5e..91722ee89bca 100644 --- a/pkgs/development/python-modules/pycep-parser/default.nix +++ b/pkgs/development/python-modules/pycep-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycep-parser"; - version = "0.3.7"; + version = "0.3.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gruebel"; repo = "pycep"; rev = "refs/tags/${version}"; - hash = "sha256-5XivzmwcJi+DrrskM0u3XBXtC5j0pjXbWHI+8mciMXM="; + hash = "sha256-y6npvFh6/QykOAKK8ihTHDcv5dFd4lLU64UXPIhBELA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index bb457af2f4de..45d69f53b3f7 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "101"; + version = "103"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-U9jdKKT6RtvdJlWTwuUby0q7Qxa3mWUds8HQvsME9R4="; + hash = "sha256-nxM9airO1/CF4g9CeyV2WMxh22fBtu0fjz1R3X1zm+o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix index b34c4838cb8d..83e09317661f 100644 --- a/pkgs/development/python-modules/pyipma/default.nix +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyipma"; - version = "2.1.5"; + version = "3.0.0"; disabled = pythonOlder "3.7"; # Request for GitHub releases, https://github.com/dgomes/pyipma/issues/10 src = fetchPypi { inherit pname version; - sha256 = "0hq5dasqpsn64x2sf6a28hdmysygmcdq4in6s08w97jfvwc6xmym"; + sha256 = "sha256-LfnatA8CimHIXH3f3T4PatDBIEhh6vlQtI080iu8UEg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 9fb8401bdc47..039c793f20b2 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -1,23 +1,45 @@ -{ buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }: +{ lib +, buildPythonPackage +, cyrus_sasl +, fetchPypi +, libmemcached +, pythonOlder +, zlib +}: buildPythonPackage rec { - version = "1.6.1"; pname = "pylibmc"; + version = "1.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1sg7d9j0v6g3xg3finf4l1hb72c13vcyyi6rqrc9shbx903d93ca"; + hash = "sha256-QatJ05VAdnN0iRvvC+tSkcqXvrcEi3r3dSEGSVPATcA="; }; - buildInputs = [ libmemcached zlib cyrus_sasl ]; - setupPyBuildFlags = [ "--with-sasl2" ]; + buildInputs = [ + cyrus_sasl + libmemcached + zlib + ]; - # requires an external memcached server running + setupPyBuildFlags = [ + "--with-sasl2" + ]; + + # Requires an external memcached server running doCheck = false; + pythonImportsCheck = [ + "pylibmc" + ]; + meta = with lib; { description = "Quick and small memcached client for Python"; homepage = "http://sendapatch.se/projects/pylibmc/"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index fe4f854e53ea..e725a72b646c 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -45,6 +45,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'backoff = "^1.10.0"' 'backoff = "*"' + ''; + pythonImportsCheck = [ "pyoverkiz" ]; diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix new file mode 100644 index 000000000000..7ec64df2e1b8 --- /dev/null +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pysigma-backend-elasticsearch"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-backend-elasticsearch"; + rev = "v${version}"; + hash = "sha256-BEvYz0jTJifsNBrA4r16JkiFaERDj/zWKd9MbhcuCS8="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ + "sigma.backends.elasticsearch" + ]; + + disabledTests = [ + # Tests requires network access + "test_connect_lucene" + ]; + + meta = with lib; { + description = "Library to support Elasticsearch for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index 50b1e40852a2..c373a2fc6776 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.1.6"; + version = "0.1.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-Sg+AYoEbCmcqxw5dl8wmQcI+lFrAfFgDnQjiQh6r9Yc="; + hash = "sha256-5uWSXUKLSJbkJHvMmFGrS/yukBO/ax8seg+0ZqAHdaE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix new file mode 100644 index 000000000000..36e44c629855 --- /dev/null +++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pysigma-backend-elasticsearch +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pysigma-backend-opensearch"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-backend-opensearch"; + rev = "v${version}"; + hash = "sha256-5+/LOi7GHu8h9WhjpZ7bBc4aM41NiXrSrdGhbXdYMvw="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + pysigma-backend-elasticsearch + ]; + + checkInputs = [ + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ + "sigma.backends.opensearch" + ]; + + disabledTests = [ + # Tests requires network access + "test_connect_lucene" + ]; + + meta = with lib; { + description = "Library to support OpenSearch for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-backend-opensearch"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix new file mode 100644 index 000000000000..348dd6991a5b --- /dev/null +++ b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pysigma-pipeline-sysmon +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pysigma-backend-qradar"; + version = "0.1.9"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nNipsx-Sec"; + repo = "pySigma-backend-qradar"; + rev = "v${version}"; + hash = "sha256-b3e8cVrVFZgihhEk6QlUnRZigglczHUa/XeMvMzNYLk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pysigma-pipeline-sysmon + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.backends.qradar" + ]; + + meta = with lib; { + description = "Library to support Qradar for pySigma"; + homepage = "https://github.com/nNipsx-Sec/pySigma-backend-qradar"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index 7f7539973ab3..b44baae526b0 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.3.5"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "refs/tags/v${version}"; - hash = "sha256-W6wnxQPrtMDG5jctB7CMXr4kPIhZievFTBJCeSeDCWw="; + hash = "sha256-6XvKytODJll9BPeAhk6girwLibNJk+QEn2AV/WNqnyI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index 14129f148b19..d6207f7082a2 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "0.1.6"; + version = "0.1.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "v${version}"; - hash = "sha256-5xX7NwM+Us0ToJa2miAw9KsCt2T+TqBnqHtwphZNxJI="; + hash = "sha256-cALpOAn+zf1w7KYExBVFebRwNYMjiQPE7fdB1x7gHZw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index d308d72d805f..23c9b5eef4d5 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-sysmon"; - version = "0.1.6"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "v${version}"; - hash = "sha256-hKXnM3iqt6PnV+cMV3gEleBChd263sy2DovpIKg22fs="; + hash = "sha256-OwWUt1O8436kmuaqv8Ec6485NLkVztLjGIWF2SPRtKA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index 7620f84a97e5..98808b6090a2 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-windows"; - version = "0.1.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-windows"; rev = "refs/tags/v${version}"; - hash = "sha256-ATDWhHY9tjuQbfIFgoGhz8qsluH9hTSI9zdPmP8GPWE="; + hash = "sha256-/DUhgvcGhk28HRDCi96K1NH6MHNB1WogfuMVCgNbot4="; }; nativeBuildInputs = [ @@ -29,11 +29,6 @@ buildPythonPackage rec { pysigma ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pysigma = "^0.5.0"' 'pysigma = "^0.6.0"' - ''; - checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index a125c68dbf98..b75df650acdf 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.6.8"; + version = "0.7.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-Jq37/9w1GHr+GZ8Fvftmfz2XkL3zUpTjbDlokrUoLtw="; + hash = "sha256-yXzYNBD39dPd2f5Gvmo5p0cVlTy38q1jnBL+HjAxmB8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index 91cfdcb4b69c..63e8ccf517d0 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.12"; + version = "0.3.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = "refs/tags/${version}"; - sha256 = "sha256-NEdlhp0Bjbb1oRCFf0OPEuFlLE2JjRWYWwnTaHozPr0="; + sha256 = "sha256-ps83Jo1H5hkCZ6kmuSSEC+UAdul84JJ7syMJq95Z2wQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 141b0e486327..903f09acb225 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.17.3"; + version = "0.18.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-vyfIt9Tkl6jpO//xizraqBwwwGmuJjkFGU3TzN3dqhQ="; + hash = "sha256-lj2ud+Bp4z154XfPPJ6ocA9mlmRtlHOZRaOeDLQfYyo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 6a7495041f7a..c9b344e5acf9 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.3.3"; + version = "4.3.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-+0H7Ojy5/K0EllNTSvGLNIZlglcMh76r9XHxFMUwrrY="; + sha256 = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 56026e10fe0b..a6b2bc0d247a 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.7.0"; + version = "5.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-POYD4w0iBAdaN2L4cpLJz1aCE9J0Iob//VN94/5lJLw="; + sha256 = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index b00cc63da1fa..8942d44e0ced 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.23.0"; + version = "0.24.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - hash = "sha256-DMYSv66PVBuOHuIio06OLrtGP0q7PeuDGKK+OznaLec="; + hash = "sha256-Ib9Rb6RkhUe4WDDHVLgaOYOleSFj7LFys6pW3WgxMQo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index c63bcbf39962..fdcfe0495377 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -71,6 +71,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov=pyunifiprotect --cov-append" "" + substituteInPlace setup.cfg \ + --replace "pydantic!=1.9.1" "pydantic" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 4751ded3f39a..b8d4fee93c2a 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.37.1"; + version = "2.37.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nWiaKfs2eVnwyA+UACcB/OImWSb5Nn6n/8gcGPNevM4="; + sha256 = "sha256-woHYMzk1xLDfJ14UycPlbaMG8mHeBixqDvs9vO0TKQI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 4742143edad1..b9101e9888b3 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; rev = "v${version}"; - sha256 = "sha256-qMVoVzqXALhPWVKLzu+VqihHPN7J+pMhKnXdb+ow0zw="; + sha256 = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc="; }; nativeBuildInputs = [ pkgconfig pkg-config ]; @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "A python wrapper for libvips"; homepage = "https://github.com/libvips/pyvips"; license = licenses.mit; - maintainers = with maintainers; [ ccellado ]; + maintainers = with maintainers; [ ccellado anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 4916afc5861a..2dcb884931d9 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "rdkit"; - version = "2022.03.3"; + version = "2022.03.4"; src = let @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - sha256 = "sha256-YZq1JKDlCQVvjv7+XpEhD/wfFcQ5m3i5VO4rNQ3ONRQ="; + sha256 = "13aga2fy1hgldb229n16niv30n3lwlypd7xv16smpbgw0cp1xpp2"; }; unpackPhase = '' diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 71b8ecad8eb1..e9d504f5bc29 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.07.3"; + version = "2022.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-z7FrVnGQjpTjdIX/gatP/ZjzOLaj2D8XsQ+UTYBOHgE="; + sha256 = "sha256-JPJ+8h3r1C2fHxVPsQgk0ZuG7VqKfBb4qthAG+GCvcE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index e2115cb1988a..77d4cc5aa280 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.101.1"; + version = "2.103.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f3bmx8iJkTJ6WSl3RkQ19cbOKB4UrhoAP8pEYEtyr74="; + hash = "sha256-0iXIUWvoL6+kT+KaJq7yzdEzYA0orKBbQkGAVUYcSKk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 3566be620e28..68052145766c 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, ply, toml }: +{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, ply, toml, fetchpatch }: buildPythonPackage rec { pname = "sip"; @@ -15,6 +15,13 @@ buildPythonPackage rec { # and PIP will refuse to install the resulting wheel. # remove once upstream fixes this, hopefully in 6.5.2 ./fix-manylinux-version.patch + + # fix issue triggered by QGIS 3.26.x, already fixed upstream + # in SIP, waiting for release past 6.6.2 + (fetchpatch { + url = "https://riverbankcomputing.com/hg/sip/raw-diff/323d39a2d602/sipbuild/generator/parser/instantiations.py"; + hash = "sha256-QEQuRzXA+wK9Dt22U/LgIwtherY9pJURGJYpKpJkiok="; + }) ]; propagatedBuildInputs = [ packaging ply toml ]; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 87696e3acd33..d3a8e39d48ea 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.7"; + version = "1.6.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J0USsiCWaysQOir/wpkw6GT1ILckjK7EUiY541aoahA="; + sha256 = "sha256-OWIuYAms4SXQXVr0Wx8y7pne13IBclfq0P3VTy91Kz8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 452343e443fa..494338cdde10 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eRwaQZwqlw+U6QnJqCypeihfrZuSwdETt8aNyICfdck="; + hash = "sha256-0IWz6UUKVVCRL0dsbbsrr6Ep5IXiTW9AR8UJT/CNXeI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index 7f1a8d8facd7..97e03ad4b036 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.3.0"; + version = "1.4.1"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-o4mYuV0buZVk3J3/rxXk6UU3YfJ5DS3UFHpK1fusEHg="; + sha256 = "sha256-SMJHBsI7tCYhc7b6Seq7EK+hW4QS8UKDEgVJUXzPoxQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix index e814f01320e4..85cbff5a1d9a 100644 --- a/pkgs/development/python-modules/tesla-wall-connector/default.nix +++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "einarhauks"; repo = pname; rev = version; - sha256 = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE="; + hash = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE="; }; nativeBuildInputs = [ @@ -40,13 +40,17 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'backoff = "^1.11.1"' 'backoff = "*"' + ''; pythonImportsCheck = [ "tesla_wall_connector" ]; meta = with lib; { - description = "Python library for communicating with a Tesla Wall Connector"; + description = "Library for communicating with a Tesla Wall Connector"; homepage = "https://github.com/einarhauks/tesla-wall-connector"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 2b074168c59b..ebc0f4e6ecd1 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-wAhi8TW0rOeJ3QWjmfLqJ3cKnLZShMekyQ6j7I2uwGY="; + sha256 = "sha256-BAayVUmp2dsaWzH8dvTjZCKGnpc6uY6Y/6gWYIgaES8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index ef32e540c7f1..3c817dd7080d 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.12.9"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rEWMPK07AqFEd/5ax/kIh49QSlbYqjlSxDDS6Q5ZaLU="; + sha256 = "sha256-hmfjsyOyFJXw/B08g/ZkdN746vK5ZgmNQqo81gDUQA0="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index a604b3e92eed..f8b663abe6fe 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.6"; + version = "2.28.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zzODu9eTlL8FGgqSAtaDH6li8Yb5I8F498BZ40JL0A4="; + sha256 = "sha256-ep97FS1ZShwY3UkyzdJZa4777t/XPKpOSrs3VYBbRoU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index d164c58a96f2..a22bb03ad73c 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 = "63.2.2"; + version = "63.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qaoMAdXzRDzVRAJtX/yXuV3a33MdqxNBnDk9Q/2GF8A="; + sha256 = "sha256-+VQEQDQGbNPYzszIfi1c6+epbJ+HmW9hw8apLNVsyKQ="; }; # 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 6907fb7a62b6..b17d83a35190 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.19"; + version = "1.26.22"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-RbMHvbc9LqwML7E4bal+UcmufxR07zX2ECTDCEtr83E="; + hash = "sha256-sFr5DnOInmiAlACKl8qVeI24vzc24ndv1D+2sXFIXZQ="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 3511d16962ed..adb55bd0726d 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "molobrakos"; repo = "volvooncall"; rev = "v${version}"; - hash = "sha256-HLSanXJs1yPSgYo4oX0zJtrV5sKkxV2yLPhc2dVRHY8="; + hash = "sha256-udYvgKj7Rlc/hA86bbeBfnoVRjKkXT4TwpceWz226cU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index 8ab9cc6fd9dc..fcb4d938934d 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.5"; + version = "0.1.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Jm3+WMGuYc910TNDVzHjYcbNcts668D3xYORXxozWqA="; + hash = "sha256-gLA6tT6ZUMjb2ZF5t6DdI5nqiX2Uxatj3ThmQ+VZu9A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 7cb664d77fcd..ba48de4de7e1 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -5,19 +5,19 @@ , pygobject3 , gtk3 , gobject-introspection -, xapps +, xapp , polkit }: buildPythonPackage rec { pname = "xapp"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-UC+0nbf+SRQsF5R0LcrPpmNbaoRM14DC82JccSpsKsY="; + hash = "sha256-ntjJ/O6HiRZMsqsuQY4HLM4fBE0aWpn/L4n5YCRlhhg="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { pygobject3 gtk3 gobject-introspection - xapps + xapp polkit ]; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 3e93a01b57ba..8a320eb103a0 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.25"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O7M9Shh8jp2fTaVQPM8mgh1pkv75wn22PFpxJVenbAo="; + sha256 = "sha256-7+4Icg3E6xrWmxObNzNuDc+MXJ9rnbgBHMK4uPBJeuY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zadnegoale/default.nix b/pkgs/development/python-modules/zadnegoale/default.nix new file mode 100644 index 000000000000..7d47cb347c8c --- /dev/null +++ b/pkgs/development/python-modules/zadnegoale/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, dacite +, orjson +, pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zadnegoale"; + version = "0.6.5"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-ubBN4jvueNgReNbS+RXNDNHID0MF/rvQnb0+F4/DZaU="; + }; + + propagatedBuildInputs = [ + aiohttp + dacite + orjson + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-error-for-skips + pytestCheckHook + ]; + + pythonImportsCheck = [ + "zadnegoale" + ]; + + meta = with lib; { + description = "Python wrapper for getting allergen concentration data from Żadnego Ale servers"; + homepage = "https://github.com/bieniu/zadnegoale"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 7c87b09c3bf4..4373d9a2d062 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,5 +1,6 @@ -{ stdenv -, lib +{ lib +, stdenv +, async-timeout , buildPythonPackage , fetchFromGitHub , ifaddr @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.38.7"; + version = "0.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,10 +20,11 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - hash = "sha256-Q/rrN7xzbehwMa3yFVP5F9ztUcJCDsfBIGf0b/GPzLM="; + hash = "sha256-R6q5fq8P91q+qhy+lOCuoKUMFBvkKFsKLVCoqIy7Qpk="; }; propagatedBuildInputs = [ + async-timeout ifaddr ]; @@ -39,7 +41,7 @@ buildPythonPackage rec { "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" "test_integration_with_listener_ipv6" - # Starting with 0.38.7: AssertionError: assert [('add', '_ht..._tcp.local.')] + # Starting with 0.39.0: AssertionError: assert [('add', '_ht..._tcp.local.')] "test_service_browser_expire_callbacks" ] ++ lib.optionals stdenv.isDarwin [ "test_lots_of_names" diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index d577b62a193a..e7c38c1b0234 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -8,13 +8,13 @@ , pkgsMusl # for passthru.tests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20220208"; + version = "20220726"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - hash = "sha256-ewDB4UYrLh5Upk2ND88n/HfursPxOSDv+NlST/BZ1to="; + url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA="; }; # Make tests work with musl @@ -60,10 +60,15 @@ stdenv.mkDerivation rec { ]; # Disabled tests: + # opt-chdir: ofborg complains about it somehow + # opt-keep-going-indirect: not yet known # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, # implicit paths - # opt-chdir: ofborg complains about it somehow - BROKEN_TESTS = "varmod-localtime opt-chdir"; + BROKEN_TESTS = builtins.concatStringsSep " " [ + "opt-chdir" + "opt-keep-going-indirect" + "varmod-localtime" + ]; buildPhase = '' runHook preBuild @@ -105,9 +110,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ thoughtpolice AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # ofborg complains }; passthru.tests.bmakeMusl = pkgsMusl.bmake; -} +}) # TODO: report the quirks and patches to bmake devteam (especially the Musl one) diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index a5ba3ea76c47..eb6e79644674 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.2.27"; + version = "0.2.28"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - sha256 = "sha256-NOdr/C2a4A1uC9al2gkrGKJ01/R9TUpHjwuQNpSGHCo="; + sha256 = "sha256-f9Oq9+FiGaL71RGR2eerHM9bBbNK7ysZsCWvOZo5u8g="; }; - vendorSha256 = "sha256-+TKdLtR5W4RtOs1qpA1EVc6RS6/SQT8OWNwwllSsBqQ="; + vendorSha256 = "sha256-e++fNcgdQUPnbKVx7ncuf7NGc8eVdli5/rB7Jw+D/Ds="; subPackages = [ "cmd/dagger" diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e70d9b6347ea..bd1e4c5db299 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "15.2.0"; + version = "15.2.1"; in buildGoModule rec { inherit version; @@ -14,13 +14,13 @@ buildGoModule rec { "-X ${commonPackagePath}.REVISION=v${version}" ]; - vendorSha256 = "sha256-0lp4Hd6j7G59clWxLfz8GfQEmpXmhuGzmgX2ws/VJeQ="; + vendorSha256 = "sha256-weT4Ed/VNTLovxUu2xCdHDqxY7v/5Wi3WsWlNDWYLLc="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-1OflKz8AV8vSCkNBWGteIbXqbueAYNeAdp9nL3lgD8A="; + sha256 = "sha256-HaFxMNREHTtnbIuQUXCinhd4lhcnkLkacLczeySsfWQ="; }; patches = [ diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm/default.nix index e3efa50a857b..3fc916f9082d 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "cpm"; - version = "0.35.3"; + version = "0.35.4"; src = fetchurl { url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; - sha256 = "sha256-Ft9iPBo31xzFEoqSGETzOTCRULR6GqsUQYrzdNHOpiU="; + sha256 = "sha256-Ve+NhDAiAzH4x3ZUZjQkuZ69n65ljGc2h6cR62xnf+0="; }; dontUnpack = true; diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix index 1dbd242b1709..d68786a9ee68 100644 --- a/pkgs/development/tools/database/trino-cli/default.nix +++ b/pkgs/development/tools/database/trino-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "trino-cli"; - version = "390"; + version = "392"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-rqs2rWmr5hv4F/tc7xWBgkNht/l3meJUnpEyOn2cU48="; + sha256 = "sha256-yqTKXmcRgsSSr4KAZ2NV7FrCGIxCU/V14XFEZmUTj1s="; }; dontUnpack = true; diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/development/tools/ec2-metadata-mock/default.nix index 3967a061de9e..7fd87e839be5 100644 --- a/pkgs/development/tools/ec2-metadata-mock/default.nix +++ b/pkgs/development/tools/ec2-metadata-mock/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ec2-metadata-mock"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ec2-metadata-mock"; rev = "v${version}"; - sha256 = "sha256-H10aZB1xx2Q3cItmqmGAUiVgr+9+VloH3pzDrzP2MQw="; + sha256 = "sha256-hYyJtkwAzweH8boUY3vrvy6Ug+Ier5f6fvR52R+Di8o="; }; vendorSha256 = "sha256-T45abGVoiwxAEO60aPH3hUqiH6ON3aRhkrOFcOi+Bm8="; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index aea6d6ac22d4..cbf91a17bc56 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.51"; + version = "0.14.53"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-IzFjbKX4DoRo57i9ogGCuvZpamk+brkKnsI6Yy843VA="; + sha256 = "sha256-o92OVyaiOXtJOAT5WJiclOBt2f1GK3t9vD3cjw1nv+8="; }; vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/build-support/go/garble.nix b/pkgs/development/tools/garble/default.nix similarity index 100% rename from pkgs/build-support/go/garble.nix rename to pkgs/development/tools/garble/default.nix diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index d11576a5e01e..c03511011220 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib, installShellFiles }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "golangci-lint"; - version = "1.47.3"; + version = "1.48.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-uY8D3VqcaLEi/QChH/kfY9SF3H2wmiScm3m6OGeWTu8="; + sha256 = "sha256-6nXn1+LsjiXjCeHhvVjyU1F6IJ8YP1Oj+5tDRhiMuUc="; }; - vendorSha256 = "sha256-F7arWygCbh9Z6zemPt+0T6wWMcP2Wg5A1qC6A7mYngI="; + vendorSha256 = "sha256-4ZqO4NEZfIhl/hWcB0HeRbp2jQ/WhMBpTLmP2W7X7xM="; doCheck = false; diff --git a/pkgs/development/tools/kubectx/bump-golang-x-sys.patch b/pkgs/development/tools/kubectx/bump-golang-x-sys.patch new file mode 100644 index 000000000000..ec838728410a --- /dev/null +++ b/pkgs/development/tools/kubectx/bump-golang-x-sys.patch @@ -0,0 +1,25 @@ +diff --git a/go.mod b/go.mod +index c523783..1ef8d00 100644 +--- a/go.mod ++++ b/go.mod +@@ -9,6 +9,7 @@ require ( + github.com/imdario/mergo v0.3.9 // indirect + github.com/mattn/go-isatty v0.0.12 + github.com/pkg/errors v0.9.1 ++ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c + k8s.io/apimachinery v0.21.0-alpha.1 + k8s.io/client-go v0.21.0-alpha.1 +diff --git a/go.sum b/go.sum +index 8f16b5a..7426c68 100644 +--- a/go.sum ++++ b/go.sum +@@ -293,6 +293,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w + golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= + golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= ++golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 1de22705ebda..dfdfebcf3eab 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -11,7 +11,11 @@ buildGoModule rec { sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM="; }; - vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg="; + patches = [ + ./bump-golang-x-sys.patch + ]; + + vendorSha256 = "sha256-p4KUBmJw6hWG1J2qwg4QBbh6Vo1cr/HQz0IqytIDJjU="; nativeBuildInputs = [ installShellFiles ]; @@ -24,6 +28,5 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://github.com/ahmetb/kubectx"; maintainers = with maintainers; [ jlesquembre ]; - platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index aa7cced5016d..b915cdb65ced 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, getconf, - ocaml, unzip, ncurses, curl, aspcud, bubblewrap + ocaml, unzip, ncurses, curl, bubblewrap }: assert lib.versionAtLeast ocaml.version "4.02.3"; @@ -119,7 +119,7 @@ in stdenv.mkDerivation { mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index c914bac8b5c6..2e816da8cc4d 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -21,12 +21,12 @@ chomp $OPAM_RELEASE_SHA256; my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG"; my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`; -my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" {>= "(.*)"}$/m +my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" \{>= "(.*)"}$/m or die "could not parse ocaml version bound\n"; print <<"EOF"; { stdenv, lib, fetchurl, makeWrapper, getconf, - ocaml, unzip, ncurses, curl, aspcud, bubblewrap + ocaml, unzip, ncurses, curl, bubblewrap }: assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION"; @@ -114,7 +114,7 @@ print <<'EOF'; mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 56ef62ce1346..8ee80ec448c9 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xZakVuw+QKzFh6wsnZbltLEEwyb9WcMvVWEzKnS9aWc="; + sha256 = "sha256-kHnRzjhrUPXgDTBu95Ytrhx5lO5ogm9PMzeANfLcWHQ="; # 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; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorSha256 = "sha256-Fpl5i+qMvJ/CDh8X0gps9C/BxF7/Uvln+3DpVOXE0WQ="; + vendorSha256 = "sha256-sa4OkTSRyoPFXTGmjpiqBug+EKgxkcJrNxQwbTRfN2A="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.2.1.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.2.2.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 8a4832dd6fe2..a19393b7e227 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.28"; + version = "1.0.29"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-PiVHA9dcndL301xTUEG4k2hqa4X7mn909/l+oxdkhw4="; + sha256 = "sha256-HK6FnB8S3rVTN9p7wYvmMUmdNmYQ738ua5491R6/KME="; }; - cargoSha256 = "sha256-dfCACQszWhEnTLZFBe64CFrG+eoz0kmrquq7TnHkji4="; + cargoSha256 = "sha256-hqg4Htf8nRRPLm9xyJgb2T8ycsPUZmrRMvk4E5f17Fc="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 3e5c8e2b9eab..a0e458bbd6e8 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-xymDV/FHJABw1s94m8fl8D51PQwkF5dX+1XD96++RX8="; + sha256 = "sha256-GxlUhfzGIKHSTNcSme/mQums6yI4ev8V0L1bXAWt8pw="; }; - cargoSha256 = "sha256-2szgR9N3PGjGCIjqgtGNFSnzfSv57sGfslZ/PZyqMjI="; + cargoSha256 = "sha256-nCMUnhxNAMdk3Mi6eebrViQ1G5jcc3jk+CPRTUvcWRc="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ]; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index d5ec6f1228bf..f34efb944180 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "sha256-wAPZVDhT6Z8hTOYgbrCGu9uhxNhBLuygAsSpwVGzZxc="; + sha256 = "sha256-4XJ0dNbACCcbN5+d05H++jlRKuL+au3iOLMoBR/whOs="; }; - cargoSha256 = "sha256-YUIeph0aacrC4OXb5qcjM5CSvKZEG+gYk6r45urmUeg="; + cargoSha256 = "sha256-sIe+uVCzTVUTePNIBekCA/uwRG+GWGonnvzhRDwh5Y4="; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 6d5155b769dc..8dce87bb301d 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.19": { - "url": "https://piston-data.mojang.com/v1/objects/8399e1211e95faa421c1507b322dbeae86d604df/server.jar", - "sha1": "8399e1211e95faa421c1507b322dbeae86d604df", - "version": "1.19.1", + "url": "https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar", + "sha1": "f69c284232d7c7580bd89a5a4931c3581eae1378", + "version": "1.19.2", "javaVersion": 17 }, "1.18": { diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index f765961266ed..4c537d4dd372 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11, cmake, imagemagick , pkg-config, perl, wrapGAppsHook +, isMobile ? false }: stdenv.mkDerivation rec { @@ -26,6 +27,8 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; + NIX_CFLAGS_COMPILE = if isMobile then "-DSTYLUS_BASED" else ""; + buildInputs = [ gtk3 libX11 ]; postInstall = '' diff --git a/pkgs/games/wargus/default.nix b/pkgs/games/wargus/default.nix index fda4f792c7b2..ca4b70923eca 100644 --- a/pkgs/games/wargus/default.nix +++ b/pkgs/games/wargus/default.nix @@ -1,11 +1,30 @@ { stdenv, lib, callPackage, fetchFromGitHub +, fetchurl, runCommand, unzip, bchunk, p7zip , cmake, pkg-config, makeWrapper , zlib, bzip2, libpng -, dialog, python3, cdparanoia +, dialog, python3, cdparanoia, ffmpeg }: let stratagus = callPackage ./stratagus.nix {}; + + dataDownload = fetchurl { + url = "https://archive.org/download/warcraft-ii-tides-of-darkness_202105/Warcess.zip"; + sha256 = "0yxgvf8xpv1w2bjmny4a38pa3xcdgqckk9abj21ilkc5zqzqmm9b"; + }; + + data = runCommand "warcraft2" { + buildInputs = [ unzip bchunk p7zip ]; + meta.license = lib.licenses.unfree; + } '' + unzip ${dataDownload} "Warcraft.II.Tides.of.Darkness/Warcraft II - Tides of Darkness (1995)/games/WarcrafD/cd/"{WC2BTDP.img,WC2BTDP.cue} + bchunk "Warcraft.II.Tides.of.Darkness/Warcraft II - Tides of Darkness (1995)/games/WarcrafD/cd/"{WC2BTDP.img,WC2BTDP.cue} WC2BTDP + rm -r Warcraft.II.Tides.of.Darkness + 7z x WC2BTDP01.iso + rm WC2BTDP*.{iso,cdr} + cp -r DATA $out + ''; + in stdenv.mkDerivation rec { pname = "wargus"; @@ -15,10 +34,10 @@ stdenv.mkDerivation rec { owner = "wargus"; repo = "wargus"; rev = "v${version}"; - sha256 = "0dibm68jxaqzgzcyblfj2bmwyz9v5ax0njnnbvak7xjk1zlh11sx"; + sha256 = "sha256-yJeMFxCD0ikwVPQApf+IBuMQ6eOjn1fVKNmqh6r760c="; }; - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ffmpeg ]; buildInputs = [ zlib bzip2 libpng ]; cmakeFlags = [ "-DSTRATAGUS=${stratagus}/games/stratagus" @@ -26,7 +45,12 @@ stdenv.mkDerivation rec { ]; postInstall = '' makeWrapper $out/games/wargus $out/bin/wargus \ - --prefix PATH : ${lib.makeBinPath [ "$out" cdparanoia python3 ]} + --prefix PATH : ${lib.makeBinPath [ "$out" ]} + substituteInPlace $out/share/applications/wargus.desktop \ + --replace $out/games/wargus $out/bin/wargus + + $out/bin/wartool -v -r ${data} $out/share/games/stratagus/wargus + ln -s $out/share/games/stratagus/wargus/{contrib/black_title.png,graphics/ui/black_title.png} ''; meta = with lib; { diff --git a/pkgs/games/wargus/stratagus.nix b/pkgs/games/wargus/stratagus.nix index aa050442bfdb..fc4f23427994 100644 --- a/pkgs/games/wargus/stratagus.nix +++ b/pkgs/games/wargus/stratagus.nix @@ -1,25 +1,25 @@ { lib, stdenv, fetchFromGitHub , cmake, pkg-config, makeWrapper , zlib, bzip2, libpng, lua5_1, toluapp -, SDL, SDL_mixer, SDL_image, libGL +, SDL2, SDL2_mixer, SDL2_image, libGL }: stdenv.mkDerivation rec { pname = "stratagus"; - version = "2.4.3"; + version = "3.3.1"; src = fetchFromGitHub { owner = "wargus"; repo = "stratagus"; rev = "v${version}"; - sha256 = "128m5n9axq007xi8a002ig7d4dyw8j060542x220ld66ibfprhcn"; + sha256 = "sha256-q8AvIWr/bOzI0wV0D2emxIXYEKDYmFxbtwr2BS+xYfA="; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib bzip2 libpng lua5_1 toluapp - (lib.getDev SDL) SDL_image SDL_mixer libGL + (lib.getDev SDL2) SDL2_image SDL2_mixer libGL ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow" diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index 517a8cc65328..a07748fbe263 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rkdeveloptool"; - version = "unstable-2021-02-03"; + version = "unstable-2021-04-08"; src = fetchFromGitHub { owner = "rockchip-linux"; repo = "rkdeveloptool"; - rev = "e607a5d6ad3f6af66d3daf3f6370e6dc9763a20d"; - sha256 = "08m0yfds5rpr5l0s75ynfarq3hrv94l3aadld17cz5gqapqcfs2n"; + rev = "46bb4c073624226c3f05b37b9ecc50bbcf543f5a"; + sha256 = "eIFzyoY6l3pdfCN0uS16hbVp0qzdG3MtcS1jnDX1Yk0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ libusb1 ]; # main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5 - CPPFLAGS = "-Wno-error=format-truncation"; + CPPFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ]; meta = with lib; { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index af7726458248..5475a565b09b 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,20 +1,30 @@ -{ stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables -, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config -, which, python3, makeWrapper, docbook_xml_dtd_45, perl }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, protobuf, protobufc, asciidoc, iptables +, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2 +, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd }: stdenv.mkDerivation rec { pname = "criu"; - version = "3.15"; + version = "3.17.1"; - src = fetchurl { - url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; - sha256 = "09d0j24x0cyc7wkgi7cnxqgfjk7kbdlm79zxpj8d356sa3rw2z24"; + src = fetchFromGitHub { + owner = "checkpoint-restore"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0B0cdX5bemy4glF9iWjrQIXIqilyYcCcAN9x4Jjrwzk="; }; + patches = [ + # Fixes redefinition of rseq headers + (fetchpatch { + url = "https://github.com/checkpoint-restore/criu/commit/1e6e826ffb7ac05f33fa123051c2fc2ddf0f68ea.patch"; + hash = "sha256-LJjk0jQ5v5wqeprvBMpxhjLXn7v+lSPldEGgazGUM44="; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ]; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; - propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; + buildInputs = [ protobuf asciidoc xmlto libpaper libnl libcap libnet nftables libbsd ]; + propagatedBuildInputs = [ protobufc ] ++ (with python3.pkgs; [ python python3.pkgs.protobuf ]); postPatch = '' substituteInPlace ./Documentation/Makefile \ @@ -39,7 +49,8 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/criu \ - --prefix PATH : ${lib.makeBinPath [ iptables ]} + --set-default CR_IPTABLES ${iptables}/bin/iptables \ + --set-default CR_IP_TOOL ${iproute2}/bin/ip wrapPythonPrograms ''; diff --git a/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/pkgs/os-specific/linux/intel-cmt-cat/default.nix index af194d9dc1ca..669f79fab49b 100644 --- a/pkgs/os-specific/linux/intel-cmt-cat/default.nix +++ b/pkgs/os-specific/linux/intel-cmt-cat/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "4.3.0"; + version = "4.4.0"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; rev = "v${version}"; - sha256 = "sha256-9XZuSHWcAFN5otBfG8xE4gTIDixw7mYnHT/CTjyOvwo="; + sha256 = "sha256-THP0ie9Ta0iNcAJYCRXMajqYBIFuT67kGMDakL4vIZc="; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index f04ccc569dff..71bafb7abd9b 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, kernel, fetchurl }: stdenv.mkDerivation rec { - name = "xone-${version}-${kernel.version}"; - version = "0.2"; + pname = "xone"; + version = "0.3"; src = fetchFromGitHub { owner = "medusalix"; - repo = "xone"; - rev = "v${version}"; - sha256 = "sha256-m4305Xl5w4nyAVqubjwWsiyPDVtfGykjlSW2eKEytVk="; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE="; }; setSourceRoot = '' diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index ff07116e2bd2..3de8fef11888 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/pkgs/servers/etcd/3.5.nix @@ -1,15 +1,18 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin }: let - etcdVersion = "3.5.4"; - etcdSrc = fetchFromGitHub { + version = "3.5.4"; + + src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; - rev = "v${etcdVersion}"; + rev = "v${version}"; sha256 = "sha256-mTQHxLLfNiihvHg5zaTeVNWKuzvE0KBiJdY3qMJHMCM="; }; - commonMeta = with lib; { + CGO_ENABLED = 0; + + meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; @@ -19,60 +22,50 @@ let etcdserver = buildGoModule rec { pname = "etcdserver"; - version = etcdVersion; + + inherit CGO_ENABLED meta src version; vendorSha256 = "sha256-4djUQvWp9hScua9l1ZTq298zWSeDYRDojEt2AWmarzw="; - src = etcdSrc; modRoot = "./server"; postBuild = '' mv $GOPATH/bin/{server,etcd} ''; - CGO_ENABLED = 0; - # We set the GitSHA to `GitNotFound` to match official build scripts when # git is unavailable. This is to avoid doing a full Git Checkout of etcd. # User facing version numbers are still available in the binary, just not # the sha it was built from. ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ]; - - meta = commonMeta; }; etcdutl = buildGoModule rec { pname = "etcdutl"; - version = etcdVersion; + + inherit CGO_ENABLED meta src version; vendorSha256 = "sha256-nk56XGpNsDwcGrTKithKGnPCX0NhpQmzNSXHk3vmdtg="; - src = etcdSrc; modRoot = "./etcdutl"; - - CGO_ENABLED = 0; - - meta = commonMeta; }; etcdctl = buildGoModule rec { pname = "etcdctl"; - version = etcdVersion; + + inherit CGO_ENABLED meta src version; vendorSha256 = "sha256-WIMYrXfay6DMz+S/tIc/X4ffMizxub8GS1DDgIR40D4="; - src = etcdSrc; modRoot = "./etcdctl"; - - CGO_ENABLED = 0; - - meta = commonMeta; }; in symlinkJoin { - name = "etcd"; - version = etcdVersion; - meta = commonMeta; + name = "etcd-${version}"; + + inherit meta version; + + passthru = { inherit etcdserver etcdutl etcdctl; }; paths = [ etcdserver diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 46521da88539..40b5dc7e0b65 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -21,7 +21,9 @@ let common = { version, hash, jdk ? jdk11_headless, tests }: installPhase = '' mkdir -p $out cp -R * $out - wrapProgram $out/bin/hbase --set-default JAVA_HOME ${jdk.home} + wrapProgram $out/bin/hbase --set-default JAVA_HOME ${jdk.home} \ + --run "test -d /etc/hadoop-conf && export HBASE_CONF_DIR=\''${HBASE_CONF_DIR-'/etc/hadoop-conf/'}" \ + --set-default HBASE_CONF_DIR "$out/conf/" ''; passthru = { inherit tests; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c1482c3463c4..1472027b0cb3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1818,7 +1818,8 @@ nextcloudmonitor ]; "nextdns" = ps: with ps; [ - ]; # missing inputs: nextdns + nextdns + ]; "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nightscout" = ps: with ps; [ @@ -3617,6 +3618,7 @@ "network" "nexia" "nextbus" + "nextdns" "nightscout" "nina" "no_ip" diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 84133e3a087f..e2f7119440a1 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -264,8 +264,8 @@ in name = "moreheaders"; owner = "openresty"; repo = "headers-more-nginx-module"; - rev = "e536bc595d8b490dbc9cf5999ec48fca3f488632"; - sha256 = "sha256-gxLgs07XdFLcV4lv4JpiG2WGeLhBk13FRyzI0FOUjyA="; + rev = "v0.34"; + sha256 = "sha256-LsrN/rF/p17x/80Jw9CgbmK69to6LycCM1OwTBojz8M="; }; }; diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 6c95551dd1fd..d71f11fc5bbd 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c+5NvJqrYoG96CPaR4CkC9y/CmpTDxyHUmPr+C0t484="; + sha256 = "sha256-1WQo1v5TJPPJjC2lc8k9aWmtRUFITYEuwSfsPzh5320="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index eedb420f2eb4..61f48824ea45 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.15"; + version = "1.6.16"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-jXq+PWSTeO27oW9C7x1myj8qwHXy65cUXOFkOI5u1RU="; + sha256 = "sha256-MFGpO/HdDDry0OWJ/272UR+HY4WjWxjp/4dB5KGrNNo="; }; configureFlags = [ diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 0c8b871ade71..34d0fde0e88d 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "4.0"; + version = "4.0.7"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "1zv7aprmydyjs53xnn1h1s6xxb22pic7va23459zq0nfnhmsgd26"; + sha256 = "sha256-SI8n3QdjI72QXQsK+LOj4wmmKQGPU+Y1Ysmfo+N+fY0="; }; preConfigure = "cd src"; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 8e4c294429f7..e6cce463d830 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.79.0"; + version = "1.79.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-+LirbGbKeazXMtgVh5kZP+KEk/fDbSxceZ26OlE0hbY="; + sha256 = "sha256-rBR2gZ6wAt8P70MScPbktlLtXWWvqs08u786zSiFjJ0="; }; vendorSha256 = null; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 58e9ef05c5ae..44be67fc89be 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchzip }: let - version = "22.1.6"; + version = "22.1.7"; platform = if stdenv.isLinux then "linux" else "darwin"; arch = if stdenv.isAarch64 then "arm" else "amd"; sha256s = { darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g="; darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4="; - linux.amd = "sha256-17fLmvjv7+uCnOXfIgWqK8gL8GVOEvOgKOuH6HsfAbI="; + linux.amd = "sha256-FjDDrJmLvelQ8PmTEtnvV+5zpixizR0bowoJPLyPFcA="; linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix new file mode 100644 index 000000000000..a7da457ea38f --- /dev/null +++ b/pkgs/servers/spicedb/default.nix @@ -0,0 +1,32 @@ + +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "spicedb"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "authzed"; + repo = "spicedb"; + rev = "v${version}"; + hash = "sha256-X52sf21IMr5muEx9SUoYQmFonXDPeW8NKylPmoAZYjw"; + }; + + vendorHash = "sha256-lO4H2DlMfYuV2BYPnMV3Ynx0khFE6KDxf/aXA53pBpU"; + + subPackages = [ "cmd/spicedb" ]; + + meta = with lib; { + description = "Open source permission database"; + longDescription = '' + SpiceDB is an open-source permissions database inspired by + Google Zanzibar. + ''; + homepage = "https://authzed.com/"; + license = licenses.asl20; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix new file mode 100644 index 000000000000..39ac2ddc6d60 --- /dev/null +++ b/pkgs/servers/spicedb/zed.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zed"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "authzed"; + repo = "zed"; + rev = "v${version}"; + hash = "sha256-tw8Z8JtmmRLcvFacRDAdIi6TyMtm9FAZvRYNgd49qXg="; + }; + + vendorHash = "sha256-/BxQiaBFkJsySnQRU870CzvPxtPwvdwx4DwSzhaYYYQ="; + + meta = with lib; { + description = "Command line for managing SpiceDB"; + longDescription = '' + SpiceDB is an open-source permissions database inspired by + Google Zanzibar. zed is the command line client for SpiceDB. + ''; + homepage = "https://authzed.com/"; + license = licenses.asl20; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index 4576febce910..f849e62e367e 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "repmgr"; - version = "5.3.1"; + version = "5.3.2"; src = fetchFromGitHub { owner = "2ndQuadrant"; repo = "repmgr"; rev = "v${version}"; - sha256 = "sha256-fHoXbFOF3xj/eNHgQIghF15vbDObnuwl2DAH+zRVGZQ="; + sha256 = "sha256-M8FMin9y6nAiPYeT5pUUy0KyZ1dkuH708GshZ6GoXXw="; }; nativeBuildInputs = [ flex ]; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 2a80f5ca28de..480857cc8a39 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "uftp"; - version = "5.0"; + version = "5.0.1"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "1q08schd765fsm9647ac4ic2x70ys2x48mqz97mibdi4bbm72bsn"; + sha256 = "sha256-8ENfvI6f+hJeBWAMtsf8kz19WH9brkGyVyZ75PLODmE="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index d6d6ba0d5fcb..fafff0201060 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.16.3"; src = fetchurl { - url = "https://dlcdn.apache.org/nifi/${version}/nifi-${version}-bin.tar.gz"; + url = "https://archive.apache.org/dist/nifi/${version}/nifi-${version}-bin.tar.gz"; sha256 = "sha256-57ZtgK1Z8G/nX2rtf7osmymvE4RukGi7CIvCvRQNKuE="; }; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index f4c4b0facde1..0f649a6948f4 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -9,6 +9,7 @@ , glib , pkg-config , cyrus_sasl +, pulseaudioSupport ? stdenv.isLinux , libpulseaudio , libgcrypt , gtk3 @@ -51,8 +52,13 @@ stdenv.mkDerivation rec { glib libgcrypt cyrus_sasl - libpulseaudio gtk3 + ] ++ lib.optionals pulseaudioSupport [ + libpulseaudio + ]; + + mesonFlags = lib.optionals (!pulseaudioSupport) [ + "-Dpulseaudio=disabled" ]; passthru = { @@ -67,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/gtk-vnc"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 9d7fa718a4f3..dadd79824927 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -10,11 +10,11 @@ let pname = "pgadmin"; - version = "6.11"; + version = "6.12"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "sha256-1MvvQvVoWiV5hhgJUcAHbMyZzkADunLtwmszaO4EeCA="; + sha256 = "sha256-cO7GdZDfJ0pq1jpMyrVy0UM49WhrKOIJOmMJauSkbyo="; }; yarnDeps = mkYarnModules { @@ -72,7 +72,7 @@ let azure-identity ]; - # override necessary on pgadmin4 6.11 + # override necessary on pgadmin4 6.12 pythonPackages = python3.pkgs.overrideScope (final: prev: rec { werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { version = "2.0.3"; diff --git a/pkgs/tools/admin/pgadmin/expose-setup.py.patch b/pkgs/tools/admin/pgadmin/expose-setup.py.patch index 0b1cb8f95e9f..13f7d5069c69 100644 --- a/pkgs/tools/admin/pgadmin/expose-setup.py.patch +++ b/pkgs/tools/admin/pgadmin/expose-setup.py.patch @@ -1,9 +1,3 @@ -From 391433d020da52fba28ad08beb2cc85ffd852044 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= -Date: Wed, 23 Feb 2022 14:40:11 +0100 -Subject: [PATCH] Expose setup.py as pgadmin4-setup - ---- pkg/pip/setup_pip.py | 5 ++++- web/setup.py | 14 ++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) @@ -25,41 +19,42 @@ index 5592d1b04..131eaa1ed 100644 ) diff --git a/web/setup.py b/web/setup.py -index 5f4257e86..df970f049 100644 +index 2204ffb..d5fda9f 100644 --- a/web/setup.py +++ b/web/setup.py -@@ -32,6 +32,10 @@ from pgadmin import create_app - from pgadmin.utils import clear_database_servers, dump_database_servers,\ - load_database_servers - -+# Configuration settings -+import config -+from pgadmin.model import SCHEMA_VERSION -+from pgadmin.setup import db_upgrade, create_app_data_directory - - def dump_servers(args): - """Dump the server groups and servers. -@@ -139,12 +143,7 @@ def clear_servers(): +@@ -14,7 +14,6 @@ import argparse + import os + import sys + import builtins +-import config + + # Grab the SERVER_MODE if it's been set by the runtime + if 'SERVER_MODE' in globals(): +@@ -91,6 +90,9 @@ def load_servers(args): + def setup_db(app): + """Setup the configuration database.""" + ++ # here we need an additional import, since the call to setup_db changed ++ # https://redmine.postgresql.org/projects/pgadmin4/repository/2/revisions/3a69d50458f57d19948b867aec55c55d635a36e5/diff/web/setup.py ++ import config + create_app_data_directory(config) + + print("pgAdmin 4 - Application Initialisation") +@@ -139,8 +141,9 @@ def clear_servers(): clear_database_servers(load_user, True) - - + + -if __name__ == '__main__': -- # Configuration settings -- import config -- from pgadmin.model import SCHEMA_VERSION -- from pgadmin.setup import db_upgrade, create_app_data_directory -- +def main(): + # Configuration settings ++ import config parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB') - + exp_group = parser.add_argument_group('Dump server config') -@@ -194,3 +193,6 @@ if __name__ == '__main__': - print(str(e)) +@@ -191,3 +194,6 @@ if __name__ == '__main__': else: - setup_db() + app = create_app() + setup_db(app) + +if __name__ == '__main__': + main() --- -2.35.1 - diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index 60eef375e59c..bdcbe761b7f4 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/pkgs/tools/admin/pgadmin/package.json @@ -70,7 +70,7 @@ "webpack": "^5.21.2", "webpack-bundle-analyzer": "^4.4.0", "webpack-cli": "^4.5.0", - "yarn-audit-html": "^3.0.1" + "yarn-audit-html": "^4.0.0" }, "dependencies": { "@babel/plugin-proposal-class-properties": "^7.10.4", @@ -111,12 +111,12 @@ "closest": "^0.0.1", "codemirror": "^5.59.2", "context-menu": "^2.0.0", + "convert-units": "^2.3.4", "css-loader": "^5.0.1", "cssnano": "^5.0.2", "dagre": "^0.8.4", "date-fns": "^2.24.0", "diff-arrays-of-objects": "^1.1.8", - "dropzone": "^5.9.3", "html2canvas": "^1.0.0-rc.7", "immutability-helper": "^3.0.0", "imports-loader": "^2.0.0", @@ -124,7 +124,7 @@ "ip-address": "^7.1.0", "jquery": "^3.6.0", "jquery-contextmenu": "^2.9.2", - "jquery-ui": "^1.13.0", + "jquery-ui": "^1.13.2", "json-bignumber": "^1.0.1", "jsoneditor": "^9.5.4", "jsoneditor-react": "^3.1.1", @@ -132,7 +132,7 @@ "leaflet": "^1.5.1", "lodash": "4.*", "ml-matrix": "^6.5.0", - "moment": "^2.29.3", + "moment": "^2.29.4", "moment-timezone": "^0.5.34", "mousetrap": "^1.6.3", "notificar": "^1.0.1", @@ -150,6 +150,7 @@ "react-data-grid": "git+https://github.com/adityatoshniwal/react-data-grid.git/#8d9bc16ddd7c419acfbbd1c1cc2b70eb9f5b453c", "react-dom": "^17.0.1", "react-draggable": "^4.4.4", + "react-dropzone": "^14.2.1", "react-leaflet": "^3.2.2", "react-rnd": "^10.3.5", "react-router-dom": "^6.2.2", @@ -165,7 +166,6 @@ "socket.io-client": "^4.0.0", "split.js": "^1.5.10", "styled-components": "^5.2.1", - "tablesorter": "^2.31.2", "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.19.3", "underscore": "^1.13.1", diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 182e681f917c..df627ad86368 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -2098,10 +2098,10 @@ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5" integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg== -"@gar/promisify@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" - integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== +"@gar/promisify@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" + integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== "@humanwhocodes/config-array@^0.5.0": version "0.5.0" @@ -2131,11 +2131,11 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/gen-mapping@^0.3.0": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" - integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== dependencies: - "@jridgewell/set-array" "^1.0.0" + "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" @@ -2144,11 +2144,19 @@ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72" integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg== -"@jridgewell/set-array@^1.0.0": +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== +"@jridgewell/source-map@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" + integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.13" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" @@ -2277,18 +2285,18 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/fs@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f" - integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ== +"@npmcli/fs@^2.1.0": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.1.tgz#c0c480b03450d8b9fc086816a50cb682668a48bf" + integrity sha512-1Q0uzx6c/NVNGszePbr5Gc2riSU1zLpNlo/1YWntH+eaPmMgBssAW0qXofCVkpdj3ce4swZtlDYQu+NKiYcptg== dependencies: - "@gar/promisify" "^1.0.1" + "@gar/promisify" "^1.1.3" semver "^7.3.5" -"@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== +"@npmcli/move-file@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz#417f585016081a0184cef3e38902cd917a9bbd02" + integrity sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg== dependencies: mkdirp "^1.0.4" rimraf "^3.0.2" @@ -2500,10 +2508,10 @@ dependencies: tippy.js "^6.3.1" -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@trysound/sax@0.2.0": version "0.2.0" @@ -2640,19 +2648,19 @@ dependencies: "@types/react" "*" -"@vusion/webfonts-generator@^0.7.2": - version "0.7.3" - resolved "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.7.3.tgz#f940348b6251edfba4b2961097f44a391670e63d" - integrity sha512-0qDx8stMupH3s4WDVw2y347XEMvR+OSZIOYEdoD9YIw7ZRq9GA+B2GtR7KPPoGHbzWWR+VGkzplPO5tfukewiw== +"@vusion/webfonts-generator@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.8.0.tgz#3ff41b9ec4b83decd87650637ee050741741e794" + integrity sha512-1q17CF6umBEjlAtO37TzRw3aOCCAyFX+T4HPG70BmM6qx8s6H4/LQOa8eHFZq/oiMuMyd0FehKgUt/pqYlIMWA== dependencies: handlebars "^4.0.11" mkdirp "^1.0.4" q "^1.1.2" - svg2ttf "^5.0.0" - svgicons2svgfont "^9.0.3" - ttf2eot "^2.0.0" - ttf2woff "^2.0.1" - ttf2woff2 "^4.0.1" + svg2ttf "^6.0.3" + svgicons2svgfont "^10.0.4" + ttf2eot "^3.0.0" + ttf2woff "^3.0.0" + ttf2woff2 "^4.0.4" underscore "^1.9.1" url-join "^4.0.0" @@ -2809,6 +2817,11 @@ react-test-renderer "^17.0.0" semver "^5.7.0" +"@xmldom/xmldom@^0.7.2": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" + integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -2822,7 +2835,7 @@ FileSaver@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/FileSaver/-/FileSaver-0.10.0.tgz#7def3889944458042ef5df2e9064c88e3d2281c7" - integrity sha1-fe84iZREWAQu9d8ukGTIjj0igcc= + integrity sha512-W+syaSPuxeh8yRPinETA4RlBO0ZuyM8IQIln8Y/pYZ136+pxqr64/JRx8rDm3uVqvgQ4xIHgAmZoepujBT1mvg== JSONStream@^1.0.3: version "1.3.5" @@ -2889,6 +2902,11 @@ acorn@^8.0.4, acorn@^8.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== +acorn@^8.5.0: + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== + agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2896,10 +2914,10 @@ agent-base@6, agent-base@^6.0.2: dependencies: debug "4" -agentkeepalive@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" - integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== +agentkeepalive@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" + integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== dependencies: debug "^4.1.0" depd "^1.1.2" @@ -2941,7 +2959,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.5.2: ajv@^5.0.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= + integrity sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw== dependencies: co "^4.6.0" fast-deep-equal "^1.0.0" @@ -2985,7 +3003,7 @@ ajv@^8.8.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= + integrity sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ== ansi-colors@^4.1.1: version "4.1.1" @@ -2995,7 +3013,7 @@ ansi-colors@^4.1.1: 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= + integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== ansi-regex@^5.0.1: version "5.0.1" @@ -3005,7 +3023,7 @@ ansi-regex@^5.0.1: ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== ansi-styles@^3.2.1: version "3.2.1" @@ -3037,20 +3055,20 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== -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== +are-we-there-yet@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d" + integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw== dependencies: delegates "^1.0.0" - readable-stream "^2.0.6" + readable-stream "^3.6.0" -argparse@^1.0.6, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -3112,16 +3130,6 @@ array.prototype.flat@^1.2.3: define-properties "^1.1.3" es-abstract "^1.19.0" -array.prototype.flatmap@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9" - integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - function-bind "^1.1.1" - array.prototype.flatmap@^1.2.4: version "1.2.5" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" @@ -3183,11 +3191,6 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async@0.9.x: - version "0.9.2" - resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" - integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= - async@^2.1.4: version "2.6.4" resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" @@ -3200,6 +3203,16 @@ async@^3.2.0: resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd" integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g== +async@^3.2.3: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== + +attr-accept@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b" + integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== + autoprefixer@^10.2.4: version "10.4.0" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8" @@ -3236,7 +3249,7 @@ axios@^0.21.1: babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= + integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g== dependencies: chalk "^1.1.3" esutils "^2.0.2" @@ -3269,7 +3282,7 @@ babel-loader@^8.1.0: babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= + integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w== dependencies: babel-runtime "^6.22.0" @@ -3366,12 +3379,12 @@ babel-plugin-polyfill-regenerator@^0.3.0: babel-plugin-syntax-jsx@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= + integrity sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw== babel-runtime@^6.22.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== dependencies: core-js "^2.4.0" regenerator-runtime "^0.11.0" @@ -3379,7 +3392,7 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0: babel-template@^6.16.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= + integrity sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg== dependencies: babel-runtime "^6.26.0" babel-traverse "^6.26.0" @@ -3390,7 +3403,7 @@ babel-template@^6.16.0: babel-traverse@^6.18.0, babel-traverse@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= + integrity sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA== dependencies: babel-code-frame "^6.26.0" babel-messages "^6.23.0" @@ -3405,7 +3418,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.26.0: babel-types@^6.18.0, babel-types@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= + integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g== dependencies: babel-runtime "^6.26.0" esutils "^2.0.2" @@ -3425,7 +3438,7 @@ babylon@^6.18.0: "backbone@1.1.2 || 1.2.3 || ~1.3.2": version "1.3.3" resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999" - integrity sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk= + integrity sha512-aK+k3TiU4tQDUrRCymDDE7XDFnMVuyE6zbZ4JX7mb4pJbQTVOH997/kyBzb8wB2s5Y/Oh7EUfj+sZhwRPxWwow== dependencies: underscore ">=1.8.3" @@ -3439,19 +3452,19 @@ backbone@1.4.0: backbone@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.2.3.tgz#c22cfd07fc86ebbeae61d18929ed115e999d65b9" - integrity sha1-wiz9B/yG676uYdGJKe0RXpmdZbk= + integrity sha512-1/eXj4agG79UDN7TWnZXcGD6BJrBwLZKCX7zYcBIy9jWf4mrtVkw7IE1VOYFnrKahsmPF9L55Tib9IQRvk027w== dependencies: underscore ">=1.7.0" backform@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/backform/-/backform-0.2.0.tgz#b14cb8deb08c863fc595a2bc505066e32a2ad4ce" - integrity sha1-sUy43rCMhj/FlaK8UFBm4yoq1M4= + integrity sha512-QYwlItiVqb4CDELHyBC+TM4UcoG6Mw/al+PUDUVbQ7OJojpQHaa2TV8uJHhMR6o/Xq4FGt+52qIZLp36dletfw== backgrid-filter@^0.3.7: version "0.3.7" resolved "https://registry.yarnpkg.com/backgrid-filter/-/backgrid-filter-0.3.7.tgz#d4b19d0e707013d7f181f9e8c7febb4997d56f03" - integrity sha1-1LGdDnBwE9fxgfnox/67SZfVbwM= + integrity sha512-HKWOXXd/dES5Ll3R1+vsfPYO7yVQ0V4+h8cPirFqci4oKTyyZVJupXM2fINhqm0On9dvHijHje8h4X+Wg621gw== dependencies: backbone "~1.2.3" backgrid "~0.3.7" @@ -3461,12 +3474,12 @@ backgrid-filter@^0.3.7: backgrid-select-all@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/backgrid-select-all/-/backgrid-select-all-0.3.5.tgz#143a800e5d95ff2ae5a84d78bf4fba41f9481e94" - integrity sha1-FDqADl2V/yrlqE14v0+6QflIHpQ= + integrity sha512-bwMQi5d8AnBSZDiV4nWrXcOSmEODbxB6/70mSHG8cGoDfjgW5X7mLiXlmlgEP3VsA1avFD6VvCvpAKZ4BS5f9Q== backgrid@~0.3.7: version "0.3.8" resolved "https://registry.yarnpkg.com/backgrid/-/backgrid-0.3.8.tgz#7d26816742d72c859cad39b13f19c9f27baffed7" - integrity sha1-fSaBZ0LXLIWcrTmxPxnJ8nuv/tc= + integrity sha512-Klzo941ahoj8Kqd0tRsau+VfXddV3YnQTwb6wVwIaaQxoJ9ORykQy2MNit1MUBnZO6IValYJPvCQyvZhnV6Lfg== dependencies: backbone "1.1.2 || 1.2.3 || ~1.3.2" underscore "^1.8.0" @@ -3474,7 +3487,7 @@ backgrid@~0.3.7: backo2@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" - integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= + integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA== balanced-match@^1.0.0: version "1.0.2" @@ -3557,7 +3570,7 @@ body-parser@^1.19.0: boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== bootstrap-datepicker@^1.8.0: version "1.9.0" @@ -3589,10 +3602,17 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + brace@^0.11.1: version "0.11.1" resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58" - integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg= + integrity sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q== braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: version "3.0.2" @@ -3604,7 +3624,7 @@ braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== browser-pack@^6.0.1: version "6.1.0" @@ -3789,7 +3809,7 @@ buffer-from@^1.0.0: buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ== buffer@^6.0.3: version "6.0.3" @@ -3817,41 +3837,41 @@ bufferstreams@^3.0.0: builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ== bytes@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^15.2.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" - integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== +cacache@^16.1.0: + version "16.1.1" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.1.tgz#4e79fb91d3efffe0630d5ad32db55cc1b870669c" + integrity sha512-VDKN+LHyCQXaaYZ7rA/qtkURU+/yYhviUdvqEv2LT6QPZU8jpyzEkEVAcKlKLt5dJ5BRp11ym8lo3NKLluEPLg== dependencies: - "@npmcli/fs" "^1.0.0" - "@npmcli/move-file" "^1.0.1" + "@npmcli/fs" "^2.1.0" + "@npmcli/move-file" "^2.0.0" chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" + fs-minipass "^2.1.0" + glob "^8.0.1" infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" + lru-cache "^7.7.1" + minipass "^3.1.6" minipass-collect "^1.0.2" minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" + minipass-pipeline "^1.2.4" + mkdirp "^1.0.4" p-map "^4.0.0" promise-inflight "^1.0.1" rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" + ssri "^9.0.0" + tar "^6.1.11" unique-filename "^1.1.1" cached-path-relative@^1.0.0, cached-path-relative@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz#865576dfef39c0d6a7defde794d078f5308e3ef3" - integrity "sha1-hlV23+85wNan3v3nlNB49TCOPvM= sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==" + integrity sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA== call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" @@ -3889,7 +3909,7 @@ camelcase@^6.3.0: camelize@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" - integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= + integrity sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg== caniuse-api@^3.0.0: version "3.0.0" @@ -3903,7 +3923,7 @@ caniuse-api@^3.0.0: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001274, caniuse-lite@^1.0.30001286: version "1.0.30001338" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz#b5dd7a7941a51a16480bdf6ff82bded1628eec0d" integrity sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ== caniuse-lite@^1.0.30001332: @@ -3914,7 +3934,7 @@ caniuse-lite@^1.0.30001332: chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== dependencies: ansi-styles "^2.2.1" escape-string-regexp "^1.0.2" @@ -3922,7 +3942,7 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.4.2: +chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3931,7 +3951,7 @@ chalk@^2.0.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -4059,7 +4079,7 @@ clone-deep@^4.0.1: closest@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/closest/-/closest-0.0.1.tgz#26da6f80b3e0e17e71f80f12782819e9f653495c" - integrity sha1-JtpvgLPg4X5x+A8SeCgZ6fZTSVw= + integrity sha512-HafRXTAiWp5nf6kxOy2EoIGSsJMn0zew9E5zp3Dy/8CXdp8GvVjZn1TSMEVdDxSP/acXZcWJWiIgF83Di7M1Ew== dependencies: matches-selector "0.0.1" @@ -4071,12 +4091,7 @@ clsx@^1.0.2, clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1: co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= - -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= + integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== codemirror@^5.59.2: version "5.63.3" @@ -4100,13 +4115,18 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + colord@^2.9.1: version "2.9.1" resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz#c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e" @@ -4120,7 +4140,7 @@ colorette@^2.0.14: combine-source-map@^0.8.0, combine-source-map@~0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b" - integrity sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos= + integrity sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg== dependencies: convert-source-map "~1.1.0" inline-source-map "~0.6.0" @@ -4132,25 +4152,20 @@ commander@^2.19.0, 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@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== - 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.2.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.3.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c" + integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw== commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== component-emitter@~1.3.0: version "1.3.0" @@ -4160,7 +4175,7 @@ component-emitter@~1.3.0: concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: version "1.6.2" @@ -4187,15 +4202,15 @@ console-browserify@^1.1.0: resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== -console-control-strings@^1.0.0, console-control-strings@~1.1.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= + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== constants-browserify@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= + integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ== content-type@~1.0.4: version "1.0.4" @@ -4219,7 +4234,15 @@ convert-source-map@^1.5.0, convert-source-map@^1.7.0, convert-source-map@^1.8.0: convert-source-map@~1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860" - integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA= + integrity sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg== + +convert-units@^2.3.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/convert-units/-/convert-units-2.3.4.tgz#a279f4b3cb9b5d5094beba61abc742dcb46a180d" + integrity sha512-ERHfdA0UhHJp1IpwE6PnFJx8LqG7B1ZjJ20UvVCmopEnVCfER68Tbe3kvN63dLbYXDA2xFWRE6zd4Wsf0w7POg== + dependencies: + lodash.foreach "2.3.x" + lodash.keys "2.3.x" cookie@~0.4.1: version "0.4.1" @@ -4368,7 +4391,7 @@ crypto-browserify@^3.0.0: css-color-keywords@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" - integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= + integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg== css-color-names@^1.0.1: version "1.0.1" @@ -4531,7 +4554,7 @@ csstype@^3.0.2: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw== -cubic2quad@^1.0.0: +cubic2quad@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/cubic2quad/-/cubic2quad-1.2.1.tgz#2442260b72c02ee4b6a2fe998fcc1c4073622286" integrity sha512-wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ== @@ -4539,7 +4562,7 @@ cubic2quad@^1.0.0: custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" - integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU= + integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg== dagre@^0.8.4: version "0.8.5" @@ -4571,24 +4594,17 @@ debug@2.6.9, debug@^2.6.8: dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.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== - dependencies: - ms "2.1.2" - -debug@^4.3.3, debug@~4.3.2: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity "sha1-BCZuC3CpjURi5uKI44JZITMytmQ= sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==" +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3, debug@~4.3.1, debug@~4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" - integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= + integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg== dependencies: decamelize "^1.1.0" map-obj "^1.0.0" @@ -4596,7 +4612,7 @@ decamelize-keys@^1.1.0: decamelize@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== decamelize@^5.0.0: version "5.0.1" @@ -4611,7 +4627,7 @@ deep-diff@^1.0.2: deep-equal-ident@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz#06f4b89e53710cd6cea4a7781c7a956642de8dc9" - integrity sha1-BvS4nlNxDNbOpKd4HHqVZkLejck= + integrity sha512-aWv7VhTl/Lju1zenOD3E1w8PpUVrTDbwXCHtbSNr+p/uadr49Y1P1ld0W3Pl6gbvIbiRjoCVsqw70UupCNGh6g== dependencies: lodash.isequal "^3.0" @@ -4635,17 +4651,17 @@ define-properties@^1.1.3: defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= + integrity sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ== delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== deps-sort@^2.0.1: version "2.0.1" @@ -4668,7 +4684,7 @@ des.js@^1.0.0: detect-indent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= + integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A== dependencies: repeating "^2.0.0" @@ -4684,7 +4700,7 @@ detective@^5.2.0: di@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" - integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw= + integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA== diff-arrays-of-objects@^1.1.8: version "1.1.9" @@ -4713,7 +4729,7 @@ dir-glob@^3.0.1: discontinuous-range@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" - integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo= + integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ== doctrine@^2.1.0: version "2.1.0" @@ -4745,7 +4761,7 @@ dom-helpers@^5.0.1: dom-serialize@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" - integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs= + integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ== dependencies: custom-event "~1.0.0" ent "~2.2.0" @@ -4787,15 +4803,10 @@ domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0: domelementtype "^2.2.0" domhandler "^4.2.0" -dropzone@^5.9.3: - version "5.9.3" - resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz#b3070ae090fa48cbc04c17535635537ca72d70d6" - integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA== - duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= + integrity sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA== dependencies: readable-stream "^2.0.2" @@ -4807,14 +4818,14 @@ duplexer@^0.1.2: ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@~3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" - integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== +ejs@~3.1.8: + version "3.1.8" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" + integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== dependencies: - jake "^10.6.1" + jake "^10.8.5" electron-to-chromium@^1.3.886: version "1.3.889" @@ -4857,9 +4868,9 @@ emojis-list@^3.0.0: encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -encoding@^0.1.12: +encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -4922,7 +4933,7 @@ enquirer@^2.3.5: ent@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= + integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== entities@^2.0.0: version "2.2.0" @@ -5013,7 +5024,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.18.0-next.1, es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: +es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== @@ -5066,12 +5077,12 @@ escalade@^3.1.1: escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== escape-string-regexp@^4.0.0: version "4.0.0" @@ -5225,7 +5236,7 @@ esutils@^2.0.2: eve@~0.5.1: version "0.5.4" resolved "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz#67d080b9725291d7e389e34c26860dd97f1debaa" - integrity sha1-Z9CAuXJSkdfjieNMJoYN2X8d66o= + integrity sha512-aqprQ9MAOh1t66PrHxDFmMXPlgNO6Uv1uqvxmwjprQV50jaQ2RqO7O1neY4PJwC+hMnkyMDphu2AQPOPZdjQog== eventemitter3@^4.0.0: version "4.0.7" @@ -5275,7 +5286,7 @@ extend@^3.0.0: fast-deep-equal@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= + integrity sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw== fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" @@ -5312,7 +5323,7 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fast-memoize@^2.5.1: version "2.5.2" @@ -5343,6 +5354,13 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +file-selector@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.6.0.tgz#fa0a8d9007b829504db4d07dd4de0310b65287dc" + integrity sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw== + dependencies: + tslib "^2.4.0" + file-type@^12.0.0: version "12.4.2" resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz#a344ea5664a1d01447ee7fb1b635f72feb6169d9" @@ -5354,16 +5372,16 @@ file-uri-to-path@1.0.0: integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== filelist@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" - integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== dependencies: - minimatch "^3.0.4" + minimatch "^5.0.1" filename-reserved-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" - integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik= + integrity sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ== fill-range@^7.0.1: version "7.0.1" @@ -5436,12 +5454,12 @@ flatted@^3.2.4: follow-redirects@^1.0.0, follow-redirects@^1.14.0: version "1.14.8" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" - integrity "sha1-AWmW+5oRoQBWY5ixxoOTN9e/qPw= sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==" + integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== foreach@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= + integrity sha512-ZBbtRiapkZYLsqoPyZOR+uPfto0GRMNQN1GwzZtZt7iZvPPbDDQV0JF5Hx4o/QFQ5c0vyuoZ98T8RSBbopzWtA== fraction.js@^4.1.1: version "4.1.1" @@ -5457,7 +5475,7 @@ fs-extra@^10.0.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^2.0.0: +fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -5467,7 +5485,7 @@ fs-minipass@^2.0.0: fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: version "2.3.2" @@ -5492,26 +5510,26 @@ function.prototype.name@^1.1.2, function.prototype.name@^1.1.3: functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== functions-have-names@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21" integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA== -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= +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== 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" + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" gensync@^1.0.0-beta.2: version "1.0.0-beta.2" @@ -5579,6 +5597,17 @@ glob@^7.1.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.1: + version "8.0.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -5678,7 +5707,7 @@ hard-rejection@^2.1.0: has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== dependencies: ansi-regex "^2.0.0" @@ -5690,12 +5719,12 @@ has-bigints@^1.0.1: has-cors@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" - integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= + integrity sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA== has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" @@ -5714,10 +5743,10 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -has-unicode@^2.0.0: +has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== has@^1.0.0, has@^1.0.3: version "1.0.3" @@ -5746,12 +5775,12 @@ hash.js@^1.0.0, hash.js@^1.0.3: hat@^0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a" - integrity sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo= + integrity sha512-zpImx2GoKXy42fVDSEad2BPKuSQdLcqsCYa48K3zHSzM/ugWuYjLDr8IXxpVuL7uCLHw56eaiLxCRthhOzf5ug== heap@0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.5.tgz#713b65590ebcc40fcbeeaf55e851694092b39af1" - integrity sha1-cTtlWQ68xA/L7q9V6FFpQJKzmvE= + integrity sha512-G7HLD+WKcrOyJP5VQwYZNC3Z6FcQ7YYjEFiFoIj8PfEr73mu421o8B1N5DKUcc8K37EsJ2XXWA8DtrDz/2dReg== history@^5.2.0: version "5.3.0" @@ -5763,7 +5792,7 @@ history@^5.2.0: hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= + integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg== dependencies: hash.js "^1.0.3" minimalistic-assert "^1.0.0" @@ -5825,7 +5854,7 @@ html2canvas@^1.0.0-rc.7: htmlescape@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" - integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E= + integrity sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg== htmlparser2@6.1.0, htmlparser2@^6.1.0: version "6.1.0" @@ -5853,12 +5882,12 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== dependencies: - "@tootallnate/once" "1" + "@tootallnate/once" "2" agent-base "6" debug "4" @@ -5874,12 +5903,12 @@ http-proxy@^1.18.1: https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= + integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg== https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -5892,7 +5921,7 @@ human-signals@^2.1.0: humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== dependencies: ms "^2.0.0" @@ -5997,7 +6026,7 @@ imports-loader@^2.0.0: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== indent-string@^4.0.0: version "4.0.0" @@ -6017,7 +6046,7 @@ infer-owner@^1.0.4: inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" @@ -6030,17 +6059,17 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= + integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA== inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== inline-source-map@~0.6.0: version "0.6.2" resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5" - integrity sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU= + integrity sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA== dependencies: source-map "~0.5.3" @@ -6099,10 +6128,10 @@ ip-address@^7.1.0: jsbn "1.1.0" sprintf-js "1.1.2" -ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== is-absolute-url@^3.0.3: version "3.0.3" @@ -6125,7 +6154,7 @@ is-arguments@^1.0.4: is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== is-bigint@^1.0.1: version "1.0.4" @@ -6198,20 +6227,13 @@ is-docker@^2.1.1: is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-finite@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -6234,12 +6256,12 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: is-in-browser@^1.0.2, is-in-browser@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" - integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU= + integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g== is-lambda@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== is-negative-zero@^2.0.1: version "2.0.1" @@ -6261,7 +6283,7 @@ is-number@^7.0.0: is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== is-plain-object@^2.0.4: version "2.0.4" @@ -6310,7 +6332,7 @@ is-string@^1.0.5, is-string@^1.0.7: is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" - integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY= + integrity sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw== is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" @@ -6347,12 +6369,12 @@ is-weakref@^1.0.1: isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== isbinaryfile@^4.0.8: version "4.0.8" @@ -6362,12 +6384,12 @@ isbinaryfile@^4.0.8: isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== istanbul-instrumenter-loader@^3.0.1: version "3.0.1" @@ -6438,13 +6460,13 @@ istanbul-reports@^3.0.0: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jake@^10.6.1: - version "10.8.2" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" - integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== +jake@^10.8.5: + version "10.8.5" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" + integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== dependencies: - async "0.9.x" - chalk "^2.4.2" + async "^3.2.3" + chalk "^4.0.2" filelist "^1.0.1" minimatch "^3.0.4" @@ -6463,7 +6485,7 @@ jasmine-enzyme@^7.1.2: javascript-natural-sort@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" - integrity sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k= + integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== jest-worker@^27.0.2, jest-worker@^27.0.6: version "27.3.1" @@ -6477,7 +6499,7 @@ jest-worker@^27.0.2, jest-worker@^27.0.6: jmespath@^0.15.0: version "0.15.0" resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" - integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= + integrity sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w== jquery-contextmenu@^2.6.4, jquery-contextmenu@^2.9.2: version "2.9.2" @@ -6486,14 +6508,14 @@ jquery-contextmenu@^2.6.4, jquery-contextmenu@^2.9.2: dependencies: jquery "^3.5.0" -jquery-ui@>=1.8.0, jquery-ui@^1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz#ab5ac65f37ca093c51b3478c4097f55bbc008f36" - integrity sha512-Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw== +jquery-ui@>=1.8.0, jquery-ui@^1.13.2: + version "1.13.2" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034" + integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q== dependencies: jquery ">=1.8.0 <4.0.0" -jquery@>=1.2.6, "jquery@>=1.7.1 <4.0.0", jquery@>=1.8.0, "jquery@>=1.8.0 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.5.1, jquery@^3.6.0: +"jquery@>=1.7.1 <4.0.0", jquery@>=1.8.0, "jquery@>=1.8.0 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.5.1, jquery@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== @@ -6501,7 +6523,7 @@ jquery@>=1.2.6, "jquery@>=1.7.1 <4.0.0", jquery@>=1.8.0, "jquery@>=1.8.0 <4.0.0" js-string-escape@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" - integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8= + integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -6511,7 +6533,7 @@ js-string-escape@^1.0.0: js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= + integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg== js-yaml@^3.13.1: version "3.14.1" @@ -6524,12 +6546,12 @@ js-yaml@^3.13.1: jsbn@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" - integrity sha1-sBMHyym2GKHtJux56RH4A8TaAEA= + integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= + integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA== jsesc@^2.5.1: version "2.5.2" @@ -6539,7 +6561,7 @@ jsesc@^2.5.1: jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== json-bignumber@^1.0.1: version "1.0.2" @@ -6561,7 +6583,7 @@ json-parse-even-better-errors@^2.3.0: json-schema-traverse@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A= + integrity sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA== json-schema-traverse@^0.4.1: version "0.4.1" @@ -6581,7 +6603,7 @@ json-source-map@^0.6.1: json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json5@^1.0.1: version "1.0.1" @@ -6636,7 +6658,7 @@ jsonfile@^6.0.1: jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== jsonrepair@^2.2.1: version "2.2.1" @@ -6777,7 +6799,7 @@ karma-jasmine@^4.0.1: karma-requirejs@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798" - integrity sha1-/driy4fX68FvsCIok1ZNf+5Xh5g= + integrity sha512-MHTOYKdwwJBkvYid0TaYvBzOnFH3TDtzo6ie5E4o9SaUSXXsfMRLa/whUz6efVIgTxj1xnKYasNn/XwEgJeB/Q== karma-source-map-support@^1.4.0: version "1.4.0" @@ -6871,7 +6893,7 @@ lilconfig@^2.0.3: 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= + integrity sha512-8ZmlJFVK9iCmtLz19HpSsR8HaAMWBT284VMNednLwlIMDP2hJDCIhUp0IZ2xUcZ+Ob6BM0VvCSJwzASDM45NLQ== loader-runner@^4.2.0: version "4.2.0" @@ -6910,10 +6932,48 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +lodash._basebind@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._basebind/-/lodash._basebind-2.3.0.tgz#2b5bc452a0e106143b21869f233bdb587417d248" + integrity sha512-SHqM7YCuJ+BeGTs7lqpWnmdHEeF4MWxS3dksJctHFNxR81FXPOzA4bS5Vs5CpcGTkBpM8FCl+YEbQEblRw8ABg== + dependencies: + lodash._basecreate "~2.3.0" + lodash._setbinddata "~2.3.0" + lodash.isobject "~2.3.0" + +lodash._basecreate@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-2.3.0.tgz#9b88a86a4dcff7b7f3c61d83a2fcfc0671ec9de0" + integrity sha512-vwZaWldZwS2y9b99D8i9+WtgiZXbHKsBsMrpxJEqTsNW20NhJo5W8PBQkeQO9CmxuqEYn8UkMnfEM2MMT4cVrw== + dependencies: + lodash._renative "~2.3.0" + lodash.isobject "~2.3.0" + lodash.noop "~2.3.0" + +lodash._basecreatecallback@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._basecreatecallback/-/lodash._basecreatecallback-2.3.0.tgz#37b2ab17591a339e988db3259fcd46019d7ac362" + integrity sha512-Ev+pDzzfVfgbiucpXijconLGRBar7/+KNCf05kSnk4CmdDVhAy1RdbU9efCJ/o9GXI08JdUGwZ+5QJ3QX3kj0g== + dependencies: + lodash._setbinddata "~2.3.0" + lodash.bind "~2.3.0" + lodash.identity "~2.3.0" + lodash.support "~2.3.0" + +lodash._basecreatewrapper@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.3.0.tgz#aa0c61ad96044c3933376131483a9759c3651247" + integrity sha512-YLycQ7k8AB9Wc1EOvLNxuRWcqipDkMXq2GCgnLWQR6qtgTb3gY3LELzEpnFshrEO4LOLs+R2EpcY+uCOZaLQ8Q== + dependencies: + lodash._basecreate "~2.3.0" + lodash._setbinddata "~2.3.0" + lodash._slice "~2.3.0" + lodash.isobject "~2.3.0" + lodash._baseisequal@^3.0.0: version "3.0.7" resolved "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz#d8025f76339d29342767dcc887ce5cb95a5b51f1" - integrity sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE= + integrity sha512-U+3GsNEZj9ebI03ncLC2pLmYVjgtYZEwdkAPO7UGgtGvAz36JVFPAQUufpSaVL93Cz5arc6JGRKZRhaOhyVJYA== dependencies: lodash.isarray "^3.0.0" lodash.istypedarray "^3.0.0" @@ -6922,42 +6982,112 @@ lodash._baseisequal@^3.0.0: lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= + integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ== + +lodash._createwrapper@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._createwrapper/-/lodash._createwrapper-2.3.0.tgz#d1aae1102dadf440e8e06fc133a6edd7fe146075" + integrity sha512-XjaI/rzg9W+WO4WJDQ+PRlHD5sAMJ1RhJLuT65cBxLCb1kIYs4U20jqvTDGAWyVT3c34GYiLd9AreHYuB/8yJA== + dependencies: + lodash._basebind "~2.3.0" + lodash._basecreatewrapper "~2.3.0" + lodash.isfunction "~2.3.0" lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= + integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA== + +lodash._objecttypes@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.3.0.tgz#6a3ea3987dd6eeb8021b2d5c9c303549cc2bae1e" + integrity sha512-jbA6QyHt9cw3BzvbWzIcnU3Z12jSneT6xBgz3Y782CJsN1tV5aTBKrFo2B4AkeHBNaxSrbPYZZpi1Lwj3xjdtg== + +lodash._renative@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._renative/-/lodash._renative-2.3.0.tgz#77d8edd4ced26dd5971f9e15a5f772e4e317fbd3" + integrity sha512-v44MRirqYqZGK/h5UKoVqXWF2L+LUiLTU+Ogu5rHRVWJUA1uWIlHaMpG8f/OA8j++BzPMQij9+erXHtgFcbuwg== + +lodash._setbinddata@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._setbinddata/-/lodash._setbinddata-2.3.0.tgz#e5610490acd13277d59858d95b5f2727f1508f04" + integrity sha512-xMFfbF7dL+sFtrdE49uHFmfpBAEwlFtfgMp86nQRlAF6aizYL+3MTbnYMKJSkP1W501PhsgiBED5kBbZd8kR2g== + dependencies: + lodash._renative "~2.3.0" + lodash.noop "~2.3.0" + +lodash._shimkeys@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.3.0.tgz#611f93149e3e6c721096b48769ef29537ada8ba9" + integrity sha512-9Iuyi7TiWMGa/9+2rqEE+Zwye4b/U2w7Saw6UX1h6Xs88mEER+uz9FZcEBPKMVKsad9Pw5GNAcIBRnW2jNpneQ== + dependencies: + lodash._objecttypes "~2.3.0" + +lodash._slice@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._slice/-/lodash._slice-2.3.0.tgz#147198132859972e4680ca29a5992c855669aa5c" + integrity sha512-7C61GhzRUv36gTafr+RIb+AomCAYsSATEoK4OP0VkNBcwvsM022Z22AVgqjjzikeNO1U29LzsJZDvLbiNPUYvA== + +lodash.bind@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-2.3.0.tgz#c2a8e18b68e5ecc152e2b168266116fea5b016cc" + integrity sha512-goakyOo+FMN8lttMPnZ0UNlr5RlzX4IrUXyTJPT2A0tGCMXySupond9wzvDqTvVmYTcQjIKGrj8naJDS2xWAlQ== + dependencies: + lodash._createwrapper "~2.3.0" + lodash._renative "~2.3.0" + lodash._slice "~2.3.0" lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== lodash.escape@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" - integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg= + integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw== lodash.flattendeep@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" - integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= + integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ== + +lodash.foreach@2.3.x: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-2.3.0.tgz#083404c91e846ee77245fdf9d76519c68b2af168" + integrity sha512-yLnyptVRJd0//AbGp480grgQG9iaDIV5uOgSbpurRy1dYybPbjNTLQ3FyLEQ84buVLPG7jyaiyvpzgfOutRB3Q== + dependencies: + lodash._basecreatecallback "~2.3.0" + lodash.forown "~2.3.0" + +lodash.forown@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.forown/-/lodash.forown-2.3.0.tgz#24fb4aaf800d45fc2dc60bfec3ce04c836a3ad7f" + integrity sha512-dUnCsuQTtq3Y7bxPNoEEqjJjPL2ftLtcz2PTeRKvhbpdM514AvnqCjewHGsm/W+dwspIwa14KoWEZeizJ7smxA== + dependencies: + lodash._basecreatecallback "~2.3.0" + lodash._objecttypes "~2.3.0" + lodash.keys "~2.3.0" + +lodash.identity@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.identity/-/lodash.identity-2.3.0.tgz#6b01a210c9485355c2a913b48b6711219a173ded" + integrity sha512-NYJ2r2cwy3tkx/saqbIZEX6oQUzjWTnGRu7d/zmBjMCZos3eHBxCpbvWFWSetv8jFVrptsp6EbWjzNgBKhUoOA== lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= + integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg== lodash.isarray@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= + integrity sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ== lodash.isequal@^3.0: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-3.0.4.tgz#1c35eb3b6ef0cd1ff51743e3ea3cf7fdffdacb64" - integrity sha1-HDXrO27wzR/1F0Pj6jz3/f/ay2Q= + integrity sha512-Bsu5fP9Omd+HBk2Dz8qp4BHbC+83DBykZ87Lz1JmPKTVNy4Q0XQVtUrbfXVAK/udQrWNcGStcKSA9yj/Zkm3TQ== dependencies: lodash._baseisequal "^3.0.0" lodash._bindcallback "^3.0.0" @@ -6965,17 +7095,38 @@ lodash.isequal@^3.0: lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== + +lodash.isfunction@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-2.3.0.tgz#6b2973e47a647cf12e70d676aea13643706e5267" + integrity sha512-X5lteBYlCrVO7Qc00fxP8W90fzRp6Ax9XcHANmU3OsZHdSyIVZ9ZlX5QTTpRq8aGY+9I5Rmd0UTzTIIyWPugEQ== + +lodash.isobject@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.3.0.tgz#2e16d3fc583da9831968953f2d8e6d73434f6799" + integrity sha512-jo1pfV61C4TE8BfEzqaHj6EIKiSkFANJrB6yscwuCJMSRw5tbqjk4Gv7nJzk4Z6nFKobZjGZ8Qd41vmnwgeQqQ== + dependencies: + lodash._objecttypes "~2.3.0" lodash.istypedarray@^3.0.0: version "3.0.6" resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62" - integrity sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I= + integrity sha512-lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw== + +lodash.keys@2.3.x, lodash.keys@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.3.0.tgz#b350f4f92caa9f45a4a2ecf018454cf2f28ae253" + integrity sha512-c0UW0ffqMxSCtoVbmVt2lERJLkEqgoOn2ejPsWXzr0ZrqRbl3uruGgwHzhtqXxi6K/ei3Ey7zimOqSwXgzazPg== + dependencies: + lodash._renative "~2.3.0" + lodash._shimkeys "~2.3.0" + lodash.isobject "~2.3.0" lodash.keys@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo= + integrity sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ== dependencies: lodash._getnative "^3.0.0" lodash.isarguments "^3.0.0" @@ -6984,27 +7135,39 @@ lodash.keys@^3.0.0: lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== lodash.memoize@~3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" - integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8= + integrity sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A== lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.noop@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-2.3.0.tgz#3059d628d51bbf937cd2a0b6fc3a7f212a669c2c" + integrity sha512-NpSm8HRm1WkBBWHUveDukLF4Kfb5P5E3fjHc9Qre9A11nNubozLWD2wH3UBTZbu+KSuX8aSUvy9b+PUyEceJ8g== + +lodash.support@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.support/-/lodash.support-2.3.0.tgz#7eaf038af4f0d6aab776b44aa6dcfc80334c9bfd" + integrity sha512-etc7VWbB0U3Iya8ixj2xy4sDBN3jvPX7ODi8iXtn4KkkjNpdngrdc7Vlt5jub/Vgqx6/dWtp7Ml9awhCQPYKGQ== + dependencies: + lodash._renative "~2.3.0" + lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== lodash@4, lodash@4.*, lodash@^4.14.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" @@ -7036,10 +7199,15 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.7.1: + version "7.13.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz#267a81fbd0881327c46a81c5922606a2cfe336c4" + integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== + lunr@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/lunr/-/lunr-0.7.2.tgz#79a30e932e216cba163541ee37a3607c12cd7281" - integrity sha1-eaMOky4hbLoWNUHuN6NgfBLNcoE= + integrity sha512-qXxxSzrWOhFu4EhyvYqCGMv1nJsTy5OGQN3GtClGbRSaqJ/1XASk41nF2jjxzKTS8kjU0QybhOgGgGo6HUZqSQ== make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" @@ -7048,47 +7216,47 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: dependencies: semver "^6.0.0" -make-fetch-happen@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" - integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== +make-fetch-happen@^10.0.3: + version "10.2.0" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.0.tgz#0bde3914f2f82750b5d48c6d2294d2c74f985e5b" + integrity sha512-OnEfCLofQVJ5zgKwGk55GaqosqKjaR6khQlJY3dBAA+hM25Bc5CmX5rKUfVut+rYA3uidA7zb7AvcglU87rPRg== dependencies: - agentkeepalive "^4.1.3" - cacache "^15.2.0" + agentkeepalive "^4.2.1" + cacache "^16.1.0" http-cache-semantics "^4.1.0" - http-proxy-agent "^4.0.1" + http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" is-lambda "^1.0.1" - lru-cache "^6.0.0" - minipass "^3.1.3" + lru-cache "^7.7.1" + minipass "^3.1.6" minipass-collect "^1.0.2" - minipass-fetch "^1.3.2" + minipass-fetch "^2.0.3" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - negotiator "^0.6.2" + negotiator "^0.6.3" promise-retry "^2.0.1" - socks-proxy-agent "^6.0.0" - ssri "^8.0.0" + socks-proxy-agent "^7.0.0" + ssri "^9.0.0" map-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= + integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== map-obj@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== -marked@^3.0.7: - version "3.0.8" - resolved "https://registry.yarnpkg.com/marked/-/marked-3.0.8.tgz#2785f0dc79cbdc6034be4bb4f0f0a396bd3f8aeb" - integrity sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw== +marked@^4.0.17: + version "4.0.18" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.18.tgz#cd0ac54b2e5610cfb90e8fd46ccaa8292c9ed569" + integrity sha512-wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw== matches-selector@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/matches-selector/-/matches-selector-0.0.1.tgz#1df5262243ae341c1a0804dd302048267ac713bb" - integrity sha1-HfUmIkOuNBwaCATdMCBIJnrHE7s= + integrity sha512-Bm8wuvuNGPY3j1Mo23PxieRQAmQQe2qVcqgmpHOp1BEBNgb4dqzn2Dcgu5bYltMosjGi6LD7GPW72zboSdyJQg== md5.js@^1.3.4: version "1.3.5" @@ -7107,7 +7275,7 @@ mdn-data@2.0.14: media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== "memoize-one@>=3.1.1 <6", memoize-one@^5.0.0: version "5.2.1" @@ -7145,7 +7313,7 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: microbuffer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz#8b3832ed40c87d51f47bb234913a698a756d19d2" - integrity sha1-izgy7UDIfVH0e7I0kTppinVtGdI= + integrity sha512-O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA== micromatch@^4.0.4: version "4.0.4" @@ -7212,7 +7380,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= + integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg== minimatch@^3.0.0, minimatch@^3.0.4: version "3.0.4" @@ -7221,6 +7389,13 @@ minimatch@^3.0.0, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" + integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -7233,7 +7408,7 @@ minimist-options@4.1.0: minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity "sha1-hjelt1nqDW6YcCz7OpKDMjyTr0Q= sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" @@ -7242,16 +7417,16 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" -minipass-fetch@^1.3.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6" - integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw== +minipass-fetch@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8" + integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg== dependencies: - minipass "^3.1.0" + minipass "^3.1.6" minipass-sized "^1.0.3" - minizlib "^2.0.0" + minizlib "^2.1.2" optionalDependencies: - encoding "^0.1.12" + encoding "^0.1.13" minipass-flush@^1.0.5: version "1.0.5" @@ -7260,7 +7435,7 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" -minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: +minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== @@ -7274,14 +7449,14 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: - version "3.1.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" - integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== +minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: + version "3.3.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" + integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== dependencies: yallist "^4.0.0" -minizlib@^2.0.0, minizlib@^2.1.1: +minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -7362,24 +7537,17 @@ module-deps@^6.2.3: through2 "^2.0.0" xtend "^4.0.0" -moment-timezone@^0.5.31: - version "0.5.33" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c" - integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w== - dependencies: - moment ">= 2.9.0" - -moment-timezone@^0.5.34: +moment-timezone@^0.5.31, moment-timezone@^0.5.34: version "0.5.34" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c" integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg== dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@^2.29.0, moment@^2.29.3, moment@~2.29.2: - version "2.29.3" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3" - integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw== +"moment@>= 2.9.0", moment@^2.29.0, moment@^2.29.4, moment@~2.29.2: + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== moo@^0.5.0: version "0.5.1" @@ -7394,32 +7562,27 @@ mousetrap@^1.6.3: ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== -ms@2.1.2: +ms@2.1.2, ms@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.0.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - nan@^2.14.2: - version "2.15.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" - integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== + version "2.16.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" + integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== nanoid@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" - integrity "sha1-YmZ1Itpmc5ccypFqbT7/P0Ff+Aw= sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" + integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== nanoid@^3.1.30: version "3.3.2" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557" - integrity "sha1-yJYi+vtDgc0iFCHGnsWFR6HuxVc= sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==" + integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA== nanopop@^2.1.0: version "2.1.0" @@ -7429,7 +7592,7 @@ nanopop@^2.1.0: natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== nearley@^2.7.10: version "2.20.1" @@ -7444,31 +7607,36 @@ nearley@^2.7.10: neatequal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b" - integrity sha1-LuEhG8n6bkxVcV/SELsFYC6xrjs= + integrity sha512-sVt5awO4a4w24QmAthdrCPiVRW3naB8FGLdyadin01BH+6BzNPEBwGrpwCczQvPlULS6uXTItTe1PJ5P0kYm7A== dependencies: varstream "^0.3.2" -negotiator@0.6.2, negotiator@^0.6.2: +negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +negotiator@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + neo-async@^2.6.0, neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -node-gyp@^8.1.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.0.tgz#6e1112b10617f0f8559c64b3f737e8109e5a8338" - integrity sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q== +node-gyp@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8" + integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g== dependencies: env-paths "^2.2.0" glob "^7.1.4" graceful-fs "^4.2.6" - make-fetch-happen "^9.1.0" + make-fetch-happen "^10.0.3" nopt "^5.0.0" - npmlog "^4.1.2" + npmlog "^6.0.0" rimraf "^3.0.2" semver "^7.3.5" tar "^6.1.2" @@ -7509,7 +7677,7 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= + integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== normalize-url@^6.0.1: version "6.1.0" @@ -7536,15 +7704,15 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npmlog@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== +npmlog@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" nth-check@^2.0.0: version "2.0.1" @@ -7553,15 +7721,10 @@ nth-check@^2.0.0: dependencies: boolbase "^1.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, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-inspect@^1.11.0, object-inspect@^1.7.0, object-inspect@^1.9.0: version "1.11.0" @@ -7629,14 +7792,14 @@ object.values@^1.1.1, object.values@^1.1.4: on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== dependencies: ee-first "1.1.1" once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" @@ -7667,12 +7830,12 @@ optionator@^0.9.1: os-browserify@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= + integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A== os-shim@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" - integrity sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc= + integrity sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A== p-limit@^2.2.0: version "2.3.0" @@ -7717,7 +7880,7 @@ p-pipe@^3.0.0: p-reduce@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" - integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= + integrity sha512-3Tx1T3oM1xO/Y8Gj0sWyE78EIJZ+t+aEmXUdvQgvGmSMri7aPTHoovbXEreWKkL5j21Er60XAWLTzKbAKYOujQ== p-series@^1.0.0, p-series@^1.1.0: version "1.1.0" @@ -7747,7 +7910,7 @@ parent-module@^1.0.0: parents@^1.0.0, parents@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751" - integrity sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E= + integrity sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg== dependencies: path-platform "~0.11.15" @@ -7819,7 +7982,7 @@ path-fx@^2.0.0, path-fx@^2.1.1: path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" @@ -7834,7 +7997,7 @@ path-parse@^1.0.6: path-platform@~0.11.15: version "0.11.15" resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" - integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I= + integrity sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg== path-type@^4.0.0: version "4.0.0" @@ -7844,7 +8007,7 @@ path-type@^4.0.0: pathfinding@^0.4.18: version "0.4.18" resolved "https://registry.yarnpkg.com/pathfinding/-/pathfinding-0.4.18.tgz#a9990f6fa22b7ef196e5651b049165403a045fe8" - integrity sha1-qZkPb6IrfvGW5WUbBJFlQDoEX+g= + integrity sha512-R0TGEQ9GRcFCDvAWlJAWC+KGJ9SLbW4c0nuZRcioVlXVTlw+F5RvXQ8SQgSqI9KXWC1ew95vgmIiyaWTlCe9Ag== dependencies: heap "0.2.5" @@ -7867,7 +8030,7 @@ pbkdf2@^3.0.3: performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== "pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#07cc449e1d89ecc8cce3679d8cff5a35f1db67ee": version "1.0.0" @@ -7903,7 +8066,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: picomodal@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/picomodal/-/picomodal-3.0.0.tgz#facd30f4fbf34a809c1e04ea525f004f399c0b82" - integrity sha1-+s0w9PvzSoCcHgTqUl8ATzmcC4I= + integrity sha512-FoR3TDfuLlqUvcEeK5ifpKSVVns6B4BQvc8SDF6THVMuadya6LLtji0QgUDSStw0ZR2J7I6UGi5V2V23rnPWTw== pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" @@ -8192,7 +8355,7 @@ postcss@^8.2.15, postcss@^8.3.5: precond@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" - integrity sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw= + integrity sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ== prelude-ls@^1.2.1: version "1.2.1" @@ -8207,7 +8370,7 @@ process-nextick-args@~2.0.0: process@^0.11.10, process@~0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= + integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== progress@^2.0.0: version "2.0.3" @@ -8217,7 +8380,7 @@ progress@^2.0.0: promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= + integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== promise-retry@^2.0.1: version "2.0.1" @@ -8245,6 +8408,15 @@ prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: object-assign "^4.1.1" react-is "^16.8.1" +prop-types@^15.8.1: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + public-encrypt@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" @@ -8260,12 +8432,12 @@ public-encrypt@^4.0.0: punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw== punycode@^1.3.2: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== punycode@^2.1.0: version "2.1.1" @@ -8275,7 +8447,7 @@ punycode@^2.1.0: q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== qjobs@^1.2.0: version "1.2.0" @@ -8290,12 +8462,12 @@ qs@6.7.0: querystring-es3@~0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= + integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA== querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== queue-microtask@^1.2.2: version "1.2.3" @@ -8317,7 +8489,7 @@ raf@^3.4.1: railroad-diagrams@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" - integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234= + integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A== randexp@0.4.6: version "0.4.6" @@ -8554,6 +8726,15 @@ react-draggable@^4.4.4: clsx "^1.1.1" prop-types "^15.6.0" +react-dropzone@^14.2.1: + version "14.2.1" + resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.1.tgz#aad17e06290723358398a7be76fb38ecf6d77c1a" + integrity sha512-jzX6wDtAjlfwZ+Fbg+G17EszWUkQVxhMTWMfAC9qSUq7II2pKglHA8aarbFKl0mLpRPDaNUcy+HD/Sf4gkf76Q== + dependencies: + attr-accept "^2.2.2" + file-selector "^0.6.0" + prop-types "^15.8.1" + react-input-autosize@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz#6b5898c790d4478d69420b55441fcc31d5c50a85" @@ -8696,7 +8877,7 @@ react@^17.0.1: read-only-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" - integrity sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A= + integrity sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w== dependencies: readable-stream "^2.0.2" @@ -8722,14 +8903,14 @@ read-pkg@^6.0.0: readable-stream@^1.0.33: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== dependencies: core-util-is "~1.0.0" inherits "~2.0.1" isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@~2.3.6: +readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6: 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== @@ -8776,7 +8957,7 @@ redent@^4.0.0: reflect.ownkeys@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" - integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA= + integrity sha512-qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg== regenerate-unicode-properties@^10.0.1: version "10.0.1" @@ -8885,7 +9066,7 @@ regjsparser@^0.8.2: repeating@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A== dependencies: is-finite "^1.0.0" @@ -8897,7 +9078,7 @@ replace-ext@^1.0.0: require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== require-from-string@^2.0.2: version "2.0.2" @@ -8907,7 +9088,7 @@ require-from-string@^2.0.2: requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== resize-observer-polyfill@^1.5.1: version "1.5.1" @@ -8955,7 +9136,7 @@ ret@~0.1.10: retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== reusify@^1.0.4: version "1.0.4" @@ -8992,7 +9173,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: rst-selector-parser@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" - integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE= + integrity sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA== dependencies: lodash.flattendeep "^4.4.0" nearley "^2.7.10" @@ -9068,7 +9249,7 @@ scheduler@^0.20.2: schema-utils@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" - integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8= + integrity sha512-QaVYBaD9U8scJw2EBWnCBY+LJ0AD+/2edTaigDs0XLDLBfJmSUK9KGqktg1rb32U3z4j/XwvFwHHH1YfbYFd7Q== dependencies: ajv "^5.0.0" @@ -9119,13 +9300,20 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.4, semver@^7.3.5: +semver@^7.2.1, semver@^7.3.4: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" +semver@^7.3.5: + version "7.3.7" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + dependencies: + lru-cache "^6.0.0" + serialize-javascript@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" @@ -9140,10 +9328,10 @@ serialize-javascript@^6.0.0: dependencies: randombytes "^2.1.0" -set-blocking@~2.0.0: +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= + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== setprototypeof@1.1.1: version "1.1.1" @@ -9197,7 +9385,7 @@ shell-quote@^1.6.1: shim-loader@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/shim-loader/-/shim-loader-1.0.1.tgz#2583a6d2aa938897c2a41658bcef73ec87d3aa5e" - integrity sha1-JYOm0qqTiJfCpBZYvO9z7IfTql4= + integrity sha512-O7amY2FR6Mmu0LRair5uLc/NG/sHFw/ulOf9s4iJfW/4KBSQdyqz9iZmOf57QG7xbKISHHPttMsVZWqQ/0vxpw== dependencies: loader-utils "^1.1.0" lodash "^4.14.1" @@ -9213,10 +9401,10 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, 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== +signal-exit@^3.0.3, signal-exit@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== simple-concat@^1.0.0: version "1.0.1" @@ -9258,7 +9446,7 @@ slice-ansi@^4.0.0: jquery ">=1.8.0" jquery-ui ">=1.8.0" -smart-buffer@^4.1.0: +smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== @@ -9266,14 +9454,14 @@ smart-buffer@^4.1.0: snapsvg-cjs@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/snapsvg-cjs/-/snapsvg-cjs-0.0.6.tgz#3b2f56af2573d3d364c3ed5bf8885745f4d2dde1" - integrity sha1-Oy9WryVz09Nkw+1b+IhXRfTS3eE= + integrity sha512-7NNvoGrc3BQvWz5rWK1DsD5/Vni4STswz5B3JrBADboQWcN8OBVGjYVJFPT5JkUXb2iVnEflZANhufEpEcTHXw== dependencies: snapsvg "0.5.1" snapsvg@0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz#0caf52c79189a290746fc446cc5e863f6bdddfe3" - integrity sha1-DK9Sx5GJopB0b8RGzF6GP2vd3+M= + integrity sha512-CjwWYsL7+CCk1vCk9BBKGYS4WJVDfJAOMWU+Zhzf8wf6pAm/xT34wnpaMPAgcgCNkxuU6OkQPPd8wGuRCY9aNw== dependencies: eve "~0.5.1" @@ -9323,27 +9511,27 @@ socket.io@^4.2.0: socket.io-adapter "~2.3.3" socket.io-parser "~4.0.4" -socks-proxy-agent@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz#869cf2d7bd10fea96c7ad3111e81726855e285c3" - integrity sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg== +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== dependencies: agent-base "^6.0.2" - debug "^4.3.1" - socks "^2.6.1" + debug "^4.3.3" + socks "^2.6.2" -socks@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" - integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== +socks@^2.6.2: + version "2.7.0" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" + integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== dependencies: - ip "^1.1.5" - smart-buffer "^4.1.0" + ip "^2.0.0" + smart-buffer "^4.2.0" source-list-map@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1" - integrity sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE= + integrity sha512-FqR2O+cX+toUD3ULVIgTtiqYIqPnA62ehJD47mf4LG1PZCB+xmIa3gcTEhegGbP22aRPh88dJSdgDIolrvSxBQ== source-list-map@^2.0.0: version "2.0.1" @@ -9374,18 +9562,13 @@ source-map-support@~0.5.20: source-map@^0.5.0, source-map@^0.5.7, source-map@~0.5.3: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@~0.7.2: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" @@ -9425,12 +9608,12 @@ sprintf-js@1.1.2: sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -ssri@^8.0.0, ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== +ssri@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" + integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== dependencies: minipass "^3.1.1" @@ -9442,7 +9625,7 @@ stable@^0.1.8: "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== stream-browserify@^3.0.0: version "3.0.0" @@ -9455,7 +9638,7 @@ stream-browserify@^3.0.0: stream-combiner2@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe" - integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4= + integrity sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw== dependencies: duplexer2 "~0.1.0" readable-stream "^2.0.2" @@ -9487,15 +9670,6 @@ streamroller@^3.0.2: debug "^4.1.1" fs-extra "^10.0.0" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -9505,16 +9679,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.fromcodepoint@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz#8d978333c0bc92538f50f383e4888f3e5619d653" - integrity sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM= - -string.prototype.codepointat@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc" - integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg== - string.prototype.matchall@^4.0.5: version "4.0.6" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" @@ -9564,7 +9728,7 @@ string_decoder@^1.1.1: string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== string_decoder@~1.1.1: version "1.1.1" @@ -9573,10 +9737,10 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: +strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== dependencies: ansi-regex "^2.0.0" @@ -9663,14 +9827,14 @@ stylis@^4.0.10, stylis@^4.0.7: subarg@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" - integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI= + integrity sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg== dependencies: minimist "^1.1.0" supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" @@ -9698,38 +9862,35 @@ svg-parser@^2.0.2: resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== -svg-pathdata@^5.0.2: - version "5.0.5" - resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-5.0.5.tgz#65e8d765642ba15fe15434444087d082bc526b29" - integrity sha512-TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow== +svg-pathdata@^6.0.0: + version "6.0.3" + resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz#80b0e0283b652ccbafb69ad4f8f73e8d3fbf2cac" + integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw== -svg2ttf@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-5.2.0.tgz#75c9b8d3c799a91c893ef7bdbfa72d8e00a48a5c" - integrity sha512-CzxPnSm2/CrMnJuKlXVllOx+q9wuarbIMi4Vf14eJoeESRqAOxVZiH0Ias71mhyXYGgz88A4T/E8fN/Y8eXoYA== +svg2ttf@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-6.0.3.tgz#7b92978ff124b2a583d21e1208b9675e245e56d1" + integrity sha512-CgqMyZrbOPpc+WqH7aga4JWkDPso23EgypLsbQ6gN3uoPWwwiLjXvzgrwGADBExvCRJrWFzAeK1bSoSpE7ixSQ== dependencies: + "@xmldom/xmldom" "^0.7.2" argparse "^2.0.1" - cubic2quad "^1.0.0" + cubic2quad "^1.2.1" lodash "^4.17.10" microbuffer "^1.0.0" svgpath "^2.1.5" - xmldom "~0.5.0" -svgicons2svgfont@^9.0.3: - version "9.2.0" - resolved "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-9.2.0.tgz#9ff1b643891891eb52ab1bd764b468e2d06ded80" - integrity sha512-mWeiuob7L2ZTcnAEP4JvSQ1pnIsGjV16ykQ0fCiiXqoUAQ/iNsDvBc601ojjfP89eCPtr3IVZ9mDxYpdxYO3xQ== +svgicons2svgfont@^10.0.4: + version "10.0.6" + resolved "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-10.0.6.tgz#2901f9016244049674d3b3178c36471994a30c0a" + integrity sha512-fUgQEVg3XwTbOHvlXahHGqCet5Wvfo1bV4DCvbSRvjsOCPCRunYbG4dUJCPegps37BMph3eOrfoobhH5AWuC6A== dependencies: - array.prototype.flatmap "1.2.4" - commander "^4.0.1" + commander "^7.2.0" geometry-interfaces "^1.1.4" glob "^7.1.6" neatequal "^1.0.0" readable-stream "^3.4.0" sax "^1.2.4" - string.fromcodepoint "^0.2.1" - string.prototype.codepointat "^0.2.1" - svg-pathdata "^5.0.2" + svg-pathdata "^6.0.0" svgo-loader@^2.2.0: version "2.2.2" @@ -9753,9 +9914,9 @@ svgo@^2.5.0, svgo@^2.7.0: stable "^0.1.8" svgpath@^2.1.5: - version "2.3.1" - resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.3.1.tgz#b102334bebd2244b4818460ba2ebad52716a0d43" - integrity sha512-wNz6lCoj+99GMoyU7SozTfPqiLHz6WcJYZ30Z+F4lF/gPtxWHBCpZ4DhoDI0+oZ0dObKyYsJdSPGbL2mJq/qCg== + version "2.5.0" + resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.5.0.tgz#d57434641d9aa9abae02a4038ebf281fa3005b10" + integrity sha512-o/vohwqjUO9nDAh4rcjE3KaW/v//At8UJu2LJMybXidf5QLQLVA4bxH0//4YCsr+1H4Gw1Wi/Jc62ynzSBYidw== syntax-error@^1.1.1: version "1.4.0" @@ -9775,19 +9936,12 @@ table@^6.0.9: string-width "^4.2.3" strip-ansi "^6.0.1" -tablesorter@^2.31.2: - version "2.31.3" - resolved "https://registry.yarnpkg.com/tablesorter/-/tablesorter-2.31.3.tgz#94c33234ba0e5d9efc5ba4e48651010a396c8b64" - integrity sha512-ueEzeKiMajDcCWnUoT1dOeNEaS1OmPh9+8J0O2Sjp3TTijMygH74EA9QNJiNkLJqULyNU0RhbKY26UMUq9iurA== - dependencies: - jquery ">=1.2.6" - tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar@^6.0.2, tar@^6.1.2: +tar@^6.1.11, tar@^6.1.2: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== @@ -9832,12 +9986,13 @@ terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.1.3: 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.14.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" + integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== dependencies: + "@jridgewell/source-map" "^0.3.2" + acorn "^8.5.0" commander "^2.20.0" - source-map "~0.7.2" source-map-support "~0.5.20" text-segmentation@^1.0.2: @@ -9850,7 +10005,7 @@ text-segmentation@^1.0.2: text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== through2@^2.0.0: version "2.0.5" @@ -9863,19 +10018,19 @@ through2@^2.0.0: "through@>=2.2.7 <3": version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== timers-browserify@^1.0.1: version "1.4.2" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" - integrity sha1-ycWLV1voQHN1y14kYtrO50NZ9B0= + integrity sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q== dependencies: process "~0.11.0" timsort@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= + integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A== tiny-emitter@^2.0.2: version "2.1.0" @@ -9904,12 +10059,12 @@ tmp@^0.2.1: to-fast-properties@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= + integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og== to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== to-regex-range@^5.0.1: version "5.0.1" @@ -9936,7 +10091,7 @@ trim-newlines@^4.0.2: trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= + integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== tslib@2.3.0: version "2.3.0" @@ -9948,31 +10103,34 @@ tslib@^2.2.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -ttf2eot@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz#8e6337a585abd1608a0c84958ab483ce69f6654b" - integrity sha1-jmM3pYWr0WCKDISVirSDzmn2ZUs= - dependencies: - argparse "^1.0.6" - microbuffer "^1.0.0" +tslib@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== -ttf2woff2@^4.0.1: - version "4.0.4" - resolved "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.4.tgz#a995856dc0cc6f4b12ea38c5de7ab289b645ef26" - integrity sha512-pdt/q89D6VmWToUkiwrUo/OrQtmHGr2iBl3GQriHE6xq0cnteb8gJF8UitOdXmFTX8ajKgb3HMGKpKAsCJM61g== +ttf2eot@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-3.1.0.tgz#c8971af7c68c5b996d8cfdb8847cdadfbf195e05" + integrity sha512-aHTbcYosNHVqb2Qtt9Xfta77ae/5y0VfdwNLUS6sGBeGr22cX2JDMo/i5h3uuOf+FAD3akYOr17+fYd5NK8aXw== + dependencies: + argparse "^2.0.1" + +ttf2woff2@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.5.tgz#c7c87242938e9e2ed37fe5f477dd21acdb88fbfd" + integrity sha512-zpoU0NopfjoyVqkFeQ722SyKk/n607mm5OHxuDS/wCCSy82B8H3hHXrezftA2KMbKqfJIjie2lsJHdvPnBGbsw== dependencies: bindings "^1.5.0" bufferstreams "^3.0.0" nan "^2.14.2" - node-gyp "^8.1.0" + node-gyp "^9.0.0" -ttf2woff@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-2.0.2.tgz#09a7cee59abd3c15282b57ed84ac7c7770749f1f" - integrity sha512-X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA== +ttf2woff@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-3.0.0.tgz#bd0fc0157e428b7a9a30340f78adf72fb741962a" + integrity sha512-OvmFcj70PhmAsVQKfC15XoKH55cRWuaRzvr2fpTNhTNer6JBpG8n6vOhRrIgxMjcikyYt88xqYXMMVapJ4Rjvg== dependencies: - argparse "^1.0.6" - microbuffer "^1.0.0" + argparse "^2.0.1" pako "^1.0.0" tty-browserify@0.0.1: @@ -10008,7 +10166,7 @@ type-is@~1.6.17: typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== typescript@^3.2.2: version "3.9.10" @@ -10021,9 +10179,9 @@ ua-parser-js@^0.7.30: integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ== uglify-js@^3.1.4: - version "3.14.3" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz#c0f25dfea1e8e5323eccf59610be08b6043c15cf" - integrity sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g== + version "3.16.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.16.2.tgz#0481e1dbeed343ad1c2ddf3c6d42e89b7a6d4def" + integrity sha512-AaQNokTNgExWrkEYA24BTNMSjyqEXPSfhqoS0AxmHkCJ4U+Dyy5AvbGV/sqxuxficEfGGoX3zWw9R7QpLFfEsg== umd@^3.0.0: version "3.0.3" @@ -10043,7 +10201,7 @@ unbox-primitive@^1.0.1: unc-path-regex@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= + integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== undeclared-identifiers@^1.1.2: version "1.1.3" @@ -10110,7 +10268,7 @@ unicode-property-aliases-ecmascript@^2.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= + integrity sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ== unique-filename@^1.1.1: version "1.1.1" @@ -10134,7 +10292,7 @@ universalify@^2.0.0: unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== uri-js@^4.2.2: version "4.4.1" @@ -10160,7 +10318,7 @@ url-loader@^1.1.2: url@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ== dependencies: punycode "1.3.2" querystring "0.2.0" @@ -10168,12 +10326,12 @@ url@~0.11.0: util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= + integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ== dependencies: inherits "2.0.1" @@ -10192,7 +10350,7 @@ util@~0.12.0: utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== utrie@^1.0.1: version "1.0.1" @@ -10209,7 +10367,7 @@ v8-compile-cache@^2.0.3: valid-filename@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/valid-filename/-/valid-filename-2.0.1.tgz#0768d6f364b1ed3bdf68f0d15abffb0d9d6cecaf" - integrity sha1-B2jW82Sx7TvfaPDRWr/7DZ1s7K8= + integrity sha512-7eF/iUZ5SPd3FighoKgatSjXDJ25Vopo/6yvEKGyX4FIeZVHcLjHmyvbQ1WdFD9RQZ9PoBA7nrSxxAz/oC64SQ== dependencies: filename-reserved-regex "^2.0.0" @@ -10231,14 +10389,14 @@ vanilla-picker@^2.11.2: varstream@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz#18ac6494765f3ff1a35ad9a4be053bec188a5de1" - integrity sha1-GKxklHZfP/GjWtmkvgU77BiKXeE= + integrity sha512-OpR3Usr9dGZZbDttlTxdviGdxiURI0prX68+DuaN/JfIDbK9ZOmREKM6PgmelsejMnhgjXmEEEgf+E4NbsSqMg== dependencies: readable-stream "^1.0.33" vary@^1: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== vendors@^1.0.3: version "1.0.4" @@ -10253,7 +10411,7 @@ vm-browserify@^1.0.0: void-elements@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" - integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= + integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== watchpack@^2.2.0: version "2.2.0" @@ -10273,11 +10431,11 @@ watchpack@^2.2.0: jquery-contextmenu "^2.6.4" webfonts-loader@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.3.0.tgz#a720fd919aad090ddb56252384035aa6fb882d99" - integrity sha512-vnqy8inrc5mvVXmyehCAZLy+yW1ir9MerPmklt3+2BL5f1QiD1HXtC/owyoQbjlWE6XAN+ev3JCJzaMoC+nuJg== + version "7.5.2" + resolved "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.5.2.tgz#9cdf86db9a24d07c6f9ad2fb59e7fa1e20fcfebb" + integrity sha512-XUCqaPZwWrQyTk7zWuHnxVy+ZDdKexAqPJm02dpQwN/zIaHdsGFohLVb09onRRsHRai49b7SZLDVaTxJY8wLsA== dependencies: - "@vusion/webfonts-generator" "^0.7.2" + "@vusion/webfonts-generator" "^0.8.0" glob "^7.1.6" loader-utils "^2.0.0" @@ -10332,7 +10490,7 @@ webpack-merge@^5.7.3: webpack-sources@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb" - integrity sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s= + integrity sha512-iqanNZjOHLdPn/R0e/nKVn90dm4IsUMxKam0MZD1btWhFub/Cdo1nWdMio6yEqBc0F8mEieOjc+jfBSXwna94Q== dependencies: source-list-map "^1.1.1" source-map "~0.5.3" @@ -10417,7 +10575,7 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: +wide-align@^1.1.5: 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== @@ -10444,7 +10602,7 @@ word-wrap@^1.2.3: wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= + integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== wrap-ansi@^7.0.0: version "7.0.0" @@ -10458,7 +10616,7 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@^7.3.1: version "7.5.5" @@ -10470,11 +10628,6 @@ ws@~8.2.3: resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== -xmldom@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== - xmlhttprequest-ssl@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" @@ -10538,19 +10691,19 @@ yargs@^16.1.1: y18n "^5.0.5" yargs-parser "^20.2.2" -yarn-audit-html@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-3.0.1.tgz#222de37f2233f95a37b651efc2ac52e53a666a03" - integrity sha512-tdtbJyKD7lhGS3f1df/boxhNrnEfmjVCyjHGc/9WebZ3gHvF/dxyLDPOzio1vpJRczaYqW3WVF6M1Srgt1O2yQ== +yarn-audit-html@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-4.0.0.tgz#dc04c9cf83e758fd6d9efad8c96df1fc8c4bf30c" + integrity sha512-PZW+M6b6BW4hBU6AuUnxFSOVOq6Gnrh+krBdzcX3OjWNqiDh8ovhiB6pTYEeR13jL8J9VXk/1POn2XljicWZNA== dependencies: - commander "^8.2.0" - ejs "~3.1.6" - marked "^3.0.7" + commander "^9.3.0" + ejs "~3.1.8" + marked "^4.0.17" yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" - integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= + integrity sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg== yocto-queue@^0.1.0: version "0.1.0" diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index 13bd759ccc50..3e2513dd2cd0 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/pkgs/tools/admin/pgadmin/yarn.nix @@ -1898,11 +1898,11 @@ }; } { - name = "_gar_promisify___promisify_1.1.2.tgz"; + name = "_gar_promisify___promisify_1.1.3.tgz"; path = fetchurl { - name = "_gar_promisify___promisify_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz"; - sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; + name = "_gar_promisify___promisify_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz"; + sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; } { @@ -1938,11 +1938,11 @@ }; } { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; + name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; path = fetchurl { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; - sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; }; } { @@ -1961,6 +1961,14 @@ sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; }; } + { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + path = fetchurl { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; + sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; + }; + } { name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; path = fetchurl { @@ -2066,19 +2074,19 @@ }; } { - name = "_npmcli_fs___fs_1.0.0.tgz"; + name = "_npmcli_fs___fs_2.1.1.tgz"; path = fetchurl { - name = "_npmcli_fs___fs_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz"; - sha512 = "8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ=="; + name = "_npmcli_fs___fs_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.1.tgz"; + sha512 = "1Q0uzx6c/NVNGszePbr5Gc2riSU1zLpNlo/1YWntH+eaPmMgBssAW0qXofCVkpdj3ce4swZtlDYQu+NKiYcptg=="; }; } { - name = "_npmcli_move_file___move_file_1.1.2.tgz"; + name = "_npmcli_move_file___move_file_2.0.0.tgz"; path = fetchurl { - name = "_npmcli_move_file___move_file_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz"; - sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; + name = "_npmcli_move_file___move_file_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz"; + sha512 = "UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg=="; }; } { @@ -2322,11 +2330,11 @@ }; } { - name = "_tootallnate_once___once_1.1.2.tgz"; + name = "_tootallnate_once___once_2.0.0.tgz"; path = fetchurl { - name = "_tootallnate_once___once_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; - sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + name = "_tootallnate_once___once_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; + sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; } { @@ -2506,11 +2514,11 @@ }; } { - name = "_vusion_webfonts_generator___webfonts_generator_0.7.3.tgz"; + name = "_vusion_webfonts_generator___webfonts_generator_0.8.0.tgz"; path = fetchurl { - name = "_vusion_webfonts_generator___webfonts_generator_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.7.3.tgz"; - sha512 = "0qDx8stMupH3s4WDVw2y347XEMvR+OSZIOYEdoD9YIw7ZRq9GA+B2GtR7KPPoGHbzWWR+VGkzplPO5tfukewiw=="; + name = "_vusion_webfonts_generator___webfonts_generator_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.8.0.tgz"; + sha512 = "1q17CF6umBEjlAtO37TzRw3aOCCAyFX+T4HPG70BmM6qx8s6H4/LQOa8eHFZq/oiMuMyd0FehKgUt/pqYlIMWA=="; }; } { @@ -2665,6 +2673,14 @@ sha512 = "WZr8i4C6WVDV7Mb8sbm7GdlEPmk1f+xOMjUKThqrkWgwsfvu90zJyyX54wyAvsS91sjtKZ0JipGj2cJnEDaxPA=="; }; } + { + name = "_xmldom_xmldom___xmldom_0.7.5.tgz"; + path = fetchurl { + name = "_xmldom_xmldom___xmldom_0.7.5.tgz"; + url = "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz"; + sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="; + }; + } { name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; path = fetchurl { @@ -2686,7 +2702,7 @@ path = fetchurl { name = "FileSaver___FileSaver_0.10.0.tgz"; url = "https://registry.yarnpkg.com/FileSaver/-/FileSaver-0.10.0.tgz"; - sha1 = "fe84iZREWAQu9d8ukGTIjj0igcc="; + sha512 = "W+syaSPuxeh8yRPinETA4RlBO0ZuyM8IQIln8Y/pYZ136+pxqr64/JRx8rDm3uVqvgQ4xIHgAmZoepujBT1mvg=="; }; } { @@ -2777,6 +2793,14 @@ sha512 = "yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="; }; } + { + name = "acorn___acorn_8.7.1.tgz"; + path = fetchurl { + name = "acorn___acorn_8.7.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz"; + sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; + }; + } { name = "agent_base___agent_base_6.0.2.tgz"; path = fetchurl { @@ -2786,11 +2810,11 @@ }; } { - name = "agentkeepalive___agentkeepalive_4.1.4.tgz"; + name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; path = fetchurl { - name = "agentkeepalive___agentkeepalive_4.1.4.tgz"; - url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz"; - sha512 = "+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ=="; + name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; }; } { @@ -2830,7 +2854,7 @@ path = fetchurl { name = "ajv___ajv_5.5.2.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz"; - sha1 = "c7Xuyj+rZT49P5Qis0GtQiBdyWU="; + sha512 = "Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw=="; }; } { @@ -2878,7 +2902,7 @@ 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 = "l6ERlkmyEa0zaR2fn0hqjsn74KM="; + sha512 = "0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ=="; }; } { @@ -2894,7 +2918,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_2.1.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; + sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; }; } { @@ -2910,7 +2934,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_2.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "tDLdM1i2NM914eRmQ2gkBTPB3b4="; + sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="; }; } { @@ -2946,19 +2970,19 @@ }; } { - name = "aproba___aproba_1.2.0.tgz"; + name = "aproba___aproba_2.0.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=="; + name = "aproba___aproba_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; } { - name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + name = "are_we_there_yet___are_we_there_yet_3.0.0.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=="; + name = "are_we_there_yet___are_we_there_yet_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz"; + sha512 = "0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw=="; }; } { @@ -3025,14 +3049,6 @@ sha512 = "KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg=="; }; } - { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; - path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; - sha512 = "r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q=="; - }; - } { name = "array.prototype.flatmap___array.prototype.flatmap_1.2.5.tgz"; path = fetchurl { @@ -3097,14 +3113,6 @@ sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } - { - name = "async___async_0.9.2.tgz"; - path = fetchurl { - name = "async___async_0.9.2.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; - sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; - }; - } { name = "async___async_2.6.4.tgz"; path = fetchurl { @@ -3121,6 +3129,22 @@ sha512 = "H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="; }; } + { + name = "async___async_3.2.4.tgz"; + path = fetchurl { + name = "async___async_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz"; + sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; + }; + } + { + name = "attr_accept___attr_accept_2.2.2.tgz"; + path = fetchurl { + name = "attr_accept___attr_accept_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz"; + sha512 = "7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg=="; + }; + } { name = "autoprefixer___autoprefixer_10.4.0.tgz"; path = fetchurl { @@ -3158,7 +3182,7 @@ path = fetchurl { name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha1 = "Y/1D99weO7fONZR9uP42mj9Yx0s="; + sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g=="; }; } { @@ -3182,7 +3206,7 @@ path = fetchurl { name = "babel_messages___babel_messages_6.23.0.tgz"; url = "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz"; - sha1 = "8830cDhYA1sqKVHG7F7fbGLyYw4="; + sha512 = "Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w=="; }; } { @@ -3270,7 +3294,7 @@ path = fetchurl { name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; - sha1 = "CvMqmm4Tyno/1QaeYtew9Y0NiUY="; + sha512 = "qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw=="; }; } { @@ -3278,7 +3302,7 @@ path = fetchurl { name = "babel_runtime___babel_runtime_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "llxwWGaOgrVde/4E/yM3vItWR/4="; + sha512 = "ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g=="; }; } { @@ -3286,7 +3310,7 @@ path = fetchurl { name = "babel_template___babel_template_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz"; - sha1 = "3gPi0WOWsGn0bdn/+FIfsaDjXgI="; + sha512 = "PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg=="; }; } { @@ -3294,7 +3318,7 @@ path = fetchurl { name = "babel_traverse___babel_traverse_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz"; - sha1 = "RqnL1+3MYsjlwGTi0tjQ9ANXZu4="; + sha512 = "iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA=="; }; } { @@ -3302,7 +3326,7 @@ path = fetchurl { name = "babel_types___babel_types_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz"; - sha1 = "o7Bz+Uq0nrb6Vc1lInozQ4BjJJc="; + sha512 = "zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g=="; }; } { @@ -3326,7 +3350,7 @@ path = fetchurl { name = "backbone___backbone_1.3.3.tgz"; url = "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz"; - sha1 = "TMgOp8sWMaxHSInOQPL4vGg7KZk="; + sha512 = "aK+k3TiU4tQDUrRCymDDE7XDFnMVuyE6zbZ4JX7mb4pJbQTVOH997/kyBzb8wB2s5Y/Oh7EUfj+sZhwRPxWwow=="; }; } { @@ -3342,7 +3366,7 @@ path = fetchurl { name = "backbone___backbone_1.2.3.tgz"; url = "https://registry.yarnpkg.com/backbone/-/backbone-1.2.3.tgz"; - sha1 = "wiz9B/yG676uYdGJKe0RXpmdZbk="; + sha512 = "1/eXj4agG79UDN7TWnZXcGD6BJrBwLZKCX7zYcBIy9jWf4mrtVkw7IE1VOYFnrKahsmPF9L55Tib9IQRvk027w=="; }; } { @@ -3350,7 +3374,7 @@ path = fetchurl { name = "backform___backform_0.2.0.tgz"; url = "https://registry.yarnpkg.com/backform/-/backform-0.2.0.tgz"; - sha1 = "sUy43rCMhj/FlaK8UFBm4yoq1M4="; + sha512 = "QYwlItiVqb4CDELHyBC+TM4UcoG6Mw/al+PUDUVbQ7OJojpQHaa2TV8uJHhMR6o/Xq4FGt+52qIZLp36dletfw=="; }; } { @@ -3358,7 +3382,7 @@ path = fetchurl { name = "backgrid_filter___backgrid_filter_0.3.7.tgz"; url = "https://registry.yarnpkg.com/backgrid-filter/-/backgrid-filter-0.3.7.tgz"; - sha1 = "1LGdDnBwE9fxgfnox/67SZfVbwM="; + sha512 = "HKWOXXd/dES5Ll3R1+vsfPYO7yVQ0V4+h8cPirFqci4oKTyyZVJupXM2fINhqm0On9dvHijHje8h4X+Wg621gw=="; }; } { @@ -3366,7 +3390,7 @@ path = fetchurl { name = "backgrid_select_all___backgrid_select_all_0.3.5.tgz"; url = "https://registry.yarnpkg.com/backgrid-select-all/-/backgrid-select-all-0.3.5.tgz"; - sha1 = "FDqADl2V/yrlqE14v0+6QflIHpQ="; + sha512 = "bwMQi5d8AnBSZDiV4nWrXcOSmEODbxB6/70mSHG8cGoDfjgW5X7mLiXlmlgEP3VsA1avFD6VvCvpAKZ4BS5f9Q=="; }; } { @@ -3374,7 +3398,7 @@ path = fetchurl { name = "backgrid___backgrid_0.3.8.tgz"; url = "https://registry.yarnpkg.com/backgrid/-/backgrid-0.3.8.tgz"; - sha1 = "fSaBZ0LXLIWcrTmxPxnJ8nuv/tc="; + sha512 = "Klzo941ahoj8Kqd0tRsau+VfXddV3YnQTwb6wVwIaaQxoJ9ORykQy2MNit1MUBnZO6IValYJPvCQyvZhnV6Lfg=="; }; } { @@ -3382,7 +3406,7 @@ path = fetchurl { name = "backo2___backo2_1.0.2.tgz"; url = "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz"; - sha1 = "MasayLEpNjRj41s+u2n038+6eUc="; + sha512 = "zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA=="; }; } { @@ -3494,7 +3518,7 @@ path = fetchurl { name = "boolbase___boolbase_1.0.0.tgz"; url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; - sha1 = "aN/1++YMUes3cl6p4+0xDcwed24="; + sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; }; } { @@ -3537,12 +3561,20 @@ sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } + { + name = "brace_expansion___brace_expansion_2.0.1.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; + }; + } { name = "brace___brace_0.11.1.tgz"; path = fetchurl { name = "brace___brace_0.11.1.tgz"; url = "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz"; - sha1 = "SJb8ydVE7vRfS7dmDbMg07N5/lg="; + sha512 = "Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q=="; }; } { @@ -3558,7 +3590,7 @@ path = fetchurl { name = "brorand___brorand_1.1.0.tgz"; url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; - sha1 = "EsJe/kCkXjwyPrhnWgoM5XsiNx8="; + sha512 = "cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="; }; } { @@ -3678,7 +3710,7 @@ path = fetchurl { name = "buffer_xor___buffer_xor_1.0.3.tgz"; url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; - sha1 = "JuYe0UIvtw3ULm42cp7VHYVf6Nk="; + sha512 = "571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="; }; } { @@ -3710,7 +3742,7 @@ path = fetchurl { name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; - sha1 = "hZgoeOIbmOHGZCXgPQF0eI9Wnug="; + sha512 = "HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="; }; } { @@ -3722,11 +3754,11 @@ }; } { - name = "cacache___cacache_15.3.0.tgz"; + name = "cacache___cacache_16.1.1.tgz"; path = fetchurl { - name = "cacache___cacache_15.3.0.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz"; - sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; + name = "cacache___cacache_16.1.1.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-16.1.1.tgz"; + sha512 = "VDKN+LHyCQXaaYZ7rA/qtkURU+/yYhviUdvqEv2LT6QPZU8jpyzEkEVAcKlKLt5dJ5BRp11ym8lo3NKLluEPLg=="; }; } { @@ -3734,7 +3766,7 @@ path = fetchurl { name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz"; - sha1 = "hlV23+85wNan3v3nlNB49TCOPvM="; + sha512 = "WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="; }; } { @@ -3782,7 +3814,7 @@ path = fetchurl { name = "camelize___camelize_1.0.0.tgz"; url = "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz"; - sha1 = "FkpUg+Yw+kMh5a8HAg5TGDGyYJs="; + sha512 = "W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg=="; }; } { @@ -3794,10 +3826,10 @@ }; } { - name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001338.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001338.tgz"; path = fetchurl { - name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001338.tgz"; - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001338.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz"; sha512 = "1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ=="; }; } @@ -3814,7 +3846,7 @@ path = fetchurl { name = "chalk___chalk_1.1.3.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha1 = "qBFcVeSnAv5NFQq9OHKCKn4J/Jg="; + sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="; }; } { @@ -3950,7 +3982,7 @@ path = fetchurl { name = "closest___closest_0.0.1.tgz"; url = "https://registry.yarnpkg.com/closest/-/closest-0.0.1.tgz"; - sha1 = "JtpvgLPg4X5x+A8SeCgZ6fZTSVw="; + sha512 = "HafRXTAiWp5nf6kxOy2EoIGSsJMn0zew9E5zp3Dy/8CXdp8GvVjZn1TSMEVdDxSP/acXZcWJWiIgF83Di7M1Ew=="; }; } { @@ -3966,15 +3998,7 @@ path = fetchurl { name = "co___co_4.6.0.tgz"; url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; - sha1 = "bqa989hTrlTMuOR7+gvz+QMfsYQ="; - }; - } - { - 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="; + sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; }; } { @@ -4006,7 +4030,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 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; } { @@ -4017,6 +4041,14 @@ sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } + { + name = "color_support___color_support_1.1.3.tgz"; + path = fetchurl { + name = "color_support___color_support_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; + }; + } { name = "colord___colord_2.9.1.tgz"; path = fetchurl { @@ -4038,7 +4070,7 @@ path = fetchurl { name = "combine_source_map___combine_source_map_0.8.0.tgz"; url = "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz"; - sha1 = "pY0N8ELBhvz4IqjoAV9UUNLXmos="; + sha512 = "UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg=="; }; } { @@ -4049,14 +4081,6 @@ sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; } - { - name = "commander___commander_4.1.1.tgz"; - path = fetchurl { - name = "commander___commander_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; - sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; - }; - } { name = "commander___commander_7.2.0.tgz"; path = fetchurl { @@ -4066,11 +4090,11 @@ }; } { - name = "commander___commander_8.3.0.tgz"; + name = "commander___commander_9.4.0.tgz"; path = fetchurl { - name = "commander___commander_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; + name = "commander___commander_9.4.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz"; + sha512 = "sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="; }; } { @@ -4078,7 +4102,7 @@ path = fetchurl { name = "commondir___commondir_1.0.1.tgz"; url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; - sha1 = "3dgA2gxmEnOTzKWVDqloo6rxJTs="; + sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="; }; } { @@ -4094,7 +4118,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 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; } { @@ -4126,7 +4150,7 @@ 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="; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; }; } { @@ -4134,7 +4158,7 @@ path = fetchurl { name = "constants_browserify___constants_browserify_1.0.0.tgz"; url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; - sha1 = "wguW2MYXdIqvHBYCF2DNJ/y4y3U="; + sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; } { @@ -4166,7 +4190,15 @@ path = fetchurl { name = "convert_source_map___convert_source_map_1.1.3.tgz"; url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz"; - sha1 = "SCnId+n+SbMWHzvzZziI4gRpmGA="; + sha512 = "Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg=="; + }; + } + { + name = "convert_units___convert_units_2.3.4.tgz"; + path = fetchurl { + name = "convert_units___convert_units_2.3.4.tgz"; + url = "https://registry.yarnpkg.com/convert-units/-/convert-units-2.3.4.tgz"; + sha512 = "ERHfdA0UhHJp1IpwE6PnFJx8LqG7B1ZjJ20UvVCmopEnVCfER68Tbe3kvN63dLbYXDA2xFWRE6zd4Wsf0w7POg=="; }; } { @@ -4302,7 +4334,7 @@ path = fetchurl { name = "css_color_keywords___css_color_keywords_1.0.0.tgz"; url = "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz"; - sha1 = "/qJhbcZ2spYmhrOvjb2+GAskTgU="; + sha512 = "FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg=="; }; } { @@ -4454,7 +4486,7 @@ path = fetchurl { name = "custom_event___custom_event_1.0.1.tgz"; url = "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz"; - sha1 = "XQKkaFCt8bSjF5RqOSj8y1v9BCU="; + sha512 = "GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg=="; }; } { @@ -4498,19 +4530,11 @@ }; } { - name = "debug___debug_4.3.2.tgz"; + name = "debug___debug_4.3.4.tgz"; path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - } - { - 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"; - sha1 = "BCZuC3CpjURi5uKI44JZITMytmQ="; + name = "debug___debug_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; } { @@ -4518,7 +4542,7 @@ path = fetchurl { name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; url = "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; - sha1 = "0XGoeTMlKAfrPLYdwcFEXQeN8tk="; + sha512 = "ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg=="; }; } { @@ -4526,7 +4550,7 @@ path = fetchurl { name = "decamelize___decamelize_1.2.0.tgz"; url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "9lNNFRSCabIDUue+4m9QH5oZEpA="; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; } { @@ -4550,7 +4574,7 @@ path = fetchurl { name = "deep_equal_ident___deep_equal_ident_1.1.1.tgz"; url = "https://registry.yarnpkg.com/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz"; - sha1 = "BvS4nlNxDNbOpKd4HHqVZkLejck="; + sha512 = "aWv7VhTl/Lju1zenOD3E1w8PpUVrTDbwXCHtbSNr+p/uadr49Y1P1ld0W3Pl6gbvIbiRjoCVsqw70UupCNGh6g=="; }; } { @@ -4582,7 +4606,7 @@ path = fetchurl { name = "defined___defined_1.0.0.tgz"; url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz"; - sha1 = "yY2bzvdWdBiOEQlpFRGZ45sfppM="; + sha512 = "Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ=="; }; } { @@ -4590,7 +4614,7 @@ path = fetchurl { name = "delegates___delegates_1.0.0.tgz"; url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; }; } { @@ -4598,7 +4622,7 @@ path = fetchurl { name = "depd___depd_1.1.2.tgz"; url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; }; } { @@ -4622,7 +4646,7 @@ path = fetchurl { name = "detect_indent___detect_indent_4.0.0.tgz"; url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "920GQ1LN9Docts5hnE7jqUdd4gg="; + sha512 = "BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A=="; }; } { @@ -4638,7 +4662,7 @@ path = fetchurl { name = "di___di_0.0.1.tgz"; url = "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz"; - sha1 = "gGZJMmzqp8qjMG112YXqJ0i6kTw="; + sha512 = "uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA=="; }; } { @@ -4670,7 +4694,7 @@ path = fetchurl { name = "discontinuous_range___discontinuous_range_1.0.0.tgz"; url = "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; - sha1 = "44Mx8IRLukm5qctxx3FYWqsbxlo="; + sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; }; } { @@ -4710,7 +4734,7 @@ path = fetchurl { name = "dom_serialize___dom_serialize_2.2.1.tgz"; url = "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz"; - sha1 = "ViromZ9Evl6jB29UGdzVnrQ6yVs="; + sha512 = "Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ=="; }; } { @@ -4753,20 +4777,12 @@ sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; } - { - name = "dropzone___dropzone_5.9.3.tgz"; - path = fetchurl { - name = "dropzone___dropzone_5.9.3.tgz"; - url = "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz"; - sha512 = "Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA=="; - }; - } { name = "duplexer2___duplexer2_0.1.4.tgz"; path = fetchurl { name = "duplexer2___duplexer2_0.1.4.tgz"; url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "ixLauHjA1p4+eJEFFmKjL8a93ME="; + sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA=="; }; } { @@ -4782,15 +4798,15 @@ path = fetchurl { name = "ee_first___ee_first_1.1.1.tgz"; url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "WQxhFWsK4vTwJVcyoViyZrxWsh0="; + sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; } { - name = "ejs___ejs_3.1.6.tgz"; + name = "ejs___ejs_3.1.8.tgz"; path = fetchurl { - name = "ejs___ejs_3.1.6.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; - sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; + name = "ejs___ejs_3.1.8.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz"; + sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; } { @@ -4846,7 +4862,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; + sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; } { @@ -4902,7 +4918,7 @@ path = fetchurl { name = "ent___ent_2.2.0.tgz"; url = "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz"; - sha1 = "6WQhkyWiHQX0RGai9obtbOX13R0="; + sha512 = "GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="; }; } { @@ -5030,7 +5046,7 @@ path = fetchurl { name = "escape_html___escape_html_1.0.3.tgz"; url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "Aljq5NPQwJdN4cFpGI7wBR0dGYg="; + sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; }; } { @@ -5038,7 +5054,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 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; } { @@ -5174,7 +5190,7 @@ path = fetchurl { name = "eve___eve_0.5.4.tgz"; url = "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz"; - sha1 = "Z9CAuXJSkdfjieNMJoYN2X8d66o="; + sha512 = "aqprQ9MAOh1t66PrHxDFmMXPlgNO6Uv1uqvxmwjprQV50jaQ2RqO7O1neY4PJwC+hMnkyMDphu2AQPOPZdjQog=="; }; } { @@ -5230,7 +5246,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "wFNHeBfIa1HaqFPIHgWbcz0CNhQ="; + sha512 = "fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw=="; }; } { @@ -5270,7 +5286,7 @@ path = fetchurl { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; } { @@ -5313,6 +5329,14 @@ sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; } + { + name = "file_selector___file_selector_0.6.0.tgz"; + path = fetchurl { + name = "file_selector___file_selector_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/file-selector/-/file-selector-0.6.0.tgz"; + sha512 = "QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw=="; + }; + } { name = "file_type___file_type_12.4.2.tgz"; path = fetchurl { @@ -5330,11 +5354,11 @@ }; } { - name = "filelist___filelist_1.0.2.tgz"; + name = "filelist___filelist_1.0.4.tgz"; path = fetchurl { - name = "filelist___filelist_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; - sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; + name = "filelist___filelist_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz"; + sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; }; } { @@ -5342,7 +5366,7 @@ path = fetchurl { name = "filename_reserved_regex___filename_reserved_regex_2.0.0.tgz"; url = "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; - sha1 = "q/c9+rc10EVECr/qLZHzieu/oik="; + sha512 = "lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ=="; }; } { @@ -5422,7 +5446,7 @@ path = fetchurl { name = "follow_redirects___follow_redirects_1.14.8.tgz"; url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz"; - sha1 = "AWmW+5oRoQBWY5ixxoOTN9e/qPw="; + sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="; }; } { @@ -5430,7 +5454,7 @@ path = fetchurl { name = "foreach___foreach_2.0.5.tgz"; url = "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz"; - sha1 = "C+4AUBiusmDQo6865ljdATbsG5k="; + sha512 = "ZBbtRiapkZYLsqoPyZOR+uPfto0GRMNQN1GwzZtZt7iZvPPbDDQV0JF5Hx4o/QFQ5c0vyuoZ98T8RSBbopzWtA=="; }; } { @@ -5462,7 +5486,7 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; } { @@ -5494,7 +5518,7 @@ path = fetchurl { name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; + sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; }; } { @@ -5506,11 +5530,11 @@ }; } { - name = "gauge___gauge_2.7.4.tgz"; + name = "gauge___gauge_4.0.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="; + name = "gauge___gauge_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz"; + sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; }; } { @@ -5593,6 +5617,14 @@ sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } + { + name = "glob___glob_8.0.3.tgz"; + path = fetchurl { + name = "glob___glob_8.0.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz"; + sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; + }; + } { name = "globals___globals_11.12.0.tgz"; path = fetchurl { @@ -5694,7 +5726,7 @@ path = fetchurl { name = "has_ansi___has_ansi_2.0.0.tgz"; url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "NPUEnOHs3ysGSa8+8k5F7TVBbZE="; + sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="; }; } { @@ -5710,7 +5742,7 @@ path = fetchurl { name = "has_cors___has_cors_1.1.0.tgz"; url = "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "XkdHk/fqmEPRu5nCPu9J/xJv/zk="; + sha512 = "g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA=="; }; } { @@ -5718,7 +5750,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 = "tdRU3CGZriJWmfNGfloH87lVuv0="; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; } { @@ -5750,7 +5782,7 @@ path = fetchurl { name = "has_unicode___has_unicode_2.0.1.tgz"; url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; } { @@ -5782,7 +5814,7 @@ path = fetchurl { name = "hat___hat_0.0.3.tgz"; url = "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz"; - sha1 = "uwFKnmSzeIrtgAWRdBPU/z1QLYo="; + sha512 = "zpImx2GoKXy42fVDSEad2BPKuSQdLcqsCYa48K3zHSzM/ugWuYjLDr8IXxpVuL7uCLHw56eaiLxCRthhOzf5ug=="; }; } { @@ -5790,7 +5822,7 @@ path = fetchurl { name = "heap___heap_0.2.5.tgz"; url = "https://registry.yarnpkg.com/heap/-/heap-0.2.5.tgz"; - sha1 = "cTtlWQ68xA/L7q9V6FFpQJKzmvE="; + sha512 = "G7HLD+WKcrOyJP5VQwYZNC3Z6FcQ7YYjEFiFoIj8PfEr73mu421o8B1N5DKUcc8K37EsJ2XXWA8DtrDz/2dReg=="; }; } { @@ -5806,7 +5838,7 @@ path = fetchurl { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "0nRXAQJabHdabFRXk+1QL8DGSaE="; + sha512 = "Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="; }; } { @@ -5870,7 +5902,7 @@ path = fetchurl { name = "htmlescape___htmlescape_1.1.1.tgz"; url = "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz"; - sha1 = "OgPtwiFLyjtmQko+eVk0lQnLA1E="; + sha512 = "eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg=="; }; } { @@ -5898,11 +5930,11 @@ }; } { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; path = fetchurl { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; - sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; + sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; }; } { @@ -5918,15 +5950,15 @@ path = fetchurl { name = "https_browserify___https_browserify_1.0.0.tgz"; url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; - sha1 = "7AbBDgo0wPL68Zn3/X/Hj//QPHM="; + sha512 = "J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="; }; } { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; } { @@ -5942,7 +5974,7 @@ path = fetchurl { name = "humanize_ms___humanize_ms_1.2.1.tgz"; url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha1 = "xG4xWaKT9riW2ikxbYtv6Lt5u+0="; + sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; }; } { @@ -6062,7 +6094,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; } { @@ -6094,7 +6126,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; } { @@ -6110,7 +6142,7 @@ path = fetchurl { name = "inherits___inherits_2.0.1.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; - sha1 = "sX0I0ya0Qj5Wjv9xn5GwscvfafE="; + sha512 = "8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="; }; } { @@ -6118,7 +6150,7 @@ path = fetchurl { name = "inherits___inherits_2.0.3.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "Yzwsg+PaQqUC9SRmAiSA9CCCYd4="; + sha512 = "x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="; }; } { @@ -6126,7 +6158,7 @@ path = fetchurl { name = "inline_source_map___inline_source_map_0.6.2.tgz"; url = "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz"; - sha1 = "+Tk0ccGKedFyT4Y/o4tYY3Ct4qU="; + sha512 = "0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA=="; }; } { @@ -6186,11 +6218,11 @@ }; } { - name = "ip___ip_1.1.5.tgz"; + name = "ip___ip_2.0.0.tgz"; path = fetchurl { - name = "ip___ip_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; - sha1 = "vd7XARQpCCjAoDnnLvJfWq7ENUo="; + name = "ip___ip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; }; } { @@ -6222,7 +6254,7 @@ path = fetchurl { name = "is_arrayish___is_arrayish_0.2.1.tgz"; url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; }; } { @@ -6318,7 +6350,7 @@ path = fetchurl { name = "is_extglob___is_extglob_2.1.1.tgz"; url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; } { @@ -6329,14 +6361,6 @@ sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="; }; } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; - }; - } { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; path = fetchurl { @@ -6366,7 +6390,7 @@ path = fetchurl { name = "is_in_browser___is_in_browser_1.1.3.tgz"; url = "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz"; - sha1 = "Vv9NtoOgeMYILrldrX3GLh0E+DU="; + sha512 = "FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g=="; }; } { @@ -6374,7 +6398,7 @@ path = fetchurl { name = "is_lambda___is_lambda_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz"; - sha1 = "PZh3iZ5qU+/AFgUEzeFfgubwYdU="; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; } { @@ -6406,7 +6430,7 @@ path = fetchurl { name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "caUMhCnfync8kqOQpKA7OfzVHT4="; + sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; }; } { @@ -6470,7 +6494,7 @@ path = fetchurl { name = "is_subset___is_subset_0.1.1.tgz"; url = "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz"; - sha1 = "ilkRfZMt4d4A8kX83TnOQ/HpOaY="; + sha512 = "6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw=="; }; } { @@ -6510,7 +6534,7 @@ path = fetchurl { name = "isarray___isarray_0.0.1.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; - sha1 = "ihis/Kmo9Bd+Cav8YDiTmwXR7t8="; + sha512 = "D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="; }; } { @@ -6518,7 +6542,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; } { @@ -6534,7 +6558,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; } { @@ -6542,7 +6566,7 @@ path = fetchurl { name = "isobject___isobject_3.0.1.tgz"; url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; - sha1 = "TkMekrEalzFjaqH5yNHMvP2reN8="; + sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; }; } { @@ -6610,11 +6634,11 @@ }; } { - name = "jake___jake_10.8.2.tgz"; + name = "jake___jake_10.8.5.tgz"; path = fetchurl { - name = "jake___jake_10.8.2.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; - sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; + name = "jake___jake_10.8.5.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz"; + sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; }; } { @@ -6638,7 +6662,7 @@ path = fetchurl { name = "javascript_natural_sort___javascript_natural_sort_0.7.1.tgz"; url = "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz"; - sha1 = "+eIwPUUH9tdDVac2ZNFED7Wg71k="; + sha512 = "nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="; }; } { @@ -6654,7 +6678,7 @@ path = fetchurl { name = "jmespath___jmespath_0.15.0.tgz"; url = "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz"; - sha1 = "o/Iiqarp+Wb10nx5ZRDigJF2Qhc="; + sha512 = "+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w=="; }; } { @@ -6666,11 +6690,11 @@ }; } { - name = "jquery_ui___jquery_ui_1.13.0.tgz"; + name = "jquery_ui___jquery_ui_1.13.2.tgz"; path = fetchurl { - name = "jquery_ui___jquery_ui_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz"; - sha512 = "Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw=="; + name = "jquery_ui___jquery_ui_1.13.2.tgz"; + url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz"; + sha512 = "wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q=="; }; } { @@ -6686,7 +6710,7 @@ path = fetchurl { name = "js_string_escape___js_string_escape_1.0.1.tgz"; url = "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz"; - sha1 = "4mJbrbwNZ8dTPp7cEGjFh65BN+8="; + sha512 = "Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg=="; }; } { @@ -6702,7 +6726,7 @@ path = fetchurl { name = "js_tokens___js_tokens_3.0.2.tgz"; url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "mGbfOVECEw449/mWvOtlRDIJwls="; + sha512 = "RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg=="; }; } { @@ -6718,7 +6742,7 @@ path = fetchurl { name = "jsbn___jsbn_1.1.0.tgz"; url = "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz"; - sha1 = "sBMHyym2GKHtJux56RH4A8TaAEA="; + sha512 = "4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="; }; } { @@ -6726,7 +6750,7 @@ path = fetchurl { name = "jsesc___jsesc_1.3.0.tgz"; url = "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz"; - sha1 = "RsP+yMGJKxKwgz25vHYiF226s0s="; + sha512 = "Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA=="; }; } { @@ -6742,7 +6766,7 @@ path = fetchurl { name = "jsesc___jsesc_0.5.0.tgz"; url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "597mbjXW/Bb3EP6R1c9p9w8IkR0="; + sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; }; } { @@ -6774,7 +6798,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.3.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "NJptRMU6Ud6JtAgFxdXlm0F9M0A="; + sha512 = "4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA=="; }; } { @@ -6806,7 +6830,7 @@ path = fetchurl { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; } { @@ -6862,7 +6886,7 @@ path = fetchurl { name = "jsonparse___jsonparse_1.3.1.tgz"; url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "P02uSpH6wxX3EGL4UhzCOfE2YoA="; + sha512 = "POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="; }; } { @@ -7006,7 +7030,7 @@ path = fetchurl { name = "karma_requirejs___karma_requirejs_1.1.0.tgz"; url = "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz"; - sha1 = "/driy4fX68FvsCIok1ZNf+5Xh5g="; + sha512 = "MHTOYKdwwJBkvYid0TaYvBzOnFH3TDtzo6ie5E4o9SaUSXXsfMRLa/whUz6efVIgTxj1xnKYasNn/XwEgJeB/Q=="; }; } { @@ -7094,7 +7118,7 @@ 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 = "HADHQ7QzzQpOgHWPe2SldEDZ/wA="; + sha512 = "8ZmlJFVK9iCmtLz19HpSsR8HaAMWBT284VMNednLwlIMDP2hJDCIhUp0IZ2xUcZ+Ob6BM0VvCSJwzASDM45NLQ=="; }; } { @@ -7137,12 +7161,44 @@ sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; } + { + name = "lodash._basebind___lodash._basebind_2.3.0.tgz"; + path = fetchurl { + name = "lodash._basebind___lodash._basebind_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._basebind/-/lodash._basebind-2.3.0.tgz"; + sha512 = "SHqM7YCuJ+BeGTs7lqpWnmdHEeF4MWxS3dksJctHFNxR81FXPOzA4bS5Vs5CpcGTkBpM8FCl+YEbQEblRw8ABg=="; + }; + } + { + name = "lodash._basecreate___lodash._basecreate_2.3.0.tgz"; + path = fetchurl { + name = "lodash._basecreate___lodash._basecreate_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-2.3.0.tgz"; + sha512 = "vwZaWldZwS2y9b99D8i9+WtgiZXbHKsBsMrpxJEqTsNW20NhJo5W8PBQkeQO9CmxuqEYn8UkMnfEM2MMT4cVrw=="; + }; + } + { + name = "lodash._basecreatecallback___lodash._basecreatecallback_2.3.0.tgz"; + path = fetchurl { + name = "lodash._basecreatecallback___lodash._basecreatecallback_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._basecreatecallback/-/lodash._basecreatecallback-2.3.0.tgz"; + sha512 = "Ev+pDzzfVfgbiucpXijconLGRBar7/+KNCf05kSnk4CmdDVhAy1RdbU9efCJ/o9GXI08JdUGwZ+5QJ3QX3kj0g=="; + }; + } + { + name = "lodash._basecreatewrapper___lodash._basecreatewrapper_2.3.0.tgz"; + path = fetchurl { + name = "lodash._basecreatewrapper___lodash._basecreatewrapper_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.3.0.tgz"; + sha512 = "YLycQ7k8AB9Wc1EOvLNxuRWcqipDkMXq2GCgnLWQR6qtgTb3gY3LELzEpnFshrEO4LOLs+R2EpcY+uCOZaLQ8Q=="; + }; + } { name = "lodash._baseisequal___lodash._baseisequal_3.0.7.tgz"; path = fetchurl { name = "lodash._baseisequal___lodash._baseisequal_3.0.7.tgz"; url = "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz"; - sha1 = "2AJfdjOdKTQnZ9zIh85cuVpbUfE="; + sha512 = "U+3GsNEZj9ebI03ncLC2pLmYVjgtYZEwdkAPO7UGgtGvAz36JVFPAQUufpSaVL93Cz5arc6JGRKZRhaOhyVJYA=="; }; } { @@ -7150,7 +7206,15 @@ path = fetchurl { name = "lodash._bindcallback___lodash._bindcallback_3.0.1.tgz"; url = "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"; - sha1 = "5THCdkTPi1epnhftlbNcdIeJOS4="; + sha512 = "2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ=="; + }; + } + { + name = "lodash._createwrapper___lodash._createwrapper_2.3.0.tgz"; + path = fetchurl { + name = "lodash._createwrapper___lodash._createwrapper_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._createwrapper/-/lodash._createwrapper-2.3.0.tgz"; + sha512 = "XjaI/rzg9W+WO4WJDQ+PRlHD5sAMJ1RhJLuT65cBxLCb1kIYs4U20jqvTDGAWyVT3c34GYiLd9AreHYuB/8yJA=="; }; } { @@ -7158,7 +7222,55 @@ path = fetchurl { name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; url = "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "VwvH3t5G1hzc3mh9ZdPuy6o6r/U="; + sha512 = "RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA=="; + }; + } + { + name = "lodash._objecttypes___lodash._objecttypes_2.3.0.tgz"; + path = fetchurl { + name = "lodash._objecttypes___lodash._objecttypes_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.3.0.tgz"; + sha512 = "jbA6QyHt9cw3BzvbWzIcnU3Z12jSneT6xBgz3Y782CJsN1tV5aTBKrFo2B4AkeHBNaxSrbPYZZpi1Lwj3xjdtg=="; + }; + } + { + name = "lodash._renative___lodash._renative_2.3.0.tgz"; + path = fetchurl { + name = "lodash._renative___lodash._renative_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._renative/-/lodash._renative-2.3.0.tgz"; + sha512 = "v44MRirqYqZGK/h5UKoVqXWF2L+LUiLTU+Ogu5rHRVWJUA1uWIlHaMpG8f/OA8j++BzPMQij9+erXHtgFcbuwg=="; + }; + } + { + name = "lodash._setbinddata___lodash._setbinddata_2.3.0.tgz"; + path = fetchurl { + name = "lodash._setbinddata___lodash._setbinddata_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._setbinddata/-/lodash._setbinddata-2.3.0.tgz"; + sha512 = "xMFfbF7dL+sFtrdE49uHFmfpBAEwlFtfgMp86nQRlAF6aizYL+3MTbnYMKJSkP1W501PhsgiBED5kBbZd8kR2g=="; + }; + } + { + name = "lodash._shimkeys___lodash._shimkeys_2.3.0.tgz"; + path = fetchurl { + name = "lodash._shimkeys___lodash._shimkeys_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.3.0.tgz"; + sha512 = "9Iuyi7TiWMGa/9+2rqEE+Zwye4b/U2w7Saw6UX1h6Xs88mEER+uz9FZcEBPKMVKsad9Pw5GNAcIBRnW2jNpneQ=="; + }; + } + { + name = "lodash._slice___lodash._slice_2.3.0.tgz"; + path = fetchurl { + name = "lodash._slice___lodash._slice_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._slice/-/lodash._slice-2.3.0.tgz"; + sha512 = "7C61GhzRUv36gTafr+RIb+AomCAYsSATEoK4OP0VkNBcwvsM022Z22AVgqjjzikeNO1U29LzsJZDvLbiNPUYvA=="; + }; + } + { + name = "lodash.bind___lodash.bind_2.3.0.tgz"; + path = fetchurl { + name = "lodash.bind___lodash.bind_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-2.3.0.tgz"; + sha512 = "goakyOo+FMN8lttMPnZ0UNlr5RlzX4IrUXyTJPT2A0tGCMXySupond9wzvDqTvVmYTcQjIKGrj8naJDS2xWAlQ=="; }; } { @@ -7166,7 +7278,7 @@ path = fetchurl { name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "gteb/zCmfEAF/9XiUVMArZyk168="; + sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; }; } { @@ -7174,7 +7286,7 @@ path = fetchurl { name = "lodash.escape___lodash.escape_4.0.1.tgz"; url = "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz"; - sha1 = "yQRGkMIeBClL6qUXcS/e0fqI3pg="; + sha512 = "nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw=="; }; } { @@ -7182,7 +7294,31 @@ path = fetchurl { name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz"; url = "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha1 = "+wMJF/hqMTTlvJvsDWngAT3f7bI="; + sha512 = "uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ=="; + }; + } + { + name = "lodash.foreach___lodash.foreach_2.3.0.tgz"; + path = fetchurl { + name = "lodash.foreach___lodash.foreach_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-2.3.0.tgz"; + sha512 = "yLnyptVRJd0//AbGp480grgQG9iaDIV5uOgSbpurRy1dYybPbjNTLQ3FyLEQ84buVLPG7jyaiyvpzgfOutRB3Q=="; + }; + } + { + name = "lodash.forown___lodash.forown_2.3.0.tgz"; + path = fetchurl { + name = "lodash.forown___lodash.forown_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.forown/-/lodash.forown-2.3.0.tgz"; + sha512 = "dUnCsuQTtq3Y7bxPNoEEqjJjPL2ftLtcz2PTeRKvhbpdM514AvnqCjewHGsm/W+dwspIwa14KoWEZeizJ7smxA=="; + }; + } + { + name = "lodash.identity___lodash.identity_2.3.0.tgz"; + path = fetchurl { + name = "lodash.identity___lodash.identity_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.identity/-/lodash.identity-2.3.0.tgz"; + sha512 = "NYJ2r2cwy3tkx/saqbIZEX6oQUzjWTnGRu7d/zmBjMCZos3eHBxCpbvWFWSetv8jFVrptsp6EbWjzNgBKhUoOA=="; }; } { @@ -7190,7 +7326,7 @@ path = fetchurl { name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz"; url = "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "L1c9hcaiQon/AGY7SRwdM4/zRYo="; + sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="; }; } { @@ -7198,7 +7334,7 @@ path = fetchurl { name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; url = "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha1 = "eeTriMNqgSKvhvhEqpvNhRtfu1U="; + sha512 = "JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ=="; }; } { @@ -7206,7 +7342,7 @@ path = fetchurl { name = "lodash.isequal___lodash.isequal_3.0.4.tgz"; url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-3.0.4.tgz"; - sha1 = "HDXrO27wzR/1F0Pj6jz3/f/ay2Q="; + sha512 = "Bsu5fP9Omd+HBk2Dz8qp4BHbC+83DBykZ87Lz1JmPKTVNy4Q0XQVtUrbfXVAK/udQrWNcGStcKSA9yj/Zkm3TQ=="; }; } { @@ -7214,7 +7350,23 @@ path = fetchurl { name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; - sha1 = "QVxEePK8wwEgwizhDtMib30+GOA="; + sha512 = "pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="; + }; + } + { + name = "lodash.isfunction___lodash.isfunction_2.3.0.tgz"; + path = fetchurl { + name = "lodash.isfunction___lodash.isfunction_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-2.3.0.tgz"; + sha512 = "X5lteBYlCrVO7Qc00fxP8W90fzRp6Ax9XcHANmU3OsZHdSyIVZ9ZlX5QTTpRq8aGY+9I5Rmd0UTzTIIyWPugEQ=="; + }; + } + { + name = "lodash.isobject___lodash.isobject_2.3.0.tgz"; + path = fetchurl { + name = "lodash.isobject___lodash.isobject_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.3.0.tgz"; + sha512 = "jo1pfV61C4TE8BfEzqaHj6EIKiSkFANJrB6yscwuCJMSRw5tbqjk4Gv7nJzk4Z6nFKobZjGZ8Qd41vmnwgeQqQ=="; }; } { @@ -7222,7 +7374,15 @@ path = fetchurl { name = "lodash.istypedarray___lodash.istypedarray_3.0.6.tgz"; url = "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz"; - sha1 = "yaR3SYYHUB2OhJTSg7h8OSgc72I="; + sha512 = "lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw=="; + }; + } + { + name = "lodash.keys___lodash.keys_2.3.0.tgz"; + path = fetchurl { + name = "lodash.keys___lodash.keys_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.3.0.tgz"; + sha512 = "c0UW0ffqMxSCtoVbmVt2lERJLkEqgoOn2ejPsWXzr0ZrqRbl3uruGgwHzhtqXxi6K/ei3Ey7zimOqSwXgzazPg=="; }; } { @@ -7230,7 +7390,7 @@ path = fetchurl { name = "lodash.keys___lodash.keys_3.1.2.tgz"; url = "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha1 = "TbwEcrFWvlCgsoaFXRvQsMZWCYo="; + sha512 = "CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ=="; }; } { @@ -7238,7 +7398,7 @@ path = fetchurl { name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha1 = "vMbEmkKihA7Zl/Mj6tpezRguC/4="; + sha512 = "t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="; }; } { @@ -7246,7 +7406,7 @@ path = fetchurl { name = "lodash.memoize___lodash.memoize_3.0.4.tgz"; url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; - sha1 = "LcvSwofLwKVcxCMovQxzYVDVPj8="; + sha512 = "eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A=="; }; } { @@ -7257,12 +7417,28 @@ sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; } + { + name = "lodash.noop___lodash.noop_2.3.0.tgz"; + path = fetchurl { + name = "lodash.noop___lodash.noop_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-2.3.0.tgz"; + sha512 = "NpSm8HRm1WkBBWHUveDukLF4Kfb5P5E3fjHc9Qre9A11nNubozLWD2wH3UBTZbu+KSuX8aSUvy9b+PUyEceJ8g=="; + }; + } + { + name = "lodash.support___lodash.support_2.3.0.tgz"; + path = fetchurl { + name = "lodash.support___lodash.support_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.support/-/lodash.support-2.3.0.tgz"; + sha512 = "etc7VWbB0U3Iya8ixj2xy4sDBN3jvPX7ODi8iXtn4KkkjNpdngrdc7Vlt5jub/Vgqx6/dWtp7Ml9awhCQPYKGQ=="; + }; + } { name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; path = fetchurl { name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha1 = "WjUNoLERO4N+z//VgSy+WNbq4ZM="; + sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; }; } { @@ -7270,7 +7446,7 @@ path = fetchurl { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "0CJTc662Uq3BvILklFM5qEJ1R3M="; + sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; }; } { @@ -7305,12 +7481,20 @@ sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } + { + name = "lru_cache___lru_cache_7.13.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_7.13.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz"; + sha512 = "CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ=="; + }; + } { name = "lunr___lunr_0.7.2.tgz"; path = fetchurl { name = "lunr___lunr_0.7.2.tgz"; url = "https://registry.yarnpkg.com/lunr/-/lunr-0.7.2.tgz"; - sha1 = "eaMOky4hbLoWNUHuN6NgfBLNcoE="; + sha512 = "qXxxSzrWOhFu4EhyvYqCGMv1nJsTy5OGQN3GtClGbRSaqJ/1XASk41nF2jjxzKTS8kjU0QybhOgGgGo6HUZqSQ=="; }; } { @@ -7322,11 +7506,11 @@ }; } { - name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; + name = "make_fetch_happen___make_fetch_happen_10.2.0.tgz"; path = fetchurl { - name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; - sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; + name = "make_fetch_happen___make_fetch_happen_10.2.0.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.0.tgz"; + sha512 = "OnEfCLofQVJ5zgKwGk55GaqosqKjaR6khQlJY3dBAA+hM25Bc5CmX5rKUfVut+rYA3uidA7zb7AvcglU87rPRg=="; }; } { @@ -7334,7 +7518,7 @@ path = fetchurl { name = "map_obj___map_obj_1.0.1.tgz"; url = "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "2TPOuSBdgr3PSIb2dCvcK03qFG0="; + sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; }; } { @@ -7346,11 +7530,11 @@ }; } { - name = "marked___marked_3.0.8.tgz"; + name = "marked___marked_4.0.18.tgz"; path = fetchurl { - name = "marked___marked_3.0.8.tgz"; - url = "https://registry.yarnpkg.com/marked/-/marked-3.0.8.tgz"; - sha512 = "0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw=="; + name = "marked___marked_4.0.18.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-4.0.18.tgz"; + sha512 = "wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw=="; }; } { @@ -7358,7 +7542,7 @@ path = fetchurl { name = "matches_selector___matches_selector_0.0.1.tgz"; url = "https://registry.yarnpkg.com/matches-selector/-/matches-selector-0.0.1.tgz"; - sha1 = "HfUmIkOuNBwaCATdMCBIJnrHE7s="; + sha512 = "Bm8wuvuNGPY3j1Mo23PxieRQAmQQe2qVcqgmpHOp1BEBNgb4dqzn2Dcgu5bYltMosjGi6LD7GPW72zboSdyJQg=="; }; } { @@ -7382,7 +7566,7 @@ path = fetchurl { name = "media_typer___media_typer_0.3.0.tgz"; url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "hxDXrwqmJvj/+hzgAWhUUmMlV0g="; + sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; } { @@ -7422,7 +7606,7 @@ path = fetchurl { name = "microbuffer___microbuffer_1.0.0.tgz"; url = "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz"; - sha1 = "izgy7UDIfVH0e7I0kTppinVtGdI="; + sha512 = "O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA=="; }; } { @@ -7510,7 +7694,7 @@ path = fetchurl { name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "9sAMHAsIIkblxNmd+4x8CDsrWCo="; + sha512 = "JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="; }; } { @@ -7521,6 +7705,14 @@ sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } + { + name = "minimatch___minimatch_5.1.0.tgz"; + path = fetchurl { + name = "minimatch___minimatch_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz"; + sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + }; + } { name = "minimist_options___minimist_options_4.1.0.tgz"; path = fetchurl { @@ -7534,7 +7726,7 @@ path = fetchurl { name = "minimist___minimist_1.2.6.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; - sha1 = "hjelt1nqDW6YcCz7OpKDMjyTr0Q="; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; } { @@ -7546,11 +7738,11 @@ }; } { - name = "minipass_fetch___minipass_fetch_1.4.1.tgz"; + name = "minipass_fetch___minipass_fetch_2.1.0.tgz"; path = fetchurl { - name = "minipass_fetch___minipass_fetch_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; - sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; + name = "minipass_fetch___minipass_fetch_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz"; + sha512 = "H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg=="; }; } { @@ -7578,11 +7770,11 @@ }; } { - name = "minipass___minipass_3.1.5.tgz"; + name = "minipass___minipass_3.3.4.tgz"; path = fetchurl { - name = "minipass___minipass_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz"; - sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + name = "minipass___minipass_3.3.4.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz"; + sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; }; } { @@ -7665,14 +7857,6 @@ sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; }; } - { - name = "moment_timezone___moment_timezone_0.5.33.tgz"; - path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.33.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz"; - sha512 = "PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w=="; - }; - } { name = "moment_timezone___moment_timezone_0.5.34.tgz"; path = fetchurl { @@ -7682,11 +7866,11 @@ }; } { - name = "moment___moment_2.29.3.tgz"; + name = "moment___moment_2.29.4.tgz"; path = fetchurl { - name = "moment___moment_2.29.3.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz"; - sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; + name = "moment___moment_2.29.4.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz"; + sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; } { @@ -7710,7 +7894,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; }; } { @@ -7722,19 +7906,11 @@ }; } { - name = "ms___ms_2.1.3.tgz"; + name = "nan___nan_2.16.0.tgz"; path = fetchurl { - name = "ms___ms_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - } - { - name = "nan___nan_2.15.0.tgz"; - path = fetchurl { - name = "nan___nan_2.15.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; - sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; + name = "nan___nan_2.16.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz"; + sha512 = "UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA=="; }; } { @@ -7742,7 +7918,7 @@ path = fetchurl { name = "nanoid___nanoid_3.2.0.tgz"; url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz"; - sha1 = "YmZ1Itpmc5ccypFqbT7/P0Ff+Aw="; + sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; }; } { @@ -7750,7 +7926,7 @@ path = fetchurl { name = "nanoid___nanoid_3.3.2.tgz"; url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz"; - sha1 = "yJYi+vtDgc0iFCHGnsWFR6HuxVc="; + sha512 = "CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA=="; }; } { @@ -7766,7 +7942,7 @@ path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; } { @@ -7782,7 +7958,7 @@ path = fetchurl { name = "neatequal___neatequal_1.0.0.tgz"; url = "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz"; - sha1 = "LuEhG8n6bkxVcV/SELsFYC6xrjs="; + sha512 = "sVt5awO4a4w24QmAthdrCPiVRW3naB8FGLdyadin01BH+6BzNPEBwGrpwCczQvPlULS6uXTItTe1PJ5P0kYm7A=="; }; } { @@ -7793,6 +7969,14 @@ sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; } + { + name = "negotiator___negotiator_0.6.3.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; + }; + } { name = "neo_async___neo_async_2.6.2.tgz"; path = fetchurl { @@ -7802,11 +7986,11 @@ }; } { - name = "node_gyp___node_gyp_8.4.0.tgz"; + name = "node_gyp___node_gyp_9.1.0.tgz"; path = fetchurl { - name = "node_gyp___node_gyp_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.0.tgz"; - sha512 = "Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q=="; + name = "node_gyp___node_gyp_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz"; + sha512 = "HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g=="; }; } { @@ -7854,7 +8038,7 @@ path = fetchurl { name = "normalize_range___normalize_range_0.1.2.tgz"; url = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz"; - sha1 = "LRDAa9/TEuqXd2laTShDlFa3WUI="; + sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; }; } { @@ -7890,11 +8074,11 @@ }; } { - name = "npmlog___npmlog_4.1.2.tgz"; + name = "npmlog___npmlog_6.0.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 = "npmlog___npmlog_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz"; + sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; }; } { @@ -7905,20 +8089,12 @@ sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; }; } - { - 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="; + sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; } { @@ -7990,7 +8166,7 @@ path = fetchurl { name = "on_finished___on_finished_2.3.0.tgz"; url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "IPEzZIGwg811M3mSoWlxqi2QaUc="; + sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; }; } { @@ -7998,7 +8174,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; } { @@ -8030,7 +8206,7 @@ path = fetchurl { name = "os_browserify___os_browserify_0.3.0.tgz"; url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; - sha1 = "hUNzx/XCMVkU/Jv8a9gjj92h7Cc="; + sha512 = "gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="; }; } { @@ -8038,7 +8214,7 @@ path = fetchurl { name = "os_shim___os_shim_0.1.3.tgz"; url = "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz"; - sha1 = "a2LDeRz3kJ6jXtRuF2WLtBfLORc="; + sha512 = "jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A=="; }; } { @@ -8094,7 +8270,7 @@ path = fetchurl { name = "p_reduce___p_reduce_1.0.0.tgz"; url = "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz"; - sha1 = "GMKw3ZNqRpClKfgjH1ig/bakffo="; + sha512 = "3Tx1T3oM1xO/Y8Gj0sWyE78EIJZ+t+aEmXUdvQgvGmSMri7aPTHoovbXEreWKkL5j21Er60XAWLTzKbAKYOujQ=="; }; } { @@ -8134,7 +8310,7 @@ path = fetchurl { name = "parents___parents_1.0.1.tgz"; url = "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz"; - sha1 = "/t1NK/GTp3dF/nHjcdc8MwfZx1E="; + sha512 = "mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg=="; }; } { @@ -8222,7 +8398,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 = "F0uSaHNVNP+8es5r9TpanhtcX18="; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; } { @@ -8246,7 +8422,7 @@ path = fetchurl { name = "path_platform___path_platform_0.11.15.tgz"; url = "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz"; - sha1 = "6GQhf3TDaFDwhSt43Hv31KVyG/I="; + sha512 = "Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg=="; }; } { @@ -8262,7 +8438,7 @@ path = fetchurl { name = "pathfinding___pathfinding_0.4.18.tgz"; url = "https://registry.yarnpkg.com/pathfinding/-/pathfinding-0.4.18.tgz"; - sha1 = "qZkPb6IrfvGW5WUbBJFlQDoEX+g="; + sha512 = "R0TGEQ9GRcFCDvAWlJAWC+KGJ9SLbW4c0nuZRcioVlXVTlw+F5RvXQ8SQgSqI9KXWC1ew95vgmIiyaWTlCe9Ag=="; }; } { @@ -8286,7 +8462,7 @@ path = fetchurl { name = "performance_now___performance_now_2.1.0.tgz"; url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "Ywn04OX6kT7BxpMHrjZLSzd8nns="; + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; } { @@ -8326,7 +8502,7 @@ path = fetchurl { name = "picomodal___picomodal_3.0.0.tgz"; url = "https://registry.yarnpkg.com/picomodal/-/picomodal-3.0.0.tgz"; - sha1 = "+s0w9PvzSoCcHgTqUl8ATzmcC4I="; + sha512 = "FoR3TDfuLlqUvcEeK5ifpKSVVns6B4BQvc8SDF6THVMuadya6LLtji0QgUDSStw0ZR2J7I6UGi5V2V23rnPWTw=="; }; } { @@ -8638,7 +8814,7 @@ path = fetchurl { name = "precond___precond_0.2.3.tgz"; url = "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz"; - sha1 = "qpWRvKokkj8eD0hJ0kD0fvwQdaw="; + sha512 = "QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ=="; }; } { @@ -8662,7 +8838,7 @@ path = fetchurl { name = "process___process_0.11.10.tgz"; url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; - sha1 = "czIwDoQBYb2j5podHZGn1LwW8YI="; + sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; }; } { @@ -8678,7 +8854,7 @@ path = fetchurl { name = "promise_inflight___promise_inflight_1.0.1.tgz"; url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha1 = "mEcocL8igTL8vdhoEputEsPAKeM="; + sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; }; } { @@ -8705,6 +8881,14 @@ sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="; }; } + { + name = "prop_types___prop_types_15.8.1.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.8.1.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz"; + sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="; + }; + } { name = "public_encrypt___public_encrypt_4.0.3.tgz"; path = fetchurl { @@ -8718,7 +8902,7 @@ path = fetchurl { name = "punycode___punycode_1.3.2.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; - sha1 = "llOgNvt8HuQjQvIyXM7v6jkmxI0="; + sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; }; } { @@ -8726,7 +8910,7 @@ path = fetchurl { name = "punycode___punycode_1.4.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; - sha1 = "wNWmOycYgArY4esPpSachN1BhF4="; + sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; } { @@ -8742,7 +8926,7 @@ path = fetchurl { name = "q___q_1.5.1.tgz"; url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; - sha1 = "fjL3W0E4EpHQRhHxvxQQmsAGUdc="; + sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; }; } { @@ -8766,7 +8950,7 @@ path = fetchurl { name = "querystring_es3___querystring_es3_0.2.1.tgz"; url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "nsYfeQSYdXB9aUFFlv2Qek1xHnM="; + sha512 = "773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="; }; } { @@ -8774,7 +8958,7 @@ path = fetchurl { name = "querystring___querystring_0.2.0.tgz"; url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; - sha1 = "sgmEkgO7Jd+CDadW50cAWHhSFiA="; + sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="; }; } { @@ -8806,7 +8990,7 @@ path = fetchurl { name = "railroad_diagrams___railroad_diagrams_1.0.0.tgz"; url = "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; - sha1 = "635iZ1SN3t+4mcG5Dlc3RVnN234="; + sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; }; } { @@ -9017,6 +9201,14 @@ sha512 = "6e0WdcNLwpBx/YIDpoyd2Xb04PB0elrDrulKUgdrIlwuYvxh5Ok9M+F8cljm8kPXXs43PmMzek9RrB1b7mLMqA=="; }; } + { + name = "react_dropzone___react_dropzone_14.2.1.tgz"; + path = fetchurl { + name = "react_dropzone___react_dropzone_14.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.1.tgz"; + sha512 = "jzX6wDtAjlfwZ+Fbg+G17EszWUkQVxhMTWMfAC9qSUq7II2pKglHA8aarbFKl0mLpRPDaNUcy+HD/Sf4gkf76Q=="; + }; + } { name = "react_input_autosize___react_input_autosize_3.0.0.tgz"; path = fetchurl { @@ -9174,7 +9366,7 @@ path = fetchurl { name = "read_only_stream___read_only_stream_2.0.0.tgz"; url = "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz"; - sha1 = "JyT9aoET1zdkrCiNQ4YnDB2/F/A="; + sha512 = "3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w=="; }; } { @@ -9198,7 +9390,7 @@ path = fetchurl { name = "readable_stream___readable_stream_1.1.14.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "fPTFTvZI44EwhMY23SB54WbAgdk="; + sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; } { @@ -9246,7 +9438,7 @@ path = fetchurl { name = "reflect.ownkeys___reflect.ownkeys_0.2.0.tgz"; url = "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz"; - sha1 = "dJrO7H8/34tj+SegSAnpDFwLNGA="; + sha512 = "qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg=="; }; } { @@ -9374,7 +9566,7 @@ path = fetchurl { name = "repeating___repeating_2.0.1.tgz"; url = "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz"; - sha1 = "UhTFOpJtNVJwdSf7q0FdvAjQbdo="; + sha512 = "ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A=="; }; } { @@ -9390,7 +9582,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 = "jGStX9MNqxyXbiNE/+f3kqam30I="; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; }; } { @@ -9406,7 +9598,7 @@ path = fetchurl { name = "requires_port___requires_port_1.0.0.tgz"; url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "kl0mAdOaxIXgkc8NpcbmlNw9yv8="; + sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; } { @@ -9470,7 +9662,7 @@ path = fetchurl { name = "retry___retry_0.12.0.tgz"; url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; - sha1 = "G0KmJmoh8HQh0bC1S33BZ7AcATs="; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; }; } { @@ -9518,7 +9710,7 @@ path = fetchurl { name = "rst_selector_parser___rst_selector_parser_2.2.3.tgz"; url = "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz"; - sha1 = "gbIw6i/MYGbInjRy3nlChdmwPZE="; + sha512 = "nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA=="; }; } { @@ -9606,7 +9798,7 @@ path = fetchurl { name = "schema_utils___schema_utils_0.3.0.tgz"; url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz"; - sha1 = "9YdyIs4+kx7a4DnxfrNxbnE3+M8="; + sha512 = "QaVYBaD9U8scJw2EBWnCBY+LJ0AD+/2edTaigDs0XLDLBfJmSUK9KGqktg1rb32U3z4j/XwvFwHHH1YfbYFd7Q=="; }; } { @@ -9673,6 +9865,14 @@ sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } + { + name = "semver___semver_7.3.7.tgz"; + path = fetchurl { + name = "semver___semver_7.3.7.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + }; + } { name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; path = fetchurl { @@ -9694,7 +9894,7 @@ 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="; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; } { @@ -9766,7 +9966,7 @@ path = fetchurl { name = "shim_loader___shim_loader_1.0.1.tgz"; url = "https://registry.yarnpkg.com/shim-loader/-/shim-loader-1.0.1.tgz"; - sha1 = "JYOm0qqTiJfCpBZYvO9z7IfTql4="; + sha512 = "O7amY2FR6Mmu0LRair5uLc/NG/sHFw/ulOf9s4iJfW/4KBSQdyqz9iZmOf57QG7xbKISHHPttMsVZWqQ/0vxpw=="; }; } { @@ -9778,11 +9978,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.5.tgz"; + name = "signal_exit___signal_exit_3.0.7.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"; - sha512 = "KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="; + name = "signal_exit___signal_exit_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; } { @@ -9854,7 +10054,7 @@ path = fetchurl { name = "snapsvg_cjs___snapsvg_cjs_0.0.6.tgz"; url = "https://registry.yarnpkg.com/snapsvg-cjs/-/snapsvg-cjs-0.0.6.tgz"; - sha1 = "Oy9WryVz09Nkw+1b+IhXRfTS3eE="; + sha512 = "7NNvoGrc3BQvWz5rWK1DsD5/Vni4STswz5B3JrBADboQWcN8OBVGjYVJFPT5JkUXb2iVnEflZANhufEpEcTHXw=="; }; } { @@ -9862,7 +10062,7 @@ path = fetchurl { name = "snapsvg___snapsvg_0.5.1.tgz"; url = "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz"; - sha1 = "DK9Sx5GJopB0b8RGzF6GP2vd3+M="; + sha512 = "CjwWYsL7+CCk1vCk9BBKGYS4WJVDfJAOMWU+Zhzf8wf6pAm/xT34wnpaMPAgcgCNkxuU6OkQPPd8wGuRCY9aNw=="; }; } { @@ -9906,19 +10106,19 @@ }; } { - name = "socks_proxy_agent___socks_proxy_agent_6.1.0.tgz"; + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; path = fetchurl { - name = "socks_proxy_agent___socks_proxy_agent_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz"; - sha512 = "57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg=="; + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; + sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; }; } { - name = "socks___socks_2.6.1.tgz"; + name = "socks___socks_2.7.0.tgz"; path = fetchurl { - name = "socks___socks_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz"; - sha512 = "kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA=="; + name = "socks___socks_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz"; + sha512 = "scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA=="; }; } { @@ -9926,7 +10126,7 @@ path = fetchurl { name = "source_list_map___source_list_map_1.1.2.tgz"; url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz"; - sha1 = "mIkBnRAkzOVc3AaUmDN+9hhqEaE="; + sha512 = "FqR2O+cX+toUD3ULVIgTtiqYIqPnA62ehJD47mf4LG1PZCB+xmIa3gcTEhegGbP22aRPh88dJSdgDIolrvSxBQ=="; }; } { @@ -9966,7 +10166,7 @@ path = fetchurl { name = "source_map___source_map_0.5.7.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; + sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; }; } { @@ -9977,14 +10177,6 @@ sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } - { - name = "source_map___source_map_0.7.3.tgz"; - path = fetchurl { - name = "source_map___source_map_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; - sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; - }; - } { name = "spdx_correct___spdx_correct_3.1.1.tgz"; path = fetchurl { @@ -10038,15 +10230,15 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.0.3.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; } { - name = "ssri___ssri_8.0.1.tgz"; + name = "ssri___ssri_9.0.1.tgz"; path = fetchurl { - name = "ssri___ssri_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz"; - sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; + name = "ssri___ssri_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz"; + sha512 = "o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q=="; }; } { @@ -10062,7 +10254,7 @@ path = fetchurl { name = "statuses___statuses_1.5.0.tgz"; url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; - sha1 = "Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="; + sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; }; } { @@ -10078,7 +10270,7 @@ path = fetchurl { name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; - sha1 = "+02KFCDqNidk4hrUeAOXvry0HL4="; + sha512 = "3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw=="; }; } { @@ -10105,14 +10297,6 @@ sha512 = "ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA=="; }; } - { - name = "string_width___string_width_1.0.2.tgz"; - path = fetchurl { - name = "string_width___string_width_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; - }; - } { name = "string_width___string_width_4.2.3.tgz"; path = fetchurl { @@ -10121,22 +10305,6 @@ sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } - { - name = "string.fromcodepoint___string.fromcodepoint_0.2.1.tgz"; - path = fetchurl { - name = "string.fromcodepoint___string.fromcodepoint_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz"; - sha1 = "jZeDM8C8klOPUPOD5IiPPlYZ1lM="; - }; - } - { - name = "string.prototype.codepointat___string.prototype.codepointat_0.2.1.tgz"; - path = fetchurl { - name = "string.prototype.codepointat___string.prototype.codepointat_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz"; - sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="; - }; - } { name = "string.prototype.matchall___string.prototype.matchall_4.0.6.tgz"; path = fetchurl { @@ -10182,7 +10350,7 @@ path = fetchurl { name = "string_decoder___string_decoder_0.10.31.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="; + sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="; }; } { @@ -10198,7 +10366,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_3.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; }; } { @@ -10294,7 +10462,7 @@ path = fetchurl { name = "subarg___subarg_1.0.0.tgz"; url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz"; - sha1 = "9izxdYHplrSPyWVpn1TAauJouNI="; + sha512 = "RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg=="; }; } { @@ -10302,7 +10470,7 @@ path = fetchurl { name = "supports_color___supports_color_2.0.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "U10EXOa2Nj+kARcIRimZXp3zJMc="; + sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="; }; } { @@ -10338,27 +10506,27 @@ }; } { - name = "svg_pathdata___svg_pathdata_5.0.5.tgz"; + name = "svg_pathdata___svg_pathdata_6.0.3.tgz"; path = fetchurl { - name = "svg_pathdata___svg_pathdata_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; - sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; + name = "svg_pathdata___svg_pathdata_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz"; + sha512 = "qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw=="; }; } { - name = "svg2ttf___svg2ttf_5.2.0.tgz"; + name = "svg2ttf___svg2ttf_6.0.3.tgz"; path = fetchurl { - name = "svg2ttf___svg2ttf_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-5.2.0.tgz"; - sha512 = "CzxPnSm2/CrMnJuKlXVllOx+q9wuarbIMi4Vf14eJoeESRqAOxVZiH0Ias71mhyXYGgz88A4T/E8fN/Y8eXoYA=="; + name = "svg2ttf___svg2ttf_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-6.0.3.tgz"; + sha512 = "CgqMyZrbOPpc+WqH7aga4JWkDPso23EgypLsbQ6gN3uoPWwwiLjXvzgrwGADBExvCRJrWFzAeK1bSoSpE7ixSQ=="; }; } { - name = "svgicons2svgfont___svgicons2svgfont_9.2.0.tgz"; + name = "svgicons2svgfont___svgicons2svgfont_10.0.6.tgz"; path = fetchurl { - name = "svgicons2svgfont___svgicons2svgfont_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-9.2.0.tgz"; - sha512 = "mWeiuob7L2ZTcnAEP4JvSQ1pnIsGjV16ykQ0fCiiXqoUAQ/iNsDvBc601ojjfP89eCPtr3IVZ9mDxYpdxYO3xQ=="; + name = "svgicons2svgfont___svgicons2svgfont_10.0.6.tgz"; + url = "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-10.0.6.tgz"; + sha512 = "fUgQEVg3XwTbOHvlXahHGqCet5Wvfo1bV4DCvbSRvjsOCPCRunYbG4dUJCPegps37BMph3eOrfoobhH5AWuC6A=="; }; } { @@ -10378,11 +10546,11 @@ }; } { - name = "svgpath___svgpath_2.3.1.tgz"; + name = "svgpath___svgpath_2.5.0.tgz"; path = fetchurl { - name = "svgpath___svgpath_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/svgpath/-/svgpath-2.3.1.tgz"; - sha512 = "wNz6lCoj+99GMoyU7SozTfPqiLHz6WcJYZ30Z+F4lF/gPtxWHBCpZ4DhoDI0+oZ0dObKyYsJdSPGbL2mJq/qCg=="; + name = "svgpath___svgpath_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/svgpath/-/svgpath-2.5.0.tgz"; + sha512 = "o/vohwqjUO9nDAh4rcjE3KaW/v//At8UJu2LJMybXidf5QLQLVA4bxH0//4YCsr+1H4Gw1Wi/Jc62ynzSBYidw=="; }; } { @@ -10401,14 +10569,6 @@ sha512 = "5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw=="; }; } - { - name = "tablesorter___tablesorter_2.31.3.tgz"; - path = fetchurl { - name = "tablesorter___tablesorter_2.31.3.tgz"; - url = "https://registry.yarnpkg.com/tablesorter/-/tablesorter-2.31.3.tgz"; - sha512 = "ueEzeKiMajDcCWnUoT1dOeNEaS1OmPh9+8J0O2Sjp3TTijMygH74EA9QNJiNkLJqULyNU0RhbKY26UMUq9iurA=="; - }; - } { name = "tapable___tapable_2.2.1.tgz"; path = fetchurl { @@ -10450,11 +10610,11 @@ }; } { - name = "terser___terser_5.9.0.tgz"; + name = "terser___terser_5.14.2.tgz"; path = fetchurl { - name = "terser___terser_5.9.0.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz"; - sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; + name = "terser___terser_5.14.2.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz"; + sha512 = "oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA=="; }; } { @@ -10470,7 +10630,7 @@ path = fetchurl { name = "text_table___text_table_0.2.0.tgz"; url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; } { @@ -10486,7 +10646,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; + sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; }; } { @@ -10494,7 +10654,7 @@ path = fetchurl { name = "timers_browserify___timers_browserify_1.4.2.tgz"; url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz"; - sha1 = "ycWLV1voQHN1y14kYtrO50NZ9B0="; + sha512 = "PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q=="; }; } { @@ -10502,7 +10662,7 @@ path = fetchurl { name = "timsort___timsort_0.3.0.tgz"; url = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz"; - sha1 = "QFQRqOfmM5/mTbmiNN4R3DHgK9Q="; + sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; } { @@ -10542,7 +10702,7 @@ path = fetchurl { name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; - sha1 = "uDVx+k2MJbguIxsG46MFXeTKGkc="; + sha512 = "lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og=="; }; } { @@ -10550,7 +10710,7 @@ path = fetchurl { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; + sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; }; } { @@ -10590,7 +10750,7 @@ path = fetchurl { name = "trim_right___trim_right_1.0.1.tgz"; url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM="; + sha512 = "WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw=="; }; } { @@ -10610,27 +10770,35 @@ }; } { - name = "ttf2eot___ttf2eot_2.0.0.tgz"; + name = "tslib___tslib_2.4.0.tgz"; path = fetchurl { - name = "ttf2eot___ttf2eot_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz"; - sha1 = "jmM3pYWr0WCKDISVirSDzmn2ZUs="; + name = "tslib___tslib_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz"; + sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; }; } { - name = "ttf2woff2___ttf2woff2_4.0.4.tgz"; + name = "ttf2eot___ttf2eot_3.1.0.tgz"; path = fetchurl { - name = "ttf2woff2___ttf2woff2_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.4.tgz"; - sha512 = "pdt/q89D6VmWToUkiwrUo/OrQtmHGr2iBl3GQriHE6xq0cnteb8gJF8UitOdXmFTX8ajKgb3HMGKpKAsCJM61g=="; + name = "ttf2eot___ttf2eot_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-3.1.0.tgz"; + sha512 = "aHTbcYosNHVqb2Qtt9Xfta77ae/5y0VfdwNLUS6sGBeGr22cX2JDMo/i5h3uuOf+FAD3akYOr17+fYd5NK8aXw=="; }; } { - name = "ttf2woff___ttf2woff_2.0.2.tgz"; + name = "ttf2woff2___ttf2woff2_4.0.5.tgz"; path = fetchurl { - name = "ttf2woff___ttf2woff_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-2.0.2.tgz"; - sha512 = "X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA=="; + name = "ttf2woff2___ttf2woff2_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.5.tgz"; + sha512 = "zpoU0NopfjoyVqkFeQ722SyKk/n607mm5OHxuDS/wCCSy82B8H3hHXrezftA2KMbKqfJIjie2lsJHdvPnBGbsw=="; + }; + } + { + name = "ttf2woff___ttf2woff_3.0.0.tgz"; + path = fetchurl { + name = "ttf2woff___ttf2woff_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-3.0.0.tgz"; + sha512 = "OvmFcj70PhmAsVQKfC15XoKH55cRWuaRzvr2fpTNhTNer6JBpG8n6vOhRrIgxMjcikyYt88xqYXMMVapJ4Rjvg=="; }; } { @@ -10678,7 +10846,7 @@ path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; + sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; } { @@ -10698,11 +10866,11 @@ }; } { - name = "uglify_js___uglify_js_3.14.3.tgz"; + name = "uglify_js___uglify_js_3.16.2.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.14.3.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz"; - sha512 = "mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g=="; + name = "uglify_js___uglify_js_3.16.2.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.16.2.tgz"; + sha512 = "AaQNokTNgExWrkEYA24BTNMSjyqEXPSfhqoS0AxmHkCJ4U+Dyy5AvbGV/sqxuxficEfGGoX3zWw9R7QpLFfEsg=="; }; } { @@ -10726,7 +10894,7 @@ path = fetchurl { name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "5z3T17DXxe2G+6xrCufYxqadUPo="; + sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; }; } { @@ -10814,7 +10982,7 @@ path = fetchurl { name = "uniqs___uniqs_2.0.0.tgz"; url = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz"; - sha1 = "/+3ks2slKQaW5uFl1KWe25mOawI="; + sha512 = "mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ=="; }; } { @@ -10846,7 +11014,7 @@ path = fetchurl { name = "unpipe___unpipe_1.0.0.tgz"; url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "sr9O6FFKrmFltIF4KdIbLvSZBOw="; + sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; }; } { @@ -10878,7 +11046,7 @@ path = fetchurl { name = "url___url_0.11.0.tgz"; url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; - sha1 = "ODjpfPxgUh63PFJajlW/3Z4uKPE="; + sha512 = "kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ=="; }; } { @@ -10886,7 +11054,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 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; } { @@ -10894,7 +11062,7 @@ path = fetchurl { name = "util___util_0.10.3.tgz"; url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; - sha1 = "evsa/lCAUkZInj23/g7TeTNqwPk="; + sha512 = "5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ=="; }; } { @@ -10910,7 +11078,7 @@ path = fetchurl { name = "utils_merge___utils_merge_1.0.1.tgz"; url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "n5VxD1CiZ5R7LMwSR0HBAoQn5xM="; + sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; }; } { @@ -10934,7 +11102,7 @@ path = fetchurl { name = "valid_filename___valid_filename_2.0.1.tgz"; url = "https://registry.yarnpkg.com/valid-filename/-/valid-filename-2.0.1.tgz"; - sha1 = "B2jW82Sx7TvfaPDRWr/7DZ1s7K8="; + sha512 = "7eF/iUZ5SPd3FighoKgatSjXDJ25Vopo/6yvEKGyX4FIeZVHcLjHmyvbQ1WdFD9RQZ9PoBA7nrSxxAz/oC64SQ=="; }; } { @@ -10958,7 +11126,7 @@ path = fetchurl { name = "varstream___varstream_0.3.2.tgz"; url = "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz"; - sha1 = "GKxklHZfP/GjWtmkvgU77BiKXeE="; + sha512 = "OpR3Usr9dGZZbDttlTxdviGdxiURI0prX68+DuaN/JfIDbK9ZOmREKM6PgmelsejMnhgjXmEEEgf+E4NbsSqMg=="; }; } { @@ -10966,7 +11134,7 @@ path = fetchurl { name = "vary___vary_1.1.2.tgz"; url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; - sha1 = "IpnwLG3tMNSllhsLn3RSShj2NPw="; + sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; }; } { @@ -10990,7 +11158,7 @@ path = fetchurl { name = "void_elements___void_elements_2.0.1.tgz"; url = "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz"; - sha1 = "wGavtYK7HLQSjWDqkjkulNXp2+w="; + sha512 = "qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung=="; }; } { @@ -11018,11 +11186,11 @@ ''; } { - name = "webfonts_loader___webfonts_loader_7.3.0.tgz"; + name = "webfonts_loader___webfonts_loader_7.5.2.tgz"; path = fetchurl { - name = "webfonts_loader___webfonts_loader_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.3.0.tgz"; - sha512 = "vnqy8inrc5mvVXmyehCAZLy+yW1ir9MerPmklt3+2BL5f1QiD1HXtC/owyoQbjlWE6XAN+ev3JCJzaMoC+nuJg=="; + name = "webfonts_loader___webfonts_loader_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.5.2.tgz"; + sha512 = "XUCqaPZwWrQyTk7zWuHnxVy+ZDdKexAqPJm02dpQwN/zIaHdsGFohLVb09onRRsHRai49b7SZLDVaTxJY8wLsA=="; }; } { @@ -11062,7 +11230,7 @@ path = fetchurl { name = "webpack_sources___webpack_sources_0.2.3.tgz"; url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz"; - sha1 = "F8Yr+vE8cH+dAsR54Nzd6DgGl/s="; + sha512 = "iqanNZjOHLdPn/R0e/nKVn90dm4IsUMxKam0MZD1btWhFub/Cdo1nWdMio6yEqBc0F8mEieOjc+jfBSXwna94Q=="; }; } { @@ -11158,7 +11326,7 @@ path = fetchurl { name = "wordwrap___wordwrap_1.0.0.tgz"; url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "J1hIEIkUVqQXHI0CJkQa3pDLyus="; + sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; }; } { @@ -11174,7 +11342,7 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; } { @@ -11193,14 +11361,6 @@ sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; }; } - { - name = "xmldom___xmldom_0.5.0.tgz"; - path = fetchurl { - name = "xmldom___xmldom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; - sha512 = "Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="; - }; - } { name = "xmlhttprequest_ssl___xmlhttprequest_ssl_2.0.0.tgz"; path = fetchurl { @@ -11290,11 +11450,11 @@ }; } { - name = "yarn_audit_html___yarn_audit_html_3.0.1.tgz"; + name = "yarn_audit_html___yarn_audit_html_4.0.0.tgz"; path = fetchurl { - name = "yarn_audit_html___yarn_audit_html_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-3.0.1.tgz"; - sha512 = "tdtbJyKD7lhGS3f1df/boxhNrnEfmjVCyjHGc/9WebZ3gHvF/dxyLDPOzio1vpJRczaYqW3WVF6M1Srgt1O2yQ=="; + name = "yarn_audit_html___yarn_audit_html_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-4.0.0.tgz"; + sha512 = "PZW+M6b6BW4hBU6AuUnxFSOVOq6Gnrh+krBdzcX3OjWNqiDh8ovhiB6pTYEeR13jL8J9VXk/1POn2XljicWZNA=="; }; } { @@ -11302,7 +11462,7 @@ path = fetchurl { name = "yeast___yeast_0.1.2.tgz"; url = "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz"; - sha1 = "AI4G2AlDIMNy28L47XagymyKxBk="; + sha512 = "8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="; }; } { diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 8ed36c029025..141496eaa65c 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.9.0"; + version = "1.10.3"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OKCrz+A+y9XmYKsN5wsrcpDeBLMlalVULib/1FCKqhM="; + sha256 = "sha256-jos6SZ2ZkUeWOM0ALlsc5a+5kcullNF/2AknTQpRnIc="; }; vendorSha256 = "sha256-1c+YtfRy1ey0z117YHHkrCnpb7g+DmM+LR1rjn1YwMQ="; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 3954d3f5cd9b..9208e286c9b4 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools - cinnamon.xapps + cinnamon.xapp gnome.gnome-bluetooth_1_0 python3Packages.python util-linux diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix index 8495cfad8ddd..bc178c155f28 100644 --- a/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bluetuith"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "darkhz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NXQa3aOjTIcQQZNwkS5ypBp7jzUhXztJ6LgtucIEDYI="; + sha256 = "sha256-HQIcHOZf7jDYaG4RnhWDTk6CRu55IfGZevbWixlNE2M="; }; - vendorSha256 = "sha256-sCpJow5tiliiNSnKjgzxmgyHxPk8j1RdjobFwKhpU4w="; + vendorSha256 = "sha256-/CEQfpE5ENpfWQ0OvMaG9rZ/4BtFm21JkqDZtHwzqNU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 0373f7aa725b..efcb1241b611 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.14.7"; + version = "0.14.8"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-Bn2ZksGUiRNFb9AncPYlhzvjhYRdP89aKJmDP8qnTNg="; + sha256 = "sha256-PakfSEQCp4LG7mInJvPKFnpRqI7HVr5BxEOM2TronXQ="; }; - cargoSha256 = "sha256-zoK8J8b70sKKDSb2Hhh1v9qY2PlNn26/H18hAWnHETk="; + cargoSha256 = "sha256-hCoStHD+RG700IBXMV4I007mzFvaKk/bVpnte3cigYk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index e62cfa6b8a80..26c1b99216c6 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -1,28 +1,26 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , fetchurl , substituteAll , coreutils , curl -, gawk , glxinfo , gnugrep , gnused -, lsof , xdg-utils , dbus , hwdata , libX11 , mangohud32 , vulkan-headers +, appstream , glslang , makeWrapper +, Mako , meson , ninja , pkg-config -, python3Packages , unzip , vulkan-loader , libXNVCtrl @@ -43,24 +41,24 @@ let src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; - rev = "v${version}"; - hash = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18="; }; patch = fetchurl { url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch"; - hash = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18="; + sha256 = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18="; }; }; in stdenv.mkDerivation rec { pname = "mangohud"; - version = "0.6.7-1"; + version = "0.6.8"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "sha256-60cZYo+d679KRggLBGbpLYM5Iu1XySEEGp+MxZs6wF0="; + sha256 = "sha256-jfmgN90kViHa7vMOjo2x4bNY2QbLk93uYEvaA4DxYvg="; }; outputs = [ "out" "doc" "man" ]; @@ -81,23 +79,15 @@ in stdenv.mkDerivation rec { path = lib.makeBinPath [ coreutils curl - gawk glxinfo gnugrep gnused - lsof xdg-utils ]; libdbus = dbus.lib; inherit hwdata libX11; }) - - (fetchpatch { - name = "allow-system-nlohmann-json.patch"; - url = "https://github.com/flightlessmango/MangoHud/commit/e1ffa0f85820abea44639438fca2152290c87ee8.patch"; - sha256 = "sha256-CaJb0RpXmNGCBidMXM39VJVLIXb6NbN5HXWkH/5Sfvo="; - }) ] ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") [ # Support 32bit OpenGL applications by appending the mangohud32 # lib path to LD_LIBRARY_PATH. @@ -124,13 +114,13 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + appstream glslang makeWrapper + Mako meson ninja pkg-config - python3Packages.Mako - python3Packages.python unzip vulkan-loader ]; diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch index 379e1dd7ba23..0416008a99a3 100644 --- a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch +++ b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch @@ -1,15 +1,3 @@ -From 56a191f6db6d530c2bc89d9d3395b4c9768d108f Mon Sep 17 00:00:00 2001 -From: Atemu -Date: Tue, 17 May 2022 16:58:08 +0200 -Subject: [PATCH 1/2] hardcode dependencies - ---- - src/dbus.cpp | 2 +- - src/loaders/loader_x11.cpp | 2 +- - src/logging.cpp | 7 +++++++ - src/pci_ids.cpp | 6 ++---- - 4 files changed, 11 insertions(+), 6 deletions(-) - diff --git a/src/dbus.cpp b/src/dbus.cpp index 3b3cccb..1405725 100644 --- a/src/dbus.cpp @@ -34,21 +22,18 @@ index 4db6f78..c60d08c 100644 -std::shared_ptr g_x11(new libx11_loader("libX11.so.6")); +std::shared_ptr g_x11(new libx11_loader("@libX11@/lib/libX11.so.6")); diff --git a/src/logging.cpp b/src/logging.cpp -index b27f21e..48f5e03 100644 +index 1668226..f0c8df5 100644 --- a/src/logging.cpp +++ b/src/logging.cpp -@@ -22,7 +22,14 @@ string exec(string command) { +@@ -24,7 +24,11 @@ string exec(string command) { #endif std::array buffer; std::string result; + + char* originalPath = getenv("PATH"); + setenv("PATH", "@path@", 1); -+ std::unique_ptr pipe(popen(command.c_str(), "r"), pclose); -+ + setenv("PATH", originalPath, 1); -+ if (!pipe) { return "popen failed!"; } @@ -70,6 +55,3 @@ index feec222..6baa707 100644 } std::string line; --- -2.36.0 - diff --git a/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch index f4f2e112d945..03af397faee7 100644 --- a/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch +++ b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch @@ -1,24 +1,12 @@ -From 1ac93cbf0eed951af6967a81f731a0f418ea0b3d Mon Sep 17 00:00:00 2001 -From: Atemu -Date: Tue, 17 May 2022 16:58:45 +0200 -Subject: [PATCH 2/2] opengl32 nix workaround - ---- - bin/mangohud.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/bin/mangohud.in b/bin/mangohud.in -index 8ec21de..f65304a 100755 +index e13da99..086443c 100755 --- a/bin/mangohud.in +++ b/bin/mangohud.in @@ -23,6 +23,6 @@ fi # figure out whether the 32 or 64 bit version should be used, and will search # for it in the correct directory - LD_PRELOAD="${LD_PRELOAD}:${MANGOHUD_LIB_NAME}" --LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@" -+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@:@mangohud32@/lib/mangohud" + LD_PRELOAD="${LD_PRELOAD}${LD_PRELOAD:+:}${MANGOHUD_LIB_NAME}" +-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@ld_libdir_mangohud@" ++LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@ld_libdir_mangohud@:@mangohud32@/lib/mangohud" exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LD_PRELOAD="${LD_PRELOAD}" "$@" --- -2.36.0 - diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index da2a969aafc2..17f2f7d94e1d 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 = "04.00.00"; + version = "04.00.01"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-I7bmsO3EAUnmo2KoIy5myxXuZB8tzs5kCEXpG550x8Y="; + sha256 = "sha256-NhXS7WpFbKuRFiAWDSy+g9PoYVQcpugLppQEF/S5WeI="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/reredirect/default.nix b/pkgs/tools/misc/reredirect/default.nix index eb1c90324e01..479c8ac28e54 100644 --- a/pkgs/tools/misc/reredirect/default.nix +++ b/pkgs/tools/misc/reredirect/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "reredirect"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "jerome-pouiller"; repo = "reredirect"; rev = "v${version}"; - sha256 = "0aqzs940kwvw80lhkszx8spcdh9ilsx5ncl9vnp611hwlryfw7kk"; + sha256 = "sha256-RHRamDo7afnJ4DlOVAqM8lQAC60YESGSMKa8Io2vcX0="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 6fa707b521f3..a7ba390b101c 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.20.4"; + version = "1.20.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "cli-v${version}"; - sha256 = "sha256-se3iqz+qjwf71wvHQhCWYryEdUc+kY0Q0ZTg4i1ayNI="; + sha256 = "sha256-x1weerTOpD4g1Fbm5erbS4S87ZjygF2X3MyyXl+9DXw="; }; - cargoSha256 = "sha256-YM+Zm3wFp3Lsx5LmyjGwZywV/SZjriL6JMDO1l0tNf4="; + cargoSha256 = "sha256-hyPIdMVUXc03B8opcqq7y0wS1rqCfOQ1W5M8jDUqr0k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 1dddd4b64ce4..c199473179e9 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-IQ6YIHcFriqLAGoB8QhvWiYkI7Aq4RL12TL3c/N+YqE="; + hash = "sha256-nci2VXto9LptfNHBmLGxfMXQnzbVP1+GlvllOqWFGKU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index acda428875e7..e35abc33ca91 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; - version = "1.4.5"; + version = "1.4.8"; src = fetchFromGitHub { owner = "yuezk"; repo = "GlobalProtect-openconnect"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-9wRe7pJiosk2b0FKhHKpG6P2QPuBo8bVi6rnUMIkG6I="; + sha256 = "sha256-PQAlGeHVayImKalCNv2SwPcxD0ts4BVSqeo1hKYmnMA="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 116b8b0c4c74..068baff54d83 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-BxANSw+SWOpz9vM2I3ODghOqJRi5dBr7j0YVSSBrrto="; + sha256 = "sha256-2vjOxbfCBNBNlEUOXmmWEJYxM2aeEi3yIbJ1XsFmNNw="; }; vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE="; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 510c3a69185d..bbaa588545f6 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = "v${version}"; - sha256 = "/RGq/q0N623RR4HuAmyfFx1/OYZBrmK1ddhiT4bgy3k="; + hash = "sha256-kgskeQM6zESkjDWmgGqhZlGnH8naZ5k0sw+70ZzW2/E="; }; postPatch = '' diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index ea810ca77d40..b8b70d861e81 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "siege"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; - hash = "sha256-zkPfnH9rCBqE52CxaEMlGUebrrRXtHTAl6/6W0UqRcs="; + hash = "sha256-B235/Nt/Y8Rtb2YazCzMhAWTeunK5JCrip14qdLnuMs="; }; NIX_LDFLAGS = lib.optionalString stdenv.isLinux [ diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index 9763d52d0b1d..691ea6e8a3d9 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "36.1"; + version = "37"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "sha256-5pAt7IjgbCCGaHeSoQvuoc6KPD9Yn5iXL1CAawgBeY0="; + sha256 = "sha256-zmcLXhqgwP9SKTyUUhOehQRJk6uX7iwgu9WP2TVhsR8="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index 224b71f63d95..d1443ddd20a8 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.33"; + version = "3.0.34"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-1oGir5F3wgwRQxz3eXI58wMIKYwvtHrRW4VJh0hIVyE="; + sha256 = "sha256-C6uSqb8o6hcK7r7NxlHckMBcdMf2APK4FYRpQFMaE9Y="; }; dontUnpack = true; diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 2c3861d60bad..990534b13dfa 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-xze8Frxy9Rv01yz0L8GkEaXUoLlpODv3pEat1HnDIOs="; + sha256 = "sha256-3zlpmOGCjox8dVItVxyQloPgC0+dYw57pFFBySAXC5g="; }; - cargoSha256 = "sha256-yCQLSLxEziDQGDNtP7pmXlTImSKzr/O/5sITMHVJg8E="; + cargoSha256 = "sha256-LvhSgJQyPyTSD1koXBXYaC6I5njZavgQK4WaW5/b9g4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index d7f8e30e182d..200cd96c238b 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "brutespray"; - version = "1.7.0"; + version = "1.8"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0lkm3fvx35ml5jh4ykjr2srq8qfajkmxwp4qfcn9xi58khk3asq3"; + sha256 = "sha256-hlFp2ZQnoydxF2NBCjSKtmNzMj9V14AKrNYKMF/8m70="; }; postPatch = '' diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 22106727e392..7d6122fe5f40 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,24 +2,23 @@ let pname = "buttercup-desktop"; - version = "2.14.2"; - name = "${pname}-${version}"; + version = "2.16.0"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-ZZaolebDGqRk4BHP5PxFxBsMgOQAxUoIMTlhxM58k0Y="; + sha256 = "sha256-o6KdbwD0VdCTYLEfar7Jt7MRZUayGHyasnmtU8Cqg3E="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname src version; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname src version; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/buttercup-desktop + mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/buttercup.desktop -t $out/share/applications substituteInPlace $out/share/applications/buttercup.desktop \ - --replace 'Exec=AppRun' 'Exec=buttercup-desktop' + --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; diff --git a/pkgs/tools/security/credential-detector/default.nix b/pkgs/tools/security/credential-detector/default.nix index 1e3497b0ca0e..e4ef8a6e90dc 100644 --- a/pkgs/tools/security/credential-detector/default.nix +++ b/pkgs/tools/security/credential-detector/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "credential-detector"; - version = "1.7.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "ynori7"; repo = pname; rev = "v${version}"; - sha256 = "1g5ja32rsf1b7y9gvmy29qz2ymyyvgh53wzd6vvknfla1df0slab"; + sha256 = "sha256-zUQRzlp/7gZhCm5JYu9kYxcoFjDldCYKarRorOHa3E0="; }; - vendorSha256 = "1mn3sysvdz4b94804gns1yssk2q08djq3kq3cd1h7gm942zwrnq4"; + vendorSha256 = "sha256-VWmfATUbfnI3eJbFTUp6MR1wGESuI15PHZWuon5M5rg="; meta = with lib; { description = "Tool to detect potentially hard-coded credentials"; diff --git a/pkgs/tools/security/davtest/default.nix b/pkgs/tools/security/davtest/default.nix new file mode 100644 index 000000000000..d4a7b6068c55 --- /dev/null +++ b/pkgs/tools/security/davtest/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, perl, perlPackages, fetchurl }: + +stdenv.mkDerivation rec { + pname = "davtest"; + version = "1.0"; + + src = fetchurl { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/davtest/davtest-${version}.tar.bz2"; + sha256 = "0kigcgv1bbnan9yr5481s4b9islmvzl2arpg1ig1i39sxrna06y7"; + }; + + postPatch = '' + substituteInPlace davtest.pl \ + --replace "backdoors/" "$out/share/davtest/backdoors/" \ + --replace "tests/" "$out/share/davtest/tests/" + ''; + + buildInputs = [ + (perl.withPackages (p: with p; [ HTTPDAV ])) + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 davtest.pl $out/bin/davtest.pl + mkdir -p $out/share/davtest + cp -r backdoors/ tests/ $out/share/davtest/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Tests WebDAV servers by uploading test files, and then optionally testing for command execution or other actions directly on the target"; + homepage = "https://code.google.com/p/davtest/"; + mainProgram = "davtest.pl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 73e4f79cab80..3b9fa39c604d 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "1.1.1"; + version = "1.1.2"; format = "setuptools"; src = fetchFromGitHub { owner = "darkoperator"; repo = pname; rev = version; - hash = "sha256-zbFtaEklkfLkrqJAPptOqDTdWGbCE+3ZO79t68iqLIU="; + hash = "sha256-rOFDoQEIlwV02c2aJsovnhvaC2XTFq9mMEfilG+Gs4w="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 951e45e04425..802230774a43 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.9.0"; + version = "8.10.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LH8iW2RsBq+mxGXR/RKsIqPWMqHNlhQ9Ye9Z/LOdmYQ="; + sha256 = "sha256-Qquqluf5uzJD5u15TPOrrzSnDPbrFKCBQPDW+7A6AQY="; }; vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; diff --git a/pkgs/tools/security/msfpc/default.nix b/pkgs/tools/security/msfpc/default.nix new file mode 100644 index 000000000000..428611181410 --- /dev/null +++ b/pkgs/tools/security/msfpc/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, metasploit, curl, inetutils, openssl }: + +stdenv.mkDerivation rec { + pname = "msfpc"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "g0tmi1k"; + repo = pname; + rev = "v${version}"; + sha256 = "UIdE0oSaNu16pf+M96x8AnNju88hdzokv86wm8uBYDQ="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 msfpc.sh $out/bin/msfpc + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/msfpc \ + --prefix PATH : "${lib.makeBinPath [ metasploit curl inetutils openssl ]}" + ''; + + meta = with lib; { + description = "MSFvenom Payload Creator"; + homepage = "https://github.com/g0tmi1k/msfpc"; + license = licenses.mit; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index 5a3ed90a4182..8b10d6412d1c 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.4.3"; + version = "0.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3LFakeS3aQaacm7HqeAJPMJhi3Wf8zbJc//SEWUA1Rg="; + hash = "sha256-i0rin4TLoqo+F2nWG4kcFp3x/cRtkMzAo5Ldyo0Si5w="; }; nativeBuildInputs = with python3.pkgs; [ @@ -23,8 +23,11 @@ python3.pkgs.buildPythonApplication rec { click prettytable pysigma - pysigma-backend-splunk + pysigma-backend-elasticsearch pysigma-backend-insightidr + pysigma-backend-opensearch + pysigma-backend-qradar + pysigma-backend-splunk pysigma-pipeline-crowdstrike pysigma-pipeline-sysmon pysigma-pipeline-windows @@ -37,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'prettytable = "^3.1.1"' 'prettytable = "*"' \ - --replace 'pysigma = "^0.5.0"' 'pysigma = "*"' + --replace 'pysigma = "^0.7.2"' 'pysigma = "*"' ''; pythonImportsCheck = [ diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index e3a377163e3e..08023b0e0326 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , lib , libevdev , pkg-config @@ -8,16 +9,24 @@ rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sL9hP+222i8y0sK3ZEx66yXBTgZp5ewoPUlZS4XnphY="; + sha256 = "sha256-0S27dOwtHxQi5ERno040RWZNo5+ao0ULFwHKJz27wWw="; }; - cargoHash = "sha256-uhN1UdwtU0C0/lpxUYoCcMLABFTPNO5wKsIGOBnFpzw="; + cargoHash = "sha256-Ge9CiYIl6R8cjfUAY4B9ggjNZv5vpjmQKMPv93wGJwc="; + + cargoPatches = [ + (fetchpatch { + name = "update-cargo.lock-for-1.0.6.patch"; + url = "https://github.com/jtroo/kanata/commit/29a7669ac230571c30c9113e5c82e8440c8b89af.patch"; + sha256 = "sha256-s4R7vUFlrL1XTNpgXRyIpIq4rDuM5A85ECzbMUX4MAw="; + }) + ]; buildFeatures = lib.optional withCmd "cmd"; diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index dc57cf116097..3d633c2da254 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "svt-av1"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${version}"; - sha256 = "sha256-M5ErWB/klVijsF+GysR0b3m180h+O+10weKr1pTh8ow="; + sha256 = "sha256-mUWWYaExEd/WkIYb1d8AduioHBxGp4Nn7Trhe2vv6Z0="; }; nativeBuildInputs = [ cmake nasm ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21979f95ba29..9d6f9a424985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1788,8 +1788,8 @@ with pkgs; wayst = callPackage ../applications/terminal-emulators/wayst { }; - wezterm = callPackage ../applications/terminal-emulators/wezterm { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; + wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm { + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications; }; x3270 = callPackage ../applications/terminal-emulators/x3270 { }; @@ -2639,6 +2639,14 @@ with pkgs; goku = callPackage ../os-specific/darwin/goku { }; + kerf = kerf_1; /* kerf2 is WIP */ + kerf_1 = callPackage ../development/interpreters/kerf { + stdenv = clangStdenv; + inherit (darwin.apple_sdk.frameworks) + Accelerate CoreGraphics CoreVideo + ; + }; + kwakd = callPackage ../servers/kwakd { }; kwm = callPackage ../os-specific/darwin/kwm { }; @@ -8568,6 +8576,7 @@ with pkgs; mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; mangohud32 = pkgsi686Linux.mangohud; + inherit (python3Packages) Mako; }; manix = callPackage ../tools/nix/manix { @@ -8764,6 +8773,8 @@ with pkgs; mscgen = callPackage ../tools/graphics/mscgen { }; + msfpc = callPackage ../tools/security/msfpc { }; + melt = callPackage ../tools/security/melt { }; metabigor = callPackage ../tools/security/metabigor { }; @@ -13528,6 +13539,9 @@ with pkgs; remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; + spicedb = callPackage ../servers/spicedb { }; + spicedb-zed = callPackage ../servers/spicedb/zed.nix { }; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -14916,6 +14930,8 @@ with pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy38 pypy37 rustpython; + # List of extensions with overrides to apply to all Python package sets. + pythonPackagesExtensions = [ ]; # Python package sets. python27Packages = python27.pkgs; python37Packages = python37.pkgs; @@ -16226,9 +16242,7 @@ with pkgs; kubeaudit = callPackage ../tools/security/kubeaudit { }; - kubectx = callPackage ../development/tools/kubectx { - buildGoModule = buildGo117Module; - }; + kubectx = callPackage ../development/tools/kubectx { }; kube-linter = callPackage ../development/tools/kube-linter { }; @@ -17786,7 +17800,7 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../build-support/go/garble.nix { + garble = callPackage ../development/tools/garble { # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -21971,10 +21985,10 @@ with pkgs; stdenv = gcc8Stdenv; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - buildGo117Module = callPackage ../development/go-modules/generic { + buildGo117Module = callPackage ../build-support/go/module.nix { go = buildPackages.go_1_17; }; - buildGo117Package = callPackage ../development/go-packages/generic { + buildGo117Package = callPackage ../build-support/go/package.nix { go = buildPackages.go_1_17; }; @@ -21982,10 +21996,10 @@ with pkgs; go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; }; - buildGo118Module = darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic { + buildGo118Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { go = buildPackages.go_1_18; }; - buildGo118Package = darwin.apple_sdk_11_0.callPackage ../development/go-packages/generic { + buildGo118Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix{ go = buildPackages.go_1_18; }; @@ -21993,10 +22007,10 @@ with pkgs; go_1_19 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.19.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; }; - buildGo119Module = darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic { + buildGo119Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { go = buildPackages.go_1_19; }; - buildGo119Package = darwin.apple_sdk_11_0.callPackage ../development/go-packages/generic { + buildGo119Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { go = buildPackages.go_1_19; }; @@ -25331,6 +25345,8 @@ with pkgs; oldsindhi = callPackage ../data/fonts/oldsindhi { }; + omni-gtk-theme = callPackage ../data/themes/omni-gtk-theme { }; + onestepback = callPackage ../data/themes/onestepback { }; open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; @@ -25982,6 +25998,10 @@ with pkgs; aucatctl = callPackage ../applications/audio/aucatctl { }; audacious = libsForQt5.callPackage ../applications/audio/audacious { }; + audacious-plugins = libsForQt5.callPackage ../applications/audio/audacious/plugins.nix { + # Avoid circular dependency + audacious = audacious.override { audacious-plugins = null; }; + }; audaciousQt5 = audacious; audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; @@ -30220,6 +30240,10 @@ with pkgs; runc = callPackage ../applications/virtualization/runc {}; + rusty-psn = callPackage ../applications/misc/rusty-psn {}; + + rusty-psn-gui = rusty-psn.override { withGui = true; }; + rymcast = callPackage ../applications/audio/rymcast { inherit (gnome) zenity; }; @@ -30322,6 +30346,8 @@ with pkgs; snixembed = callPackage ../applications/misc/snixembed { }; + sommelier = callPackage ../applications/window-managers/sommelier { }; + sooperlooper = callPackage ../applications/audio/sooperlooper { }; sops = callPackage ../tools/security/sops { }; @@ -30819,7 +30845,7 @@ with pkgs; timelimit = callPackage ../tools/misc/timelimit { }; - timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapps; }; + timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapp; }; timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2_full; }; @@ -31567,7 +31593,7 @@ with pkgs; xdotool = callPackage ../tools/X11/xdotool { }; xed-editor = callPackage ../applications/editors/xed-editor { - xapps = cinnamon.xapps; + xapp = cinnamon.xapp; }; xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); @@ -31677,7 +31703,7 @@ with pkgs; xplayer = callPackage ../applications/video/xplayer { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; - inherit (cinnamon) xapps; + inherit (cinnamon) xapp; }; libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; @@ -32110,6 +32136,8 @@ with pkgs; stdenv = if stdenv.isDarwin then stdenv else llvmPackages_13.stdenv; }; + zecwallet-lite = callPackage ../applications/blockchains/zecwallet-lite { }; + lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; openethereum = callPackage ../applications/blockchains/openethereum { }; @@ -33043,6 +33071,10 @@ with pkgs; sgtpuzzles = callPackage ../games/sgt-puzzles { }; + sgtpuzzles-mobile = callPackage ../games/sgt-puzzles { + isMobile = true; + }; + shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; @@ -33597,6 +33629,8 @@ with pkgs; dalfox = callPackage ../tools/security/dalfox { }; + davtest = callPackage ../tools/security/davtest { }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; deepdiff = with python3Packages; toPythonApplication deepdiff; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c5a7f89d4c31..693eebfbd96a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -759,10 +759,10 @@ let Appcpm = buildPerlModule { pname = "App-cpm"; - version = "0.997006"; + version = "0.997011"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997006.tar.gz"; - sha256 = "1mh4bg141qbch0vdvir2l9533zzm3k8hnqx36iwciwzhvpd9hl9s"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997011.tar.gz"; + sha256 = "sha256-YyECxuZ958nP9R1vqg2dA7/vvtNbXMXZaRn3uSAlAck="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPAN02PackagesSearch CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy Modulecpmfile ModuleCPANfile ParsePMFile ParallelPipes locallib ]; @@ -3527,13 +3527,13 @@ let CommandRunner = buildPerlModule { pname = "Command-Runner"; - version = "0.103"; + version = "0.200"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.103.tar.gz"; - sha256 = "0f180b5c3b3fc9db7b83d4a5fdd959db34f7d6d2472f817dbf8b4b795a9dc82a"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.200.tar.gz"; + sha256 = "sha256-WtJtBhEb/s1TyPW7XeqUvyAl9seOlfbYAS5M+oninyY="; }; buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ CaptureTiny StringShellQuote Win32ShellQuote ]; + propagatedBuildInputs = [ CaptureTiny Filepushd StringShellQuote Win32ShellQuote ]; meta = { homepage = "https://github.com/skaji/Command-Runner"; description = "Run external commands and Perl code refs"; @@ -9277,6 +9277,23 @@ let }; }; + FutureIO = buildPerlModule { + pname = "Future-IO"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-IO-0.11.tar.gz"; + sha256 = "sha256-dVM2JvgfdoxfIxyXAhBsJbV3KotplcqixYvMSsyRB8k="; + }; + buildInputs = [ TestIdentity ]; + propagatedBuildInputs = [ Future StructDumb ]; + preCheck = "rm t/06connect.t"; # this test fails in sandbox + meta = { + description = "Future-returning IO methods"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + GamesSolitaireVerify = buildPerlModule { pname = "Games-Solitaire-Verify"; version = "0.2403"; @@ -11014,10 +11031,10 @@ let Imager = buildPerlPackage { pname = "Imager"; - version = "1.012"; + version = "1.019"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.012.tar.gz"; - sha256 = "a321c728e3277fd15de842351e69bbef0e2a5a608a31d089e5029b8381e23f21"; + url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.019.tar.gz"; + sha256 = "sha256-dNRNcBwfFPxLmE+toelVcmtQTC2LBtJl56hh+llDy0g="; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; @@ -11214,14 +11231,14 @@ let IOAsync = buildPerlModule { pname = "IO-Async"; - version = "0.78"; + version = "0.801"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.78.tar.gz"; - sha256 = "sha256-P7UYhZd7hiGKiepC84yvvOWCO/SPqqLRhaGGwqNYNmw="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.801.tar.gz"; + sha256 = "sha256-ieRZuhe3alcrsbS7EgMBVB6MyTJCQXFmI2tsbbDhybk="; }; preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; - buildInputs = [ TestFatal TestIdentity TestMetricsAny TestRefcount ]; + buildInputs = [ FutureIO TestFatal TestIdentity TestMetricsAny TestRefcount ]; meta = { description = "Asynchronous event-driven programming"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11230,10 +11247,10 @@ let IOAsyncSSL = buildPerlModule { pname = "IO-Async-SSL"; - version = "0.22"; + version = "0.23"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.22.tar.gz"; - sha256 = "0c7363a7f1a08805bd1b2cf2b1a42a950ca71914c2aedbdd985970e011331a21"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.23.tar.gz"; + sha256 = "sha256-0vyuFuJ+F6yjkDpK1aK/L7wmjQZRzn8ARabQVG9YTy4="; }; buildInputs = [ TestIdentity ]; propagatedBuildInputs = [ Future IOAsync IOSocketSSL ]; @@ -17546,10 +17563,10 @@ let ParallelPipes = buildPerlModule { pname = "Parallel-Pipes"; - version = "0.005"; + version = "0.102"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.005.tar.gz"; - sha256 = "44bd9e2be33d7b314f81c9b886a95d53514689090635f9fad53181f2d3051fd5"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.102.tar.gz"; + sha256 = "sha256-JjZfgQXcYGsUC9HUX41w1cMFQ5D3Xk/bdISj5ZHL+pc="; }; buildInputs = [ ModuleBuildTiny ]; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60485dcd9ea3..497940bfaa33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -287,6 +287,8 @@ in { aioeagle = callPackage ../development/python-modules/aioeagle { }; + aioecowitt = callPackage ../development/python-modules/aioecowitt { }; + aioemonitor = callPackage ../development/python-modules/aioemonitor { }; aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; @@ -2029,6 +2031,10 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + cryptolyzer = callPackage ../development/python-modules/cryptolyzer { }; + + cryptoparser = callPackage ../development/python-modules/cryptoparser { }; + crytic-compile = callPackage ../development/python-modules/crytic-compile { }; csrmesh = callPackage ../development/python-modules/csrmesh { }; @@ -2701,6 +2707,8 @@ in { dvc-render = callPackage ../development/python-modules/dvc-render { }; + dvc-task = callPackage ../development/python-modules/dvc-task { }; + dvclive = callPackage ../development/python-modules/dvclive { }; dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { }; @@ -2900,6 +2908,8 @@ in { eth-utils = callPackage ../development/python-modules/eth-utils { }; + etils = callPackage ../development/python-modules/etils { }; + etuples = callPackage ../development/python-modules/etuples { }; et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; @@ -5451,6 +5461,8 @@ in { meteoalertapi = callPackage ../development/python-modules/meteoalertapi { }; + meteocalc = callPackage ../development/python-modules/meteocalc { }; + meteofrance-api = callPackage ../development/python-modules/meteofrance-api { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; @@ -5880,6 +5892,8 @@ in { nextcord = callPackage ../development/python-modules/nextcord { }; + nextdns = callPackage ../development/python-modules/nextdns { }; + nftables = toPythonModule (pkgs.nftables.override { python3 = python; withPython = true; @@ -7111,6 +7125,8 @@ in { py-tes = callPackage ../development/python-modules/py-tes { }; + py-tree-sitter = callPackage ../development/python-modules/py-tree-sitter { }; + py-ubjson = callPackage ../development/python-modules/py-ubjson { }; py-zabbix = callPackage ../development/python-modules/py-zabbix { }; @@ -8184,6 +8200,12 @@ in { pysigma = callPackage ../development/python-modules/pysigma { }; + pysigma-backend-elasticsearch = callPackage ../development/python-modules/pysigma-backend-elasticsearch { }; + + pysigma-backend-opensearch = callPackage ../development/python-modules/pysigma-backend-opensearch { }; + + pysigma-backend-qradar = callPackage ../development/python-modules/pysigma-backend-qradar { }; + pysigma-backend-splunk = callPackage ../development/python-modules/pysigma-backend-splunk { }; pysigma-backend-insightidr = callPackage ../development/python-modules/pysigma-backend-insightidr { }; @@ -11490,7 +11512,7 @@ in { xapp = callPackage ../development/python-modules/xapp { inherit (pkgs) gtk3 gobject-introspection polkit; - inherit (pkgs.cinnamon) xapps; + inherit (pkgs.cinnamon) xapp; }; xarray = callPackage ../development/python-modules/xarray { }; @@ -11683,6 +11705,8 @@ in { inherit python; })).python; + zadnegoale = callPackage ../development/python-modules/zadnegoale { }; + zake = callPackage ../development/python-modules/zake { }; zarr = callPackage ../development/python-modules/zarr { };