diff --git a/lib/licenses.nix b/lib/licenses.nix
index f22d1401410b..79303964e9dc 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -114,6 +114,16 @@ in mkLicense lset) ({
fullName = "Bitstream Vera Font License";
};
+ bitTorrent10 = {
+ spdxId = "BitTorrent-1.0";
+ fullName = " BitTorrent Open Source License v1.0";
+ };
+
+ bitTorrent11 = {
+ spdxId = "BitTorrent-1.1";
+ fullName = " BitTorrent Open Source License v1.1";
+ };
+
bola11 = {
url = "https://blitiri.com.ar/p/bola/";
fullName = "Buena Onda License Agreement 1.1";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0d8f71d9808b..a0f7a5c9b000 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13684,6 +13684,12 @@
githubId = 57048005;
name = "snicket2100";
};
+ sno2wman = {
+ name = "SnO2WMaN";
+ email = "me@sno2wman.net";
+ github = "sno2wman";
+ githubId = 15155608;
+ };
snpschaaf = {
email = "philipe.schaaf@secunet.com";
name = "Philippe Schaaf";
@@ -15303,6 +15309,12 @@
githubId = 27813;
name = "Vincent Breitmoser";
};
+ vamega = {
+ email = "github@madiathv.com";
+ github = "vamega";
+ githubId = 223408;
+ name = "Varun Madiath";
+ };
vandenoever = {
email = "jos@vandenoever.info";
github = "vandenoever";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index ff4ac1fe7b69..36628b959d9f 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -421,6 +421,16 @@
attribute name.
+
+
+ Nebula now runs as a system user and group created for each
+ nebula network, using the CAP_NET_ADMIN
+ ambient capability on launch rather than starting as root.
+ Ensure that any files each Nebula instance needs to access are
+ owned by the correct user and group, by default
+ nebula-${networkName}.
+
+
In mastodon it is now necessary to specify
@@ -512,19 +522,72 @@
A few openssh options have been moved from extraConfig to the
new freeform option settings and renamed as
- follow:
- services.openssh.kbdInteractiveAuthentication
- to
- services.openssh.settings.KbdInteractiveAuthentication,
- services.openssh.passwordAuthentication to
- services.openssh.settings.PasswordAuthentication,
- services.openssh.useDns to
- services.openssh.settings.UseDns,
- services.openssh.permitRootLogin to
- services.openssh.settings.PermitRootLogin,
- services.openssh.logLevel to
- services.openssh.settings.LogLevel.
+ follows:
+
+
+
+ services.openssh.forwardX11 to
+ services.openssh.settings.X11Forwarding
+
+
+
+
+ services.openssh.kbdInteractiveAuthentication
+ ->
+ services.openssh.settings.KbdInteractiveAuthentication
+
+
+
+
+ services.openssh.passwordAuthentication
+ to
+ services.openssh.settings.PasswordAuthentication
+
+
+
+
+ services.openssh.useDns to
+ services.openssh.settings.UseDns
+
+
+
+
+ services.openssh.permitRootLogin to
+ services.openssh.settings.PermitRootLogin
+
+
+
+
+ services.openssh.logLevel to
+ services.openssh.settings.LogLevel
+
+
+
+
+ services.openssh.kexAlgorithms to
+ services.openssh.settings.KexAlgorithms
+
+
+
+
+ services.openssh.macs to
+ services.openssh.settings.Macs
+
+
+
+
+ services.openssh.cyphers to
+ services.openssh.settings.Cyphers
+
+
+
+
+ services.openssh.gatewayPorts to
+ services.openssh.settings.GatewayPorts
+
+
+
@@ -803,6 +866,18 @@
system.stateVersion.
+
+
+ Nebula now supports the
+ services.nebula.networks.<name>.isRelay
+ and
+ services.nebula.networks.<name>.relays
+ configuration options for setting up or allowing traffic
+ relaying. See the
+ announcement
+ for more details about relays.
+
+
hip has been separated into
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index dc4db8cf0636..466279cd7dad 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -101,6 +101,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name.
+- Nebula now runs as a system user and group created for each nebula network, using the `CAP_NET_ADMIN` ambient capability on launch rather than starting as root. Ensure that any files each Nebula instance needs to access are owned by the correct user and group, by default `nebula-${networkName}`.
+
- In `mastodon` it is now necessary to specify location of file with `PostgreSQL` database password. In `services.mastodon.database.passwordFile` parameter default value `/var/lib/mastodon/secrets/db-password` has been changed to `null`.
- The `--target-host` and `--build-host` options of `nixos-rebuild` no longer treat the `localhost` value specially – to build on/deploy to local machine, omit the relevant flag.
@@ -126,7 +128,17 @@ In addition to numerous new and upgraded packages, this release has the followin
- The module `usbmuxd` now has the ability to change the package used by the daemon. In case you're experiencing issues with `usbmuxd` you can try an alternative program like `usbmuxd2`. Available as [services.usbmuxd.package](#opt-services.usbmuxd.package)
-- A few openssh options have been moved from extraConfig to the new freeform option `settings` and renamed as follow: `services.openssh.kbdInteractiveAuthentication` to `services.openssh.settings.KbdInteractiveAuthentication`, `services.openssh.passwordAuthentication` to `services.openssh.settings.PasswordAuthentication`, `services.openssh.useDns` to `services.openssh.settings.UseDns`, `services.openssh.permitRootLogin` to `services.openssh.settings.PermitRootLogin`, `services.openssh.logLevel` to `services.openssh.settings.LogLevel`.
+- A few openssh options have been moved from extraConfig to the new freeform option `settings` and renamed as follows:
+ - `services.openssh.forwardX11` to `services.openssh.settings.X11Forwarding`
+ - `services.openssh.kbdInteractiveAuthentication` -> `services.openssh.settings.KbdInteractiveAuthentication`
+ - `services.openssh.passwordAuthentication` to `services.openssh.settings.PasswordAuthentication`
+ - `services.openssh.useDns` to `services.openssh.settings.UseDns`
+ - `services.openssh.permitRootLogin` to `services.openssh.settings.PermitRootLogin`
+ - `services.openssh.logLevel` to `services.openssh.settings.LogLevel`
+ - `services.openssh.kexAlgorithms` to `services.openssh.settings.KexAlgorithms`
+ - `services.openssh.macs` to `services.openssh.settings.Macs`
+ - `services.openssh.cyphers` to `services.openssh.settings.Cyphers`
+ - `services.openssh.gatewayPorts` to `services.openssh.settings.GatewayPorts`
- `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables.
@@ -199,6 +211,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [Garage](https://garagehq.deuxfleurs.fr/) version is based on [system.stateVersion](options.html#opt-system.stateVersion), existing installations will keep using version 0.7. New installations will use version 0.8. In order to upgrade a Garage cluster, please follow [upstream instructions](https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/) and force [services.garage.package](options.html#opt-services.garage.package) or upgrade accordingly [system.stateVersion](options.html#opt-system.stateVersion).
+- Nebula now supports the `services.nebula.networks..isRelay` and `services.nebula.networks..relays` configuration options for setting up or allowing traffic relaying. See the [announcement](https://www.defined.net/blog/announcing-relay-support-in-nebula/) for more details about relays.
+
- `hip` has been separated into `hip`, `hip-common` and `hipcc`.
- `services.nginx.recommendedProxySettings` now removes the `Connection` header preventing clients from closing backend connections.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1a2d75307496..7a818f11ee27 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -698,6 +698,7 @@
./services/monitoring/arbtt.nix
./services/monitoring/bosun.nix
./services/monitoring/cadvisor.nix
+ ./services/monitoring/cockpit.nix
./services/monitoring/collectd.nix
./services/monitoring/das_watchdog.nix
./services/monitoring/datadog-agent.nix
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 36b724e04bde..3b8da78e2af5 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -282,7 +282,7 @@ in
config = {
programs.ssh.setXAuthLocation =
- mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.forwardX11);
+ mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.settings.X11Forwarding);
assertions =
[ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 0c80e79d4b79..344c43a429b3 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -383,7 +383,7 @@ in
"d /var/spool/slurmd 755 root root -"
];
- services.openssh.forwardX11 = mkIf cfg.client.enable (mkDefault true);
+ services.openssh.settings.X11Forwarding = mkIf cfg.client.enable (mkDefault true);
systemd.services.slurmctld = mkIf (cfg.server.enable) {
path = with pkgs; [ wrappedSlurm munge coreutils ]
diff --git a/nixos/modules/services/monitoring/cockpit.nix b/nixos/modules/services/monitoring/cockpit.nix
new file mode 100644
index 000000000000..2947b4d80120
--- /dev/null
+++ b/nixos/modules/services/monitoring/cockpit.nix
@@ -0,0 +1,231 @@
+{ pkgs, config, lib, ... }:
+
+let
+ cfg = config.services.cockpit;
+ inherit (lib) types mkEnableOption mkOption mkIf mdDoc literalMD mkPackageOptionMD;
+ settingsFormat = pkgs.formats.ini {};
+in {
+ options = {
+ services.cockpit = {
+ enable = mkEnableOption (mdDoc "Cockpit");
+
+ package = mkPackageOptionMD pkgs "Cockpit" {
+ default = [ "cockpit" ];
+ };
+
+ settings = lib.mkOption {
+ type = settingsFormat.type;
+
+ default = {};
+
+ description = mdDoc ''
+ Settings for cockpit that will be saved in /etc/cockpit/cockpit.conf.
+
+ See the [documentation](https://cockpit-project.org/guide/latest/cockpit.conf.5.html), that is also available with `man cockpit.conf.5` for details.
+ '';
+ };
+
+ port = mkOption {
+ description = mdDoc "Port where cockpit will listen.";
+ type = types.port;
+ default = 9090;
+ };
+
+ openFirewall = mkOption {
+ description = mdDoc "Open port for cockpit.";
+ type = types.bool;
+ default = false;
+ };
+ };
+ };
+ config = mkIf cfg.enable {
+
+ # expose cockpit-bridge system-wide
+ environment.systemPackages = [ cfg.package ];
+
+ # allow cockpit to find its plugins
+ environment.pathsToLink = [ "/share/cockpit" ];
+
+ # generate cockpit settings
+ environment.etc."cockpit/cockpit.conf".source = settingsFormat.generate "cockpit.conf" cfg.settings;
+
+ security.pam.services.cockpit = {};
+
+ networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
+
+ # units are in reverse sort order if you ls $out/lib/systemd/system
+ # all these units are basically verbatim translated from upstream
+
+ # Translation from $out/lib/systemd/system/systemd-cockpithttps.slice
+ systemd.slices.system-cockpithttps = {
+ description = "Resource limits for all cockpit-ws-https@.service instances";
+ sliceConfig = {
+ TasksMax = 200;
+ MemoryHigh = "75%";
+ MemoryMax = "90%";
+ };
+ };
+
+ # Translation from $out/lib/systemd/system/cockpit-wsinstance-https@.socket
+ systemd.sockets."cockpit-wsinstance-https@" = {
+ unitConfig = {
+ Description = "Socket for Cockpit Web Service https instance %I";
+ BindsTo = [ "cockpit.service" "cockpit-wsinstance-https@%i.service" ];
+ # clean up the socket after the service exits, to prevent fd leak
+ # this also effectively prevents a DoS by starting arbitrarily many sockets, as
+ # the services are resource-limited by system-cockpithttps.slice
+ Documentation = "man:cockpit-ws(8)";
+ };
+ socketConfig = {
+ ListenStream = "/run/cockpit/wsinstance/https@%i.sock";
+ SocketUser = "root";
+ SocketMode = "0600";
+ };
+ };
+
+ # Translation from $out/lib/systemd/system/cockpit-wsinstance-https@.service
+ systemd.services."cockpit-wsinstance-https@" = {
+ description = "Cockpit Web Service https instance %I";
+ bindsTo = [ "cockpit.service"];
+ path = [ cfg.package ];
+ documentation = [ "man:cockpit-ws(8)" ];
+ serviceConfig = {
+ Slice = "system-cockpithttps.slice";
+ ExecStart = "${cfg.package}/libexec/cockpit-ws --for-tls-proxy --port=0";
+ User = "root";
+ Group = "";
+ };
+ };
+
+ # Translation from $out/lib/systemd/system/cockpit-wsinstance-http.socket
+ systemd.sockets.cockpit-wsinstance-http = {
+ unitConfig = {
+ Description = "Socket for Cockpit Web Service http instance";
+ BindsTo = "cockpit.service";
+ Documentation = "man:cockpit-ws(8)";
+ };
+ socketConfig = {
+ ListenStream = "/run/cockpit/wsinstance/http.sock";
+ SocketUser = "root";
+ SocketMode = "0600";
+ };
+ };
+
+ # Translation from $out/lib/systemd/system/cockpit-wsinstance-https-factory.socket
+ systemd.sockets.cockpit-wsinstance-https-factory = {
+ unitConfig = {
+ Description = "Socket for Cockpit Web Service https instance factory";
+ BindsTo = "cockpit.service";
+ Documentation = "man:cockpit-ws(8)";
+ };
+ socketConfig = {
+ ListenStream = "/run/cockpit/wsinstance/https-factory.sock";
+ Accept = true;
+ SocketUser = "root";
+ SocketMode = "0600";
+ };
+ };
+
+ # Translation from $out/lib/systemd/system/cockpit-wsinstance-https-factory@.service
+ systemd.services."cockpit-wsinstance-https-factory@" = {
+ description = "Cockpit Web Service https instance factory";
+ documentation = [ "man:cockpit-ws(8)" ];
+ path = [ cfg.package ];
+ serviceConfig = {
+ ExecStart = "${cfg.package}/libexec/cockpit-wsinstance-factory";
+ User = "root";
+ };
+ };
+
+ # Translation from $out/lib/systemd/system/cockpit-wsinstance-http.service
+ systemd.services."cockpit-wsinstance-http" = {
+ description = "Cockpit Web Service http instance";
+ bindsTo = [ "cockpit.service" ];
+ path = [ cfg.package ];
+ documentation = [ "man:cockpit-ws(8)" ];
+ serviceConfig = {
+ ExecStart = "${cfg.package}/libexec/cockpit-ws --no-tls --port=0";
+ User = "root";
+ Group = "";
+ };
+ };
+
+ # Translation from $out/lib/systemd/system/cockpit.socket
+ systemd.sockets."cockpit" = {
+ unitConfig = {
+ Description = "Cockpit Web Service Socket";
+ Documentation = "man:cockpit-ws(8)";
+ Wants = "cockpit-motd.service";
+ };
+ socketConfig = {
+ ListenStream = cfg.port;
+ ExecStartPost = [
+ "-${cfg.package}/share/cockpit/motd/update-motd \"\" localhost"
+ "-${pkgs.coreutils}/bin/ln -snf active.motd /run/cockpit/motd"
+ ];
+ ExecStopPost = "-${pkgs.coreutils}/bin/ln -snf inactive.motd /run/cockpit/motd";
+ };
+ wantedBy = [ "sockets.target" ];
+ };
+
+ # Translation from $out/lib/systemd/system/cockpit.service
+ systemd.services."cockpit" = {
+ description = "Cockpit Web Service";
+ documentation = [ "man:cockpit-ws(8)" ];
+ restartIfChanged = true;
+ path = with pkgs; [ coreutils cfg.package ];
+ requires = [ "cockpit.socket" "cockpit-wsinstance-http.socket" "cockpit-wsinstance-https-factory.socket" ];
+ after = [ "cockpit-wsinstance-http.socket" "cockpit-wsinstance-https-factory.socket" ];
+ environment = {
+ G_MESSAGES_DEBUG = "cockpit-ws,cockpit-bridge";
+ };
+ serviceConfig = {
+ RuntimeDirectory="cockpit/tls";
+ ExecStartPre = [
+ # cockpit-tls runs in a more constrained environment, these + means that these commands
+ # will run with full privilege instead of inside that constrained environment
+ # See https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= for details
+ "+${cfg.package}/libexec/cockpit-certificate-ensure --for-cockpit-tls"
+ ];
+ ExecStart = "${cfg.package}/libexec/cockpit-tls";
+ User = "root";
+ Group = "";
+ NoNewPrivileges = true;
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ ProtectKernelTunables = true;
+ RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
+ MemoryDenyWriteExecute = true;
+ };
+ };
+
+ # Translation from $out/lib/systemd/system/cockpit-motd.service
+ # This part basically implements a motd state machine:
+ # - If cockpit.socket is enabled then /run/cockpit/motd points to /run/cockpit/active.motd
+ # - If cockpit.socket is disabled then /run/cockpit/motd points to /run/cockpit/inactive.motd
+ # - As cockpit.socket is disabled by default, /run/cockpit/motd points to /run/cockpit/inactive.motd
+ # /run/cockpit/active.motd is generated dynamically by cockpit-motd.service
+ systemd.services."cockpit-motd" = {
+ path = with pkgs; [ nettools ];
+ serviceConfig = {
+ Type = "oneshot";
+ ExecStart = "${cfg.package}/share/cockpit/motd/update-motd";
+ };
+ description = "Cockpit motd updater service";
+ documentation = [ "man:cockpit-ws(8)" ];
+ wants = [ "network.target" ];
+ after = [ "network.target" "cockpit.socket" ];
+ };
+
+ systemd.tmpfiles.rules = [ # From $out/lib/tmpfiles.d/cockpit-tmpfiles.conf
+ "C /run/cockpit/inactive.motd 0640 root root - ${cfg.package}/share/cockpit/motd/inactive.motd"
+ "f /run/cockpit/active.motd 0640 root root -"
+ "L+ /run/cockpit/motd - - - - inactive.motd"
+ "d /etc/cockpit/ws-certs.d 0600 root root 0"
+ ];
+ };
+
+ meta.maintainers = pkgs.cockpit.meta.maintainers;
+}
diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix
index 2bedafc5d9fe..e1a8c6740f57 100644
--- a/nixos/modules/services/networking/nebula.nix
+++ b/nixos/modules/services/networking/nebula.nix
@@ -68,6 +68,12 @@ in
description = lib.mdDoc "Whether this node is a lighthouse.";
};
+ isRelay = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc "Whether this node is a relay.";
+ };
+
lighthouses = mkOption {
type = types.listOf types.str;
default = [];
@@ -78,6 +84,15 @@ in
example = [ "192.168.100.1" ];
};
+ relays = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = lib.mdDoc ''
+ List of IPs of relays that this node should allow traffic from.
+ '';
+ example = [ "192.168.100.1" ];
+ };
+
listen.host = mkOption {
type = types.str;
default = "0.0.0.0";
@@ -157,6 +172,11 @@ in
am_lighthouse = netCfg.isLighthouse;
hosts = netCfg.lighthouses;
};
+ relay = {
+ am_relay = netCfg.isRelay;
+ relays = netCfg.relays;
+ use_relays = true;
+ };
listen = {
host = netCfg.listen.host;
port = netCfg.listen.port;
@@ -173,25 +193,41 @@ in
configFile = format.generate "nebula-config-${netName}.yml" settings;
in
{
- # Create systemd service for Nebula.
+ # Create the systemd service for Nebula.
"nebula@${netName}" = {
description = "Nebula VPN service for ${netName}";
wants = [ "basic.target" ];
after = [ "basic.target" "network.target" ];
before = [ "sshd.service" ];
wantedBy = [ "multi-user.target" ];
- serviceConfig = mkMerge [
- {
- Type = "simple";
- Restart = "always";
- ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}";
- }
- # The service needs to launch as root to access the tun device, if it's enabled.
- (mkIf netCfg.tun.disable {
- User = networkId;
- Group = networkId;
- })
- ];
+ serviceConfig = {
+ Type = "simple";
+ Restart = "always";
+ ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}";
+ UMask = "0027";
+ CapabilityBoundingSet = "CAP_NET_ADMIN";
+ AmbientCapabilities = "CAP_NET_ADMIN";
+ LockPersonality = true;
+ NoNewPrivileges = true;
+ PrivateDevices = false; # needs access to /dev/net/tun (below)
+ DeviceAllow = "/dev/net/tun rw";
+ DevicePolicy = "closed";
+ PrivateTmp = true;
+ PrivateUsers = false; # CapabilityBoundingSet needs to apply to the host namespace
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProtectSystem = "strict";
+ RestrictNamespaces = true;
+ RestrictSUIDSGID = true;
+ User = networkId;
+ Group = networkId;
+ };
unitConfig.StartLimitIntervalSec = 0; # ensure Restart=always is always honoured (networks can go down for arbitrarily long)
};
}) enabledNetworks);
@@ -202,7 +238,7 @@ in
# Create the service users and groups.
users.users = mkMerge (mapAttrsToList (netName: netCfg:
- mkIf netCfg.tun.disable {
+ {
${nameToId netName} = {
group = nameToId netName;
description = "Nebula service user for network ${netName}";
@@ -210,9 +246,8 @@ in
};
}) enabledNetworks);
- users.groups = mkMerge (mapAttrsToList (netName: netCfg:
- mkIf netCfg.tun.disable {
- ${nameToId netName} = {};
- }) enabledNetworks);
+ users.groups = mkMerge (mapAttrsToList (netName: netCfg: {
+ ${nameToId netName} = {};
+ }) enabledNetworks);
};
}
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index f2b8d12ccc94..b1a108be0cfa 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -13,11 +13,12 @@ let
else pkgs.buildPackages.openssh;
# reports boolean as yes / no
- mkValueStringSshd = v:
+ mkValueStringSshd = with lib; v:
if isInt v then toString v
else if isString v then v
else if true == v then "yes"
else if false == v then "no"
+ else if isList v then concatStringsSep "," v
else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}";
# dont use the "=" operator
@@ -104,6 +105,11 @@ in
(mkRenamedOptionModule [ "services" "openssh" "useDns" ] [ "services" "openssh" "settings" "UseDns" ])
(mkRenamedOptionModule [ "services" "openssh" "permitRootLogin" ] [ "services" "openssh" "settings" "PermitRootLogin" ])
(mkRenamedOptionModule [ "services" "openssh" "logLevel" ] [ "services" "openssh" "settings" "LogLevel" ])
+ (mkRenamedOptionModule [ "services" "openssh" "macs" ] [ "services" "openssh" "settings" "Macs" ])
+ (mkRenamedOptionModule [ "services" "openssh" "cyphers" ] [ "services" "openssh" "settings" "Cyphers" ])
+ (mkRenamedOptionModule [ "services" "openssh" "kexAlgorithms" ] [ "services" "openssh" "settings" "KexAlgorithms" ])
+ (mkRenamedOptionModule [ "services" "openssh" "gatewayPorts" ] [ "services" "openssh" "settings" "GatewayPorts" ])
+ (mkRenamedOptionModule [ "services" "openssh" "forwardX11" ] [ "services" "openssh" "settings" "X11Forwarding" ])
];
###### interface
@@ -131,14 +137,6 @@ in
'';
};
- forwardX11 = mkOption {
- type = types.bool;
- default = false;
- description = lib.mdDoc ''
- Whether to allow X11 connections to be forwarded.
- '';
- };
-
allowSFTP = mkOption {
type = types.bool;
default = true;
@@ -167,16 +165,6 @@ in
'';
};
- gatewayPorts = mkOption {
- type = types.str;
- default = "no";
- description = lib.mdDoc ''
- Specifies whether remote hosts are allowed to connect to
- ports forwarded for the client. See
- {manpage}`sshd_config(5)`.
- '';
- };
-
ports = mkOption {
type = types.listOf types.port;
default = [22];
@@ -286,63 +274,6 @@ in
'';
};
- kexAlgorithms = mkOption {
- type = types.listOf types.str;
- default = [
- "sntrup761x25519-sha512@openssh.com"
- "curve25519-sha256"
- "curve25519-sha256@libssh.org"
- "diffie-hellman-group-exchange-sha256"
- ];
- description = lib.mdDoc ''
- Allowed key exchange algorithms
-
- Uses the lower bound recommended in both
-
- and
-
- '';
- };
-
- ciphers = mkOption {
- type = types.listOf types.str;
- default = [
- "chacha20-poly1305@openssh.com"
- "aes256-gcm@openssh.com"
- "aes128-gcm@openssh.com"
- "aes256-ctr"
- "aes192-ctr"
- "aes128-ctr"
- ];
- description = lib.mdDoc ''
- Allowed ciphers
-
- Defaults to recommended settings from both
-
- and
-
- '';
- };
-
- macs = mkOption {
- type = types.listOf types.str;
- default = [
- "hmac-sha2-512-etm@openssh.com"
- "hmac-sha2-256-etm@openssh.com"
- "umac-128-etm@openssh.com"
- "hmac-sha2-512"
- "hmac-sha2-256"
- "umac-128@openssh.com"
- ];
- description = lib.mdDoc ''
- Allowed MACs
-
- Defaults to recommended settings from both
-
- and
-
- '';
- };
settings = mkOption {
@@ -374,7 +305,13 @@ in
~/.ssh/authorized_keys from and sshd_config Match Host directives.
'';
};
-
+ X11Forwarding = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Whether to allow X11 connections to be forwarded.
+ '';
+ };
PasswordAuthentication = mkOption {
type = types.bool;
default = true;
@@ -396,6 +333,70 @@ in
Specifies whether keyboard-interactive authentication is allowed.
'';
};
+ GatewayPorts = mkOption {
+ type = types.str;
+ default = "no";
+ description = lib.mdDoc ''
+ Specifies whether remote hosts are allowed to connect to
+ ports forwarded for the client. See
+ {manpage}`sshd_config(5)`.
+ '';
+ };
+ KexAlgorithms = mkOption {
+ type = types.listOf types.str;
+ default = [
+ "sntrup761x25519-sha512@openssh.com"
+ "curve25519-sha256"
+ "curve25519-sha256@libssh.org"
+ "diffie-hellman-group-exchange-sha256"
+ ];
+ description = lib.mdDoc ''
+ Allowed key exchange algorithms
+
+ Uses the lower bound recommended in both
+
+ and
+
+ '';
+ };
+ Macs = mkOption {
+ type = types.listOf types.str;
+ default = [
+ "hmac-sha2-512-etm@openssh.com"
+ "hmac-sha2-256-etm@openssh.com"
+ "umac-128-etm@openssh.com"
+ "hmac-sha2-512"
+ "hmac-sha2-256"
+ "umac-128@openssh.com"
+ ];
+ description = lib.mdDoc ''
+ Allowed MACs
+
+ Defaults to recommended settings from both
+
+ and
+
+ '';
+ };
+ Ciphers = mkOption {
+ type = types.listOf types.str;
+ default = [
+ "chacha20-poly1305@openssh.com"
+ "aes256-gcm@openssh.com"
+ "aes128-gcm@openssh.com"
+ "aes256-ctr"
+ "aes192-ctr"
+ "aes128-ctr"
+ ];
+ description = lib.mdDoc ''
+ Allowed ciphers
+
+ Defaults to recommended settings from both
+
+ and
+
+ '';
+ };
};
});
};
@@ -555,17 +556,10 @@ in
${optionalString cfgc.setXAuthLocation ''
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
''}
-
- X11Forwarding ${if cfg.forwardX11 then "yes" else "no"}
-
${optionalString cfg.allowSFTP ''
Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags}
''}
-
- GatewayPorts ${cfg.gatewayPorts}
-
PrintMotd no # handled by pam_motd
-
AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}
${optionalString (cfg.authorizedKeysCommand != "none") ''
AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
@@ -575,13 +569,9 @@ in
${flip concatMapStrings cfg.hostKeys (k: ''
HostKey ${k.path}
'')}
-
- KexAlgorithms ${concatStringsSep "," cfg.kexAlgorithms}
- Ciphers ${concatStringsSep "," cfg.ciphers}
- MACs ${concatStringsSep "," cfg.macs}
'';
- assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
+ assertions = [{ assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true;
message = "cannot enable X11 forwarding without setting xauth location";}]
++ forEach cfg.listenAddresses ({ addr, ... }: {
assertion = addr != null;
diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix
index 73567ca0bc98..7c9fa62ae954 100644
--- a/nixos/modules/services/search/meilisearch.nix
+++ b/nixos/modules/services/search/meilisearch.nix
@@ -115,7 +115,7 @@ in
MEILI_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.listenPort}";
MEILI_NO_ANALYTICS = toString cfg.noAnalytics;
MEILI_ENV = cfg.environment;
- MEILI_DUMPS_DIR = "/var/lib/meilisearch/dumps";
+ MEILI_DUMP_DIR = "/var/lib/meilisearch/dumps";
MEILI_LOG_LEVEL = cfg.logLevel;
MEILI_MAX_INDEX_SIZE = cfg.maxIndexSize;
};
diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix
index e446e606cad8..664335cb58e8 100644
--- a/nixos/modules/services/security/privacyidea.nix
+++ b/nixos/modules/services/security/privacyidea.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.privacyidea;
opt = options.services.privacyidea;
- uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; python3 = pkgs.python39; };
+ uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; python3 = pkgs.python310; };
python = uwsgi.python3;
penv = python.withPackages (const [ pkgs.privacyidea ]);
logCfg = pkgs.writeText "privacyidea-log.cfg" ''
@@ -41,7 +41,7 @@ let
piCfgFile = pkgs.writeText "privacyidea.cfg" ''
SUPERUSER_REALM = [ '${concatStringsSep "', '" cfg.superuserRealm}' ]
- SQLALCHEMY_DATABASE_URI = 'postgresql:///privacyidea'
+ SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2:///privacyidea'
SECRET_KEY = '${cfg.secretKey}'
PI_PEPPER = '${cfg.pepper}'
PI_ENCFILE = '${cfg.encFile}'
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 1837ec936c69..bc5b4be51098 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -203,7 +203,8 @@ let
proxy_send_timeout ${cfg.proxyTimeout};
proxy_read_timeout ${cfg.proxyTimeout};
proxy_http_version 1.1;
- # don't let clients close the keep-alive connection to upstream
+ # don't let clients close the keep-alive connection to upstream. See the nginx blog for details:
+ # https://www.nginx.com/blog/avoiding-top-10-nginx-configuration-mistakes/#no-keepalives
proxy_set_header "Connection" "";
include ${recommendedProxyConfig};
''}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7b1159d66715..7ee83be6672e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -134,6 +134,7 @@ in {
cloud-init-hostname = handleTest ./cloud-init-hostname.nix {};
cloudlog = handleTest ./cloudlog.nix {};
cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {};
+ cockpit = handleTest ./cockpit.nix {};
cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {};
collectd = handleTest ./collectd.nix {};
connman = handleTest ./connman.nix {};
diff --git a/nixos/tests/cockpit.nix b/nixos/tests/cockpit.nix
new file mode 100644
index 000000000000..4a4983f9bc4e
--- /dev/null
+++ b/nixos/tests/cockpit.nix
@@ -0,0 +1,135 @@
+import ./make-test-python.nix (
+ { pkgs, lib, ... }:
+
+ let
+ user = "alice"; # from ./common/user-account.nix
+ password = "foobar"; # from ./common/user-account.nix
+ in {
+ name = "cockpit";
+ meta = {
+ maintainers = with lib.maintainers; [ lucasew ];
+ };
+ nodes = {
+ server = { config, ... }: {
+ imports = [ ./common/user-account.nix ];
+ security.polkit.enable = true;
+ users.users.${user} = {
+ extraGroups = [ "wheel" ];
+ };
+ services.cockpit = {
+ enable = true;
+ openFirewall = true;
+ settings = {
+ WebService = {
+ Origins = "https://server:9090";
+ };
+ };
+ };
+ };
+ client = { config, ... }: {
+ imports = [ ./common/user-account.nix ];
+ environment.systemPackages = let
+ seleniumScript = pkgs.writers.writePython3Bin "selenium-script" {
+ libraries = with pkgs.python3Packages; [ selenium ];
+ } ''
+ from selenium import webdriver
+ from selenium.webdriver.common.by import By
+ from selenium.webdriver.firefox.options import Options
+ from selenium.webdriver.support.ui import WebDriverWait
+ from selenium.webdriver.support import expected_conditions as EC
+ from time import sleep
+
+
+ def log(msg):
+ from sys import stderr
+ print(f"[*] {msg}", file=stderr)
+
+
+ log("Initializing")
+
+ options = Options()
+ options.add_argument("--headless")
+
+ driver = webdriver.Firefox(options=options)
+
+ driver.implicitly_wait(10)
+
+ log("Opening homepage")
+ driver.get("https://server:9090")
+
+ wait = WebDriverWait(driver, 60)
+
+
+ def wait_elem(by, query):
+ wait.until(EC.presence_of_element_located((by, query)))
+
+
+ def wait_title_contains(title):
+ wait.until(EC.title_contains(title))
+
+
+ def find_element(by, query):
+ return driver.find_element(by, query)
+
+
+ def set_value(elem, value):
+ script = 'arguments[0].value = arguments[1]'
+ return driver.execute_script(script, elem, value)
+
+
+ log("Waiting for the homepage to load")
+
+ # cockpit sets initial title as hostname
+ wait_title_contains("server")
+ wait_elem(By.CSS_SELECTOR, 'input#login-user-input')
+
+ log("Homepage loaded!")
+
+ log("Filling out username")
+ login_input = find_element(By.CSS_SELECTOR, 'input#login-user-input')
+ set_value(login_input, "${user}")
+
+ log("Filling out password")
+ password_input = find_element(By.CSS_SELECTOR, 'input#login-password-input')
+ set_value(password_input, "${password}")
+
+ log("Submiting credentials for login")
+ driver.find_element(By.CSS_SELECTOR, 'button#login-button').click()
+
+ # driver.implicitly_wait(1)
+ # driver.get("https://server:9090/system")
+
+ log("Waiting dashboard to load")
+ wait_title_contains("${user}@server")
+
+ log("Waiting for the frontend to initalize")
+ sleep(1)
+
+ log("Looking for that banner that tells about limited access")
+ container_iframe = find_element(By.CSS_SELECTOR, 'iframe.container-frame')
+ driver.switch_to.frame(container_iframe)
+
+ assert "Web console is running in limited access mode" in driver.page_source
+
+ driver.close()
+ '';
+ in with pkgs; [ firefox-unwrapped geckodriver seleniumScript ];
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ server.wait_for_open_port(9090)
+ server.wait_for_unit("network.target")
+ server.wait_for_unit("multi-user.target")
+ server.systemctl("start", "polkit")
+
+ client.wait_for_unit("multi-user.target")
+
+ client.succeed("curl -k https://server:9090 -o /dev/stderr")
+ print(client.succeed("whoami"))
+ client.succeed('PYTHONUNBUFFERED=1 selenium-script')
+ '';
+ }
+)
diff --git a/nixos/tests/cups-pdf.nix b/nixos/tests/cups-pdf.nix
index 70d14f29e2e5..957b0296a755 100644
--- a/nixos/tests/cups-pdf.nix
+++ b/nixos/tests/cups-pdf.nix
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
testScript = ''
from subprocess import run
- machine.wait_for_unit("cups.service")
+ machine.wait_for_unit("multi-user.target")
for name in ("opt", "noopt"):
text = f"test text {name}".upper()
machine.wait_until_succeeds(f"lpstat -v {name}")
diff --git a/nixos/tests/nebula.nix b/nixos/tests/nebula.nix
index 372cfebdf801..89b91d89fcb3 100644
--- a/nixos/tests/nebula.nix
+++ b/nixos/tests/nebula.nix
@@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let
environment.systemPackages = [ pkgs.nebula ];
users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
services.openssh.enable = true;
+ networking.interfaces.eth1.useDHCP = false;
services.nebula.networks.smoke = {
# Note that these paths won't exist when the machine is first booted.
@@ -30,13 +31,14 @@ in
lighthouse = { ... } @ args:
makeNebulaNode args "lighthouse" {
- networking.interfaces.eth1.ipv4.addresses = [{
+ networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{
address = "192.168.1.1";
prefixLength = 24;
}];
services.nebula.networks.smoke = {
isLighthouse = true;
+ isRelay = true;
firewall = {
outbound = [ { port = "any"; proto = "any"; host = "any"; } ];
inbound = [ { port = "any"; proto = "any"; host = "any"; } ];
@@ -44,9 +46,9 @@ in
};
};
- node2 = { ... } @ args:
- makeNebulaNode args "node2" {
- networking.interfaces.eth1.ipv4.addresses = [{
+ allowAny = { ... } @ args:
+ makeNebulaNode args "allowAny" {
+ networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{
address = "192.168.1.2";
prefixLength = 24;
}];
@@ -55,6 +57,7 @@ in
staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; };
isLighthouse = false;
lighthouses = [ "10.0.100.1" ];
+ relays = [ "10.0.100.1" ];
firewall = {
outbound = [ { port = "any"; proto = "any"; host = "any"; } ];
inbound = [ { port = "any"; proto = "any"; host = "any"; } ];
@@ -62,9 +65,9 @@ in
};
};
- node3 = { ... } @ args:
- makeNebulaNode args "node3" {
- networking.interfaces.eth1.ipv4.addresses = [{
+ allowFromLighthouse = { ... } @ args:
+ makeNebulaNode args "allowFromLighthouse" {
+ networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{
address = "192.168.1.3";
prefixLength = 24;
}];
@@ -73,6 +76,7 @@ in
staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; };
isLighthouse = false;
lighthouses = [ "10.0.100.1" ];
+ relays = [ "10.0.100.1" ];
firewall = {
outbound = [ { port = "any"; proto = "any"; host = "any"; } ];
inbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ];
@@ -80,9 +84,9 @@ in
};
};
- node4 = { ... } @ args:
- makeNebulaNode args "node4" {
- networking.interfaces.eth1.ipv4.addresses = [{
+ allowToLighthouse = { ... } @ args:
+ makeNebulaNode args "allowToLighthouse" {
+ networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{
address = "192.168.1.4";
prefixLength = 24;
}];
@@ -92,6 +96,7 @@ in
staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; };
isLighthouse = false;
lighthouses = [ "10.0.100.1" ];
+ relays = [ "10.0.100.1" ];
firewall = {
outbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ];
inbound = [ { port = "any"; proto = "any"; host = "any"; } ];
@@ -99,9 +104,9 @@ in
};
};
- node5 = { ... } @ args:
- makeNebulaNode args "node5" {
- networking.interfaces.eth1.ipv4.addresses = [{
+ disabled = { ... } @ args:
+ makeNebulaNode args "disabled" {
+ networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{
address = "192.168.1.5";
prefixLength = 24;
}];
@@ -111,6 +116,7 @@ in
staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; };
isLighthouse = false;
lighthouses = [ "10.0.100.1" ];
+ relays = [ "10.0.100.1" ];
firewall = {
outbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ];
inbound = [ { port = "any"; proto = "any"; host = "any"; } ];
@@ -123,12 +129,14 @@ in
testScript = let
setUpPrivateKey = name: ''
- ${name}.succeed(
- "mkdir -p /root/.ssh",
- "chown 700 /root/.ssh",
- "cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil",
- "chown 600 /root/.ssh/id_snakeoil",
- )
+ ${name}.start()
+ ${name}.succeed(
+ "mkdir -p /root/.ssh",
+ "chown 700 /root/.ssh",
+ "cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil",
+ "chown 600 /root/.ssh/id_snakeoil",
+ "mkdir -p /root"
+ )
'';
# From what I can tell, StrictHostKeyChecking=no is necessary for ssh to work between machines.
@@ -146,26 +154,48 @@ in
${name}.succeed(
"mkdir -p /etc/nebula",
"nebula-cert keygen -out-key /etc/nebula/${name}.key -out-pub /etc/nebula/${name}.pub",
- "scp ${sshOpts} /etc/nebula/${name}.pub 192.168.1.1:/tmp/${name}.pub",
+ "scp ${sshOpts} /etc/nebula/${name}.pub root@192.168.1.1:/root/${name}.pub",
)
lighthouse.succeed(
- 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -ip "${ip}" -in-pub /tmp/${name}.pub -out-crt /tmp/${name}.crt',
+ 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -ip "${ip}" -in-pub /root/${name}.pub -out-crt /root/${name}.crt'
)
${name}.succeed(
- "scp ${sshOpts} 192.168.1.1:/tmp/${name}.crt /etc/nebula/${name}.crt",
- "scp ${sshOpts} 192.168.1.1:/etc/nebula/ca.crt /etc/nebula/ca.crt",
+ "scp ${sshOpts} root@192.168.1.1:/root/${name}.crt /etc/nebula/${name}.crt",
+ "scp ${sshOpts} root@192.168.1.1:/etc/nebula/ca.crt /etc/nebula/ca.crt",
+ '(id nebula-smoke >/dev/null && chown -R nebula-smoke:nebula-smoke /etc/nebula) || true'
)
'';
- in ''
- start_all()
+ getPublicIp = node: ''
+ ${node}.succeed("ip --brief addr show eth1 | awk '{print $3}' | tail -n1 | cut -d/ -f1").strip()
+ '';
+ # Never do this for anything security critical! (Thankfully it's just a test.)
+ # Restart Nebula right after the mutual block and/or restore so the state is fresh.
+ blockTrafficBetween = nodeA: nodeB: ''
+ node_a = ${getPublicIp nodeA}
+ node_b = ${getPublicIp nodeB}
+ ${nodeA}.succeed("iptables -I INPUT -s " + node_b + " -j DROP")
+ ${nodeB}.succeed("iptables -I INPUT -s " + node_a + " -j DROP")
+ ${nodeA}.systemctl("restart nebula@smoke.service")
+ ${nodeB}.systemctl("restart nebula@smoke.service")
+ '';
+ allowTrafficBetween = nodeA: nodeB: ''
+ node_a = ${getPublicIp nodeA}
+ node_b = ${getPublicIp nodeB}
+ ${nodeA}.succeed("iptables -D INPUT -s " + node_b + " -j DROP")
+ ${nodeB}.succeed("iptables -D INPUT -s " + node_a + " -j DROP")
+ ${nodeA}.systemctl("restart nebula@smoke.service")
+ ${nodeB}.systemctl("restart nebula@smoke.service")
+ '';
+ in ''
# Create the certificate and sign the lighthouse's keys.
${setUpPrivateKey "lighthouse"}
lighthouse.succeed(
"mkdir -p /etc/nebula",
'nebula-cert ca -name "Smoke Test" -out-crt /etc/nebula/ca.crt -out-key /etc/nebula/ca.key',
'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "lighthouse" -groups "lighthouse" -ip "10.0.100.1/24" -out-crt /etc/nebula/lighthouse.crt -out-key /etc/nebula/lighthouse.key',
+ 'chown -R nebula-smoke:nebula-smoke /etc/nebula'
)
# Reboot the lighthouse and verify that the nebula service comes up on boot.
@@ -175,49 +205,104 @@ in
lighthouse.wait_for_unit("nebula@smoke.service")
lighthouse.succeed("ping -c5 10.0.100.1")
- # Create keys for node2's nebula service and test that it comes up.
- ${setUpPrivateKey "node2"}
- ${signKeysFor "node2" "10.0.100.2/24"}
- ${restartAndCheckNebula "node2" "10.0.100.2"}
+ # Create keys for allowAny's nebula service and test that it comes up.
+ ${setUpPrivateKey "allowAny"}
+ ${signKeysFor "allowAny" "10.0.100.2/24"}
+ ${restartAndCheckNebula "allowAny" "10.0.100.2"}
- # Create keys for node3's nebula service and test that it comes up.
- ${setUpPrivateKey "node3"}
- ${signKeysFor "node3" "10.0.100.3/24"}
- ${restartAndCheckNebula "node3" "10.0.100.3"}
+ # Create keys for allowFromLighthouse's nebula service and test that it comes up.
+ ${setUpPrivateKey "allowFromLighthouse"}
+ ${signKeysFor "allowFromLighthouse" "10.0.100.3/24"}
+ ${restartAndCheckNebula "allowFromLighthouse" "10.0.100.3"}
- # Create keys for node4's nebula service and test that it comes up.
- ${setUpPrivateKey "node4"}
- ${signKeysFor "node4" "10.0.100.4/24"}
- ${restartAndCheckNebula "node4" "10.0.100.4"}
+ # Create keys for allowToLighthouse's nebula service and test that it comes up.
+ ${setUpPrivateKey "allowToLighthouse"}
+ ${signKeysFor "allowToLighthouse" "10.0.100.4/24"}
+ ${restartAndCheckNebula "allowToLighthouse" "10.0.100.4"}
- # Create keys for node4's nebula service and test that it does not come up.
- ${setUpPrivateKey "node5"}
- ${signKeysFor "node5" "10.0.100.5/24"}
- node5.fail("systemctl status nebula@smoke.service")
- node5.fail("ping -c5 10.0.100.5")
+ # Create keys for disabled's nebula service and test that it does not come up.
+ ${setUpPrivateKey "disabled"}
+ ${signKeysFor "disabled" "10.0.100.5/24"}
+ disabled.fail("systemctl status nebula@smoke.service")
+ disabled.fail("ping -c5 10.0.100.5")
- # The lighthouse can ping node2 and node3 but not node5
+ # The lighthouse can ping allowAny and allowFromLighthouse but not disabled
lighthouse.succeed("ping -c3 10.0.100.2")
lighthouse.succeed("ping -c3 10.0.100.3")
lighthouse.fail("ping -c3 10.0.100.5")
- # node2 can ping the lighthouse, but not node3 because of its inbound firewall
- node2.succeed("ping -c3 10.0.100.1")
- node2.fail("ping -c3 10.0.100.3")
+ # allowAny can ping the lighthouse, but not allowFromLighthouse because of its inbound firewall
+ allowAny.succeed("ping -c3 10.0.100.1")
+ allowAny.fail("ping -c3 10.0.100.3")
- # node3 can ping the lighthouse and node2
- node3.succeed("ping -c3 10.0.100.1")
- node3.succeed("ping -c3 10.0.100.2")
+ # allowFromLighthouse can ping the lighthouse and allowAny
+ allowFromLighthouse.succeed("ping -c3 10.0.100.1")
+ allowFromLighthouse.succeed("ping -c3 10.0.100.2")
- # node4 can ping the lighthouse but not node2 or node3
- node4.succeed("ping -c3 10.0.100.1")
- node4.fail("ping -c3 10.0.100.2")
- node4.fail("ping -c3 10.0.100.3")
+ # block allowFromLighthouse <-> allowAny, and allowFromLighthouse -> allowAny should still work.
+ ${blockTrafficBetween "allowFromLighthouse" "allowAny"}
+ allowFromLighthouse.succeed("ping -c10 10.0.100.2")
+ ${allowTrafficBetween "allowFromLighthouse" "allowAny"}
+ allowFromLighthouse.succeed("ping -c10 10.0.100.2")
- # node2 can ping node3 now that node3 pinged it first
- node2.succeed("ping -c3 10.0.100.3")
- # node4 can ping node2 if node2 pings it first
- node2.succeed("ping -c3 10.0.100.4")
- node4.succeed("ping -c3 10.0.100.2")
+ # allowToLighthouse can ping the lighthouse but not allowAny or allowFromLighthouse
+ allowToLighthouse.succeed("ping -c3 10.0.100.1")
+ allowToLighthouse.fail("ping -c3 10.0.100.2")
+ allowToLighthouse.fail("ping -c3 10.0.100.3")
+
+ # allowAny can ping allowFromLighthouse now that allowFromLighthouse pinged it first
+ allowAny.succeed("ping -c3 10.0.100.3")
+
+ # block allowAny <-> allowFromLighthouse, and allowAny -> allowFromLighthouse should still work.
+ ${blockTrafficBetween "allowAny" "allowFromLighthouse"}
+ allowFromLighthouse.succeed("ping -c10 10.0.100.2")
+ allowAny.succeed("ping -c10 10.0.100.3")
+ ${allowTrafficBetween "allowAny" "allowFromLighthouse"}
+ allowFromLighthouse.succeed("ping -c10 10.0.100.2")
+ allowAny.succeed("ping -c10 10.0.100.3")
+
+ # allowToLighthouse can ping allowAny if allowAny pings it first
+ allowAny.succeed("ping -c3 10.0.100.4")
+ allowToLighthouse.succeed("ping -c3 10.0.100.2")
+
+ # block allowToLighthouse <-> allowAny, and allowAny <-> allowToLighthouse should still work.
+ ${blockTrafficBetween "allowAny" "allowToLighthouse"}
+ allowAny.succeed("ping -c10 10.0.100.4")
+ allowToLighthouse.succeed("ping -c10 10.0.100.2")
+ ${allowTrafficBetween "allowAny" "allowToLighthouse"}
+ allowAny.succeed("ping -c10 10.0.100.4")
+ allowToLighthouse.succeed("ping -c10 10.0.100.2")
+
+ # block lighthouse <-> allowFromLighthouse and allowAny <-> allowFromLighthouse; allowFromLighthouse won't get to allowAny
+ ${blockTrafficBetween "allowFromLighthouse" "lighthouse"}
+ ${blockTrafficBetween "allowFromLighthouse" "allowAny"}
+ allowFromLighthouse.fail("ping -c3 10.0.100.2")
+ ${allowTrafficBetween "allowFromLighthouse" "lighthouse"}
+ ${allowTrafficBetween "allowFromLighthouse" "allowAny"}
+ allowFromLighthouse.succeed("ping -c3 10.0.100.2")
+
+ # block lighthouse <-> allowAny, allowAny <-> allowFromLighthouse, and allowAny <-> allowToLighthouse; it won't get to allowFromLighthouse or allowToLighthouse
+ ${blockTrafficBetween "allowAny" "lighthouse"}
+ ${blockTrafficBetween "allowAny" "allowFromLighthouse"}
+ ${blockTrafficBetween "allowAny" "allowToLighthouse"}
+ allowFromLighthouse.fail("ping -c3 10.0.100.2")
+ allowAny.fail("ping -c3 10.0.100.3")
+ allowAny.fail("ping -c3 10.0.100.4")
+ ${allowTrafficBetween "allowAny" "lighthouse"}
+ ${allowTrafficBetween "allowAny" "allowFromLighthouse"}
+ ${allowTrafficBetween "allowAny" "allowToLighthouse"}
+ allowFromLighthouse.succeed("ping -c3 10.0.100.2")
+ allowAny.succeed("ping -c3 10.0.100.3")
+ allowAny.succeed("ping -c3 10.0.100.4")
+
+ # block lighthouse <-> allowToLighthouse and allowToLighthouse <-> allowAny; it won't get to allowAny
+ ${blockTrafficBetween "allowToLighthouse" "lighthouse"}
+ ${blockTrafficBetween "allowToLighthouse" "allowAny"}
+ allowAny.fail("ping -c3 10.0.100.4")
+ allowToLighthouse.fail("ping -c3 10.0.100.2")
+ ${allowTrafficBetween "allowToLighthouse" "lighthouse"}
+ ${allowTrafficBetween "allowToLighthouse" "allowAny"}
+ allowAny.succeed("ping -c3 10.0.100.4")
+ allowToLighthouse.succeed("ping -c3 10.0.100.2")
'';
})
diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix
index 2a2b5aaa2841..3b98a5257a13 100644
--- a/nixos/tests/pgadmin4.nix
+++ b/nixos/tests/pgadmin4.nix
@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }:
- /*
+/*
This test suite replaces the typical pytestCheckHook function in python
packages. Pgadmin4 test suite needs a running and configured postgresql
server. This is why this test exists.
@@ -17,117 +17,123 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
*/
- let
- pgadmin4SrcDir = "/pgadmin";
- pgadmin4Dir = "/var/lib/pgadmin";
- pgadmin4LogDir = "/var/log/pgadmin";
+let
+ pgadmin4SrcDir = "/pgadmin";
+ pgadmin4Dir = "/var/lib/pgadmin";
+ pgadmin4LogDir = "/var/log/pgadmin";
- in
- {
- name = "pgadmin4";
- meta.maintainers = with lib.maintainers; [ gador ];
+in
+{
+ name = "pgadmin4";
+ meta.maintainers = with lib.maintainers; [ gador ];
- nodes.machine = { pkgs, ... }: {
- imports = [ ./common/x11.nix ];
- # needed because pgadmin 6.8 will fail, if those dependencies get updated
- nixpkgs.overlays = [
- (self: super: {
- pythonPackages = pythonEnv;
- })
+ nodes.machine = { pkgs, ... }: {
+ imports = [ ./common/x11.nix ];
+ # needed because pgadmin 6.8 will fail, if those dependencies get updated
+ nixpkgs.overlays = [
+ (self: super: {
+ pythonPackages = pythonEnv;
+ })
+ ];
+
+ environment.systemPackages = with pkgs; [
+ pgadmin4
+ postgresql
+ chromedriver
+ chromium
+ # include the same packages as in pgadmin minus speaklater3
+ (python3.withPackages
+ (ps: buildDeps ++
+ [
+ # test suite package requirements
+ pythonPackages.testscenarios
+ pythonPackages.selenium
+ ])
+ )
+ ];
+ services.postgresql = {
+ enable = true;
+ authentication = ''
+ host all all localhost trust
+ '';
+ ensureUsers = [
+ {
+ name = "postgres";
+ ensurePermissions = {
+ "DATABASE \"postgres\"" = "ALL PRIVILEGES";
+ };
+ }
];
-
- environment.systemPackages = with pkgs; [
- pgadmin4
- postgresql
- chromedriver
- chromium
- # include the same packages as in pgadmin minus speaklater3
- (python3.withPackages
- (ps: buildDeps ++
- [
- # test suite package requirements
- pythonPackages.testscenarios
- pythonPackages.selenium
- ])
- )
- ];
- services.postgresql = {
- enable = true;
- authentication = ''
- host all all localhost trust
- '';
- ensureUsers = [
- {
- name = "postgres";
- ensurePermissions = {
- "DATABASE \"postgres\"" = "ALL PRIVILEGES";
- };
- }
- ];
- };
};
+ };
- testScript = ''
- machine.wait_for_unit("postgresql")
+ testScript = ''
+ machine.wait_for_unit("postgresql")
- # pgadmin4 needs its data and log directories
+ # pgadmin4 needs its data and log directories
+ machine.succeed(
+ "mkdir -p ${pgadmin4Dir} \
+ && mkdir -p ${pgadmin4LogDir} \
+ && mkdir -p ${pgadmin4SrcDir}"
+ )
+
+ machine.succeed(
+ "tar xvzf ${pkgs.pgadmin4.src} -C ${pgadmin4SrcDir}"
+ )
+
+ machine.wait_for_file("${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/README.md")
+
+ # set paths and config for tests
+ # also ensure Server Mode is set to false, which will automatically exclude some unnecessary tests.
+ # see https://github.com/pgadmin-org/pgadmin4/blob/fd1c26408bbf154fa455a49ee5c12895933833a3/web/regression/runtests.py#L217-L226
+ machine.succeed(
+ "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \
+ && cp -v web/regression/test_config.json.in web/regression/test_config.json \
+ && sed -i 's|PostgreSQL 9.4|PostgreSQL|' web/regression/test_config.json \
+ && sed -i 's|/opt/PostgreSQL/9.4/bin/|${pkgs.postgresql}/bin|' web/regression/test_config.json \
+ && sed -i 's|\"headless_chrome\": false|\"headless_chrome\": true|' web/regression/test_config.json \
+ && sed -i 's|builtins.SERVER_MODE = None|builtins.SERVER_MODE = False|' web/regression/runtests.py"
+ )
+
+ # adapt chrome config to run within a sandbox without GUI
+ # see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t#50642913
+ # add chrome binary path. use spaces to satisfy python indention (tabs throw an error)
+ machine.succeed(
+ "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \
+ && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.binary_location = \"${pkgs.chromium}/bin/chromium\"' web/regression/runtests.py \
+ && sed -i '\|options.add_argument(\"--no-sandbox\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--headless\")' web/regression/runtests.py \
+ && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--disable-dev-shm-usage\")' web/regression/runtests.py \
+ && sed -i 's|(chrome_options=options)|(executable_path=\"${pkgs.chromedriver}/bin/chromedriver\", chrome_options=options)|' web/regression/runtests.py \
+ && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py"
+ )
+
+ # don't bother to test kerberos authentication
+ excluded_tests = [ "browser.tests.test_kerberos_with_mocking",
+ ]
+
+ with subtest("run browser test"):
+ machine.succeed(
+ 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
+ && python regression/runtests.py \
+ --pkg browser \
+ --exclude ' + ','.join(excluded_tests)
+ )
+
+ with subtest("run resql test"):
machine.succeed(
- "mkdir -p ${pgadmin4Dir} \
- && mkdir -p ${pgadmin4LogDir} \
- && mkdir -p ${pgadmin4SrcDir}"
+ 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
+ && python regression/runtests.py --pkg resql'
)
- machine.succeed(
- "tar xvzf ${pkgs.pgadmin4.src} -C ${pgadmin4SrcDir}"
- )
-
- machine.wait_for_file("${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/README.md")
-
- # set paths and config for tests
- machine.succeed(
- "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \
- && cp -v web/regression/test_config.json.in web/regression/test_config.json \
- && sed -i 's|PostgreSQL 9.4|PostgreSQL|' web/regression/test_config.json \
- && sed -i 's|/opt/PostgreSQL/9.4/bin/|${pkgs.postgresql}/bin|' web/regression/test_config.json \
- && sed -i 's|\"headless_chrome\": false|\"headless_chrome\": true|' web/regression/test_config.json"
- )
-
- # adapt chrome config to run within a sandbox without GUI
- # see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t#50642913
- # add chrome binary path. use spaces to satisfy python indention (tabs throw an error)
- # this works for selenium 3 (currently used), but will need to be updated
- # to work with "from selenium.webdriver.chrome.service import Service" in selenium 4
- machine.succeed(
- "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \
- && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.binary_location = \"${pkgs.chromium}/bin/chromium\"' web/regression/runtests.py \
- && sed -i '\|options.add_argument(\"--no-sandbox\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--headless\")' web/regression/runtests.py \
- && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--disable-dev-shm-usage\")' web/regression/runtests.py \
- && sed -i 's|(chrome_options=options)|(executable_path=\"${pkgs.chromedriver}/bin/chromedriver\", chrome_options=options)|' web/regression/runtests.py \
- && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py"
- )
-
- # Don't bother to test LDAP or kerberos authentication
- with subtest("run browser test"):
- machine.succeed(
- 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
- && python regression/runtests.py \
- --pkg browser \
- --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking'
- )
-
- # fontconfig is necessary for chromium to run
- # https://github.com/NixOS/nixpkgs/issues/136207
- with subtest("run feature test"):
- machine.succeed(
- 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
- && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \
- && python regression/runtests.py --pkg feature_tests'
- )
-
- with subtest("run resql test"):
- machine.succeed(
- 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
- && python regression/runtests.py --pkg resql'
- )
- '';
- })
+ # fontconfig is necessary for chromium to run
+ # https://github.com/NixOS/nixpkgs/issues/136207
+ # also, the feature_tests require Server Mode = True
+ with subtest("run feature test"):
+ machine.succeed(
+ 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
+ && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \
+ && sed -i \'s|builtins.SERVER_MODE = False|builtins.SERVER_MODE = True|\' regression/runtests.py \
+ && python regression/runtests.py --pkg feature_tests'
+ )
+ '';
+})
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 276b3d6c7bc2..e48e27b5cc69 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -4,7 +4,6 @@
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
, fftw, phonon, plasma-framework, threadweaver, breeze-icons
, curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mariadb-embedded, pcre, snappy, taglib, taglib_extras
-, pmdk, numactl
}:
mkDerivation rec {
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 1a036dee23f0..0b02b1d9d807 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1198,7 +1198,7 @@ self: super: {
hexokinase = buildGoModule {
name = "hexokinase";
src = old.src + "/hexokinase";
- vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+ vendorSha256 = null;
};
in
''
diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix
index 52872f3fbdb0..8241c3e98cfc 100644
--- a/pkgs/applications/misc/iptsd/default.nix
+++ b/pkgs/applications/misc/iptsd/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "iptsd";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "linux-surface";
repo = pname;
rev = "v${version}";
- hash = "sha256-fd/WZXRvJb6XCATNmPj2xi1UseoZqBT9IN21iwxHGLs=";
+ hash = "sha256-B5d1OjrRB164BYtFzZoZ3I4elZSKpHg0PCBiwXPnqLs=";
};
nativeBuildInputs = [
@@ -45,8 +45,10 @@ stdenv.mkDerivation rec {
# Original installs udev rules and service config into global paths
postPatch = ''
substituteInPlace etc/meson.build \
- --replace "install_dir: unitdir" "install_dir: datadir" \
- --replace "install_dir: rulesdir" "install_dir: datadir" \
+ --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \
+ --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'"
+ substituteInPlace etc/udev/50-ipts.rules \
+ --replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape"
'';
mesonFlags = [
diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index cf8e9978c911..91f2db2a2854 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }:
+{ lib, stdenv, makeDesktopItem, fetchurl, jdk19, wrapGAppsHook, glib }:
stdenv.mkDerivation rec {
pname = "pdfsam-basic";
- version = "4.3.4";
+ version = "5.0.2";
src = fetchurl {
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
- sha256 = "sha256-DYCiK5DgWTu1cm4TRsGDCB3LzVCGVkVzSlG3Jeo2WVI=";
+ hash = "sha256-+nBLmbu1aRnfWYNhTBUJdRmdlud8FK7LZFvDNFDrhiI=";
};
unpackPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib ];
preFixup = ''
- gappsWrapperArgs+=(--set JAVA_HOME "${jdk11}" --set PDFSAM_JAVA_PATH "${jdk11}")
+ gappsWrapperArgs+=(--set JAVA_HOME "${jdk19}" --set PDFSAM_JAVA_PATH "${jdk19}")
'';
installPhase = ''
@@ -40,14 +40,14 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
- homepage = "https://github.com/torakiki/pdfsam";
- description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files";
- sourceProvenance = with sourceTypes; [
- binaryBytecode
- binaryNativeCode
- ];
- license = licenses.agpl3;
- platforms = platforms.all;
- maintainers = with maintainers; [ _1000101 ];
+ homepage = "https://github.com/torakiki/pdfsam";
+ description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files";
+ sourceProvenance = with sourceTypes; [
+ binaryBytecode
+ binaryNativeCode
+ ];
+ license = licenses.agpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ _1000101 ];
};
}
diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix
index b45854a6d180..b83fd511b5d8 100644
--- a/pkgs/applications/misc/privacyidea/default.nix
+++ b/pkgs/applications/misc/privacyidea/default.nix
@@ -1,9 +1,13 @@
{ lib, fetchFromGitHub, cacert, openssl, nixosTests
-, python39, fetchpatch
+, python310, fetchpatch
}:
let
- python3' = python39.override {
+ dropDevOutput = { outputs, ... }: {
+ outputs = lib.filter (x: x != "doc") outputs;
+ };
+
+ python3' = python310.override {
packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.3.24";
@@ -25,6 +29,15 @@ let
sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";
};
});
+ flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec {
+ version = "2.5.1";
+ format = "setuptools";
+ src = self.fetchPypi {
+ pname = "Flask-SQLAlchemy";
+ inherit version;
+ hash = "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912";
+ };
+ });
# Taken from by https://github.com/NixOS/nixpkgs/pull/173090/commits/d2c0c7eb4cc91beb0a1adbaf13abc0a526a21708
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
version = "1.0.1";
@@ -44,6 +57,19 @@ let
inherit version;
sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y=";
};
+ patches = [
+ # python 3.10 compat fixes. In later upstream releases, but these
+ # are not compatible with flask 1 which we need here :(
+ (fetchpatch {
+ url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch";
+ sha256 = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU=";
+ })
+ (fetchpatch {
+ url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch";
+ sha256 = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA=";
+ excludes = [ "CHANGES.rst" ];
+ })
+ ];
});
# Required by jinja2-2.11.3
markupsafe = super.markupsafe.overridePythonAttrs (old: rec {
@@ -84,18 +110,62 @@ let
nativeCheckInputs = [];
doCheck = false;
});
+ # Requires pytest-httpserver as checkInput now which requires Werkzeug>=2 which is not
+ # supported by current privacyIDEA.
+ responses = super.responses.overridePythonAttrs (lib.const {
+ doCheck = false;
+ });
+ flask-babel = (super.flask-babel.override {
+ sphinxHook = null;
+ furo = null;
+ }).overridePythonAttrs (old: (dropDevOutput old) // rec {
+ pname = "Flask-Babel";
+ version = "2.0.0";
+ format = "setuptools";
+ src = self.fetchPypi {
+ inherit pname;
+ inherit version;
+ hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
+ };
+ });
+ psycopg2 = (super.psycopg2.override {
+ sphinxHook = null;
+ sphinx-better-theme = null;
+ }).overridePythonAttrs dropDevOutput;
+ hypothesis = super.hypothesis.override {
+ enableDocumentation = false;
+ };
+ pyjwt = (super.pyjwt.override {
+ sphinxHook = null;
+ sphinx-rtd-theme = null;
+ }).overridePythonAttrs (old: (dropDevOutput old) // { format = "setuptools"; });
+ beautifulsoup4 = (super.beautifulsoup4.override {
+ sphinxHook = null;
+ }).overridePythonAttrs dropDevOutput;
+ pydash = (super.pydash.override {
+ sphinx-rtd-theme = null;
+ }).overridePythonAttrs (old: rec {
+ version = "5.1.0";
+ src = self.fetchPypi {
+ inherit (old) pname;
+ inherit version;
+ hash = "sha256-GysFCsG64EnNB/WSCxT6u+UmOPSF2a2h6xFanuv/aDU=";
+ };
+ format = "setuptools";
+ doCheck = false;
+ });
};
};
in
python3'.pkgs.buildPythonPackage rec {
pname = "privacyIDEA";
- version = "3.7.4";
+ version = "3.8";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-QoVL6WJjX6+sN5S/iqV3kcfQ5fWTXkTnf6NpZcw3bGo=";
+ sha256 = "sha256-FCvuWXon8c9LnX1FnCxcSTfBR5/6zijD6ld0iAEVFkU=";
fetchSubmodules = true;
};
@@ -104,17 +174,7 @@ python3'.pkgs.buildPythonPackage rec {
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
- pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt
- ];
-
- patches = [
- # Apply https://github.com/privacyidea/privacyidea/pull/3304, fixes
- # `Exceeds the limit (4300) for integer string conversion` in the tests,
- # see https://hydra.nixos.org/build/192932057
- (fetchpatch {
- url = "https://github.com/privacyidea/privacyidea/commit/0e28f36c0b3291a361669f4a3a77c294f4564475.patch";
- sha256 = "sha256-QqcO8bkt+I2JKce/xk2ZhzEaLZ3E4uZ4x5W9Kk0pMQQ=";
- })
+ pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt segno
];
passthru.tests = { inherit (nixosTests) privacyidea; };
@@ -128,6 +188,7 @@ python3'.pkgs.buildPythonPackage rec {
# Tries to connect to `fcm.googleapis.com`.
"test_02_api_push_poll"
+ "test_04_decline_auth_request"
# Timezone info not available in build sandbox
"test_14_convert_timestamp_to_utc"
diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix
index 6cd7be52d5ec..cbe31867228a 100644
--- a/pkgs/applications/misc/watchmate/default.nix
+++ b/pkgs/applications/misc/watchmate/default.nix
@@ -1,6 +1,6 @@
{ lib
, rustPlatform
-, fetchFromGitLab
+, fetchFromGitHub
, pkg-config
, gtk4
, libadwaita
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "watchmate";
- version = "0.3.0";
+ version = "0.4.0";
- src = fetchFromGitLab {
+ src = fetchFromGitHub {
owner = "azymohliad";
repo = "watchmate";
rev = "v${version}";
- sha256 = "sha256-HyH+9KMbdiJSmjo2NsAvz8rN3JhYKz1nNqfuZufKjQA=";
+ hash = "sha256-WRoAQDOsCi9VbshGzdw+qrVFKQhOQwPgxOfWXYJ3nhg=";
};
- cargoSha256 = "sha256-HvuxKPIVwVrcsTKgPwNosF/ar8QL9Jlldq7SBe2nh6o=";
+ cargoHash = "sha256-pEXC5IVcMhqYM+bGyTh/vaSS9LxYE2YbtIaPplc4Al8=";
nativeBuildInputs = [
pkg-config
@@ -46,7 +46,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "PineTime smart watch companion app for Linux phone and desktop";
- homepage = "https://gitlab.com/azymohliad/watchmate";
+ homepage = "https://github.com/azymohliad/watchmate";
+ changelog = "https://github.com/azymohliad/watchmate/raw/v${version}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 16c6bfac7ed0..32b53a663d07 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "xchm";
- version = "1.33";
+ version = "1.35";
src = fetchFromGitHub {
owner = "rzvncj";
repo = "xCHM";
rev = version;
- sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw=";
+ sha256 = "sha256-ZJvlllhF7KPz+v6KEVPyJjiz+4LHM2Br/oqI54a2Ews=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index aea178a3afc5..4a7048010c81 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -34,6 +34,7 @@
, libva
, libdrm, wayland, libxkbcommon # Ozone
, curl
+, libffi
, libepoxy
# postPatch:
, glibc # gconv + locale
@@ -151,7 +152,8 @@ let
libepoxy
] ++ lib.optional systemdSupport systemd
++ lib.optionals cupsSupport [ libgcrypt cups ]
- ++ lib.optional pulseSupport libpulseaudio;
+ ++ lib.optional pulseSupport libpulseaudio
+ ++ lib.optional (chromiumVersionAtLeast "110") libffi;
patches = [
# Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):
@@ -299,6 +301,10 @@ let
use_system_libwayland = true;
# The default value is hardcoded instead of using pkg-config:
system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner";
+ } // lib.optionalAttrs (chromiumVersionAtLeast "110") {
+ # To fix the build as we don't provide libffi_pic.a
+ # (ld.lld: error: unable to find library -l:libffi_pic.a):
+ use_system_libffi = true;
} // lib.optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index e12667c94f78..ead92ac3aec7 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -19,9 +19,9 @@
}
},
"beta": {
- "version": "110.0.5481.52",
- "sha256": "09khb67xl1b2caw0j9lmv6a9iyms9sprn2r7wsgqzjn9dzd9wwcq",
- "sha256bin64": "0dv9fxwqn50hl06y7zfqby8hd9lwqwk2q3856fygbn82qppkbl4r",
+ "version": "110.0.5481.77",
+ "sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73",
+ "sha256bin64": "0wnzgvwbpmb5ja4ba5mjk4bk0aaxzbw4zi509vw96q6mbqmr4iwr",
"deps": {
"gn": {
"version": "2022-12-12",
@@ -32,9 +32,9 @@
}
},
"dev": {
- "version": "111.0.5562.0",
- "sha256": "0aviz1cjm00lya530n0wyqn85d3idzn3bbp8065ygvfawqcf163j",
- "sha256bin64": "0azkcvbl645c9ph4vn4502qbgfcb7zbs4ycy3q73nj5al642absm",
+ "version": "111.0.5563.8",
+ "sha256": "0gflrk5i6dr5vrywhxab73044gryxj49px59blgl6nyphw7swpwy",
+ "sha256bin64": "1dgfjz9pnziy1zymk7g15i5zdb002g77q8kqhkwgi4m0fndknpmj",
"deps": {
"gn": {
"version": "2022-12-12",
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 0a0eb47b0a19..b91e5b05b625 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
- version = "1.14.2";
+ version = "1.15.2";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${finalAttrs.version}";
- hash = "sha256-9onjQ7fRLlL5/1vMtNHjBBcB7Fyk1ERaHg5IwtwbJQg=";
+ hash = "sha256-NUgDaBRcgYGLKJhSJLT17VZj/mU0w6ySahIYnud5M6Y=";
};
nativeBuildInputs = [ cmake pkg-config zip ];
diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index fe510c7fb9d4..0a60dc720720 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
{
- "packageVersion": "109.0-1",
+ "packageVersion": "109.0.1-2",
"source": {
- "rev": "109.0-1",
- "sha256": "18nd0shx1r2y2gn42sa2jlckcymmnx3fkm4fp58c80gcppslh1fs"
+ "rev": "109.0.1-2",
+ "sha256": "1b5572i7aqad0pmjw88d3mhmhhhacp505z0d9l4l89r7gadssbwb"
},
"firefox": {
- "version": "109.0",
- "sha512": "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7"
+ "version": "109.0.1",
+ "sha512": "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72"
}
}
diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/applications/networking/cluster/pv-migrate/default.nix
new file mode 100644
index 000000000000..0ebb08337ccf
--- /dev/null
+++ b/pkgs/applications/networking/cluster/pv-migrate/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "pv-migrate";
+ version = "1.0.1";
+
+ src = fetchFromGitHub {
+ owner = "utkuozdemir";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-I66J1/N8Ln7KBQfzg39wdZuM6PeJGn1HiNK2YVzDySw";
+ };
+
+ subPackages = [ "cmd/pv-migrate" ];
+
+ vendorSha256 = "sha256-/klqOfM0ZhbzZWOLm0pA0/RB84kvfEzFJN1OQUVSNEA";
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.version=v${version}"
+ "-X main.commit=${src.rev}"
+ "-X main.date=1970-01-01-00:00:01"
+ ];
+
+ meta = with lib; {
+ description = "CLI tool to easily migrate Kubernetes persistent volumes ";
+ homepage = "https://github.com/utkuozdemir/pv-migrate";
+ changelog = "https://github.com/utkuozdemir/pv-migrate/releases/tag/${version}";
+ license = licenses.afl20;
+ maintainers = [ maintainers.ivankovnatsky ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index c4e95f811896..2635ca188956 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -412,11 +412,11 @@
"vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8="
},
"gandi": {
- "hash": "sha256-mQ4L2XCudyPGDw21jihF7nkSct7/KWAe/txnbtuJ8Lk=",
+ "hash": "sha256-eVSMjXSYRedig93Tm2ZLpbuJhG3wKSBwfLli7OWs3dU=",
"homepage": "https://registry.terraform.io/providers/go-gandi/gandi",
"owner": "go-gandi",
"repo": "terraform-provider-gandi",
- "rev": "v2.2.2",
+ "rev": "v2.2.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
},
diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index e0bfa57b1e8d..38a15e8bef01 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -27,11 +27,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
- version = "0.60.2";
+ version = "0.61.0";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
- hash = "sha256-jSRZZufGi1wmdT7LeNutkO74bqln8uJ5TSEDCJyfPB4=";
+ hash = "sha256-lpKnhAF/VsbLOHkIy1TFqjT0yKlFMNsN+yMUmpBAZKY=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/rime-cli/default.nix b/pkgs/applications/office/rime-cli/default.nix
new file mode 100644
index 000000000000..5dd412a45022
--- /dev/null
+++ b/pkgs/applications/office/rime-cli/default.nix
@@ -0,0 +1,23 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+ pname = "rime-cli";
+ version = "0.0.3";
+
+ src = fetchFromGitHub {
+ owner = "puddinging";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-CI0Jva7oA/zUGatv+wCdByqbTBNQRw+4clr8IDKX6HQ=";
+ };
+
+ vendorHash = null;
+
+ meta = with lib; {
+ homepage = "https://github.com/puddinging/rime-cli";
+ changelog = "https://github.com/puddinging/rime-cli/releases/tag/v${version}";
+ description = "A command line tool to add customized vocabulary for Rime IME";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ urandom ];
+ };
+}
diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix
index 5fcb367ce5cb..04ef7c2e062b 100644
--- a/pkgs/applications/science/biology/stacks/default.nix
+++ b/pkgs/applications/science/biology/stacks/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "stacks";
- version = "2.60";
+ version = "2.62";
src = fetchurl {
url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz";
- sha256 = "sha256-ppKG7Z1TyLwUyqRnGYk3QWPJqKeNcW04GMW7myPFSNM=";
+ sha256 = "sha256-7uhQVLC/AEPAPUdm3+vABoIwG4uhNy/EngjsrZjT0Ts=";
};
buildInputs = [ zlib ];
diff --git a/pkgs/applications/science/chemistry/mopac/default.nix b/pkgs/applications/science/chemistry/mopac/default.nix
new file mode 100644
index 000000000000..d2b2b558bb78
--- /dev/null
+++ b/pkgs/applications/science/chemistry/mopac/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, lib
+, gfortran
+, fetchFromGitHub
+, cmake
+, blas
+, lapack
+, python3Packages
+}:
+
+assert blas.isILP64 == lapack.isILP64;
+
+stdenv.mkDerivation rec {
+ pname = "mopac";
+ version = "22.0.6";
+
+ src = fetchFromGitHub {
+ owner = "openmopac";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-j4AP3tki+Ep9Pv+pDg8TwCiJvpF2j5npW3Kpat+7gGg=";
+ };
+
+ nativeBuildInputs = [ gfortran cmake ];
+
+ buildInputs = [ blas lapack ];
+
+ checkInputs = with python3Packages; [ python numpy ];
+
+ doCheck = true;
+
+ preCheck = ''
+ export OMP_NUM_THREADS=2
+ '';
+
+ meta = with lib; {
+ description = "Semiempirical quantum chemistry";
+ homepage = "https://github.com/openmopac/mopac";
+ license = licenses.lgpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ sheepforce markuskowa ];
+ };
+}
diff --git a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix
new file mode 100644
index 000000000000..455588ee17d1
--- /dev/null
+++ b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, wxGTK32
+, libGL
+, libGLU
+, pkg-config
+, xorg
+, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "wxmacmolplt";
+ version = "7.7.2";
+
+ src = fetchFromGitHub {
+ owner = "brettbode";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-sNxCjIEJUrDWtcUqBQqvanNfgNQ7T4cabYy+x9D1U+Q=";
+ };
+
+ nativeBuildInputs = [ pkg-config autoreconfHook ];
+ buildInputs = [
+ wxGTK32
+ libGL
+ libGLU
+ xorg.libX11
+ xorg.libX11.dev
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "Graphical user inteface for GAMESS-US";
+ homepage = "https://brettbode.github.io/wxmacmolplt/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ sheepforce markuskowa ];
+ };
+}
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 8a40216c3ecb..10d77885b5cb 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -91,7 +91,7 @@ self = stdenv.mkDerivation {
passthru = {
inherit coq-version;
inherit ocamlPackages ocamlNativeBuildInputs;
- inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs;
+ inherit ocamlPropagatedBuildInputs;
# For compatibility
inherit (ocamlPackages) ocaml camlp5 findlib num ;
emacsBufferSetup = pkgs: ''
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index 25b89889b528..16fdd0317d5f 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "conmon";
- version = "2.1.5";
+ version = "2.1.6";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-zpZ3hVgnh8gkrSghSvhSZnG9uaN+GTKFGHv+MMcs73Q=";
+ hash = "sha256-vmZSt0k6h4Zpbf+/Nq19QIkG3Fzjj3K031XnivFDA2s=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index 469a8bd67295..aca313264a28 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -145,6 +145,11 @@ let
cp -r --reflink=auto vendor $out
''}
+ if ! [ "$(ls -A $out)" ]; then
+ echo "vendor folder is empty, please set 'vendorHash = null;' or 'vendorSha256 = null;' in your expression"
+ exit 10
+ fi
+
runHook postInstall
'';
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index 9f438d67dc69..9ecc16450cc2 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -201,7 +201,7 @@ WRAPPER(int, __xstat64)(int ver, const char * path, struct stat64 * st)
WRAPPER_DEF(__xstat64)
#endif
-#ifdef __linux__
+#if defined(__linux__) && defined(STATX_TYPE)
WRAPPER(int, statx)(int dirfd, const char * restrict pathname, int flags,
unsigned int mask, struct statx * restrict statxbuf)
{
diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/build-support/libredirect/test.c
index 650bdd849037..7dd384ae3ed7 100644
--- a/pkgs/build-support/libredirect/test.c
+++ b/pkgs/build-support/libredirect/test.c
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
#ifndef __APPLE__
struct stat64 testsb64;
#endif
-#ifdef __linux__
+#if defined(__linux__) && defined(STATX_TYPE)
struct statx testsbx;
#endif
char buf[PATH_MAX];
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
#ifndef __APPLE__
assert(fstatat64(123, TESTPATH, &testsb64, 0) != -1);
#endif
-#ifdef __linux__
+#if defined(__linux__) && defined(STATX_TYPE)
assert(statx(123, TESTPATH, 0, STATX_ALL, &testsbx) != -1);
#endif
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 590163fc05fd..7e3a662fda80 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -11,7 +11,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
- version = "17.1.0";
+ version = "18.0.0";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
index 6699023498cb..6d387516e8a4 100644
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT!
{
- iosevka = "0lxcyg93max17fqm6yvxwvr79jz9bggxcmv6qx8sknvjmq89l0pf";
- iosevka-aile = "0pljy65m5zaxbajfmhc3gayz73rbp8vzaqzqcrlm2ir9yxaz21qc";
- iosevka-curly = "0svf6hm0cspydgzjg39f5rp7mrcabb0vc2088r1msipaw8naajqf";
- iosevka-curly-slab = "1afk0ijfciwh9pjy2qsawxw7gq7jxr52li2nwggcq04c9ybh62pg";
- iosevka-etoile = "07zihk9q1ff93ms9gj92hbf2fzw7h4fl28szhrfll3p96y9f81q7";
- iosevka-slab = "18hrv0kc82hfb6ivbdg5k9179k37anjigm8ddh5waiq2is6gmh8l";
- iosevka-ss01 = "127zki1wcd2wjpqr1n2zf57iq44pwcrg2vlrspi3b9lhmxw0rlz9";
- iosevka-ss02 = "0ig7y86c2d9y4bg5cqibbn0wqwwzm5d5qxd8vwhvd323mg3gh6bg";
- iosevka-ss03 = "0zp2nkrl39pvidn846706dp8l12ac66kd9wsyh4cnn08mmm6gl4i";
- iosevka-ss04 = "0r0ylsxj2j9akpxchnldwyddm7vrlpn82sxkgmjhr81hn3q08bgc";
- iosevka-ss05 = "0r9mdhdjndxgm68fg59dbd810ggrpmpkvgcypyqf92l8sf1h55hj";
- iosevka-ss06 = "1c6ga4jaglfp5mx980qy1alkifr1d1lq4qj69xfq6sx4146xn20f";
- iosevka-ss07 = "0h1x2p9finl4482vx6lvs45x5258bpw5avkpgmg66wn16kd95zfq";
- iosevka-ss08 = "1n5m11dlv49jj63s771ny77qpiz178iyvn7pfnhv2mzqwimz5sl2";
- iosevka-ss09 = "1rbs15xsk7fajrm81nacixf18jjx08bpg26fw7pmxjv727zafv05";
- iosevka-ss10 = "1rdpiq5pyzrnxhnsvf08zg0vjhln25vqkyknnv4xf34wr8r9xcc0";
- iosevka-ss11 = "0l9454vx90pj0yva864qfj06ggplia0qdkv3nr14s3wmv5khh9gw";
- iosevka-ss12 = "0cafszj0c7nkcxpbqsrqy5l2v0nzfph6i22w1iayg8bqvpip3x5m";
- iosevka-ss13 = "1mlxh6qikrl0g82difr85lpkxdr83z5iymf0brmgdxkmyig3psr7";
- iosevka-ss14 = "1330p52h94fgr76gll396hb0qalamm8z79hw73ci4ph22dpsd4ni";
- iosevka-ss15 = "0cc5a1187i9idgvz7zhs0byya8c69f0g4pkqlivh37ffj07yv47v";
- iosevka-ss16 = "052nypjppbrbkhjq85nwmx8469prfsbc9f05kw0vi30c8mpcjqwf";
- iosevka-ss17 = "0k5p1qvx8vi8ic7yayky7zdi1hrkwli698ydlfhnk4yx10l0xq8j";
- iosevka-ss18 = "16diyrfpz1kp9vcyq61pbdrrv4pl96kzn8ckv7wb5cnwxwa336c7";
- sgr-iosevka = "0b92jmai9cgxdah74jmks7fwbyb1m722ablf3qaiizc597y031wv";
- sgr-iosevka-aile = "1z5jg74aspkvhw41ihwzbfs4f075gs8ny76m30adp0n3v877nhjz";
- sgr-iosevka-curly = "06bm6jg16sgvxnqbayqa92lvr0bc5vdjybbi467yx57hi83w860q";
- sgr-iosevka-curly-slab = "08kg8imp29sww57mdpfmi86046vqwd4a2ayijcvs511v8nhl478r";
- sgr-iosevka-etoile = "0gybfn95n2b8kn3bvi8pjkps5bmndnbbq9jbfbm81fims0s0496b";
- sgr-iosevka-fixed = "15q4y8cm8cwxcbmjzknc19gyqmd4nb928b26nswm8m17p85zlcq0";
- sgr-iosevka-fixed-curly = "1faci2m7w8cf65mjkigqlyh838r5mqvg7ai4nfdidms6ilhhsf37";
- sgr-iosevka-fixed-curly-slab = "019m3nvsy6vwgf6f0z2l0wxxkqbl30y55jfgi2bsmxhizwzl3csc";
- sgr-iosevka-fixed-slab = "1ps1xi334h7by3nihn3n6d76sbzcvv03dwy4iy5wixlz0lr8id5i";
- sgr-iosevka-fixed-ss01 = "18qdd6qbk8dy6z36lsy89a7g6l1asdzqvlc82j9vk437yjm59vwi";
- sgr-iosevka-fixed-ss02 = "0xm1k1f5hbhjbksshlv7bcdigdrxxhfpc8pgv7dvz7zpy7cx2y4y";
- sgr-iosevka-fixed-ss03 = "1741k3p2mncq9kp1wshpl6dkwqvvg2bpakl91k6ssvj1z63r2zhq";
- sgr-iosevka-fixed-ss04 = "0sw65088yihk2sk2mcdr4cd8rl9l954l2sc3y7dil3jkgw6kf0wq";
- sgr-iosevka-fixed-ss05 = "1cc71vidcljh6k6pw6z5yygi0kir7n235l19as8y1qazmc8kh0ip";
- sgr-iosevka-fixed-ss06 = "0s2f0j0z4dyd23z5mldih03cg8vqwvpqrmagbpx02v2krzn2vb27";
- sgr-iosevka-fixed-ss07 = "07nfdx7bdbsxrmylsja8bvr1n2a116qyfg8pk1wpcax3vf56jamh";
- sgr-iosevka-fixed-ss08 = "0ys6gw2p7vpdv8csxzxjx09m8k0h4s28w7i98iq27ak47xcm8xd7";
- sgr-iosevka-fixed-ss09 = "0vn6vc0byakggyrd6d9mv1l9d4h5g7wcbkkmxzqfjr6xp3k96r88";
- sgr-iosevka-fixed-ss10 = "0llqjvv7m1imvqw41xvmcw9y9c9wsnv2i8swnszr9r5khx3kbp6h";
- sgr-iosevka-fixed-ss11 = "1wwjp1fgl2gxhjkmsz6k0a59kjcapby9y8j5m763ap4ig5djbv8r";
- sgr-iosevka-fixed-ss12 = "1k9ak5dc3s024iz6rp4yz9b73752v93n0kldcnwi0lvbh4hp358k";
- sgr-iosevka-fixed-ss13 = "0rgj38jkj6d7g44wn02k6ycixkwq6lwy756vp9w01aqqn5flw6s1";
- sgr-iosevka-fixed-ss14 = "0lbpwnc40lswlmfwqziz7n3kn95kc5rn4fbq5nxa1z8cxz9dkhvh";
- sgr-iosevka-fixed-ss15 = "034h7af7876q0ni8idj5dhkq1cpl91gvxhwxyw17pgnz8i51a261";
- sgr-iosevka-fixed-ss16 = "0i00nxj0j7yr57b4ccd2yc4x7k8zw1xxpdwfwlm0n38c05iqbvj9";
- sgr-iosevka-fixed-ss17 = "1z21han7l7nwz0qfi6fzvwdiadd9brpna51p24drdi8y3915b8n9";
- sgr-iosevka-fixed-ss18 = "0fjdsx66al0h3spgdivryiw5d871s93s2lbmh7nxwf19lylrkv19";
- sgr-iosevka-slab = "0j42hxgcwy5abf5jv5aqjri6h21k2nkgjj7527f68rgcnl9d980b";
- sgr-iosevka-ss01 = "1m7c8zb3rhxnf9h4v55jv7ns6x74bwfsl6f4sl2b1gkfl50ibwqg";
- sgr-iosevka-ss02 = "05cc3p8lkxl1s27wmgspk93fz8f51daqcfid8vpsvnqw75abivc9";
- sgr-iosevka-ss03 = "0bmh1ijdalss96lkji0dcyl00wc2yw7a3lx0nqbbjl4m0l2mz4yp";
- sgr-iosevka-ss04 = "1jc1y9rgw8hnd7zqrn98b35r01kmr2nykqip63h6qal7l456m4s2";
- sgr-iosevka-ss05 = "06acxqhzfxlhqd083s57b15sx2vgq0r6pl9myp8syh1d9azbk899";
- sgr-iosevka-ss06 = "0g3zaxy9363p28kcv6a52dqb1swnrn3rwl6pfvanz92vrrjspr7n";
- sgr-iosevka-ss07 = "1bmdparw1hg3i8lnx8vwd467pwf4q94q80a62fcy87hppy3afryg";
- sgr-iosevka-ss08 = "16kgj158nhmlql0gkkfya04dy1gp9an4gk691f28n0mqhi7hygcr";
- sgr-iosevka-ss09 = "144x84qmh9pycn9v36q4z074vmnngn0chlyb8a8hyhgsyfqf7q7h";
- sgr-iosevka-ss10 = "0i9hsmw78yg75a3m80jlmdn2rn72snz69m0abvz7z94b7c99ffsb";
- sgr-iosevka-ss11 = "05a9azf7f64jdr5wwiy7djlmarl01mg6rfmzvrdd8a1a0nfcz1iz";
- sgr-iosevka-ss12 = "1nqa88csh170gs3bggs6v5ssaqljvpw1zxaclhmzdvyhcphrwd19";
- sgr-iosevka-ss13 = "1klhp2w99znj9qyz95z8jq3g23fs8jznya9dfzfy2i4hivw2gxv0";
- sgr-iosevka-ss14 = "1w84mqg0x46fbr8v72ccxc9a7sp52g4qb0x6l84wr8cm1fn7n21f";
- sgr-iosevka-ss15 = "05kdxmghhdyvlnc3wxzc5yyp00ybrq63fzh2kz3s4rwh11hhf0lq";
- sgr-iosevka-ss16 = "0a9i7plsfy8fawip70p5w3dkmjh4sy61iwi9pnl0ara7z23783dq";
- sgr-iosevka-ss17 = "1xmaqs54jhag7s18gfll94g0ixjqp2z5s69kwk48nznzpbfbpdsb";
- sgr-iosevka-ss18 = "09nq0a7b4hkiyi1prxpf6vwms9cnmby2dzn9k4y0xcax7m464531";
- sgr-iosevka-term = "1zr8cyq6578n8f3y9yyc0phs26hda1bf0bsd417wqcwsn88wfmx8";
- sgr-iosevka-term-curly = "0xlwljc2gmwh119x83p2pic5zwjqdymg7pbl2ginzilsrgjl2k0q";
- sgr-iosevka-term-curly-slab = "1vmpdws71sf1pf8nz3w7y0a64a5c3mp8f9w57bqmcn9vr22ymcl7";
- sgr-iosevka-term-slab = "1wkqdgy9nd4mvy4rsssvpis1r17ikpbl8mfx6bp80fh0lai97mxw";
- sgr-iosevka-term-ss01 = "1ly5ic5ihj00apb87am3kl38mywns8jizc7f4hniyrd9xhy1186z";
- sgr-iosevka-term-ss02 = "09lisy461dvppfv6sdk4i6vfrqhxyx558zdaflv9vskmfq8iq66d";
- sgr-iosevka-term-ss03 = "0nm84l4xk53l1q96hx8q63nbflgmivj3cq7z5mysv1z8jdp7isx3";
- sgr-iosevka-term-ss04 = "1y9kkasxmpm4n1vs5plsa25cgwvdi4jahn3ggdlxpl35yi4kxnr3";
- sgr-iosevka-term-ss05 = "1drngqgcibv6kfwjn3s2bik286ypj613q4p3fz0b7incniaz372j";
- sgr-iosevka-term-ss06 = "1rkqnj59hv1lzsplss3jk0jgz6q68qkg4a3200hv10rs9i2w2qxk";
- sgr-iosevka-term-ss07 = "1z6jh8qmc2063zgwbd00xi258grdillkc1nja69awdxiamv6hgf9";
- sgr-iosevka-term-ss08 = "022qw6frmmmpwbq6af8rysm8pbq713fiw92hkqi5k3j4v8dwl9v2";
- sgr-iosevka-term-ss09 = "1c32p4d46q3izif68ka6gr1hmq10snrlga5d7ypphmm8yxvavd9c";
- sgr-iosevka-term-ss10 = "1p497kqa386q5rvsfigzxdr0009agiw4bv4xxmb83pg3sl8bf7z9";
- sgr-iosevka-term-ss11 = "19kfvmwijd1kyw4bln0m5z7wpch9h44ny13ccxx0qmiv5y7wwm94";
- sgr-iosevka-term-ss12 = "1pnr7yd431xnym12vnlww6rxm1vfd9x24kqpx0323q3n61yjqzd6";
- sgr-iosevka-term-ss13 = "04nhps95s360vv4qr1pbzs1aj8zdalzv4ajdkawdssxaz1xs57c7";
- sgr-iosevka-term-ss14 = "1xvdpx8sa4ifgy9a3y65qcxj8cavisw4h7hjfivq4y0il79sl7nw";
- sgr-iosevka-term-ss15 = "03rs8b8yb7n1f7cp6zffgr7x20vx6hiag7a22ysx0zr2i4zp37i6";
- sgr-iosevka-term-ss16 = "1s86hmr7a6qwyf5m9q0npzzd25nvh9k1nlja1b8fnnlgchycwfbw";
- sgr-iosevka-term-ss17 = "0y5i99iy7r3z4cv87s3v3mxbadp3np16a3c65w41pjv86llkc30g";
- sgr-iosevka-term-ss18 = "0s5hdh61y5v17jrdpajgkzzrg0cqgcad6gvs9m8v55xi2zlqfxip";
+ iosevka = "03f2rabj2w2l7jwqyl2awj42jhh0l3picqgyfcv3q067i34abfyn";
+ iosevka-aile = "0p1r5sysy6djfd1sx0pfxf42bv7ayqgk1nvil33jr925w96i2dp6";
+ iosevka-curly = "0r33wcgvh315avgkkic27qpf3bavrqwbig1kj4wm5rdr957ldk40";
+ iosevka-curly-slab = "0yd7grhnx7z27xmd3wr8x2xx2002hmfi1y3ndmqq1sc9gab5gcb7";
+ iosevka-etoile = "0jhd49vxxxaqi1rxfkmpc3v1q96ak1b5wyggchngqi3739pjgqy3";
+ iosevka-slab = "00wk15kj9b1nr3b0bmarx6gqx3jg8z1pm9qqf9x09s72b3ng8adm";
+ iosevka-ss01 = "1kp6zv8zyx50la7zrfz4fis68s41kplibagny61w5v3w36xpm3cs";
+ iosevka-ss02 = "1c0dl28a3wwa5g4793jyb4n4c8p5vjlyh1b8j2i5da31dqrqm9gj";
+ iosevka-ss03 = "0vs8x6l8gwqi47g1c5ainsk5fb2i6j4wv7mgdyw5j5l3blnba5yh";
+ iosevka-ss04 = "1caf4xqd1dywzbq06ip042rw88833yk9ws7y3vjvsp93g7a2r675";
+ iosevka-ss05 = "008aphj4w6ri3fgnydrxavvpm3bfywv4cym10fqi9xgd84jhm9m1";
+ iosevka-ss06 = "00dkagqiwzwzvv75zss82yx0gdcbmh9xvr8swhi5zk0y0bc3xk2y";
+ iosevka-ss07 = "1acnva081awp76xyspksq9jkvlyswh3q1jy9gnsc6kh4vyn17vjs";
+ iosevka-ss08 = "0lmkglcjlppvfd7k2pz57r476fa4c0q5l4gqzfy1mlklh0mc5hqb";
+ iosevka-ss09 = "04r2k2z54iszwfnif872p5br0dm4fvc5341cpbxv4almpzxjyqnr";
+ iosevka-ss10 = "1c6gs9g8dhywpd2ha7kx2l7g7bwj7i5a78645ipx8126f749y0y9";
+ iosevka-ss11 = "0286k56r12a2yjylxynvzd0idrcv4ykrmpkn3b5xv9f74qq6irmf";
+ iosevka-ss12 = "0ab4x5lh8spbg0djb092vcq1cnvjhazwkia8byq1q47iwiyh756l";
+ iosevka-ss13 = "0kva71mfkl9xzz8khjzgrj47zg2505rg0hv5hxflawxsqwi4iwvl";
+ iosevka-ss14 = "1gk7m3xh4v3jm6s5g2prd27w4p0r1blbxsxdy3b020bdwikxcaga";
+ iosevka-ss15 = "0frxjc3hhay8izsx4ywff4j39qxp9ljz6hvw0rjcya3vny515jq5";
+ iosevka-ss16 = "1g299yhn0kfc7vn8vbgwq4798w5lcl72j6hj91k90i1yq11lg13i";
+ iosevka-ss17 = "02z83x73bhpgf44kq0gw46bdnpqzr4vm37h78bh19vydzqaj8hg0";
+ iosevka-ss18 = "1b7vhhbspi98xzmk4hpiw08jmscm7f7nibqxhkfmppl6y0ymbm9d";
+ sgr-iosevka = "1n60dgprl2p22wwfhxpwy9v9xf6vyv3qwm2jdc0m9m0q9jwjashr";
+ sgr-iosevka-aile = "1k195vqv2wajhmyma43xgda3s2z86kl2gksgdrm95s9sx7ijns2s";
+ sgr-iosevka-curly = "15yq1fs7knp9gxgqjxslpmlx85c6kvpm31sf81llpf4k5f9dmlcp";
+ sgr-iosevka-curly-slab = "0fa68lm6iwlf2s5k8388dwgk015c55zg1wkhhhjmixwn7p8gifxz";
+ sgr-iosevka-etoile = "1ry1zc7cdx6g927d1752ipz39v4wsnfrnn8n9cfwamz8v458wld1";
+ sgr-iosevka-fixed = "173v09dx5pwsbh9jac5qxi7nk95dqyryg747hl58bchby6kmnc3k";
+ sgr-iosevka-fixed-curly = "11y8bj9vmdq48n370f1r4zsk72ci3cq7c9ff6y40hn5w40s8k379";
+ sgr-iosevka-fixed-curly-slab = "1a4gmz6sl67l23awkfl8f3xdr8hbb2mi1lsc0ain1wvvyx1bi56m";
+ sgr-iosevka-fixed-slab = "11xv18ykrfg2fdvbrlcx7k3qvp5yqbm278ks3gm0gbck1awvfckg";
+ sgr-iosevka-fixed-ss01 = "1yb96x53wjks537vs0gd7rss6piszs139k1kgb1swrpq7519awaz";
+ sgr-iosevka-fixed-ss02 = "10yy0yg2i9nm00lzpmrfbdh7jjcll37wql3fcsaxha57gcxf9nf0";
+ sgr-iosevka-fixed-ss03 = "1fpjfqlqq6lz3gya1q24nzy2xls6nxn567lhglj0ykjnh3prkll8";
+ sgr-iosevka-fixed-ss04 = "1kwa5mwd6ihsyj2y70hrrvgy41cs19i0f7nvl4khs3i69a1l58ag";
+ sgr-iosevka-fixed-ss05 = "08v8in8s8p2nayazq60w1kc1jpq48nwdwh6wbxv7ij7lfwii8xws";
+ sgr-iosevka-fixed-ss06 = "03jzylw99xa3b6hpy6bpwhyii6d9fggy9synfl54sn7smwqk08wr";
+ sgr-iosevka-fixed-ss07 = "13yzd6r51gka03fcl3bvx6d97b4m4px2cnsd724maqkqrcxkbxgb";
+ sgr-iosevka-fixed-ss08 = "1xghlj7drx9328jr1cb051nkwv47r5ykkyy6ydff1c4amc1xabsq";
+ sgr-iosevka-fixed-ss09 = "12l6lbz4m1lwyqqmv583777r9ymssy9x34rz72y3dch0mqhmjjzg";
+ sgr-iosevka-fixed-ss10 = "1flrh6a7m0dw7na30nhbxjld54517z77ff3s9fjrpmgyb9wz7i2j";
+ sgr-iosevka-fixed-ss11 = "1j4v4h6k505gkxyswcjf61kj9cfgkalxjg1arms9zb351p8rrkda";
+ sgr-iosevka-fixed-ss12 = "00qwnsxc08bm5cq3ljz2pjqsiw019ah4z0crqcwaysijicxmbckc";
+ sgr-iosevka-fixed-ss13 = "0jrw0amhfi28mc4i7a74qvgjamvymijlf3akskaw9qrmzvks8wn1";
+ sgr-iosevka-fixed-ss14 = "0rvh842zkxdrna9nh2ylsjs3q90sq39658l0mafi85b8z5asdwai";
+ sgr-iosevka-fixed-ss15 = "0j5yrr1biqfhgj6qg6359xg9rfv6qzqiqdqjgfjwbhijs6xfn8f1";
+ sgr-iosevka-fixed-ss16 = "06jrfhb257nmldnxxyc5rh869r5y62v2y034c0r9j7354s7gcq7a";
+ sgr-iosevka-fixed-ss17 = "0cgmsh0478963k1dgpkhy6j1b383gx2q09z3shr6j87knjjwqgp0";
+ sgr-iosevka-fixed-ss18 = "0r4nyd459aqgna7dyzvxnznclqihxdb888g949kdzhxykfchq53s";
+ sgr-iosevka-slab = "1bv8asz66hn80xvjxa7b0vgywha1bpmhd8q95cssc3085dprz1r6";
+ sgr-iosevka-ss01 = "0sv19w0adnddzarf8dlz0n73jzqnp0xfb2lgh4xcpjkhm66j3fhh";
+ sgr-iosevka-ss02 = "1ih10a666r77pvj57crdgyn7ll15giwxj0nis501r1fkp1bzkscn";
+ sgr-iosevka-ss03 = "180hkjzzgasf9a58vi0n0cishnbyjgbjmkh60awcpxwvh85qd4hf";
+ sgr-iosevka-ss04 = "1i4rpg9j967xaxg8h9dmachd3896f4jgwxa0mfjlizls2hfvnbsi";
+ sgr-iosevka-ss05 = "1ca2z4dincjk7jl16pa6d7dnnzq3w3il7fr2lphvrjvdrxbci615";
+ sgr-iosevka-ss06 = "08dj9dcq58grnp6lh16yvvzjqhzlm765v4ci1rys0wbjnp72xxda";
+ sgr-iosevka-ss07 = "13k6plhdgxhp5gjs8z98wb480hh5wy6p2zmc4xvhp88y93fy8kk7";
+ sgr-iosevka-ss08 = "1zfxamanq6a06fazn1jkaswh5g6iw22qnycg5dnxn4flk8nas1db";
+ sgr-iosevka-ss09 = "0qaxp4fsvl26il16h78y2l8013m49cbk2nzxcs1k9g5if11a49d3";
+ sgr-iosevka-ss10 = "1qvvm6rvhrbp83qjfb3dfsbam20f6aw52kg1i5ggfrqj35niv0hd";
+ sgr-iosevka-ss11 = "1v2b456qj8kyacm7308gsim5p25wnyg8qabyrfvdj00h81s31akl";
+ sgr-iosevka-ss12 = "1rsi6ir5vccar0n3ychisc40axiyhqj5yvcx450ppd33f3sd5rc7";
+ sgr-iosevka-ss13 = "12x4q5l1pdxi065zs913dqd7zb8qpi4bbgd43h3k5azsrwxwvixr";
+ sgr-iosevka-ss14 = "1snzdv23jqmbz25k9i2zl7px7yysk5hn74q1x251s07ghdx3nfdj";
+ sgr-iosevka-ss15 = "0hbmj6wij6cv9yh76npp4xrl7fdm8jjx03398anfcsa02gkvg8zz";
+ sgr-iosevka-ss16 = "0v6vhg0vp5ig6ngs96q5mxa2snfp08nk68a9772sm1ny61q3chrq";
+ sgr-iosevka-ss17 = "0268b85yhdfsbjyhi0vlxwrpwxa8h919np53s060z94094h6jd9x";
+ sgr-iosevka-ss18 = "13vnhh8181h36y6iz2p2x6rjgjv5w3d0gqbcdkwhgmvx7s03k122";
+ sgr-iosevka-term = "05c2sxb4aris90mhjxyfkw1b0ga0hplfas669076h7yjsimw647l";
+ sgr-iosevka-term-curly = "1j0b4fhcivkdgka9zyqf732hcxj8rchqxkwv2bwxib1a17fmwn6c";
+ sgr-iosevka-term-curly-slab = "0dvv2n3plfxm8z2xi1ihzn4rncyk1kz8xbgyprnb0lvqiyf18igy";
+ sgr-iosevka-term-slab = "0i7wrvq6c96q8v6zw9iym42b6sbm0vc04ysljghpblnnfymq5yv9";
+ sgr-iosevka-term-ss01 = "1n23qp50pr466blpn2h9dhjbn0wnbbxyzb0sz751bk8db41lpyqb";
+ sgr-iosevka-term-ss02 = "0ghvfhkdsfsjb8yjwvwlwhn66lmy8dx34126ccnvj0g77ww2nwa9";
+ sgr-iosevka-term-ss03 = "03hnmy9wijqwsc36cg5b3pxj7mb1cbyacii00pcvrpcns2w1ssbw";
+ sgr-iosevka-term-ss04 = "0fv9xhhii0h5ii4yxsdnywn45254494mgq1n5aajasq494cgxhp4";
+ sgr-iosevka-term-ss05 = "0qa4l77sjpxd9l4nb555bhgzm0f1c74w6014md2rpljjvyy2mzwg";
+ sgr-iosevka-term-ss06 = "05y7rmghvhmzw3spn7b3v6hmpcqg5p32flm437a1aljdr46sbxli";
+ sgr-iosevka-term-ss07 = "1lzqgpr1vchi4ricqp1v49nv62rl3anbdvzpvddby81wr5jcyd1y";
+ sgr-iosevka-term-ss08 = "1sxicv2gspc39fyja370dpiq12xd1bgndiw5r6cqfkkd8x8dgpdv";
+ sgr-iosevka-term-ss09 = "0ax9pgm3d171kksrqd2z8xpr68kdxkqg9h344an55gjk01q7dzay";
+ sgr-iosevka-term-ss10 = "1rgvadmvdldcaqa0r76kzmrck814qwksdqficaxcd7wk8bx64n81";
+ sgr-iosevka-term-ss11 = "02if14ff5kax4p1aa2wkbidhwlzgyxi7lxir2ildahwfkvkp971y";
+ sgr-iosevka-term-ss12 = "0sj8n12is4094nbj67wkk88953jp9235kvvr4230abql1g6s263r";
+ sgr-iosevka-term-ss13 = "006sdcj8qw247b63d647ykm8razyb0apsfd0cjmlikj9hdmyzrr2";
+ sgr-iosevka-term-ss14 = "0i7d3ldp9rj1f4kwdk8hkxq0s38df6i25qfx6hwfjj1c5bl3a843";
+ sgr-iosevka-term-ss15 = "15gjqz7zc6wwy1l61pgpnz7wwyyaij43dcrwcwyi6h10jhm8b3ia";
+ sgr-iosevka-term-ss16 = "1c1i1iyqzgh3pz4fzjp26d71lphmcgqbjp2s91yyqg3nfhwbzvyc";
+ sgr-iosevka-term-ss17 = "0kr58576vlx81nb2ia5z9226m6h0ybd5vzfj5li9b721l4q0rpky";
+ sgr-iosevka-term-ss18 = "1zjs40i4dmw2l45k8wydngl4g3a88nhbmmjwd5lsz8a40pq4bw15";
}
diff --git a/pkgs/data/themes/breath-theme/default.nix b/pkgs/data/themes/breath-theme/default.nix
new file mode 100644
index 000000000000..79bca7720207
--- /dev/null
+++ b/pkgs/data/themes/breath-theme/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, cmake
+, extra-cmake-modules
+, kdecoration
+, plasma-workspace
+, qtbase
+}:
+
+stdenv.mkDerivation {
+ pname = "breath-theme";
+ version = "unstable-2022-12-22";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.manjaro.org";
+ owner = "themes";
+ group = "artwork";
+ repo = "breath";
+ rev = "98822e7d903f16116bfb02ff9921824c139d7bbc";
+ sha256 = "sha256-gvzhHOuOhxV3TC3UZeVpxeSDLpCJV+SaapcJ5mbHskY=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+
+ kdecoration
+ plasma-workspace
+ qtbase
+ ];
+
+ dontWrapQtApps = true;
+
+ cmakeFlags = [ "-DBUILD_PLASMA_THEMES=ON" "-DBUILD_SDDM_THEME=ON" ];
+
+ meta = with lib; {
+ description = "Manjaro KDE default theme";
+ homepage = "https://gitlab.manjaro.org/artwork/themes/breath";
+ license = licenses.cc-by-sa-40;
+ maintainers = with maintainers; [ huantian ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index b2844f723bc2..30a4244e4f84 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
- version = "4.0.0";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
- hash = "sha256-Vw3+KlAuCQiyBfPOZrUotgrdkG+FRjXg8AxAanfbwJQ=";
+ hash = "sha256-tHGzXjOOOWgYBMA0skLRNFkVgXc3hcs3F1XNsHxDRhk=";
fetchSubmodules = true;
};
- cargoHash = "sha256-gV3Yf7YL3D3hrymYW1b80uOlp7RYRWFC7GtxAot5Ut0=";
+ cargoHash = "sha256-92BZdbNz22cZMJkHJwE3lUik6hAhRLCBwYzm2RAvRGo=";
cargoBuildFlags = [
"--package wasmtime-cli"
@@ -28,14 +28,8 @@ rustPlatform.buildRustPackage rec {
# false positives of this package being broken due to failed runs on
# Hydra (e.g. https://hydra.nixos.org/build/187667794/)
doCheck = (stdenv.system != "x86_64-darwin");
- checkFlags = [
- "--skip=cli_tests::run_cwasm"
- "--skip=commands::compile::test::test_unsupported_flags_compile"
- "--skip=commands::compile::test::test_aarch64_flags_compile"
- "--skip=commands::compile::test::test_successful_compile"
- "--skip=commands::compile::test::test_x64_flags_compile"
- "--skip=commands::compile::test::test_x64_presets_compile"
- "--skip=traps::parse_dwarf_info"
+ cargoTestFlags = [
+ "--package wasmtime-runtime"
];
postInstall = ''
diff --git a/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch b/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch
new file mode 100644
index 000000000000..4bacb891f221
--- /dev/null
+++ b/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch
@@ -0,0 +1,14 @@
+based onhttps://830833.bugs.gentoo.org/attachment.cgi?id=761676,
+adjusted for 1.7.2
+
+--- a/configure.in 2022-01-09 00:31:05.552582255 -0800
++++ b/configure.in 2022-01-09 00:31:19.824582533 -0800
+@@ -1329,7 +1329,7 @@
+ return 3;
+ }
+ return 0;
+- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])])
++ }], [], [ac_cv_file__dev_zero=no], [:])])
+ fi
+
+ # Now we determine which one is our anonymous shmem preference.
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 0d980db9b5a8..36a82afcf860 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -2,38 +2,15 @@
stdenv.mkDerivation rec {
pname = "apr";
- version = "1.7.0";
+ version = "1.7.2";
src = fetchurl {
url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
- sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2";
+ sha256 = "sha256-ded8yGd2wDDApcQI370L8qC3Xu1TUeUtVDn6HlUJpD4=";
};
patches = [
- (fetchpatch {
- name = "CVE-2021-35940.patch";
- url = "https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch";
- sha256 = "1qd511dyqa1b7bj89iihrlbaavbzl6yyblqginghmcnhw8adymbs";
- # convince fetchpatch to restore missing `a/`, `b/` to paths
- extraPrefix = "";
- })
-
- # Fix cross.
- (fetchpatch {
- url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch";
- sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y";
- })
- (fetchpatch {
- url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch";
- sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm";
- })
-
- # Cross fix. Patch the /dev/zero mmapable detection logic. https://bugs.gentoo.org/show_bug.cgi?id=830833
- (fetchpatch {
- url = "https://830833.bugs.gentoo.org/attachment.cgi?id=761676";
- name = "cross-assume-dev-zero-mmappable.patch";
- sha256 = "sha256-rsouJp1o7p0d+AJ5KvyhUU79vAJOcVHEuwSEKaCEGa8=";
- })
+ ./cross-assume-dev-zero-mmappable.patch
];
# This test needs the net
diff --git a/pkgs/development/libraries/sealcurses/default.nix b/pkgs/development/libraries/sealcurses/default.nix
index bde530dd9d75..ad1eb0bb276d 100644
--- a/pkgs/development/libraries/sealcurses/default.nix
+++ b/pkgs/development/libraries/sealcurses/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "sealcurses";
- version = "unstable-2022-05-18"; # No release yet
+ version = "unstable-2023-02-06"; # No release yet
src = fetchFromGitea {
domain = "git.skyjake.fi";
owner = "skyjake";
repo = pname;
- rev = "417d77d790ede990b4c149f21c58fd13b8f273cc";
- hash = "sha256-yOrJYy9vBv5n8yK6u7tfMq56LBBw5rmhUjORINW8gxo=";
+ rev = "e11026ca34b03c5ab546512f82a6f705d0c29e95";
+ hash = "sha256-N+Tvg2oIcfa68FC7rKuLxGgEKz1oBEEb8NGCiBuZ8y4=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix
index 95ea916e09b9..2970fb3c84a7 100644
--- a/pkgs/development/libraries/the-foundation/default.nix
+++ b/pkgs/development/libraries/the-foundation/default.nix
@@ -12,14 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "the-foundation";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchFromGitea {
domain = "git.skyjake.fi";
owner = "skyjake";
repo = "the_Foundation";
rev = "v${finalAttrs.version}";
- hash = "sha256-wPFBKc20/ED58RFpDhmPnlSHCf3FG5sD2ubQOl5NF+o=";
+ hash = "sha256-+V2WJYEmIZWpioNvvZMiw7Vt9ogEnEcjq+vR7UiBTO0=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix
new file mode 100644
index 000000000000..c15c3117b69b
--- /dev/null
+++ b/pkgs/development/python-modules/bambi/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pytestCheckHook
+, arviz
+, formulae
+, graphviz
+, numpy
+, pandas
+, pymc
+, scipy
+}:
+
+buildPythonPackage rec {
+ pname = "bambi";
+ version = "0.9.3";
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "bambinos";
+ repo = pname;
+ rev = "refs/tags/${version}";
+ hash = "sha256-f/4CrFmma+Lc6wZm+YyDupDWfPAtuRsZdRf28sYUWTk=";
+ };
+
+ propagatedBuildInputs = [
+ arviz
+ formulae
+ numpy
+ pandas
+ pymc
+ scipy
+ ];
+
+ preCheck = ''export HOME=$(mktemp -d)'';
+
+ nativeCheckInputs = [ graphviz pytestCheckHook ];
+ disabledTests = [
+ # attempt to fetch data:
+ "test_data_is_copied"
+ "test_predict_offset"
+ # require blackjax (not in Nixpkgs), numpyro, and jax:
+ "test_logistic_regression_categoric_alternative_samplers"
+ "test_regression_alternative_samplers"
+ ];
+
+ pythonImportsCheck = [ "bambi" ];
+
+ meta = with lib; {
+ homepage = "https://bambinos.github.io/bambi";
+ description = "High-level Bayesian model-building interface";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bcdarwin ];
+ };
+}
diff --git a/pkgs/development/python-modules/bencode-py/default.nix b/pkgs/development/python-modules/bencode-py/default.nix
new file mode 100644
index 000000000000..e4d5041e8b4b
--- /dev/null
+++ b/pkgs/development/python-modules/bencode-py/default.nix
@@ -0,0 +1,38 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ python,
+ pbr,
+ pytestCheckHook,
+}:
+buildPythonPackage rec {
+ pname = "beconde-py";
+ version = "4.0.0";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit version;
+ pname = "bencode.py";
+ sha256 = "sha256-KiTM2hclpRplCJPQtjJgE4NZ6qKZu256CZYTUKKm4Fw=";
+ };
+
+ pythonImportsCheck = [
+ "bencodepy"
+ ];
+
+ nativeBuildInputs = [
+ pbr
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ description = "Simple bencode parser (for Python 2, Python 3 and PyPy)";
+ homepage = "https://github.com/fuzeman/bencode.py";
+ license = licenses.bitTorrent11;
+ maintainers = with maintainers; [vamega];
+ };
+}
diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix
index e3ca8380c659..92ed4362ece8 100644
--- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix
+++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix
@@ -16,12 +16,11 @@
}:
let
pname = "cmsis-pack-manager";
- version = "0.5.1";
+ version = "0.4.0";
src = fetchPypi {
- pname = "cmsis_pack_manager";
- inherit version;
- sha256 = "sha256-2pKGJlPubR+C4UhdCuMDR9GG2wQOaP6YkMXxeAcaRkk=";
+ inherit pname version;
+ hash = "sha256-NeUG6PFI2eTwq5SNtAB6ZMA1M3z1JmMND29V9/O5sgw=";
};
native = rustPlatform.buildRustPackage {
@@ -74,5 +73,6 @@ buildPythonPackage rec {
homepage = "https://github.com/pyocd/cmsis-pack-manager";
license = licenses.asl20;
maintainers = with maintainers; [ frogamic sbruder ];
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix
new file mode 100644
index 000000000000..9755fed90238
--- /dev/null
+++ b/pkgs/development/python-modules/formulae/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pytestCheckHook
+, numpy
+, pandas
+, scipy
+}:
+
+buildPythonPackage rec {
+ pname = "formulae";
+ version = "0.3.4";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "bambinos";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ hash = "sha256-6IGTn3griooslN6+qRYLJiWaJhvsxa1xj1+1kQ57yN0=";
+ };
+
+ propagatedBuildInputs = [
+ numpy
+ pandas
+ scipy
+ ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+ # use assertions of form `assert pytest.approx(...)`, which is now disallowed:
+ disabledTests = [ "test_basic" "test_degree" ];
+ pythonImportsCheck = [
+ "formulae"
+ "formulae.matrices"
+ ];
+
+ meta = with lib; {
+ homepage = "https://bambinos.github.io/formulae";
+ description = "Formulas for mixed-effects models in Python";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bcdarwin ];
+ };
+}
diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix
index 33348ff252c7..13ed586c3787 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/pkgs/development/python-modules/humanize/default.nix
@@ -6,13 +6,13 @@
, importlib-metadata
, pytestCheckHook
, pythonOlder
-, setuptools
-, setuptools-scm
+, hatch-vcs
+, hatchling
}:
buildPythonPackage rec {
pname = "humanize";
- version = "4.5.0";
+ version = "4.6.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,19 +21,18 @@ buildPythonPackage rec {
owner = "python-humanize";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-vTfK45sZ9m7TUQJwZpQWhOXgZzO46CwCsnNP+PI1YfA=";
+ hash = "sha256-sI773uzh+yMiyu1ebsk6zutfyt+tfx/zT/X2AdH5Fyg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
- setuptools-scm
+ hatch-vcs
+ hatchling
gettext
];
- propagatedBuildInputs = [
- setuptools
- ] ++ lib.optionals (pythonOlder "3.8") [
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix
index f9a68d98dc31..8ce8e1fe95f1 100644
--- a/pkgs/development/python-modules/piccata/default.nix
+++ b/pkgs/development/python-modules/piccata/default.nix
@@ -7,15 +7,15 @@
buildPythonPackage rec {
pname = "piccata";
- version = "2.0.0";
+ version = "2.0.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "NordicSemiconductor";
repo = pname;
- rev = version;
- sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-Vuhwt+esTkvyEIRVYaRGvNMTAXVWBBv/6lpaxN5RrBA=";
};
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix
new file mode 100644
index 000000000000..795556797b93
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, sphinx
+, requests
+, flit-core
+}:
+
+buildPythonPackage rec {
+ pname = "sphinxcontrib-youtube";
+ version = "1.2.0";
+ format = "pyproject";
+
+ nativeBuildInputs = [ flit-core ];
+
+ src = fetchFromGitHub {
+ owner = "sphinx-contrib";
+ repo = "youtube";
+ rev = "v${version}";
+ hash = "sha256-SUnnrzYJ6cOktE0IdnRWTvPGcL/eVS9obtHBMpS2s4A=";
+ };
+
+ propagatedBuildInputs = [ sphinx requests ];
+
+ # tests require internet access
+ doCheck = false;
+
+ pythonImportsCheck = [ "sphinxcontrib.youtube" ];
+
+ meta = with lib; {
+ description = "Youtube extension for Sphinx";
+ homepage = "https://github.com/sphinx-contrib/youtube";
+ maintainers = with maintainers; [ gador ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix
index d340cb7562bf..eb23a0aae51f 100644
--- a/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/pkgs/development/tools/analysis/evmdis/default.nix
@@ -11,7 +11,7 @@ buildGoModule {
hash = "sha256-jfbjXoGT8RtwLlqX13kcKdiFlhrVwA7Ems6abGJVRbA=";
};
- vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+ vendorHash = null;
preBuild = ''
# Add go modules support
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 3eae91e939d3..68e9927522b5 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "include-what-you-use";
# Also bump llvmPackages in all-packages.nix to the supported version!
- version = "0.18";
+ version = "0.19";
src = fetchurl {
- sha256 = "sha256-kQL8hBkpR1ffhqic5uwwX42QqBjR8lmKE50V6xiUuPM=";
url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
+ hash = "sha256-KxAVe2DqCK3AjjiWtJIcc/yt1exOtlKymjQSnVAeXuA=";
};
postPatch = ''
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 747abef1e982..4f5d440858ef 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -15,18 +15,18 @@
buildGoModule rec {
pname = "buildah";
- version = "1.28.2";
+ version = "1.29.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "sha256-1WB+lm2k7q4xViCUBhvCSuMCIlCMlAJ9etRajwGyOQs=";
+ hash = "sha256-g8Y4ZmQvDbzM7rG1otTxm+SRl/sK3sLM2SOWrBseOPQ=";
};
outputs = [ "out" "man" ];
- vendorSha256 = null;
+ vendorHash = null;
doCheck = false;
diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix
index 1171700ff99e..230c38ed44e9 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/pkgs/development/tools/geckodriver/default.nix
@@ -7,17 +7,17 @@
}:
rustPlatform.buildRustPackage rec {
- version = "0.32.0";
+ version = "0.32.1";
pname = "geckodriver";
src = fetchFromGitHub {
owner = "mozilla";
repo = "geckodriver";
rev = "refs/tags/v${version}";
- sha256 = "sha256-gYDfCPA2zsscZ4r4FcNgCvIMMm13/HACTvNoiK/c+LA=";
+ sha256 = "sha256-ts2OGRdz1ajJ36XXUC48Jkygr3LDdZfHJ88peJkjqbg=";
};
- cargoSha256 = "sha256-FlttmNHh0UVQ6xbo1eID+Ys34xp6zvKab4eoKIGujCU=";
+ cargoHash = "sha256-b54/65xYZ9a04dPm90R9tzhdjTwTaXvi4NnQe9k+qvE=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix
index ba799c7267ba..7e6f83212495 100644
--- a/pkgs/development/tools/ruff/default.nix
+++ b/pkgs/development/tools/ruff/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
- version = "0.0.241";
+ version = "0.0.242";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-yrwrkU19LBM3gac70Y1UamZTdamuJdrMX4U88zGgJJs=";
+ sha256 = "sha256-TdaFo1U37W0UtGWtRchwdtTvyfljDOvtBJ7vCym1FX4=";
};
- cargoSha256 = "sha256-RzGYh0zspP+sG7k+XwDy9kaTIGIEoOEV3ZoqVf0X0GA=";
+ cargoSha256 = "sha256-3gW9wV6aYVnKNxW79mJCy/lkQUD67G6U47JiOQriT40=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix
index 6befb42c24d3..977b08602735 100644
--- a/pkgs/development/tools/statik/default.nix
+++ b/pkgs/development/tools/statik/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g=";
};
- vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+ vendorSha256 = null;
# Avoid building example
subPackages = [ "." "fs" ];
diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix
new file mode 100644
index 000000000000..0d05ef2577d6
--- /dev/null
+++ b/pkgs/development/tools/yamlfmt/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "yamlfmt";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-oTdBFWISOfaz4ZDbJmyxtaKrjo9DVNJ5N7Qxnu7SwZA=";
+ };
+
+ vendorSha256 = "sha256-QRY6mYtrMvjUqXJOOvHL0b0OQ28320UwV8HL4fXpcNQ=";
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "An extensible command line tool or library to format yaml files.";
+ homepage = "https://github.com/google/yamlfmt";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ sno2wman ];
+ };
+}
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 03a402225f1b..57baeb7fe828 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -2,18 +2,23 @@
buildPythonApplication rec {
pname = "frescobaldi";
- version = "3.1.3";
+ version = "3.2";
src = fetchFromGitHub {
owner = "wbsoft";
repo = "frescobaldi";
rev = "v${version}";
- sha256 = "1p8f4vn2dpqndw1dylmg7wms6vi69zcfj544c908s4r8rrmbycyf";
+ sha256 = "sha256-q340ChF7VZcbLMW/nd1so7WScsPfbdeJUjTzsY5dkec=";
};
propagatedBuildInputs = with python3Packages; [
- lilypond pygame python-ly sip_4
- pyqt5 poppler-qt5
+ qpageview
+ lilypond
+ pygame
+ python-ly
+ sip_4
+ pyqt5
+ poppler-qt5
pyqtwebengine
];
@@ -30,7 +35,7 @@ buildPythonApplication rec {
dontWrapQtApps = true;
makeWrapperArgs = [
- "\${qtWrapperArgs[@]}"
+ "\${qtWrapperArgs[@]}"
];
meta = with lib; {
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index a2a7e7969166..b5f812d002cc 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd }:
+{ lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd, config }:
let beat = package: extraArgs: buildGoModule (rec {
pname = package;
@@ -36,10 +36,12 @@ rec {
metricbeat7 = beat "metricbeat" {
meta.description = "Lightweight shipper for metrics";
passthru.tests =
- assert metricbeat7.drvPath == nixosTests.elk.ELK-7.elkPackages.metricbeat.drvPath;
- {
- elk = nixosTests.elk.ELK-7;
- };
+ lib.optionalAttrs config.allowUnfree (
+ assert metricbeat7.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.metricbeat.drvPath;
+ {
+ elk = nixosTests.elk.unfree.ELK-7;
+ }
+ );
};
packetbeat7 = beat "packetbeat" {
buildInputs = [ libpcap ];
diff --git a/pkgs/os-specific/darwin/openwith/default.nix b/pkgs/os-specific/darwin/openwith/default.nix
new file mode 100644
index 000000000000..37440659d7fd
--- /dev/null
+++ b/pkgs/os-specific/darwin/openwith/default.nix
@@ -0,0 +1,36 @@
+{ lib, stdenv, fetchFromGitHub, swift, AppKit, Foundation, UniformTypeIdentifiers }:
+
+let
+ arch = if stdenv.isAarch64 then "arm64" else "x86_64";
+in
+stdenv.mkDerivation rec {
+ pname = "openwith";
+ version = "unstable-2022-10-28";
+
+ src = fetchFromGitHub {
+ owner = "jdek";
+ repo = "openwith";
+ rev = "a8a99ba0d1cabee7cb470994a1e2507385c30b6e";
+ hash = "sha256-lysleg3qM2MndXeKjNk+Y9Tkk40urXA2ZdxY5KZNANo=";
+ };
+
+ nativeBuildInputs = [ swift ];
+
+ buildInputs = [ AppKit Foundation UniformTypeIdentifiers ];
+
+ makeFlags = [ "openwith_${arch}" ];
+
+ installPhase = ''
+ runHook preInstall
+ install openwith_${arch} -D $out/bin/openwith
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Utility to specify which application bundle should open specific file extensions";
+ homepage = "https://github.com/jdek/openwith";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ zowoq ];
+ platforms = [ "aarch64-darwin" "x86_64-darwin" ];
+ };
+}
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 35cb84e07749..3610fe38f50d 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
- version = "6.1.9"; #zen
+ version = "6.1.10"; #zen
suffix = "zen1"; #zen
- sha256 = "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv"; #zen
+ sha256 = "0dfn449v3lzz1clxbsypakd0sfii9iycy1hq9x52fr9xf8wy3cxk"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.1.9"; #lqx
+ version = "6.1.10"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "167qr1mxsr5llmzixsijsn72d8jyphhgg2k8qsf369m7y58sz0s9"; #lqx
+ sha256 = "1ka94z0wvq90vfzd4ncjrzk5xcb5gvaldaph7mc25jxgh6pal822"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index f743b0024846..e492bc2403fd 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -5,12 +5,12 @@
mkDerivation rec {
pname = "kernelshark";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/";
rev = "kernelshark-v${version}";
- sha256 = "sha256-1M35y3EkMHbGkVv93Xwo4zApvy9usIcz1spm5Z+1iUs=";
+ sha256 = "sha256-VkUah8qAlOck9245f/zngtVpHmJdx6eQXqwzLwK2xjU=";
};
outputs = [ "out" ];
diff --git a/pkgs/servers/geospatial/mapcache/default.nix b/pkgs/servers/geospatial/mapcache/default.nix
index 3eae9c2b33cb..781edfce98c8 100644
--- a/pkgs/servers/geospatial/mapcache/default.nix
+++ b/pkgs/servers/geospatial/mapcache/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "mapcache";
- version = "1.12.1";
+ version = "1.14.0";
src = fetchFromGitHub {
owner = "MapServer";
repo = pname;
rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
- sha256 = "sha256-NuiZMWcmsN5wDCd37Hvj3cazwT3Ea+OknV/YR3urZB0=";
+ sha256 = "sha256-+QP4xXhP+MNqnhMUtMdtKrcuJ0M2BXWu3mbxXzj5ybc=";
};
nativeBuildInputs = [
@@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
"-DAPACHE_MODULE_DIR=${placeholder "out"}/modules"
];
+ NIX_CFLAGS_COMPILE = "-std=c99";
+
meta = with lib; {
description = "A server that implements tile caching to speed up access to WMS layers";
homepage = "https://mapserver.org/mapcache/";
diff --git a/pkgs/servers/monitoring/cockpit/default.nix b/pkgs/servers/monitoring/cockpit/default.nix
new file mode 100644
index 000000000000..76f2f777f60c
--- /dev/null
+++ b/pkgs/servers/monitoring/cockpit/default.nix
@@ -0,0 +1,226 @@
+{ lib
+, stdenv
+, fetchzip
+, fetchurl
+, fetchFromGitHub
+, autoreconfHook
+, bashInteractive
+, cacert
+, coreutils
+, dbus
+, docbook_xml_dtd_43
+, docbook_xsl
+, findutils
+, gettext
+, git
+, glib
+, glibc
+, glib-networking
+, gnused
+, gnutls
+, json-glib
+, krb5
+, libssh
+, libxcrypt
+, libxslt
+, makeWrapper
+, nodejs
+, nixosTests
+, openssh
+, openssl
+, pam
+, pkg-config
+, polkit
+, python3Packages
+, ripgrep
+, runtimeShell
+, systemd
+, udev
+, xmlto
+}:
+
+let
+ pythonWithGobject = python3Packages.python.withPackages (p: with p; [
+ pygobject3
+ ]);
+in
+
+stdenv.mkDerivation rec {
+ pname = "cockpit";
+ version = "284";
+
+ src = fetchFromGitHub {
+ owner = "cockpit-project";
+ repo = "cockpit";
+ rev = "80a7c7cfed9157915067666fe95b298896f2aea8";
+ sha256 = "sha256-iAIW6nVUk1FJD2dQvDMREPVqrq0JkExJ7lVio//ALts=";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ makeWrapper
+ docbook_xml_dtd_43
+ docbook_xsl
+ findutils
+ gettext
+ git
+ (lib.getBin libxslt)
+ nodejs
+ openssl
+ pam
+ pkg-config
+ pythonWithGobject.python
+ python3Packages.setuptools
+ systemd
+ ripgrep
+ xmlto
+ ];
+
+ buildInputs = [
+ (lib.getDev glib)
+ libxcrypt
+ gnutls
+ json-glib
+ krb5
+ libssh
+ polkit
+ udev
+ ];
+
+ patches = [
+ # Instead of requiring Internet access to do an npm install to generate the package-lock.json
+ # it copies the package-lock.json already present in the node_modules folder fetched as a git
+ # submodule.
+ ./nerf-node-modules.patch
+
+ # sysconfdir is $(prefix)/etc by default and it breaks the configuration file loading feature
+ # changing sysconfdir to /etc breaks the build in this part of the makefile because it tries
+ # to write to /etc inside the sandbox
+ # this patch redirects it to write to $out/etc instead of /etc
+ ./fix-makefiles.patch
+ ];
+
+ postPatch = ''
+ # instruct users with problems to create a nixpkgs issue instead of nagging upstream directly
+ substituteInPlace configure.ac \
+ --replace 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25'
+ patchShebangs \
+ test/common/pixel-tests \
+ test/common/run-tests \
+ test/common/tap-cdp \
+ test/static-code \
+ tools/escape-to-c \
+ tools/make-compile-commands \
+ tools/node-modules \
+ tools/termschutz \
+ tools/webpack-make
+
+ for f in node_modules/.bin/*; do
+ patchShebangs $(realpath $f)
+ done
+
+ export HOME=$(mktemp -d)
+
+ cp node_modules/.package-lock.json package-lock.json
+
+ substituteInPlace src/systemd_ctypes/libsystemd.py \
+ --replace libsystemd.so.0 ${systemd}/lib/libsystemd.so.0
+
+ for f in pkg/**/*.js pkg/**/*.jsx test/**/* src/**/*; do
+ # some files substituteInPlace report as missing and it's safe to ignore them
+ substituteInPlace "$(realpath "$f")" \
+ --replace '"/usr/bin/' '"' \
+ --replace '"/bin/' '"' || true
+ done
+
+ substituteInPlace src/common/Makefile-common.am \
+ --replace 'TEST_PROGRAM += test-pipe' "" # skip test-pipe because it hangs the build
+
+ substituteInPlace test/pytest/*.py \
+ --replace "'bash" "'${bashInteractive}/bin/bash"
+
+ echo "m4_define(VERSION_NUMBER, [${version}])" > version.m4
+ '';
+
+ configureFlags = [
+ "--enable-prefix-only=yes"
+ "--sysconfdir=/etc"
+ "--disable-pcp" # TODO: figure out how to package its dependency
+ "--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin"
+ ];
+
+ enableParallelBuilding = true;
+
+ preBuild = ''
+ patchShebangs \
+ tools/test-driver
+ '';
+
+ postBuild = ''
+ find | grep cockpit-bridge
+ chmod +x \
+ src/systemd/update-motd \
+ src/tls/cockpit-certificate-helper \
+ src/ws/cockpit-desktop
+
+ patchShebangs \
+ src/systemd/update-motd \
+ src/tls/cockpit-certificate-helper \
+ src/ws/cockpit-desktop
+
+ PATH=${pythonWithGobject}/bin patchShebangs src/client/cockpit-client
+
+ substituteInPlace src/ws/cockpit-desktop \
+ --replace ' /bin/bash' ' ${runtimeShell}'
+ '';
+
+ fixupPhase = ''
+ runHook preFixup
+
+ wrapProgram $out/libexec/cockpit-certificate-helper \
+ --prefix PATH : ${lib.makeBinPath [ coreutils openssl ]} \
+ --run 'cd $(mktemp -d)'
+
+ wrapProgram $out/share/cockpit/motd/update-motd \
+ --prefix PATH : ${lib.makeBinPath [ gnused ]}
+
+ substituteInPlace $out/share/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \
+ --replace /usr $out
+
+ runHook postFixup
+ '';
+
+ doCheck = true;
+ checkInputs = [
+ bashInteractive
+ cacert
+ dbus
+ glib-networking
+ openssh
+ python3Packages.pytest
+ python3Packages.vulture
+ ];
+ checkPhase = ''
+ export GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules
+ export G_DEBUG=fatal-criticals
+ export G_MESSAGES_DEBUG=cockpit-ws,cockpit-wrapper,cockpit-bridge
+ export PATH=$PATH:$(pwd)
+
+ cockpit-bridge --version
+ make pytest -j$NIX_BUILD_CORES || true
+ make check -j$NIX_BUILD_CORES || true
+ test/static-code
+ npm run eslint
+ npm run stylelint
+ '';
+
+ passthru.tests = { inherit (nixosTests) cockpit; };
+
+ meta = with lib; {
+ description = "Web-based graphical interface for servers";
+ homepage = "https://cockpit-project.org/";
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ lucasew ];
+ };
+}
diff --git a/pkgs/servers/monitoring/cockpit/fix-makefiles.patch b/pkgs/servers/monitoring/cockpit/fix-makefiles.patch
new file mode 100644
index 000000000000..a22eb9f00ea8
--- /dev/null
+++ b/pkgs/servers/monitoring/cockpit/fix-makefiles.patch
@@ -0,0 +1,34 @@
+diff --git a/src/systemd/Makefile.am b/src/systemd/Makefile.am
+index f28ea41df..684b82006 100644
+--- a/src/systemd/Makefile.am
++++ b/src/systemd/Makefile.am
+@@ -23,10 +23,10 @@ dist_motd_SCRIPTS = src/systemd/update-motd
+
+ # Automake: 'Variables using ... ‘sysconf’ ... are installed by install-exec.'
+ install-exec-hook::
+- mkdir -p $(DESTDIR)$(sysconfdir)/motd.d
+- ln -sTfr $(DESTDIR)/run/cockpit/motd $(DESTDIR)$(sysconfdir)/motd.d/cockpit
+- mkdir -p $(DESTDIR)$(sysconfdir)/issue.d
+- ln -sTfr $(DESTDIR)/run/cockpit/motd $(DESTDIR)$(sysconfdir)/issue.d/cockpit.issue
++ mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/motd.d
++ ln -sTfr $(DESTDIR)$(prefix)/run/cockpit/motd $(DESTDIR)$(prefix)$(sysconfdir)/motd.d/cockpit
++ mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/issue.d
++ ln -sTfr $(DESTDIR)$(prefix)/run/cockpit/motd $(DESTDIR)$(prefix)$(sysconfdir)/issue.d/cockpit.issue
+
+ tempconfdir = $(prefix)/lib/tmpfiles.d
+ nodist_tempconf_DATA = src/systemd/cockpit-tempfiles.conf
+diff --git a/src/ws/Makefile-ws.am b/src/ws/Makefile-ws.am
+index ed4e4363e..77a35b0e5 100644
+--- a/src/ws/Makefile-ws.am
++++ b/src/ws/Makefile-ws.am
+@@ -169,8 +169,8 @@ install-tests::
+ $(INSTALL_DATA) mock-pam-conv-mod.so $(DESTDIR)$(pamdir)/
+
+ install-exec-hook::
+- mkdir -p $(DESTDIR)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(sysconfdir)/cockpit/machines.d
+- chmod 755 $(DESTDIR)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(sysconfdir)/cockpit/machines.d
++ mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/machines.d
++ chmod 755 $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/machines.d
+
+ dist_check_DATA += \
+ src/ws/mock-combined.crt \
diff --git a/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch b/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch
new file mode 100644
index 000000000000..36b0e3861a4a
--- /dev/null
+++ b/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch
@@ -0,0 +1,12 @@
+diff --git a/tools/node-modules b/tools/node-modules
+index 518875d..72b51e0 100755
+--- a/tools/node-modules
++++ b/tools/node-modules
+@@ -7,6 +7,7 @@ V="${V-0}" # default to friendly messages
+
+ set -eu
+ cd "${0%/*}/.."
++exit 0
+ . tools/git-utils.sh
+
+ cmd_remove() {
diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
index c6878df1e04a..3b568df12b53 100644
--- a/pkgs/servers/search/meilisearch/default.nix
+++ b/pkgs/servers/search/meilisearch/default.nix
@@ -8,7 +8,7 @@
, nixosTests
}:
-let version = "0.30.5";
+let version = "1.0.0";
in
rustPlatform.buildRustPackage {
pname = "meilisearch";
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
owner = "meilisearch";
repo = "MeiliSearch";
rev = "v${version}";
- hash = "sha256-DvMMBF5Z2VdV3ObuD/gquZeimglyzFFVzgUq+/ra+Hc=";
+ hash = "sha256-XWPJldWxe8iply7XtmDem1gfbNuuaWuFdMfuCbcU6tc=";
};
- cargoHash = "sha256-vA3DhGc0EuSdUeXYyG5iuuy7yK+22xPJjI67+/ctUFA=";
+ cargoHash = "sha256-v8P4pbTJ/t9TgB07tyhn3y8q65xILFTbBgziw5kuxUQ=";
# Default features include mini dashboard which downloads something from the internet.
buildNoDefaultFeatures = true;
diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix
index a55967920fe3..915575db65f0 100644
--- a/pkgs/servers/sftpgo/default.nix
+++ b/pkgs/servers/sftpgo/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "sftpgo";
- version = "2.4.3";
+ version = "2.4.4";
src = fetchFromGitHub {
owner = "drakkan";
repo = "sftpgo";
rev = "refs/tags/v${version}";
- hash = "sha256-cSA7ndpIV3VvIZTBa9NCIlJn57EtT1qxrB0UsMENUS0=";
+ hash = "sha256-gB3r7Q4M4pXHB9cfCRU8hMccWaJ170es0CJfbo/7lsg=";
};
- vendorHash = "sha256-C45KA+9tdj+fR3DUBLdG2dGzT59zuAJczpKVoiAZ7lg=";
+ vendorHash = "sha256-og3mn0iYl6aubcSAUohqG4ZSqdBB4AQYZtpKfbp7kcQ=";
ldflags = [
"-s"
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix
index f6f40bcd6957..ff277e06805c 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -10,12 +10,12 @@
stdenv.mkDerivation rec {
pname = "pgpool-II";
- version = "4.4.1";
+ version = "4.4.2";
src = fetchurl {
url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz";
name = "pgpool-II-${version}.tar.gz";
- sha256 = "sha256-Szebu6jheBKKHO5KW9GuEW3ts9phIbcowY8PVMiB8yg=";
+ sha256 = "sha256-Pmx4jnDwZyx7OMiKbKdvMfN4axJWiZgMwGOrdSylgjQ=";
};
buildInputs = [
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 7c9e8fa69595..8015b3a2c3cb 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb";
- version = "2.9.2";
+ version = "2.9.3";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl libkrb5 ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = version;
- sha256 = "sha256-3n3nqAVow8nIocXPsgCZcNkV+jr/G5/CmnSUfj2WMWo=";
+ sha256 = "sha256-eUn/sk2l/2aEGXupRPNDrbrIpUA3aNPo3tBJhmBoeXk=";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
index ea413c996fb5..480250900b3c 100644
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -17,7 +17,9 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-l1SOaQA4C8yXbrfi7pEE1PpUO4DVmLTTDUSACCSQ5LE=";
};
- passthru.tests = nixosTests.freshrss;
+ passthru.tests = {
+ inherit (nixosTests) freshrss-sqlite freshrss-pgsql;
+ };
buildInputs = [ php ];
diff --git a/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/servers/web-apps/phylactery/default.nix
index e7756e4bb3b6..b200ae637f56 100644
--- a/pkgs/servers/web-apps/phylactery/default.nix
+++ b/pkgs/servers/web-apps/phylactery/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
hash = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ=";
};
- vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+ vendorHash = null;
preBuild = ''
cp ${./go.mod} go.mod
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index b88307101017..d00b61744dc1 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -11,11 +11,11 @@
let
pname = "pgadmin";
- version = "6.18";
+ version = "6.19";
src = fetchurl {
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
- sha256 = "sha256-qqilmJLpJ3XNd8dwk7bDAAPxt8sou5zydFMPcJGcGoo=";
+ sha256 = "sha256-xHvdqVpNU9ZzTA6Xl2Bv044l6Tbvf4fjqyz4TmS9gmI=";
};
yarnDeps = mkYarnModules {
@@ -70,6 +70,9 @@ let
azure-mgmt-rdbms
azure-mgmt-resource
azure-identity
+ sphinxcontrib-youtube
+ dnspython
+ greenlet
];
# keep the scope, as it is used throughout the derivation and tests
@@ -104,7 +107,7 @@ let
hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI=";
};
});
- # pgadmin 6.18 is incompatible with the major flask-security-too update to 5.0.x
+ # pgadmin 6.19 is incompatible with the major flask-security-too update to 5.0.x
flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec {
version = "4.1.5";
src = oldAttrs.src.override {
diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json
index cd30686bf065..462d82e2134d 100644
--- a/pkgs/tools/admin/pgadmin/package.json
+++ b/pkgs/tools/admin/pgadmin/package.json
@@ -112,7 +112,6 @@
"classnames": "^2.2.6",
"closest": "^0.0.1",
"codemirror": "^5.59.2",
- "context-menu": "^2.0.0",
"convert-units": "^2.3.4",
"cssnano": "^5.0.2",
"dagre": "^0.8.4",
@@ -123,8 +122,6 @@
"insert-if": "^1.1.0",
"ip-address": "^7.1.0",
"jquery": "^3.6.0",
- "jquery-contextmenu": "^2.9.2",
- "jquery-ui": "^1.13.2",
"json-bignumber": "^1.0.1",
"jsoneditor": "^9.5.4",
"jsoneditor-react": "^3.1.1",
@@ -140,14 +137,13 @@
"path-fx": "^2.0.0",
"pathfinding": "^0.4.18",
"paths-js": "^0.4.9",
- "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6",
"postcss": "^8.2.15",
"raf": "^3.4.1",
"rc-dock": "^3.2.9",
"react": "^17.0.1",
"react-aspen": "^1.1.0",
"react-checkbox-tree": "^1.7.2",
- "react-data-grid": "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8",
+ "react-data-grid": "git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^17.0.1",
@@ -169,7 +165,7 @@
"tempusdominus-bootstrap-4": "^5.1.2",
"tempusdominus-core": "^5.19.3",
"valid-filename": "^2.0.1",
- "webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8",
+ "webcabin-docker": "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8",
"wkx": "^0.5.0",
"xterm": "^4.11.0",
"xterm-addon-fit": "^0.5.0",
diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock
index 463e68254ff5..df20a984a8f7 100644
--- a/pkgs/tools/admin/pgadmin/yarn.lock
+++ b/pkgs/tools/admin/pgadmin/yarn.lock
@@ -2340,7 +2340,7 @@ aspen-core@^1.0.4:
p-series "^1.1.0"
path-fx "^2.1.1"
-aspen-decorations@^1.0.2, aspen-decorations@^1.1.1:
+aspen-decorations@^1.0.2:
version "1.1.1"
resolved "https://registry.yarnpkg.com/aspen-decorations/-/aspen-decorations-1.1.1.tgz#7d0ca740efab1aa4fd91a1f3db81ac29186607a3"
integrity sha512-Ej2tv0Gz3bnhkNCyzzjDeG2V5vd49T30ca0SKywHuLA5RKrZ1NutEyZnUYku4WmUV1/TdpHRiSJ759nbZK4xtQ==
@@ -3385,13 +3385,6 @@ content-type@~1.0.4:
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-context-menu@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz#565f13210248e3442700e6b1a2d63406f2b08552"
- integrity sha512-VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg==
- dependencies:
- tiny-emitter "^2.0.2"
-
convert-source-map@^1.5.0, convert-source-map@^1.7.0, convert-source-map@^1.8.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
@@ -6133,21 +6126,14 @@ jmespath@^0.16.0:
resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
-jquery-contextmenu@^2.6.4, jquery-contextmenu@^2.9.2:
+jquery-contextmenu@^2.6.4:
version "2.9.2"
resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.9.2.tgz#f9dc362e45871dda2e50fa45de2243e917446ced"
integrity sha512-6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw==
dependencies:
jquery "^3.5.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.7.1 <4.0.0", "jquery@>=1.8.0 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.6.0:
+"jquery@>=1.7.1 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.6.0:
version "3.6.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
@@ -6238,16 +6224,16 @@ json-stable-stringify-without-jsonify@^1.0.1:
integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
json5@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
- integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+ integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
dependencies:
minimist "^1.2.0"
json5@^2.1.2, json5@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
- integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+ integrity "sha1-eM1vGhm9wStz21rQxh79ZsHikoM= sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
jsoneditor-react@^3.1.1:
version "3.1.2"
@@ -7831,27 +7817,6 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
-"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6":
- version "1.0.0"
- resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6"
- dependencies:
- "@types/classnames" "^2.2.6"
- "@types/react" "^16.7.18"
- "@types/react-dom" "^16.0.11"
- aspen-decorations "^1.1.1"
- browserfs "^1.4.3"
- classnames "^2.2.6"
- context-menu "^2.0.0"
- insert-if "^1.1.0"
- lodash "4.*"
- notificar "^1.0.1"
- path-fx "^2.0.0"
- react "^16.6.3"
- react-aspen "^1.2.0"
- react-dom "^16.6.3"
- react-virtualized-auto-sizer "^1.0.6"
- valid-filename "^2.0.1"
-
picocolors@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@@ -8531,7 +8496,7 @@ re-resizable@6.9.6:
dependencies:
fast-memoize "^2.5.1"
-react-aspen@^1.1.0, react-aspen@^1.2.0:
+react-aspen@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.2.0.tgz#375fa82a8db627542fc8b9e6e421baa49a65ab95"
integrity sha512-w+vUn4ScCzcxDB5xEsKIuIkUnySEQXlp/zqPFChWEpYG12mPO7h7z/LWuK2QXUoDbIP96Fcf1+UAI9I/cstPqg==
@@ -8552,9 +8517,9 @@ react-checkbox-tree@^1.7.2:
nanoid "^3.0.0"
prop-types "^15.5.8"
-"react-data-grid@git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8":
+"react-data-grid@git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8":
version "7.0.0-beta.14"
- resolved "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8"
+ resolved "git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8"
dependencies:
clsx "^1.1.1"
@@ -8576,16 +8541,6 @@ react-dnd@^16.0.1:
fast-deep-equal "^3.1.3"
hoist-non-react-statics "^3.3.2"
-react-dom@^16.6.3:
- version "16.14.0"
- resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
- integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
- dependencies:
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
- prop-types "^15.6.2"
- scheduler "^0.19.1"
-
react-dom@^17.0.1:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
@@ -8747,15 +8702,6 @@ react-window@^1.3.1, react-window@^1.8.5:
"@babel/runtime" "^7.0.0"
memoize-one ">=3.1.1 <6"
-react@^16.6.3:
- version "16.14.0"
- resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
- integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
- dependencies:
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
- prop-types "^15.6.2"
-
react@^17.0.1:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
@@ -9117,14 +9063,6 @@ sax@^1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-scheduler@^0.19.1:
- version "0.19.1"
- resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
- integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
- dependencies:
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
-
scheduler@^0.20.2:
version "0.20.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
@@ -9997,11 +9935,6 @@ timers-browserify@^1.0.1:
dependencies:
process "~0.11.0"
-tiny-emitter@^2.0.2:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
- integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
-
tiny-warning@^1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
@@ -10404,9 +10337,9 @@ watchpack@^2.4.0:
glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2"
-"webcabin-docker@git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8":
+"webcabin-docker@git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8":
version "2.2.5"
- resolved "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8"
+ resolved "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8"
dependencies:
"@fortawesome/fontawesome-free" "^5.14.0"
FileSaver "^0.10.0"
diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix
index 0b9a47865743..d4c5e2c7b1ce 100644
--- a/pkgs/tools/admin/pgadmin/yarn.nix
+++ b/pkgs/tools/admin/pgadmin/yarn.nix
@@ -3433,14 +3433,6 @@
sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
};
}
- {
- name = "context_menu___context_menu_2.0.0.tgz";
- path = fetchurl {
- name = "context_menu___context_menu_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz";
- sha512 = "VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg==";
- };
- }
{
name = "convert_source_map___convert_source_map_1.9.0.tgz";
path = fetchurl {
@@ -6385,14 +6377,6 @@
sha512 = "6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw==";
};
}
- {
- name = "jquery_ui___jquery_ui_1.13.2.tgz";
- path = fetchurl {
- 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==";
- };
- }
{
name = "jquery___jquery_3.6.1.tgz";
path = fetchurl {
@@ -6530,19 +6514,19 @@
};
}
{
- name = "json5___json5_1.0.1.tgz";
+ name = "json5___json5_1.0.2.tgz";
path = fetchurl {
- name = "json5___json5_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz";
- sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
+ name = "json5___json5_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz";
+ sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==";
};
}
{
- name = "json5___json5_2.2.1.tgz";
+ name = "json5___json5_2.2.3.tgz";
path = fetchurl {
- name = "json5___json5_2.2.1.tgz";
- url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz";
- sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==";
+ name = "json5___json5_2.2.3.tgz";
+ url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz";
+ sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
};
}
{
@@ -8361,22 +8345,6 @@
sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==";
};
}
- {
- name = "pgadmin4-treeview";
- path =
- let
- repo = fetchgit {
- url = "https://github.com/EnterpriseDB/pgadmin4-treeview/";
- rev = "96ceb7f27f43660a804e61d23a76aeb9aa188bb6";
- sha256 = "1hvr7arywz8rql19ma6w6lj5hrfn8xr4cyiia4bw5l8d061ak1gj";
- };
- in
- runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } ''
- # Set u+w because tar-fs can't unpack archives with read-only dirs
- # https://github.com/mafintosh/tar-fs/issues/79
- tar cf $out --mode u+w -C ${repo} .
- '';
- }
{
name = "picocolors___picocolors_1.0.0.tgz";
path = fetchurl {
@@ -9148,18 +9116,16 @@
{
name = "react-data-grid.git";
path =
- let
- repo = fetchgit {
- url = "https://github.com/EnterpriseDB/react-data-grid.git/";
- rev = "200d2f5e02de694e3e9ffbe177c279bc40240fb8";
- sha256 = "0s4k8s8ackr5lrvhv7ljbhd90679wh34p2wv71xqn8yy1ykjwm15";
- };
- in
- runCommand "react-data-grid.git" { buildInputs = [gnutar]; } ''
- # Set u+w because tar-fs can't unpack archives with read-only dirs
- # https://github.com/mafintosh/tar-fs/issues/79
- tar cf $out --mode u+w -C ${repo} .
- '';
+ let repo = fetchgit {
+ url = "https://github.com/pgadmin-org/react-data-grid.git/";
+ rev = "200d2f5e02de694e3e9ffbe177c279bc40240fb8";
+ sha256 = "0s4k8s8ackr5lrvhv7ljbhd90679wh34p2wv71xqn8yy1ykjwm15";
+ };
+ in runCommand "react-data-grid.git" { buildInputs = [gnutar]; } ''
+ # Set u+w because tar-fs can't unpack archives with read-only dirs
+ # https://github.com/mafintosh/tar-fs/issues/79
+ tar cf $out --mode u+w -C ${repo} .
+ '';
}
{
name = "react_dnd_html5_backend___react_dnd_html5_backend_16.0.1.tgz";
@@ -9177,14 +9143,6 @@
sha512 = "QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==";
};
}
- {
- name = "react_dom___react_dom_16.14.0.tgz";
- path = fetchurl {
- name = "react_dom___react_dom_16.14.0.tgz";
- url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz";
- sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==";
- };
- }
{
name = "react_dom___react_dom_17.0.2.tgz";
path = fetchurl {
@@ -9361,14 +9319,6 @@
sha512 = "D4IiBeRtGXziZ1n0XklnFGu7h9gU684zepqyKzgPNzrsrk7xOCxni+TCckjg2Nr/DiaEEGVVmnhYSlT2rB47dQ==";
};
}
- {
- name = "react___react_16.14.0.tgz";
- path = fetchurl {
- name = "react___react_16.14.0.tgz";
- url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz";
- sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==";
- };
- }
{
name = "react___react_17.0.2.tgz";
path = fetchurl {
@@ -9785,14 +9735,6 @@
sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
};
}
- {
- name = "scheduler___scheduler_0.19.1.tgz";
- path = fetchurl {
- name = "scheduler___scheduler_0.19.1.tgz";
- url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz";
- sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==";
- };
- }
{
name = "scheduler___scheduler_0.20.2.tgz";
path = fetchurl {
@@ -10769,14 +10711,6 @@
sha512 = "PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==";
};
}
- {
- name = "tiny_emitter___tiny_emitter_2.1.0.tgz";
- path = fetchurl {
- name = "tiny_emitter___tiny_emitter_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz";
- sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==";
- };
- }
{
name = "tiny_warning___tiny_warning_1.0.3.tgz";
path = fetchurl {
@@ -11290,20 +11224,18 @@
};
}
{
- name = "wcDocker";
+ name = "wcdocker";
path =
- let
- repo = fetchgit {
- url = "https://github.com/EnterpriseDB/wcDocker/";
- rev = "3df8aac825ee2892f4d824de273b779cc6dbcad8";
- sha256 = "1dihm56s7a34s132a6rh69lri93avz9bwja8bjd9hvpds20phmsg";
- };
- in
- runCommand "wcDocker" { buildInputs = [gnutar]; } ''
- # Set u+w because tar-fs can't unpack archives with read-only dirs
- # https://github.com/mafintosh/tar-fs/issues/79
- tar cf $out --mode u+w -C ${repo} .
- '';
+ let repo = fetchgit {
+ url = "https://github.com/pgadmin-org/wcdocker/";
+ rev = "3df8aac825ee2892f4d824de273b779cc6dbcad8";
+ sha256 = "1dihm56s7a34s132a6rh69lri93avz9bwja8bjd9hvpds20phmsg";
+ };
+ in runCommand "wcdocker" { buildInputs = [gnutar]; } ''
+ # Set u+w because tar-fs can't unpack archives with read-only dirs
+ # https://github.com/mafintosh/tar-fs/issues/79
+ tar cf $out --mode u+w -C ${repo} .
+ '';
}
{
name = "webfonts_loader___webfonts_loader_7.5.2.tgz";
diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix
index 0ace2196ed8c..0a4577b9f9c9 100644
--- a/pkgs/tools/misc/dua/default.nix
+++ b/pkgs/tools/misc/dua/default.nix
@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
- version = "2.19.0";
+ version = "2.19.1";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
- sha256 = "sha256-cb2WW0FpY5GMzll7sgbDRcgiKYSVZjJ8e8BabywF9wg=";
+ sha256 = "sha256-GNVmrFY/qWInP0qT9Y+UurIyK3rBhj2OyAcH+Sw3smo=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
postFetch = ''
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
'';
};
- cargoSha256 = "sha256-79dUeQOf6hiSRzz5mLWcSP5bLXMOU5YcE9ecd/t9VaI=";
+ cargoHash = "sha256-xhNHvTVOBwAkMn/lLUShhZkBih1zX5b/udeJaEcZGgs=";
doCheck = false;
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix
index dd0d34f50fe5..2b9ba694d3f6 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/pkgs/tools/misc/ldapvi/default.nix
@@ -2,11 +2,12 @@
stdenv.mkDerivation {
pname = "ldapvi";
- version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg";
+ version = "unstable-2012-04-28";
# use latest git, it includes some important patches since 2007 release
src = fetchgit {
url = "http://www.lichteblau.com/git/ldapvi.git";
+ rev = "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40";
sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030";
};
diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix
index 5a68c7697cc4..211df2186f78 100644
--- a/pkgs/tools/misc/lnch/default.nix
+++ b/pkgs/tools/misc/lnch/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-Iro/FjPFMqulcK90MbludnOXkMEHW0QSCoQRL01/LDE";
};
- vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo";
+ vendorSha256 = null;
ldflags = [ "-s" "-w" ];
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index e21842e3604e..d5d86c198516 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/hanslub42/rlwrap";
license = licenses.gpl2Plus;
platforms = platforms.unix;
- maintainers = with maintainers; [ SuperSandro2000 srapenne ];
+ maintainers = with maintainers; [ srapenne ];
};
}
diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix
index 6ca75c64f56f..9a3c350b7977 100644
--- a/pkgs/tools/misc/sharedown/default.nix
+++ b/pkgs/tools/misc/sharedown/default.nix
@@ -17,13 +17,13 @@
stdenvNoCC.mkDerivation rec {
pname = "Sharedown";
- version = "5.1.0";
+ version = "5.2.2";
src = fetchFromGitHub {
owner = "kylon";
repo = pname;
rev = version;
- sha256 = "sha256-cD+xq2LVaTZGjFj+SleQlNT3sAV6N4nG4RVbH015OOA=";
+ sha256 = "sha256-kdntnzGpu1NUP6rrBaH7ASwE7XT18vHcgf39bp5A4ds=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock
index fc30e71aaf5f..705cf9f90d70 100644
--- a/pkgs/tools/misc/sharedown/yarn.lock
+++ b/pkgs/tools/misc/sharedown/yarn.lock
@@ -7,6 +7,27 @@
resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==
+"@babel/code-frame@^7.0.0":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+ integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+ dependencies:
+ "@babel/highlight" "^7.18.6"
+
+"@babel/helper-validator-identifier@^7.18.6":
+ version "7.19.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+ integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
+"@babel/highlight@^7.18.6":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+ integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.18.6"
+ chalk "^2.0.0"
+ js-tokens "^4.0.0"
+
"@develar/schema-utils@~2.6.5":
version "2.6.5"
resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6"
@@ -15,21 +36,20 @@
ajv "^6.12.0"
ajv-keywords "^3.4.1"
-"@electron/get@^1.14.1":
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
- integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
+"@electron/get@^2.0.0":
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
+ integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==
dependencies:
debug "^4.1.1"
env-paths "^2.2.0"
fs-extra "^8.1.0"
- got "^9.6.0"
+ got "^11.8.5"
progress "^2.0.3"
semver "^6.2.0"
sumchecker "^3.0.1"
optionalDependencies:
global-agent "^3.0.0"
- global-tunnel-ng "^2.7.1"
"@electron/universal@1.2.1":
version "1.2.1"
@@ -44,10 +64,10 @@
minimatch "^3.0.4"
plist "^3.0.4"
-"@fortawesome/fontawesome-free@^6.2.0":
- version "6.2.0"
- resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5"
- integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==
+"@fortawesome/fontawesome-free@6.2.1":
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz#344baf6ff9eaad7a73cff067d8c56bfc11ae5304"
+ integrity sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==
"@malept/cross-spawn-promise@^1.1.0":
version "1.1.1"
@@ -66,23 +86,33 @@
lodash "^4.17.15"
tmp-promise "^3.0.2"
-"@sindresorhus/is@^0.14.0":
- version "0.14.0"
- resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
- integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+"@sindresorhus/is@^4.0.0":
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+ integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
-"@szmarczak/http-timer@^1.1.2":
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
- integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+"@szmarczak/http-timer@^4.0.5":
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+ integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
dependencies:
- defer-to-connect "^1.0.1"
+ defer-to-connect "^2.0.0"
"@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==
+"@types/cacheable-request@^6.0.1":
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
+ integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
+ dependencies:
+ "@types/http-cache-semantics" "*"
+ "@types/keyv" "^3.1.4"
+ "@types/node" "*"
+ "@types/responselike" "^1.0.0"
+
"@types/debug@^4.1.6":
version "4.1.7"
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
@@ -105,6 +135,18 @@
"@types/minimatch" "*"
"@types/node" "*"
+"@types/http-cache-semantics@*":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+ integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
+"@types/keyv@^3.1.4":
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
+ integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+ dependencies:
+ "@types/node" "*"
+
"@types/minimatch@*":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
@@ -116,14 +158,14 @@
integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
"@types/node@*":
- version "18.11.3"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz#78a6d7ec962b596fc2d2ec102c4dd3ef073fea6a"
- integrity sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A==
+ version "18.11.19"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz#35e26df9ec441ab99d73e99e9aca82935eea216d"
+ integrity sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw==
"@types/node@^16.11.26":
- version "16.11.68"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz#30ee923f4d940793e0380f5ce61c0bd4b7196b6c"
- integrity sha512-JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ==
+ version "16.18.12"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz#e3bfea80e31523fde4292a6118f19ffa24fd6f65"
+ integrity sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw==
"@types/plist@^3.0.1":
version "3.0.2"
@@ -133,6 +175,13 @@
"@types/node" "*"
xmlbuilder ">=11.0.1"
+"@types/responselike@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+ integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+ dependencies:
+ "@types/node" "*"
+
"@types/verror@^1.10.3":
version "1.10.6"
resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb"
@@ -144,9 +193,9 @@
integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
"@types/yargs@^17.0.1":
- version "17.0.13"
- resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76"
- integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==
+ version "17.0.22"
+ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a"
+ integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==
dependencies:
"@types/yargs-parser" "*"
@@ -184,6 +233,13 @@ ansi-regex@^5.0.1:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+ansi-styles@^3.2.1:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+ integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+ dependencies:
+ color-convert "^1.9.0"
+
ansi-styles@^4.0.0, ansi-styles@^4.1.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
@@ -280,10 +336,10 @@ at-least-node@^1.0.0:
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-axios@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35"
- integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==
+axios@^1.2.1:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz#7ac517f0fa3ec46e0e636223fd973713a09c72b3"
+ integrity sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==
dependencies:
follow-redirects "^1.15.0"
form-data "^4.0.0"
@@ -325,10 +381,10 @@ boolean@^3.0.1:
resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
-bootstrap@5.2.2:
- version "5.2.2"
- resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz#834e053eed584a65e244d8aa112a6959f56e27a0"
- integrity sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==
+bootstrap@5.2.3:
+ version "5.2.3"
+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b"
+ integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==
brace-expansion@^1.1.7:
version "1.1.11"
@@ -417,18 +473,37 @@ builder-util@23.6.0:
stat-mode "^1.0.0"
temp-file "^3.4.0"
-cacheable-request@^6.0.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
- integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+cacheable-lookup@^5.0.3:
+ version "5.0.4"
+ resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+ integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
+cacheable-request@^7.0.2:
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+ integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
dependencies:
clone-response "^1.0.2"
get-stream "^5.1.0"
http-cache-semantics "^4.0.0"
- keyv "^3.0.0"
+ keyv "^4.0.0"
lowercase-keys "^2.0.0"
- normalize-url "^4.1.0"
- responselike "^1.0.2"
+ normalize-url "^6.0.1"
+ responselike "^2.0.0"
+
+callsites@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+ integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+chalk@^2.0.0:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+ integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+ dependencies:
+ ansi-styles "^3.2.1"
+ escape-string-regexp "^1.0.5"
+ supports-color "^5.3.0"
chalk@^4.0.2, chalk@^4.1.1:
version "4.1.2"
@@ -454,9 +529,9 @@ chromium-pickle-js@^0.2.0:
integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==
ci-info@^3.2.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f"
- integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==
+ version "3.7.1"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f"
+ integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==
cli-truncate@^2.1.0:
version "2.1.0"
@@ -491,6 +566,13 @@ clone-response@^1.0.2:
dependencies:
mimic-response "^1.0.0"
+color-convert@^1.9.0:
+ version "1.9.3"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+ dependencies:
+ color-name "1.1.3"
+
color-convert@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
@@ -498,6 +580,11 @@ color-convert@^2.0.1:
dependencies:
color-name "~1.1.4"
+color-name@1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+ integrity 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"
@@ -537,19 +624,21 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-config-chain@^1.1.11:
- version "1.1.13"
- resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
- integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
- dependencies:
- ini "^1.3.4"
- proto-list "~1.2.1"
-
core-util-is@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+cosmiconfig@8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97"
+ integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==
+ dependencies:
+ import-fresh "^3.2.1"
+ js-yaml "^4.1.0"
+ parse-json "^5.0.0"
+ path-type "^4.0.0"
+
crc@^3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
@@ -598,13 +687,6 @@ debug@^2.6.8:
dependencies:
ms "2.0.0"
-decompress-response@^3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
- integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==
- dependencies:
- mimic-response "^1.0.0"
-
decompress-response@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -617,10 +699,10 @@ deep-extend@^0.6.0:
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-defer-to-connect@^1.0.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
- integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+defer-to-connect@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+ integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
define-properties@^1.1.3:
version "1.1.4"
@@ -645,10 +727,10 @@ detect-node@^2.0.4:
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
-devtools-protocol@0.0.1045489:
- version "0.0.1045489"
- resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz#f959ad560b05acd72d55644bc3fb8168a83abf28"
- integrity sha512-D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ==
+devtools-protocol@0.0.1068969:
+ version "0.0.1068969"
+ resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz#8b9a4bc48aed1453bed08d62b07481f9abf4d6d8"
+ integrity sha512-ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ==
dir-compare@^2.4.0:
version "2.4.0"
@@ -698,11 +780,6 @@ dotenv@^9.0.2:
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
-duplexer3@^0.1.4:
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
- integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
-
ejs@^3.1.7:
version "3.1.8"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
@@ -753,12 +830,12 @@ electron-publish@23.6.0:
lazy-val "^1.0.5"
mime "^2.5.2"
-electron@^21.0.1:
- version "21.2.0"
- resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz#8eb65d69b36aa8dac0ee7330eab70181df211c8b"
- integrity sha512-oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg==
+electron@^22.0.0:
+ version "22.2.0"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz#1aa321415d8b8021a4b0807641f0ad56028feaf5"
+ integrity sha512-puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g==
dependencies:
- "@electron/get" "^1.14.1"
+ "@electron/get" "^2.0.0"
"@types/node" "^16.11.26"
extract-zip "^2.0.1"
@@ -767,11 +844,6 @@ emoji-regex@^8.0.0:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-encodeurl@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
- integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-
end-of-stream@^1.1.0, end-of-stream@^1.4.1:
version "1.4.4"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -784,6 +856,13 @@ env-paths@^2.2.0:
resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+error-ex@^1.3.1:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+ integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+ dependencies:
+ is-arrayish "^0.2.1"
+
es6-error@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
@@ -794,6 +873,11 @@ escalade@^3.1.1:
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+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 sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
escape-string-regexp@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
@@ -932,15 +1016,15 @@ get-caller-file@^2.0.5:
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
get-intrinsic@^1.1.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
- integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
+ integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
dependencies:
function-bind "^1.1.1"
has "^1.0.3"
has-symbols "^1.0.3"
-get-stream@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -983,16 +1067,6 @@ global-agent@^3.0.0:
semver "^7.3.2"
serialize-error "^7.0.1"
-global-tunnel-ng@^2.7.1:
- version "2.7.1"
- resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
- integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
- dependencies:
- encodeurl "^1.0.2"
- lodash "^4.17.10"
- npm-conf "^1.1.3"
- tunnel "^0.0.6"
-
globalthis@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
@@ -1000,22 +1074,22 @@ globalthis@^1.0.1:
dependencies:
define-properties "^1.1.3"
-got@^9.6.0:
- version "9.6.0"
- resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
- integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+got@^11.8.5:
+ version "11.8.6"
+ resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
+ integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
dependencies:
- "@sindresorhus/is" "^0.14.0"
- "@szmarczak/http-timer" "^1.1.2"
- cacheable-request "^6.0.0"
- decompress-response "^3.3.0"
- duplexer3 "^0.1.4"
- get-stream "^4.1.0"
- lowercase-keys "^1.0.1"
- mimic-response "^1.0.1"
- p-cancelable "^1.0.0"
- to-readable-stream "^1.0.0"
- url-parse-lax "^3.0.0"
+ "@sindresorhus/is" "^4.0.0"
+ "@szmarczak/http-timer" "^4.0.5"
+ "@types/cacheable-request" "^6.0.1"
+ "@types/responselike" "^1.0.0"
+ cacheable-lookup "^5.0.3"
+ cacheable-request "^7.0.2"
+ decompress-response "^6.0.0"
+ http2-wrapper "^1.0.0-beta.5.2"
+ lowercase-keys "^2.0.0"
+ p-cancelable "^2.0.0"
+ responselike "^2.0.0"
graceful-fs@^4.1.6, graceful-fs@^4.2.0:
version "4.2.10"
@@ -1027,6 +1101,11 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==
+has-flag@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+ integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
+
has-flag@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
@@ -1059,9 +1138,9 @@ hosted-git-info@^4.1.0:
lru-cache "^6.0.0"
http-cache-semantics@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
- integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+ integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
http-proxy-agent@^5.0.0:
version "5.0.0"
@@ -1072,6 +1151,14 @@ http-proxy-agent@^5.0.0:
agent-base "6"
debug "4"
+http2-wrapper@^1.0.0-beta.5.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+ integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+ dependencies:
+ quick-lru "^5.1.1"
+ resolve-alpn "^1.0.0"
+
https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -1100,6 +1187,14 @@ ieee754@^1.1.13:
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+import-fresh@^3.2.1:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+ integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+ dependencies:
+ parent-module "^1.0.0"
+ resolve-from "^4.0.0"
+
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -1113,11 +1208,16 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-ini@^1.3.4, ini@~1.3.0:
+ini@~1.3.0:
version "1.3.8"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+is-arrayish@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+ integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+
is-ci@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
@@ -1179,6 +1279,11 @@ jake@^10.8.5:
filelist "^1.0.1"
minimatch "^3.0.4"
+js-tokens@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+ integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
js-yaml@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -1186,10 +1291,15 @@ js-yaml@^4.1.0:
dependencies:
argparse "^2.0.1"
-json-buffer@3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
- integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
+json-buffer@3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+ integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
+json-parse-even-better-errors@^2.3.0:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+ integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
json-schema-traverse@^0.4.1:
version "0.4.1"
@@ -1202,9 +1312,9 @@ json-stringify-safe@^5.0.1:
integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
json5@^2.2.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
- integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+ integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
jsonfile@^4.0.0:
version "4.0.0"
@@ -1230,28 +1340,28 @@ keytar@^7.9.0:
node-addon-api "^4.3.0"
prebuild-install "^7.0.1"
-keyv@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
- integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+keyv@^4.0.0:
+ version "4.5.2"
+ resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
+ integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
dependencies:
- json-buffer "3.0.0"
+ json-buffer "3.0.1"
lazy-val@^1.0.4, lazy-val@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"
integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==
-lodash@^4.17.10, lodash@^4.17.15:
+lines-and-columns@^1.1.6:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+ integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
+lodash@^4.17.15:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
- integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
lowercase-keys@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
@@ -1288,7 +1398,7 @@ mime@^2.5.2:
resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-mimic-response@^1.0.0, mimic-response@^1.0.1:
+mimic-response@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
@@ -1313,9 +1423,9 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
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==
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+ integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
dependencies:
brace-expansion "^2.0.1"
@@ -1325,12 +1435,17 @@ minimist@^1.2.0, minimist@^1.2.3:
integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
minipass@^3.0.0:
- version "3.3.4"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
- integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
+ version "3.3.6"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+ integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
dependencies:
yallist "^4.0.0"
+minipass@^4.0.0:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.2.tgz#26fc3364d5ea6cb971c6e5259eac67a0887510d1"
+ integrity sha512-4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A==
+
minizlib@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -1370,9 +1485,9 @@ nice-try@^1.0.4:
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
node-abi@^3.3.0:
- version "3.28.0"
- resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz#b0df8b317e1c4f2f323756c5fc8ffccc5bca4718"
- integrity sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==
+ version "3.31.0"
+ resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz#dfb2ea3d01188eb80859f69bb4a4354090c1b355"
+ integrity sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==
dependencies:
semver "^7.3.5"
@@ -1393,18 +1508,10 @@ node-fetch@2.6.7:
dependencies:
whatwg-url "^5.0.0"
-normalize-url@^4.1.0:
- version "4.5.1"
- resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
- integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
-npm-conf@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
- integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
- dependencies:
- config-chain "^1.1.11"
- pify "^3.0.0"
+normalize-url@^6.0.1:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+ integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
npm-run-path@^2.0.0:
version "2.0.2"
@@ -1425,16 +1532,33 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
dependencies:
wrappy "1"
-p-cancelable@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
- integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+p-cancelable@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+ integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
p-finally@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+parent-module@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+ integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+ dependencies:
+ callsites "^3.0.0"
+
+parse-json@^5.0.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+ integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ error-ex "^1.3.1"
+ json-parse-even-better-errors "^2.3.0"
+ lines-and-columns "^1.1.6"
+
path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -1450,16 +1574,16 @@ path-key@^3.1.0:
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+path-type@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+ integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
pend@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
-pify@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
- integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
-
plist@^3.0.1, plist@^3.0.4:
version "3.0.6"
resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
@@ -1486,21 +1610,11 @@ prebuild-install@^7.0.1:
tar-fs "^2.0.0"
tunnel-agent "^0.6.0"
-prepend-http@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
- integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
-
progress@2.0.3, progress@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-proto-list@~1.2.1:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
- integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
-
proxy-from-env@1.1.0, proxy-from-env@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
@@ -1515,35 +1629,42 @@ pump@^3.0.0:
once "^1.3.1"
punycode@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
- integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
+ integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
-puppeteer-core@19.0.0:
- version "19.0.0"
- resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz#8d0198550e04c7d5e0847200ba257b2a777dbd3b"
- integrity sha512-OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g==
+puppeteer-core@19.4.0:
+ version "19.4.0"
+ resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.0.tgz#3f52945d8cfa20cf8721a7902afcd8a1a299b54d"
+ integrity sha512-gG/jxseleZStinBn86x8r7trjcE4jcjx1hIQWOpACQhquHYMuKnrWxkzg+EDn8sN3wUtF/Ry9mtJgjM49oUOFQ==
dependencies:
cross-fetch "3.1.5"
debug "4.3.4"
- devtools-protocol "0.0.1045489"
+ devtools-protocol "0.0.1068969"
extract-zip "2.0.1"
https-proxy-agent "5.0.1"
proxy-from-env "1.1.0"
rimraf "3.0.2"
tar-fs "2.1.1"
unbzip2-stream "1.4.3"
- ws "8.9.0"
+ ws "8.10.0"
-puppeteer@19.0.0:
- version "19.0.0"
- resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz#848986e6ecec37b19cd5a7327ad2fcf1f1cb83fd"
- integrity sha512-3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw==
+puppeteer@19.4.0:
+ version "19.4.0"
+ resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz#3adfcb415e96d7b5900a66a1097947272313ee9f"
+ integrity sha512-sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg==
dependencies:
+ cosmiconfig "8.0.0"
+ devtools-protocol "0.0.1068969"
https-proxy-agent "5.0.1"
progress "2.0.3"
proxy-from-env "1.1.0"
- puppeteer-core "19.0.0"
+ puppeteer-core "19.4.0"
+
+quick-lru@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+ integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
rc@^1.2.7:
version "1.2.8"
@@ -1580,12 +1701,22 @@ require-directory@^2.1.1:
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-responselike@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
- integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==
+resolve-alpn@^1.0.0:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+ integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
+resolve-from@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+ integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+responselike@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
+ integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
dependencies:
- lowercase-keys "^1.0.0"
+ lowercase-keys "^2.0.0"
rimraf@3.0.2, rimraf@^3.0.0:
version "3.0.2"
@@ -1706,9 +1837,9 @@ simple-get@^4.0.0:
simple-concat "^1.0.0"
simple-update-notifier@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz#7edf75c5bdd04f88828d632f762b2bc32996a9cc"
- integrity sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
+ integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
dependencies:
semver "~7.0.0"
@@ -1789,6 +1920,13 @@ sumchecker@^3.0.1:
dependencies:
debug "^4.1.0"
+supports-color@^5.3.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+ integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+ dependencies:
+ has-flag "^3.0.0"
+
supports-color@^7.1.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
@@ -1818,13 +1956,13 @@ tar-stream@^2.1.4:
readable-stream "^3.1.1"
tar@^6.1.11:
- version "6.1.11"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
- integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+ version "6.1.13"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
+ integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
- minipass "^3.0.0"
+ minipass "^4.0.0"
minizlib "^2.1.1"
mkdirp "^1.0.3"
yallist "^4.0.0"
@@ -1856,11 +1994,6 @@ tmp@^0.2.0:
dependencies:
rimraf "^3.0.0"
-to-readable-stream@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
- integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
tr46@~0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -1880,11 +2013,6 @@ tunnel-agent@^0.6.0:
dependencies:
safe-buffer "^5.0.1"
-tunnel@^0.0.6:
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
- integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
type-fest@^0.13.1:
version "0.13.1"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
@@ -1915,13 +2043,6 @@ uri-js@^4.2.2:
dependencies:
punycode "^2.1.0"
-url-parse-lax@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
- integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==
- dependencies:
- prepend-http "^2.0.0"
-
utf8-byte-length@^1.0.1:
version "1.0.4"
resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
@@ -1982,10 +2103,10 @@ wrappy@1:
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-ws@8.9.0:
- version "8.9.0"
- resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e"
- integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==
+ws@8.10.0:
+ version "8.10.0"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51"
+ integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw==
xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1:
version "15.1.1"
@@ -2002,15 +2123,15 @@ yallist@^4.0.0:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-yargs-parser@^21.0.0:
+yargs-parser@^21.1.1:
version "21.1.1"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
yargs@^17.5.1:
- version "17.6.0"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c"
- integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==
+ version "17.6.2"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541"
+ integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
dependencies:
cliui "^8.0.1"
escalade "^3.1.1"
@@ -2018,7 +2139,7 @@ yargs@^17.5.1:
require-directory "^2.1.1"
string-width "^4.2.3"
y18n "^5.0.5"
- yargs-parser "^21.0.0"
+ yargs-parser "^21.1.1"
yauzl@^2.10.0:
version "2.10.0"
diff --git a/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/tools/misc/sharedown/yarndeps.nix
index b22d280d8a0a..e77dea2cc271 100644
--- a/pkgs/tools/misc/sharedown/yarndeps.nix
+++ b/pkgs/tools/misc/sharedown/yarndeps.nix
@@ -9,6 +9,30 @@
sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==";
};
}
+ {
+ name = "_babel_code_frame___code_frame_7.18.6.tgz";
+ path = fetchurl {
+ name = "_babel_code_frame___code_frame_7.18.6.tgz";
+ url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz";
+ sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==";
+ };
+ }
+ {
+ name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz";
+ path = fetchurl {
+ name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz";
+ sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==";
+ };
+ }
+ {
+ name = "_babel_highlight___highlight_7.18.6.tgz";
+ path = fetchurl {
+ name = "_babel_highlight___highlight_7.18.6.tgz";
+ url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz";
+ sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==";
+ };
+ }
{
name = "_develar_schema_utils___schema_utils_2.6.5.tgz";
path = fetchurl {
@@ -18,11 +42,11 @@
};
}
{
- name = "_electron_get___get_1.14.1.tgz";
+ name = "_electron_get___get_2.0.2.tgz";
path = fetchurl {
- name = "_electron_get___get_1.14.1.tgz";
- url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz";
- sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==";
+ name = "_electron_get___get_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz";
+ sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==";
};
}
{
@@ -34,11 +58,11 @@
};
}
{
- name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz";
+ name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.1.tgz";
path = fetchurl {
- name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz";
- url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz";
- sha512 = "CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==";
+ name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.1.tgz";
+ url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz";
+ sha512 = "viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==";
};
}
{
@@ -58,19 +82,19 @@
};
}
{
- name = "_sindresorhus_is___is_0.14.0.tgz";
+ name = "_sindresorhus_is___is_4.6.0.tgz";
path = fetchurl {
- name = "_sindresorhus_is___is_0.14.0.tgz";
- url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz";
- sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==";
+ name = "_sindresorhus_is___is_4.6.0.tgz";
+ url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz";
+ sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==";
};
}
{
- name = "_szmarczak_http_timer___http_timer_1.1.2.tgz";
+ name = "_szmarczak_http_timer___http_timer_4.0.6.tgz";
path = fetchurl {
- name = "_szmarczak_http_timer___http_timer_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz";
- sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
+ name = "_szmarczak_http_timer___http_timer_4.0.6.tgz";
+ url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz";
+ sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==";
};
}
{
@@ -81,6 +105,14 @@
sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==";
};
}
+ {
+ name = "_types_cacheable_request___cacheable_request_6.0.3.tgz";
+ path = fetchurl {
+ name = "_types_cacheable_request___cacheable_request_6.0.3.tgz";
+ url = "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz";
+ sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==";
+ };
+ }
{
name = "_types_debug___debug_4.1.7.tgz";
path = fetchurl {
@@ -105,6 +137,22 @@
sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==";
};
}
+ {
+ name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz";
+ path = fetchurl {
+ name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz";
+ sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==";
+ };
+ }
+ {
+ name = "_types_keyv___keyv_3.1.4.tgz";
+ path = fetchurl {
+ name = "_types_keyv___keyv_3.1.4.tgz";
+ url = "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz";
+ sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==";
+ };
+ }
{
name = "_types_minimatch___minimatch_5.1.2.tgz";
path = fetchurl {
@@ -122,19 +170,19 @@
};
}
{
- name = "_types_node___node_18.11.3.tgz";
+ name = "_types_node___node_18.11.19.tgz";
path = fetchurl {
- name = "_types_node___node_18.11.3.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz";
- sha512 = "fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A==";
+ name = "_types_node___node_18.11.19.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz";
+ sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw==";
};
}
{
- name = "_types_node___node_16.11.68.tgz";
+ name = "_types_node___node_16.18.12.tgz";
path = fetchurl {
- name = "_types_node___node_16.11.68.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz";
- sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ==";
+ name = "_types_node___node_16.18.12.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz";
+ sha512 = "vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw==";
};
}
{
@@ -145,6 +193,14 @@
sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==";
};
}
+ {
+ name = "_types_responselike___responselike_1.0.0.tgz";
+ path = fetchurl {
+ name = "_types_responselike___responselike_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz";
+ sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==";
+ };
+ }
{
name = "_types_verror___verror_1.10.6.tgz";
path = fetchurl {
@@ -162,11 +218,11 @@
};
}
{
- name = "_types_yargs___yargs_17.0.13.tgz";
+ name = "_types_yargs___yargs_17.0.22.tgz";
path = fetchurl {
- name = "_types_yargs___yargs_17.0.13.tgz";
- url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz";
- sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==";
+ name = "_types_yargs___yargs_17.0.22.tgz";
+ url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz";
+ sha512 = "pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==";
};
}
{
@@ -209,6 +265,14 @@
sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==";
};
}
+ {
+ name = "ansi_styles___ansi_styles_3.2.1.tgz";
+ path = fetchurl {
+ name = "ansi_styles___ansi_styles_3.2.1.tgz";
+ url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz";
+ sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+ };
+ }
{
name = "ansi_styles___ansi_styles_4.3.0.tgz";
path = fetchurl {
@@ -306,11 +370,11 @@
};
}
{
- name = "axios___axios_1.1.3.tgz";
+ name = "axios___axios_1.3.2.tgz";
path = fetchurl {
- name = "axios___axios_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz";
- sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==";
+ name = "axios___axios_1.3.2.tgz";
+ url = "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz";
+ sha512 = "1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==";
};
}
{
@@ -362,11 +426,11 @@
};
}
{
- name = "bootstrap___bootstrap_5.2.2.tgz";
+ name = "bootstrap___bootstrap_5.2.3.tgz";
path = fetchurl {
- name = "bootstrap___bootstrap_5.2.2.tgz";
- url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz";
- sha512 = "dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==";
+ name = "bootstrap___bootstrap_5.2.3.tgz";
+ url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz";
+ sha512 = "cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==";
};
}
{
@@ -458,11 +522,35 @@
};
}
{
- name = "cacheable_request___cacheable_request_6.1.0.tgz";
+ name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz";
path = fetchurl {
- name = "cacheable_request___cacheable_request_6.1.0.tgz";
- url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz";
- sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==";
+ name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz";
+ url = "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz";
+ sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==";
+ };
+ }
+ {
+ name = "cacheable_request___cacheable_request_7.0.2.tgz";
+ path = fetchurl {
+ name = "cacheable_request___cacheable_request_7.0.2.tgz";
+ url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz";
+ sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==";
+ };
+ }
+ {
+ name = "callsites___callsites_3.1.0.tgz";
+ path = fetchurl {
+ name = "callsites___callsites_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz";
+ sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
+ };
+ }
+ {
+ name = "chalk___chalk_2.4.2.tgz";
+ path = fetchurl {
+ name = "chalk___chalk_2.4.2.tgz";
+ url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
+ sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
};
}
{
@@ -498,11 +586,11 @@
};
}
{
- name = "ci_info___ci_info_3.5.0.tgz";
+ name = "ci_info___ci_info_3.7.1.tgz";
path = fetchurl {
- name = "ci_info___ci_info_3.5.0.tgz";
- url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz";
- sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==";
+ name = "ci_info___ci_info_3.7.1.tgz";
+ url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz";
+ sha512 = "4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==";
};
}
{
@@ -537,6 +625,14 @@
sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==";
};
}
+ {
+ name = "color_convert___color_convert_1.9.3.tgz";
+ path = fetchurl {
+ name = "color_convert___color_convert_1.9.3.tgz";
+ url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz";
+ sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
+ };
+ }
{
name = "color_convert___color_convert_2.0.1.tgz";
path = fetchurl {
@@ -545,6 +641,14 @@
sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==";
};
}
+ {
+ name = "color_name___color_name_1.1.3.tgz";
+ path = fetchurl {
+ name = "color_name___color_name_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz";
+ sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==";
+ };
+ }
{
name = "color_name___color_name_1.1.4.tgz";
path = fetchurl {
@@ -601,14 +705,6 @@
sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==";
};
}
- {
- name = "config_chain___config_chain_1.1.13.tgz";
- path = fetchurl {
- name = "config_chain___config_chain_1.1.13.tgz";
- url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz";
- sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==";
- };
- }
{
name = "core_util_is___core_util_is_1.0.2.tgz";
path = fetchurl {
@@ -617,6 +713,14 @@
sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==";
};
}
+ {
+ name = "cosmiconfig___cosmiconfig_8.0.0.tgz";
+ path = fetchurl {
+ name = "cosmiconfig___cosmiconfig_8.0.0.tgz";
+ url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz";
+ sha512 = "da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==";
+ };
+ }
{
name = "crc___crc_3.8.0.tgz";
path = fetchurl {
@@ -665,14 +769,6 @@
sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
};
}
- {
- name = "decompress_response___decompress_response_3.3.0.tgz";
- path = fetchurl {
- name = "decompress_response___decompress_response_3.3.0.tgz";
- url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz";
- sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==";
- };
- }
{
name = "decompress_response___decompress_response_6.0.0.tgz";
path = fetchurl {
@@ -690,11 +786,11 @@
};
}
{
- name = "defer_to_connect___defer_to_connect_1.1.3.tgz";
+ name = "defer_to_connect___defer_to_connect_2.0.1.tgz";
path = fetchurl {
- name = "defer_to_connect___defer_to_connect_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz";
- sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
+ name = "defer_to_connect___defer_to_connect_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz";
+ sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==";
};
}
{
@@ -730,11 +826,11 @@
};
}
{
- name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz";
+ name = "devtools_protocol___devtools_protocol_0.0.1068969.tgz";
path = fetchurl {
- name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz";
- url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz";
- sha512 = "D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ==";
+ name = "devtools_protocol___devtools_protocol_0.0.1068969.tgz";
+ url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz";
+ sha512 = "ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ==";
};
}
{
@@ -777,14 +873,6 @@
sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==";
};
}
- {
- name = "duplexer3___duplexer3_0.1.5.tgz";
- path = fetchurl {
- name = "duplexer3___duplexer3_0.1.5.tgz";
- url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz";
- sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==";
- };
- }
{
name = "ejs___ejs_3.1.8.tgz";
path = fetchurl {
@@ -818,11 +906,11 @@
};
}
{
- name = "electron___electron_21.2.0.tgz";
+ name = "electron___electron_22.2.0.tgz";
path = fetchurl {
- name = "electron___electron_21.2.0.tgz";
- url = "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz";
- sha512 = "oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg==";
+ name = "electron___electron_22.2.0.tgz";
+ url = "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz";
+ sha512 = "puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g==";
};
}
{
@@ -833,14 +921,6 @@
sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==";
};
}
- {
- name = "encodeurl___encodeurl_1.0.2.tgz";
- path = fetchurl {
- name = "encodeurl___encodeurl_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz";
- sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==";
- };
- }
{
name = "end_of_stream___end_of_stream_1.4.4.tgz";
path = fetchurl {
@@ -857,6 +937,14 @@
sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==";
};
}
+ {
+ name = "error_ex___error_ex_1.3.2.tgz";
+ path = fetchurl {
+ name = "error_ex___error_ex_1.3.2.tgz";
+ url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz";
+ sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
+ };
+ }
{
name = "es6_error___es6_error_4.1.1.tgz";
path = fetchurl {
@@ -873,6 +961,14 @@
sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==";
};
}
+ {
+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+ path = fetchurl {
+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+ sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==";
+ };
+ }
{
name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz";
path = fetchurl {
@@ -1034,11 +1130,11 @@
};
}
{
- name = "get_intrinsic___get_intrinsic_1.1.3.tgz";
+ name = "get_intrinsic___get_intrinsic_1.2.0.tgz";
path = fetchurl {
- name = "get_intrinsic___get_intrinsic_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz";
- sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==";
+ name = "get_intrinsic___get_intrinsic_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz";
+ sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==";
};
}
{
@@ -1081,14 +1177,6 @@
sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==";
};
}
- {
- name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz";
- path = fetchurl {
- name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz";
- url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz";
- sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==";
- };
- }
{
name = "globalthis___globalthis_1.0.3.tgz";
path = fetchurl {
@@ -1098,11 +1186,11 @@
};
}
{
- name = "got___got_9.6.0.tgz";
+ name = "got___got_11.8.6.tgz";
path = fetchurl {
- name = "got___got_9.6.0.tgz";
- url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz";
- sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==";
+ name = "got___got_11.8.6.tgz";
+ url = "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz";
+ sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==";
};
}
{
@@ -1121,6 +1209,14 @@
sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==";
};
}
+ {
+ name = "has_flag___has_flag_3.0.0.tgz";
+ path = fetchurl {
+ name = "has_flag___has_flag_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz";
+ sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==";
+ };
+ }
{
name = "has_flag___has_flag_4.0.0.tgz";
path = fetchurl {
@@ -1162,11 +1258,11 @@
};
}
{
- name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz";
+ name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz";
path = fetchurl {
- name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz";
- sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==";
+ name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz";
+ sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==";
};
}
{
@@ -1177,6 +1273,14 @@
sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==";
};
}
+ {
+ name = "http2_wrapper___http2_wrapper_1.0.3.tgz";
+ path = fetchurl {
+ name = "http2_wrapper___http2_wrapper_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz";
+ sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==";
+ };
+ }
{
name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz";
path = fetchurl {
@@ -1209,6 +1313,14 @@
sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
};
}
+ {
+ name = "import_fresh___import_fresh_3.3.0.tgz";
+ path = fetchurl {
+ name = "import_fresh___import_fresh_3.3.0.tgz";
+ url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz";
+ sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==";
+ };
+ }
{
name = "inflight___inflight_1.0.6.tgz";
path = fetchurl {
@@ -1233,6 +1345,14 @@
sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
};
}
+ {
+ name = "is_arrayish___is_arrayish_0.2.1.tgz";
+ path = fetchurl {
+ name = "is_arrayish___is_arrayish_0.2.1.tgz";
+ url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz";
+ sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==";
+ };
+ }
{
name = "is_ci___is_ci_3.0.1.tgz";
path = fetchurl {
@@ -1313,6 +1433,14 @@
sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==";
};
}
+ {
+ name = "js_tokens___js_tokens_4.0.0.tgz";
+ path = fetchurl {
+ name = "js_tokens___js_tokens_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz";
+ sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
+ };
+ }
{
name = "js_yaml___js_yaml_4.1.0.tgz";
path = fetchurl {
@@ -1322,11 +1450,19 @@
};
}
{
- name = "json_buffer___json_buffer_3.0.0.tgz";
+ name = "json_buffer___json_buffer_3.0.1.tgz";
path = fetchurl {
- name = "json_buffer___json_buffer_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz";
- sha512 = "CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==";
+ name = "json_buffer___json_buffer_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz";
+ sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==";
+ };
+ }
+ {
+ name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz";
+ path = fetchurl {
+ name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz";
+ url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz";
+ sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==";
};
}
{
@@ -1346,11 +1482,11 @@
};
}
{
- name = "json5___json5_2.2.1.tgz";
+ name = "json5___json5_2.2.3.tgz";
path = fetchurl {
- name = "json5___json5_2.2.1.tgz";
- url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz";
- sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==";
+ name = "json5___json5_2.2.3.tgz";
+ url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz";
+ sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
};
}
{
@@ -1378,11 +1514,11 @@
};
}
{
- name = "keyv___keyv_3.1.0.tgz";
+ name = "keyv___keyv_4.5.2.tgz";
path = fetchurl {
- name = "keyv___keyv_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz";
- sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==";
+ name = "keyv___keyv_4.5.2.tgz";
+ url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz";
+ sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==";
};
}
{
@@ -1393,6 +1529,14 @@
sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==";
};
}
+ {
+ name = "lines_and_columns___lines_and_columns_1.2.4.tgz";
+ path = fetchurl {
+ name = "lines_and_columns___lines_and_columns_1.2.4.tgz";
+ url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz";
+ sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==";
+ };
+ }
{
name = "lodash___lodash_4.17.21.tgz";
path = fetchurl {
@@ -1401,14 +1545,6 @@
sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
};
}
- {
- name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
- path = fetchurl {
- name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
- sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
- };
- }
{
name = "lowercase_keys___lowercase_keys_2.0.0.tgz";
path = fetchurl {
@@ -1490,11 +1626,11 @@
};
}
{
- name = "minimatch___minimatch_5.1.0.tgz";
+ name = "minimatch___minimatch_5.1.6.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 = "minimatch___minimatch_5.1.6.tgz";
+ url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz";
+ sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==";
};
}
{
@@ -1506,11 +1642,19 @@
};
}
{
- name = "minipass___minipass_3.3.4.tgz";
+ name = "minipass___minipass_3.3.6.tgz";
path = fetchurl {
- name = "minipass___minipass_3.3.4.tgz";
- url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz";
- sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==";
+ name = "minipass___minipass_3.3.6.tgz";
+ url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz";
+ sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==";
+ };
+ }
+ {
+ name = "minipass___minipass_4.0.2.tgz";
+ path = fetchurl {
+ name = "minipass___minipass_4.0.2.tgz";
+ url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.2.tgz";
+ sha512 = "4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A==";
};
}
{
@@ -1570,11 +1714,11 @@
};
}
{
- name = "node_abi___node_abi_3.28.0.tgz";
+ name = "node_abi___node_abi_3.31.0.tgz";
path = fetchurl {
- name = "node_abi___node_abi_3.28.0.tgz";
- url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz";
- sha512 = "fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==";
+ name = "node_abi___node_abi_3.31.0.tgz";
+ url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz";
+ sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==";
};
}
{
@@ -1602,19 +1746,11 @@
};
}
{
- name = "normalize_url___normalize_url_4.5.1.tgz";
+ name = "normalize_url___normalize_url_6.1.0.tgz";
path = fetchurl {
- name = "normalize_url___normalize_url_4.5.1.tgz";
- url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz";
- sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==";
- };
- }
- {
- name = "npm_conf___npm_conf_1.1.3.tgz";
- path = fetchurl {
- name = "npm_conf___npm_conf_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz";
- sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==";
+ name = "normalize_url___normalize_url_6.1.0.tgz";
+ url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz";
+ sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==";
};
}
{
@@ -1642,11 +1778,11 @@
};
}
{
- name = "p_cancelable___p_cancelable_1.1.0.tgz";
+ name = "p_cancelable___p_cancelable_2.1.1.tgz";
path = fetchurl {
- name = "p_cancelable___p_cancelable_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz";
- sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
+ name = "p_cancelable___p_cancelable_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz";
+ sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==";
};
}
{
@@ -1657,6 +1793,22 @@
sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==";
};
}
+ {
+ name = "parent_module___parent_module_1.0.1.tgz";
+ path = fetchurl {
+ name = "parent_module___parent_module_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz";
+ sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==";
+ };
+ }
+ {
+ name = "parse_json___parse_json_5.2.0.tgz";
+ path = fetchurl {
+ name = "parse_json___parse_json_5.2.0.tgz";
+ url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz";
+ sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==";
+ };
+ }
{
name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
path = fetchurl {
@@ -1681,6 +1833,14 @@
sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==";
};
}
+ {
+ name = "path_type___path_type_4.0.0.tgz";
+ path = fetchurl {
+ name = "path_type___path_type_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz";
+ sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
+ };
+ }
{
name = "pend___pend_1.2.0.tgz";
path = fetchurl {
@@ -1689,14 +1849,6 @@
sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==";
};
}
- {
- name = "pify___pify_3.0.0.tgz";
- path = fetchurl {
- name = "pify___pify_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz";
- sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==";
- };
- }
{
name = "plist___plist_3.0.6.tgz";
path = fetchurl {
@@ -1713,14 +1865,6 @@
sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==";
};
}
- {
- name = "prepend_http___prepend_http_2.0.0.tgz";
- path = fetchurl {
- name = "prepend_http___prepend_http_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz";
- sha512 = "ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==";
- };
- }
{
name = "progress___progress_2.0.3.tgz";
path = fetchurl {
@@ -1729,14 +1873,6 @@
sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
};
}
- {
- name = "proto_list___proto_list_1.2.4.tgz";
- path = fetchurl {
- name = "proto_list___proto_list_1.2.4.tgz";
- url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz";
- sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==";
- };
- }
{
name = "proxy_from_env___proxy_from_env_1.1.0.tgz";
path = fetchurl {
@@ -1754,27 +1890,35 @@
};
}
{
- name = "punycode___punycode_2.1.1.tgz";
+ name = "punycode___punycode_2.3.0.tgz";
path = fetchurl {
- name = "punycode___punycode_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz";
- sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+ name = "punycode___punycode_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz";
+ sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==";
};
}
{
- name = "puppeteer_core___puppeteer_core_19.0.0.tgz";
+ name = "puppeteer_core___puppeteer_core_19.4.0.tgz";
path = fetchurl {
- name = "puppeteer_core___puppeteer_core_19.0.0.tgz";
- url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz";
- sha512 = "OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g==";
+ name = "puppeteer_core___puppeteer_core_19.4.0.tgz";
+ url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.0.tgz";
+ sha512 = "gG/jxseleZStinBn86x8r7trjcE4jcjx1hIQWOpACQhquHYMuKnrWxkzg+EDn8sN3wUtF/Ry9mtJgjM49oUOFQ==";
};
}
{
- name = "puppeteer___puppeteer_19.0.0.tgz";
+ name = "puppeteer___puppeteer_19.4.0.tgz";
path = fetchurl {
- name = "puppeteer___puppeteer_19.0.0.tgz";
- url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz";
- sha512 = "3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw==";
+ name = "puppeteer___puppeteer_19.4.0.tgz";
+ url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz";
+ sha512 = "sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg==";
+ };
+ }
+ {
+ name = "quick_lru___quick_lru_5.1.1.tgz";
+ path = fetchurl {
+ name = "quick_lru___quick_lru_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz";
+ sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==";
};
}
{
@@ -1810,11 +1954,27 @@
};
}
{
- name = "responselike___responselike_1.0.2.tgz";
+ name = "resolve_alpn___resolve_alpn_1.2.1.tgz";
path = fetchurl {
- name = "responselike___responselike_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz";
- sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==";
+ name = "resolve_alpn___resolve_alpn_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz";
+ sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==";
+ };
+ }
+ {
+ name = "resolve_from___resolve_from_4.0.0.tgz";
+ path = fetchurl {
+ name = "resolve_from___resolve_from_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz";
+ sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==";
+ };
+ }
+ {
+ name = "responselike___responselike_2.0.1.tgz";
+ path = fetchurl {
+ name = "responselike___responselike_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz";
+ sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==";
};
}
{
@@ -1970,11 +2130,11 @@
};
}
{
- name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz";
+ name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz";
path = fetchurl {
- name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz";
- url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz";
- sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==";
+ name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz";
+ sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==";
};
}
{
@@ -2073,6 +2233,14 @@
sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==";
};
}
+ {
+ name = "supports_color___supports_color_5.5.0.tgz";
+ path = fetchurl {
+ name = "supports_color___supports_color_5.5.0.tgz";
+ url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz";
+ sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
+ };
+ }
{
name = "supports_color___supports_color_7.2.0.tgz";
path = fetchurl {
@@ -2098,11 +2266,11 @@
};
}
{
- name = "tar___tar_6.1.11.tgz";
+ name = "tar___tar_6.1.13.tgz";
path = fetchurl {
- name = "tar___tar_6.1.11.tgz";
- url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz";
- sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==";
+ name = "tar___tar_6.1.13.tgz";
+ url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz";
+ sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==";
};
}
{
@@ -2137,14 +2305,6 @@
sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==";
};
}
- {
- name = "to_readable_stream___to_readable_stream_1.0.0.tgz";
- path = fetchurl {
- name = "to_readable_stream___to_readable_stream_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz";
- sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==";
- };
- }
{
name = "tr46___tr46_0.0.3.tgz";
path = fetchurl {
@@ -2169,14 +2329,6 @@
sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==";
};
}
- {
- name = "tunnel___tunnel_0.0.6.tgz";
- path = fetchurl {
- name = "tunnel___tunnel_0.0.6.tgz";
- url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz";
- sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==";
- };
- }
{
name = "type_fest___type_fest_0.13.1.tgz";
path = fetchurl {
@@ -2217,14 +2369,6 @@
sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
};
}
- {
- name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
- path = fetchurl {
- name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz";
- sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==";
- };
- }
{
name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz";
path = fetchurl {
@@ -2298,11 +2442,11 @@
};
}
{
- name = "ws___ws_8.9.0.tgz";
+ name = "ws___ws_8.10.0.tgz";
path = fetchurl {
- name = "ws___ws_8.9.0.tgz";
- url = "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz";
- sha512 = "Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==";
+ name = "ws___ws_8.10.0.tgz";
+ url = "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz";
+ sha512 = "+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw==";
};
}
{
@@ -2338,11 +2482,11 @@
};
}
{
- name = "yargs___yargs_17.6.0.tgz";
+ name = "yargs___yargs_17.6.2.tgz";
path = fetchurl {
- name = "yargs___yargs_17.6.0.tgz";
- url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz";
- sha512 = "8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==";
+ name = "yargs___yargs_17.6.2.tgz";
+ url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz";
+ sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==";
};
}
{
diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix
index 6b41e80ae9c2..36c69bc4989b 100644
--- a/pkgs/tools/misc/tbls/default.nix
+++ b/pkgs/tools/misc/tbls/default.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "tbls";
- version = "1.60.0";
+ version = "1.61.0";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "tbls";
rev = "v${version}";
- hash = "sha256-5/YAJl01ARralsBEV6ZJqcYfMMudCmcQcdQD1jn1I+M=";
+ hash = "sha256-yXD/LILWaXtjd3etdWINglZtvIYE6i6qmCSR3FUUQeM=";
};
vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o=";
diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix
index dcedbb1409c5..3763f2ce1946 100644
--- a/pkgs/tools/networking/mozillavpn/default.nix
+++ b/pkgs/tools/networking/mozillavpn/default.nix
@@ -1,9 +1,9 @@
{ buildGoModule
, cmake
, fetchFromGitHub
-, fetchpatch
, go
, lib
+, libsecret
, pkg-config
, polkit
, python3
@@ -15,28 +15,20 @@
, qtwebsockets
, rustPlatform
, stdenv
-, which
, wireguard-tools
, wrapQtAppsHook
}:
let
pname = "mozillavpn";
- version = "2.12.0";
+ version = "2.13.0";
src = fetchFromGitHub {
owner = "mozilla-mobile";
repo = "mozilla-vpn-client";
rev = "v${version}";
fetchSubmodules = true;
- hash = "sha256-T8dPM90X4soVG/plKsf7DM9XgdX5Vcp0i6zTE60gbq0=";
+ hash = "sha256-EwHuNJZpTb7oFOKKDv0zWgklUe95Th97KP9G5DqRokA=";
};
- patches = [
- # vpnglean: Add Cargo.lock file
- (fetchpatch {
- url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/5236/commits/6fdc689001619a06b752fa629647642ea66f4e26.patch";
- hash = "sha256-j666Z31D29WIL3EXbek2aLzA4Fui/9VZvupubMDG24Q=";
- })
- ];
netfilter-go-modules = (buildGoModule {
inherit pname version src;
@@ -48,26 +40,27 @@ let
inherit src;
name = "${pname}-${version}-extension-bridge";
preBuild = "cd extension/bridge";
- hash = "sha256-/DmKSV0IKxZV0Drh6dTsiqgZhuxt6CoegXpYdqN4UzQ=";
+ hash = "sha256-q6Wf+jrGjGMiDEmnErnDau6Li64Dyq8t2SN1I4rspBY=";
};
signatureDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}-signature";
preBuild = "cd signature";
- hash = "sha256-6qyMARhPPgTryEtaBNrIPN9ja/fe7Fyx38iGuTd+Dk8=";
+ hash = "sha256-Dbu4WX2u3uDDUuZzS/hczypSFkQNnvuj2Su2X0QvSN4=";
};
vpngleanDeps = rustPlatform.fetchCargoTarball {
- inherit src patches;
+ inherit src;
name = "${pname}-${version}-vpnglean";
preBuild = "cd vpnglean";
- hash = "sha256-8OLTQmRvy6pATEBX2za6f9vMEqwkf9L5VyERtAN2BDQ=";
+ hash = "sha256-FDkziDDup+D7Bh+Wclqxn8Dhm/T2DanhjKXIAEFDhzc=";
};
in
stdenv.mkDerivation {
- inherit pname version src patches;
+ inherit pname version src;
buildInputs = [
+ libsecret
polkit
qt5compat
qtbase
@@ -81,13 +74,11 @@ stdenv.mkDerivation {
pkg-config
python3
python3.pkgs.glean-parser
- python3.pkgs.lxml
python3.pkgs.pyyaml
python3.pkgs.setuptools
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
- which
wrapQtAppsHook
];
@@ -110,15 +101,13 @@ stdenv.mkDerivation {
dontCargoSetupPostUnpack = true;
postPatch = ''
- for file in linux/*.service linux/extra/*.desktop src/platforms/linux/daemon/*.service; do
- substituteInPlace "$file" --replace /usr/bin/mozillavpn "$out/bin/mozillavpn"
- done
+ substituteInPlace src/apps/vpn/platforms/linux/daemon/org.mozilla.vpn.dbus.service --replace /usr/bin/mozillavpn "$out/bin/mozillavpn"
substituteInPlace scripts/addon/build.py \
--replace 'qtbinpath = args.qtpath' 'qtbinpath = "${qttools.dev}/bin"' \
--replace 'rcc = os.path.join(qtbinpath, rcc_bin)' 'rcc = "${qtbase.dev}/libexec/rcc"'
- substituteInPlace src/cmake/linux.cmake \
+ substituteInPlace src/apps/vpn/cmake/linux.cmake \
--replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \
--replace '${"$"}{POLKIT_POLICY_DIR}' "$out/share/polkit-1/actions" \
--replace '/usr/share/dbus-1' "$out/share/dbus-1" \
diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix
index 521c8ff2f20c..6f4483cd7283 100644
--- a/pkgs/tools/networking/nebula/default.nix
+++ b/pkgs/tools/networking/nebula/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "nebula";
@@ -17,6 +17,10 @@ buildGoModule rec {
ldflags = [ "-X main.Build=${version}" ];
+ passthru.tests = {
+ inherit (nixosTests) nebula;
+ };
+
meta = with lib; {
description = "A scalable overlay networking tool with a focus on performance, simplicity and security";
longDescription = ''
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
index 766c9a095021..f7118b695046 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "ssldump";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "adulau";
repo = "ssldump";
rev = "v${version}";
- sha256 = "sha256-nk1sXQN9cPIZD7Xlg8CHmKySfvfWl2j0CGxmIyvA6z4=";
+ sha256 = "sha256-mK8n+Dn7fUzmclUzlIqGjO2zzIVKQEhSRvYeuFwVJx8=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index aa9ffa6f391a..aea767e323aa 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "stress-ng";
- version = "0.15.01";
+ version = "0.15.03";
src = fetchFromGitHub {
owner = "ColinIanKing";
repo = pname;
rev = "V${version}";
- hash = "sha256-reHO426jUI0/jGhVFfurQ5dsRol4e9YlcE7p7nZyBCU=";
+ hash = "sha256-ryZoW2N93f1jDNF+qZ8y9brPGrTLiOFi2ciIEh1Lt1c=";
};
postPatch = ''
diff --git a/pkgs/tools/typesetting/tex/advi/default.nix b/pkgs/tools/typesetting/tex/advi/default.nix
new file mode 100644
index 000000000000..0be4d4a9574c
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/advi/default.nix
@@ -0,0 +1,64 @@
+{ fetchurl
+, lib
+, makeWrapper
+, writeShellScriptBin
+, ghostscriptX
+, ocamlPackages
+, texlive
+, which
+}:
+
+let
+ # simplified fake-opam edited from tweag's opam-nix
+ fake-opam = writeShellScriptBin "opam" ''
+ case "$1 $2" in
+ "config var")
+ case "$3" in
+ man) echo "$out/share/man";;
+ etc) echo "$out/etc";;
+ doc) echo "$out/share/doc";;
+ share) echo "$out/share";;
+ prefix) echo "$out";;
+ *) echo "fake-opam does not understand arguments: $@" ; exit 1 ;;
+ esac;;
+ *) echo "fake-opam does not understand arguments: $@" ; exit 1 ;;
+ esac
+ '';
+
+ # texlive currently does not symlink kpsexpand
+ kpsexpand = writeShellScriptBin "kpsexpand" ''
+ exec kpsetool -v
+ '';
+in
+ocamlPackages.buildDunePackage rec {
+ pname = "advi";
+ version = "2.0.0";
+
+ useDune2 = true;
+
+ minimalOCamlVersion = "4.11";
+
+ src = fetchurl {
+ url = "http://advi.inria.fr/advi-${version}.tar.gz";
+ hash = "sha256-c0DQHlvdekJyXCxmR4+Ut/njtoCzmqX6hNazNv8PpBQ=";
+ };
+
+ nativeBuildInputs = [ fake-opam kpsexpand makeWrapper texlive.combined.scheme-medium which ];
+ buildInputs = with ocamlPackages; [ camlimages ghostscriptX graphics ];
+
+ # TODO: ghostscript linked from texlive.combine will override ghostscriptX and break advi
+ preInstall = ''
+ make install
+ wrapProgram "$out/bin/advi" --prefix PATH : "${lib.makeBinPath [ ghostscriptX ]}"
+ '';
+
+ # TODO: redirect /share/advi/tex/latex to tex output compatible with texlive.combine
+ # (requires patching check() in advi-latex-files)
+
+ meta = with lib; {
+ homepage = "http://advi.inria.fr/";
+ description = "Active-DVI is a Unix-platform DVI previewer and a programmable presenter for slides written in LaTeX.";
+ license = licenses.lgpl21Only;
+ maintainers = [ maintainers.xworld21 ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebbdd8572777..738edd210afd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4642,6 +4642,8 @@ with pkgs;
### TOOLS/TYPESETTING/TEX
+ advi = callPackage ../tools/typesetting/tex/advi { };
+
auctex = callPackage ../tools/typesetting/tex/auctex { };
blahtexml = callPackage ../tools/typesetting/tex/blahtexml { };
@@ -13608,6 +13610,8 @@ with pkgs;
yamlfix = with python3Packages; toPythonApplication yamlfix;
+ yamlfmt = callPackage ../development/tools/yamlfmt {};
+
yamllint = with python3Packages; toPythonApplication yamllint;
yamlpath = callPackage ../development/tools/yamlpath { };
@@ -17893,7 +17897,7 @@ with pkgs;
img = callPackage ../development/tools/img { };
include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
- llvmPackages = llvmPackages_14;
+ llvmPackages = llvmPackages_15;
};
indent = callPackage ../development/tools/misc/indent { };
@@ -24229,6 +24233,8 @@ with pkgs;
clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { };
+ cockpit = callPackage ../servers/monitoring/cockpit { };
+
codeowners = callPackage ../development/tools/codeowners { };
couchdb3 = callPackage ../servers/http/couchdb/3.nix { };
@@ -25649,9 +25655,7 @@ with pkgs;
fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { };
- firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager {
- openssl = openssl_1_1;
- };
+ firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { };
firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { };
@@ -26874,6 +26878,8 @@ with pkgs;
blackout = callPackage ../data/fonts/blackout { };
+ breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { };
+
brise = callPackage ../data/misc/brise { };
cacert = callPackage ../data/misc/cacert { };
@@ -31611,7 +31617,7 @@ with pkgs;
polyphone = libsForQt5.callPackage ../applications/audio/polyphone { };
portfolio = callPackage ../applications/office/portfolio {
- jre = openjdk11;
+ jre = openjdk17;
};
prevo = callPackage ../applications/misc/prevo { };
@@ -31628,6 +31634,8 @@ with pkgs;
qemacs = callPackage ../applications/editors/qemacs { };
+ rime-cli = callPackage ../applications/office/rime-cli {};
+
roxctl = callPackage ../applications/networking/cluster/roxctl {
};
@@ -36002,6 +36010,8 @@ with pkgs;
molden = callPackage ../applications/science/chemistry/molden { };
+ mopac = callPackage ../applications/science/chemistry/mopac { };
+
octopus = callPackage ../applications/science/chemistry/octopus { };
openlp = libsForQt5.callPackage ../applications/misc/openlp { };
@@ -36026,6 +36036,8 @@ with pkgs;
siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; };
+ wxmacmolplt = callPackage ../applications/science/chemistry/wxmacmolplt { };
+
### SCIENCE/GEOMETRY
antiprism = callPackage ../applications/science/geometry/antiprism { };
@@ -38187,6 +38199,8 @@ with pkgs;
prow = callPackage ../applications/networking/cluster/prow { };
+ pv-migrate = callPackage ../applications/networking/cluster/pv-migrate { };
+
tagref = callPackage ../tools/misc/tagref { };
tcat = callPackage ../tools/misc/tcat { };
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index cf00c3da93cf..b067f5cbbc1e 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -170,6 +170,10 @@ impure-cmds // appleSourcePackages // chooseLibs // {
opencflite = callPackage ../os-specific/darwin/opencflite { };
+ openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith {
+ inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers;
+ };
+
stubs = pkgs.callPackages ../os-specific/darwin/stubs { };
trash = callPackage ../os-specific/darwin/trash { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ab7087ba63e..7c55959b6149 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1101,6 +1101,8 @@ self: super: with self; {
babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { };
+ bambi = callPackage ../development/python-modules/bambi { };
+
pad4pi = callPackage ../development/python-modules/pad4pi { };
pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; };
@@ -1218,6 +1220,8 @@ self: super: with self; {
bellows = callPackage ../development/python-modules/bellows { };
+ bencode-py = callPackage ../development/python-modules/bencode-py { };
+
bencoder = callPackage ../development/python-modules/bencoder { };
beniget = callPackage ../development/python-modules/beniget { };
@@ -3569,6 +3573,8 @@ self: super: with self; {
formbox = callPackage ../development/python-modules/formbox { };
+ formulae = callPackage ../development/python-modules/formulae { };
+
fortiosapi = callPackage ../development/python-modules/fortiosapi { };
FormEncode = callPackage ../development/python-modules/FormEncode { };
@@ -10880,6 +10886,8 @@ self: super: with self; {
sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
+ sphinxcontrib-youtube = callPackage ../development/python-modules/sphinxcontrib-youtube { };
+
sphinx = callPackage ../development/python-modules/sphinx { };
sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { };