From 431cedd67e1d8f7f99ea786e493d082f1d21693f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Dec 2025 23:56:12 +0000 Subject: [PATCH 01/65] halloy: 2025.11 -> 2025.12 --- pkgs/by-name/ha/halloy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index ffa767e5e3ef..074d88c7e8f4 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2025.11"; + version = "2025.12"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; tag = version; - hash = "sha256-5cYTHb3KK5EiPv5P8GZOoQwSSIe0FO+qBnpvLZtuByI="; + hash = "sha256-rVeh0nvmRjfOErwUhiWBx3hHla9bA2mSOORNSqSOrfw="; }; - cargoHash = "sha256-gGVclMEcvgdl3ZTiEdhW48xhC9/eONeHp0KX1lHKKxU="; + cargoHash = "sha256-lxRLTVtc2Gu3x3bt4po4q5/sfmRXb7CslEQIP8hX0+Q="; nativeBuildInputs = [ copyDesktopItems From e6ab94024c017c72ed0dc2835de5e0d4b8201f6d Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 3 Dec 2025 12:53:58 -0800 Subject: [PATCH 02/65] openssh: add withAudit (default false) libaudit linking should be controllable independently of the static build and should explicitly be added to configureFlags for users that need it. --- pkgs/tools/networking/openssh/common.nix | 38 ++++++++++++++++-------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 26999bd53ed5..1ebc5179bad7 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -18,7 +18,9 @@ fetchurl, fetchpatch, autoreconfHook, + withAudit ? false, audit, + libcap_ng, zlib, openssl, softhsm, @@ -46,6 +48,9 @@ isNixos ? stdenv.hostPlatform.isLinux, }: +# libaudit support requires Linux +assert withAudit -> stdenv.hostPlatform.isLinux; + # FIDO support requires SK support assert withFIDO -> withSecurityKey; @@ -99,7 +104,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withKerberos krb5 ++ lib.optional withLdns ldns ++ lib.optional withPAM pam - ++ lib.optional stdenv.hostPlatform.isStatic audit; + ++ lib.optionals withAudit [ + audit + libcap_ng + ]; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -107,11 +115,22 @@ stdenv.mkDerivation (finalAttrs: { unset LD ''; - env = lib.optionalAttrs isNixos { - # openssh calls passwd to allow the user to reset an expired password, but nixos - # doesn't ship it at /usr/bin/passwd. - PATH_PASSWD_PROG = "/run/wrappers/bin/passwd"; - }; + env = + lib.optionalAttrs isNixos { + # openssh calls passwd to allow the user to reset an expired password, but nixos + # doesn't ship it at /usr/bin/passwd. + PATH_PASSWD_PROG = "/run/wrappers/bin/passwd"; + } + // lib.optionalAttrs stdenv.hostPlatform.isStatic { + NIX_LDFLAGS = lib.concatStringsSep " " ( + lib.optional withKerberos "-lkeyutils" + ++ lib.optional withLdns "-lcrypto" + ++ lib.optionals withAudit [ + "-laudit" + "-lcap-ng" + ] + ); + }; # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. @@ -136,14 +155,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withLdns "--with-ldns" ++ lib.optional stdenv.hostPlatform.isOpenBSD "--with-bsd-auth" ++ lib.optional withLinuxMemlock "--with-linux-memlock-onfault" + ++ lib.optional withAudit "--with-audit=linux" ++ extraConfigureFlags; - ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null} = [ - "-laudit" - ] - ++ lib.optional withKerberos "-lkeyutils" - ++ lib.optional withLdns "-lcrypto"; - buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ]; enableParallelBuilding = true; From 19c71fd02e021855444944c9b960c07b9678d2a3 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 6 Dec 2025 11:42:59 -0500 Subject: [PATCH 03/65] mint: 0.24.1 -> 0.28.1 Diff: https://github.com/mint-lang/mint/compare/0.24.1...0.28.1 --- pkgs/by-name/mi/mint/package.nix | 4 ++-- pkgs/by-name/mi/mint/shards.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/mint/package.nix b/pkgs/by-name/mi/mint/package.nix index b6b98791ac96..4f0f65ea4487 100644 --- a/pkgs/by-name/mi/mint/package.nix +++ b/pkgs/by-name/mi/mint/package.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "mint"; - version = "0.24.1"; + version = "0.28.1"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; tag = version; - hash = "sha256-gMR/FUp/pOC0TQy6ENH3pIxK43hrHEciT17aGqXVKc8="; + hash = "sha256-CC3+ygs2JnqtKRGOlP5hZqnVARrgLjV5EewAP+jDM0M="; }; format = "shards"; diff --git a/pkgs/by-name/mi/mint/shards.nix b/pkgs/by-name/mi/mint/shards.nix index 53ceabfa26dd..4fb68ebe0329 100644 --- a/pkgs/by-name/mi/mint/shards.nix +++ b/pkgs/by-name/mi/mint/shards.nix @@ -6,8 +6,8 @@ }; ameba = { url = "https://github.com/crystal-ameba/ameba.git"; - rev = "v1.6.4"; - sha256 = "1kzr4ynd4r5w87y2czzrlir1dvqmv43ijm07804kgsy1g20k00fs"; + rev = "37fe65d0d86477ecd6cf0bab2d519f2235fea6b5"; + sha256 = "135jlnxqgg5haxfp5wprw3s0hqhhay2k22vgy2fy6vilk8rlcy7w"; }; ansi-escapes = { url = "https://github.com/gtramontina/ansi-escapes.cr.git"; From 42aa95303a9d111b8b2612b2ecbc70cbecf57881 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sat, 6 Dec 2025 03:26:44 +0100 Subject: [PATCH 04/65] nixos/tests/nebula: test IPv6 connectivity --- nixos/tests/nebula/connectivity.nix | 200 ++++++++++++++++++++++------ nixos/tests/nebula/reload.nix | 2 +- 2 files changed, 159 insertions(+), 43 deletions(-) diff --git a/nixos/tests/nebula/connectivity.nix b/nixos/tests/nebula/connectivity.nix index 6bb6547dc89d..e58c4668a241 100644 --- a/nixos/tests/nebula/connectivity.nix +++ b/nixos/tests/nebula/connectivity.nix @@ -16,6 +16,7 @@ let environment.systemPackages = [ pkgs.dig pkgs.nebula + pkgs.jq ]; users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; services.openssh.enable = true; @@ -28,7 +29,7 @@ let cert = "/etc/nebula/${name}.crt"; key = "/etc/nebula/${name}.key"; listen = { - host = "0.0.0.0"; + host = "::"; port = if ( @@ -54,12 +55,20 @@ in { ... }@args: makeNebulaNode args "lighthouse" { networking.firewall.allowedUDPPorts = [ 53 ]; - networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ - { - address = "192.168.1.1"; - prefixLength = 24; - } - ]; + networking.interfaces.eth1 = { + ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.1"; + prefixLength = 24; + } + ]; + ipv6.addresses = lib.mkForce [ + { + address = "3fff::1"; + prefixLength = 64; + } + ]; + }; services.nebula.networks.smoke = { isLighthouse = true; @@ -93,16 +102,27 @@ in allowAny = { ... }@args: makeNebulaNode args "allowAny" { - networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ - { - address = "192.168.1.2"; - prefixLength = 24; - } - ]; + networking.interfaces.eth1 = { + ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.2"; + prefixLength = 24; + } + ]; + ipv6.addresses = lib.mkForce [ + { + address = "3fff::2"; + prefixLength = 64; + } + ]; + }; services.nebula.networks.smoke = { staticHostMap = { - "10.0.100.1" = [ "192.168.1.1:4242" ]; + "10.0.100.1" = [ + "192.168.1.1:4242" + "[3fff::1]:4242" + ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; @@ -129,16 +149,21 @@ in allowFromLighthouse = { ... }@args: makeNebulaNode args "allowFromLighthouse" { - networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ - { - address = "192.168.1.3"; - prefixLength = 24; - } - ]; + networking.interfaces.eth1 = { + ipv6.addresses = lib.mkForce [ + { + address = "3fff::3"; + prefixLength = 64; + } + ]; + }; services.nebula.networks.smoke = { staticHostMap = { - "10.0.100.1" = [ "192.168.1.1:4242" ]; + "10.0.100.1" = [ + "192.168.1.1:4242" + "[3fff::1]:4242" + ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; @@ -175,7 +200,10 @@ in services.nebula.networks.smoke = { enable = true; staticHostMap = { - "10.0.100.1" = [ "192.168.1.1:4242" ]; + "10.0.100.1" = [ + "192.168.1.1:4242" + "[3fff::1]:4242" + ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; @@ -212,7 +240,9 @@ in services.nebula.networks.smoke = { enable = false; staticHostMap = { - "10.0.100.1" = [ "192.168.1.1:4242" ]; + "10.0.100.1" = [ + "192.168.1.1:4242" + ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; @@ -270,7 +300,7 @@ in "scp ${sshOpts} /etc/nebula/${name}.pub root@192.168.1.1:/root/${name}.pub", ) lighthouse.succeed( - 'nebula-cert sign -duration $((365*24*60))m -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' + 'nebula-cert sign -duration $((365*24*60))m -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -networks "${ip}" -in-pub /root/${name}.pub -out-crt /root/${name}.crt' ) ${name}.succeed( "scp ${sshOpts} root@192.168.1.1:/root/${name}.crt /etc/nebula/${name}.crt", @@ -279,28 +309,57 @@ in ) ''; - getPublicIp = node: '' - ${node}.succeed("ip --brief addr show eth1 | awk '{print $3}' | tail -n1 | cut -d/ -f1").strip() + getPublicIpv4 = node: '' + ${node}.succeed("ip --json addr show eth1 | jq -r '.[0].addr_info | map(select(.family == \"inet\")) | map(.local) | join(\",\")'").strip() + ''; + + getPublicIpv6 = node: '' + ${node}.succeed("ip --json addr show eth1 | jq -r '.[0].addr_info | map(select(.family == \"inet6\")) | map(.local) | join(\",\")'").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") + blockTrafficBetweenV4 = nodeA: nodeB: '' + node_a_4 = ${getPublicIpv4 nodeA} + node_b_4 = ${getPublicIpv4 nodeB} + ${nodeA}.succeed("iptables -I INPUT -s " + node_b_4 + " -j DROP") + ${nodeB}.succeed("iptables -I INPUT -s " + node_a_4 + " -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") + allowTrafficBetweenV4 = nodeA: nodeB: '' + node_a_4 = ${getPublicIpv4 nodeA} + node_b_4 = ${getPublicIpv4 nodeB} + ${nodeA}.succeed("iptables -D INPUT -s " + node_b_4 + " -j DROP") + ${nodeB}.succeed("iptables -D INPUT -s " + node_a_4 + " -j DROP") ${nodeA}.systemctl("restart nebula@smoke.service") ${nodeB}.systemctl("restart nebula@smoke.service") ''; + blockTrafficBetweenV6 = nodeA: nodeB: '' + node_a_6 = ${getPublicIpv6 nodeA} + node_b_6 = ${getPublicIpv6 nodeB} + ${nodeA}.succeed("ip6tables -I INPUT -i eth1 -s " + node_b_6 + " -j DROP") + ${nodeB}.succeed("ip6tables -I INPUT -i eth1 -s " + node_a_6 + " -j DROP") + ${nodeA}.systemctl("restart nebula@smoke.service") + ${nodeB}.systemctl("restart nebula@smoke.service") + ''; + allowTrafficBetweenV6 = nodeA: nodeB: '' + node_a_6 = ${getPublicIpv6 nodeA} + node_b_6 = ${getPublicIpv6 nodeB} + ${nodeA}.succeed("ip6tables -D INPUT -i eth1 -s " + node_b_6 + " -j DROP") + ${nodeB}.succeed("ip6tables -D INPUT -i eth1 -s " + node_a_6 + " -j DROP") + ${nodeA}.systemctl("restart nebula@smoke.service") + ${nodeB}.systemctl("restart nebula@smoke.service") + ''; + + blockTrafficBetween = nodeA: nodeB: '' + ${blockTrafficBetweenV4 nodeA nodeB} + ${blockTrafficBetweenV6 nodeA nodeB} + ''; + allowTrafficBetween = nodeA: nodeB: '' + ${allowTrafficBetweenV4 nodeA nodeB} + ${allowTrafficBetweenV6 nodeA nodeB} + ''; in '' # Create the certificate and sign the lighthouse's keys. @@ -308,7 +367,7 @@ in lighthouse.succeed( "mkdir -p /etc/nebula", 'nebula-cert ca -duration $((10*365*24*60))m -name "Smoke Test" -out-crt /etc/nebula/ca.crt -out-key /etc/nebula/ca.key', - 'nebula-cert sign -duration $((365*24*60))m -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', + 'nebula-cert sign -duration $((365*24*60))m -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "lighthouse" -groups "lighthouse" -networks "10.0.100.1/24,2001:db8::1/64" -out-crt /etc/nebula/lighthouse.crt -out-key /etc/nebula/lighthouse.key', 'chown -R nebula-smoke:nebula-smoke /etc/nebula' ) @@ -318,6 +377,7 @@ in lighthouse.start() lighthouse.wait_for_unit("nebula@smoke.service") lighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.1", timeout=10) + lighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::1", timeout=10) # Start all the machines to be set up allowAny.start() @@ -327,101 +387,157 @@ in # Create keys for allowAny's nebula service and test that it comes up. ${setUpPrivateKey "allowAny"} - ${signKeysFor "allowAny" "10.0.100.2/24"} + ${signKeysFor "allowAny" "10.0.100.2/24,2001:db8::2/64"} ${restartAndCheckNebula "allowAny" "10.0.100.2"} + ${restartAndCheckNebula "allowAny" "2001:db8::2"} # Create keys for allowFromLighthouse's nebula service and test that it comes up. ${setUpPrivateKey "allowFromLighthouse"} - ${signKeysFor "allowFromLighthouse" "10.0.100.3/24"} + ${signKeysFor "allowFromLighthouse" "10.0.100.3/24,2001:db8::3/64"} ${restartAndCheckNebula "allowFromLighthouse" "10.0.100.3"} + ${restartAndCheckNebula "allowFromLighthouse" "2001:db8::3"} # Create keys for allowToLighthouse's nebula service and test that it comes up. ${setUpPrivateKey "allowToLighthouse"} - ${signKeysFor "allowToLighthouse" "10.0.100.4/24"} + ${signKeysFor "allowToLighthouse" "10.0.100.4/24,2001:db8::4/64"} ${restartAndCheckNebula "allowToLighthouse" "10.0.100.4"} + ${restartAndCheckNebula "allowToLighthouse" "2001:db8::4"} # Create keys for disabled's nebula service and test that it does not come up. ${setUpPrivateKey "disabled"} - ${signKeysFor "disabled" "10.0.100.5/24"} + ${signKeysFor "disabled" "10.0.100.5/24,2001:db8::5/64"} disabled.fail("systemctl status nebula@smoke.service") disabled.fail("ping -c3 -W1 10.0.100.5") + disabled.fail("ping -c3 -W1 2001:db8::5") # The lighthouse can ping allowAny and allowFromLighthouse but not disabled lighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + lighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) lighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.3", timeout=10) + lighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::3", timeout=10) lighthouse.fail("ping -c3 -W1 10.0.100.5") + lighthouse.fail("ping -c3 -W1 2001:db8::5") # allowAny can ping the lighthouse, but not allowFromLighthouse because of its inbound firewall allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.1", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::1", timeout=10) allowAny.fail("ping -c3 -W1 10.0.100.3") + allowAny.fail("ping -c3 -W1 2001:db8::3") # allowAny can also resolve DNS on lighthouse - allowAny.succeed("dig @10.0.100.1 allowToLighthouse | grep -E 'allowToLighthouse\.\s+[0-9]+\s+IN\s+A\s+10\.0\.100\.4'") + allowAny.succeed("dig @10.0.100.1 allowToLighthouse A | grep -E 'allowToLighthouse\.\s+[0-9]+\s+IN\s+A\s+10\.0\.100\.4'") + allowAny.succeed("dig @10.0.100.1 allowToLighthouse AAAA | grep -E 'allowToLighthouse\.\s+[0-9]+\s+IN\s+AAAA\s+2001:db8::4'") # allowFromLighthouse can ping the lighthouse and allowAny allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.1", timeout=10) + allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::1", timeout=10) allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) + + # allowAny does IPv6 -> IPv4 and IPv4 -> IPv6 switchover for the underlay network + ${blockTrafficBetweenV4 "lighthouse" "allowAny"} + ${blockTrafficBetweenV6 "lighthouse" "allowToLighthouse"} + ${blockTrafficBetweenV6 "allowAny" "allowToLighthouse"} + allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.1", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::1", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.4", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::4", timeout=10) + ${blockTrafficBetweenV6 "lighthouse" "allowAny"} + allowAny.fail("ping -c3 -W1 10.0.100.1") + allowAny.fail("ping -c3 -W1 2001:db8::4") + ${allowTrafficBetweenV4 "lighthouse" "allowAny"} + allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.1", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.4", timeout=10) + ${allowTrafficBetweenV6 "lighthouse" "allowAny"} + ${allowTrafficBetweenV6 "lighthouse" "allowToLighthouse"} + ${allowTrafficBetweenV6 "allowAny" "allowToLighthouse"} # block allowFromLighthouse <-> allowAny, and allowFromLighthouse -> allowAny should still work. ${blockTrafficBetween "allowFromLighthouse" "allowAny"} + allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) ${allowTrafficBetween "allowFromLighthouse" "allowAny"} allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) # allowToLighthouse can ping the lighthouse but not allowAny or allowFromLighthouse allowToLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.1", timeout=10) + allowToLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::1", timeout=10) allowToLighthouse.fail("ping -c3 -W1 10.0.100.2") + allowToLighthouse.fail("ping -c3 -W1 2001:db8::2") allowToLighthouse.fail("ping -c3 -W1 10.0.100.3") + allowToLighthouse.fail("ping -c3 -W1 2001:db8::3") # allowAny can ping allowFromLighthouse now that allowFromLighthouse pinged it first allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.3", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::3", timeout=10) # block allowAny <-> allowFromLighthouse, and allowAny -> allowFromLighthouse should still work. ${blockTrafficBetween "allowAny" "allowFromLighthouse"} allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.3", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::3", timeout=10) ${allowTrafficBetween "allowAny" "allowFromLighthouse"} allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.3", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::3", timeout=10) # allowToLighthouse can ping allowAny if allowAny pings it first allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.4", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::4", timeout=10) allowToLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + allowToLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) # block allowToLighthouse <-> allowAny, and allowAny <-> allowToLighthouse should still work. ${blockTrafficBetween "allowAny" "allowToLighthouse"} allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.4", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::4", timeout=10) allowToLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + allowToLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) ${allowTrafficBetween "allowAny" "allowToLighthouse"} allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.4", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::4", timeout=10) allowToLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + allowToLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) # block lighthouse <-> allowFromLighthouse and allowAny <-> allowFromLighthouse; allowFromLighthouse won't get to allowAny ${blockTrafficBetween "allowFromLighthouse" "lighthouse"} ${blockTrafficBetween "allowFromLighthouse" "allowAny"} allowFromLighthouse.fail("ping -c3 -W1 10.0.100.2") + allowFromLighthouse.fail("ping -c3 -W1 2001:db8::2") ${allowTrafficBetween "allowFromLighthouse" "lighthouse"} ${allowTrafficBetween "allowFromLighthouse" "allowAny"} allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) # 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 -W1 10.0.100.2") + allowFromLighthouse.fail("ping -c3 -W1 2001:db8::2") allowAny.fail("ping -c3 -W1 10.0.100.3") + allowAny.fail("ping -c3 -W1 2001:db8::3") allowAny.fail("ping -c3 -W1 10.0.100.4") + allowAny.fail("ping -c3 -W1 2001:db8::4") ${allowTrafficBetween "allowAny" "lighthouse"} ${allowTrafficBetween "allowAny" "allowFromLighthouse"} ${allowTrafficBetween "allowAny" "allowToLighthouse"} allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 10.0.100.2", timeout=10) + allowFromLighthouse.wait_until_succeeds("ping -c1 -W1 2001:db8::2", timeout=10) allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.3", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::3", timeout=10) allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.4", timeout=10) + allowAny.wait_until_succeeds("ping -c1 -W1 2001:db8::4", timeout=10) # block lighthouse <-> allowToLighthouse and allowToLighthouse <-> allowAny; it won't get to allowAny ${blockTrafficBetween "allowToLighthouse" "lighthouse"} ${blockTrafficBetween "allowToLighthouse" "allowAny"} allowAny.fail("ping -c3 -W1 10.0.100.4") + allowAny.fail("ping -c3 -W1 2001:db8::4") allowToLighthouse.fail("ping -c3 -W1 10.0.100.2") + allowToLighthouse.fail("ping -c3 -W1 2001:db8::2") ${allowTrafficBetween "allowToLighthouse" "lighthouse"} ${allowTrafficBetween "allowToLighthouse" "allowAny"} allowAny.wait_until_succeeds("ping -c1 -W1 10.0.100.4", timeout=10) diff --git a/nixos/tests/nebula/reload.nix b/nixos/tests/nebula/reload.nix index 5e42cb2150a4..1495dbadc473 100644 --- a/nixos/tests/nebula/reload.nix +++ b/nixos/tests/nebula/reload.nix @@ -66,7 +66,7 @@ in lighthouse.succeed( "mkdir -p /etc/nebula", 'nebula-cert ca -duration $((10*365*24*60))m -name "Smoke Test" -out-crt /etc/nebula/ca.crt -out-key /etc/nebula/ca.key', - 'nebula-cert sign -duration $((365*24*60))m -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', + 'nebula-cert sign -duration $((365*24*60))m -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "lighthouse" -groups "lighthouse" -networks "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' ) From 7c2cd10603eacd0d11d10512b7bff3c1478ea77a Mon Sep 17 00:00:00 2001 From: DSeeLP <46624152+DSeeLP@users.noreply.github.com> Date: Tue, 16 Dec 2025 12:34:36 +0100 Subject: [PATCH 05/65] finamp: 0.9.20-beta -> 0.9.21-beta https://github.com/jmshrv/finamp/releases/tag/0.9.21-beta --- pkgs/by-name/fi/finamp/package.nix | 10 +- pkgs/by-name/fi/finamp/pubspec.lock.json | 216 +++++++++++++---------- 2 files changed, 130 insertions(+), 96 deletions(-) diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix index 1c99ea9ed046..11d9d6f34b18 100644 --- a/pkgs/by-name/fi/finamp/package.nix +++ b/pkgs/by-name/fi/finamp/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - flutter335, + flutter338, mpv-unwrapped, patchelf, fetchFromGitHub, @@ -9,16 +9,16 @@ makeDesktopItem, }: let - version = "0.9.20-beta"; + version = "0.9.21-beta"; in -flutter335.buildFlutterApplication { +flutter338.buildFlutterApplication { inherit version; pname = "finamp"; src = fetchFromGitHub { owner = "jmshrv"; repo = "finamp"; rev = version; - hash = "sha256-YuqYuUse6xugvc2hckZBc9kx+ryBmRQhoZzjwkpoNfo="; + hash = "sha256-Mb9oC9SJnZovcqjOJzh0bpWxZhbkfQWzFG9moghCmrw="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -37,6 +37,8 @@ flutter335.buildFlutterApplication { split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="; flutter_user_certificates_android = "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo="; smtc_windows = "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A="; + just_audio = "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs="; + just_audio_media_kit = "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw="; }; postFixup = '' diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json index 41652ff39fa4..517986f5ff6d 100644 --- a/pkgs/by-name/fi/finamp/pubspec.lock.json +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -154,11 +154,11 @@ "dependency": "direct main", "description": { "name": "audio_session", - "sha256": "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac", + "sha256": "8f96a7fecbb718cb093070f868b4cdcb8a9b1053dce342ff8ab2fde10eb9afb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.25" + "version": "0.2.2" }, "auto_size_text": { "dependency": "direct main", @@ -174,11 +174,11 @@ "dependency": "direct main", "description": { "name": "background_downloader", - "sha256": "a22acfa37aa06ba5cfe6eb7b1aa700c78af64770ff450c73dd3d279d7c37d4ac", + "sha256": "a3b340e42bc45598918944e378dc6a05877e587fcd0e1b8d2ea26339de87bdf9", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.6" + "version": "9.4.0" }, "balanced_text": { "dependency": "direct main", @@ -211,6 +211,16 @@ "source": "hosted", "version": "2.0.1" }, + "bits": { + "dependency": "direct main", + "description": { + "name": "bits", + "sha256": "30dee12524a00943b2f5d99056a6fd5b2f42d10cecee97d15119def6d350c1a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, "boolean_selector": { "dependency": "transitive", "description": { @@ -255,11 +265,11 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.4" + "version": "4.1.1" }, "build_resolvers": { "dependency": "transitive", @@ -305,11 +315,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", + "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.0" + "version": "8.12.1" }, "characters": { "dependency": "transitive", @@ -465,21 +475,21 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4+2" + "version": "0.3.5+1" }, "crypto": { "dependency": "transitive", "description": { "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.0.7" }, "custom_lint": { "dependency": "direct dev", @@ -542,7 +552,7 @@ "version": "1.2.0" }, "dbus": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "dbus", "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", @@ -555,11 +565,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6", + "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.1.0" + "version": "12.3.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -571,6 +581,16 @@ "source": "hosted", "version": "7.0.3" }, + "dynamic_color": { + "dependency": "direct main", + "description": { + "name": "dynamic_color", + "sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.8.1" + }, "equatable": { "dependency": "transitive", "description": { @@ -625,11 +645,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f", + "sha256": "7872545770c277236fd32b022767576c562ba28366204ff1a5628853cf8f2200", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.3.3" + "version": "10.3.7" }, "file_sizes": { "dependency": "direct main", @@ -655,21 +675,21 @@ "dependency": "direct main", "description": { "name": "flex_color_picker", - "sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff", + "sha256": "f5b0b53d4ae0d59b1e28dfc21d5398e5028cf8e764518e491a52fd050aa23881", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.7.1" + "version": "3.7.2" }, "flex_seed_scheme": { "dependency": "transitive", "description": { "name": "flex_seed_scheme", - "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec", + "sha256": "828291a5a4d4283590541519d8b57821946660ac61d2e07d955f81cfcab22e5d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.5.1" + "version": "3.6.1" }, "flutter": { "dependency": "direct main", @@ -757,11 +777,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31", + "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.30" + "version": "2.0.33" }, "flutter_riverpod": { "dependency": "direct main", @@ -807,11 +827,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678", + "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.3" }, "flutter_tabler_icons": { "dependency": "direct main", @@ -900,11 +920,11 @@ "dependency": "direct main", "description": { "name": "get_it", - "sha256": "a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b", + "sha256": "ae78de7c3f2304b8d81f2bb6e320833e5e81de942188542328f074978cc0efa9", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.2.0" + "version": "8.3.0" }, "glob": { "dependency": "transitive", @@ -950,21 +970,21 @@ "dependency": "direct main", "description": { "name": "hive_ce", - "sha256": "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4", + "sha256": "81d39a03c4c0ba5938260a8c3547d2e71af59defecea21793d57fc3551f0d230", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.13.2" + "version": "2.15.1" }, "hive_ce_flutter": { "dependency": "direct main", "description": { "name": "hive_ce_flutter", - "sha256": "f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc", + "sha256": "26d656c9e8974f0732f1d09020e2d7b08ba841b8961a02dbfb6caf01474b0e9a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.3.3" }, "hive_ce_generator": { "dependency": "direct dev", @@ -990,11 +1010,11 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.0" }, "http_multi_server": { "dependency": "transitive", @@ -1141,21 +1161,23 @@ "just_audio": { "dependency": "direct main", "description": { - "name": "just_audio", - "sha256": "f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e", - "url": "https://pub.dev" + "path": "just_audio", + "ref": "6dfdd07d19f6f037d3f4ff04c397639e4632c687", + "resolved-ref": "6dfdd07d19f6f037d3f4ff04c397639e4632c687", + "url": "https://github.com/LennartEnns/just_audio_fork.git" }, - "source": "hosted", - "version": "0.9.46" + "source": "git", + "version": "0.10.6" }, "just_audio_media_kit": { "dependency": "direct main", "description": { - "name": "just_audio_media_kit", - "sha256": "f3cf04c3a50339709e87e90b4e841eef4364ab4be2bdbac0c54cc48679f84d23", - "url": "https://pub.dev" + "path": ".", + "ref": "feat/queue-shuffle", + "resolved-ref": "f5237393a63da702426e4e20c6800b706a0b159f", + "url": "https://github.com/Komodo5197/just_audio_media_kit.git" }, - "source": "hosted", + "source": "git", "version": "2.1.0" }, "just_audio_platform_interface": { @@ -1238,6 +1260,16 @@ "source": "hosted", "version": "1.3.0" }, + "lzstring": { + "dependency": "transitive", + "description": { + "name": "lzstring", + "sha256": "3aa966276ef903485732ac1306598556451ff31a342378510f110304bcf2be27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0+2" + }, "marquee": { "dependency": "direct main", "description": { @@ -1272,11 +1304,11 @@ "dependency": "transitive", "description": { "name": "media_kit", - "sha256": "48c10c3785df5d88f0eef970743f8c99b2e5da2b34b9d8f9876e598f62d9e776", + "sha256": "ae9e79597500c7ad6083a3c7b7b7544ddabfceacce7ae5c9709b0ec16a5d6643", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.2.6" }, "media_kit_libs_linux": { "dependency": "direct main", @@ -1292,8 +1324,8 @@ "dependency": "direct main", "description": { "path": "libs/windows/media_kit_libs_windows_audio", - "ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811", - "resolved-ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811", + "ref": "9659892e095266beffeb71969db733afe9b6c424", + "resolved-ref": "9659892e095266beffeb71969db733afe9b6c424", "url": "https://github.com/Komodo5197/media-kit.git" }, "source": "git", @@ -1303,11 +1335,11 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.16.0" + "version": "1.17.0" }, "mime": { "dependency": "transitive", @@ -1434,21 +1466,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db", + "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.18" + "version": "2.2.22" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", + "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.1" }, "path_provider_linux": { "dependency": "transitive", @@ -1634,11 +1666,11 @@ "dependency": "transitive", "description": { "name": "qs_dart", - "sha256": "23e435223d985630e3880fd667128f520237059ca3af0cc2dc029d5365ce9ec1", + "sha256": "27da57e8b394163f96b74bccb6eb6115bfd2585de4b9ad6241bdf1a9797ab54f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.6" + "version": "1.6.0" }, "riverpod": { "dependency": "transitive", @@ -1774,11 +1806,11 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6", + "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.0" + "version": "12.0.1" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -1804,21 +1836,21 @@ "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e", + "sha256": "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.13" + "version": "2.4.18" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.5.6" }, "shared_preferences_linux": { "dependency": "transitive", @@ -1958,16 +1990,6 @@ "source": "git", "version": "3.2.1" }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, "sqflite": { "dependency": "transitive", "description": { @@ -2092,11 +2114,21 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.6" + "version": "0.7.7" + }, + "threshold": { + "dependency": "transitive", + "description": { + "name": "threshold", + "sha256": "0a1585947eb84bfbe7ca6a6598c9075d3d71fe969e81668cd6d2122be664fd39", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" }, "time": { "dependency": "transitive", @@ -2132,11 +2164,11 @@ "dependency": "transitive", "description": { "name": "universal_io", - "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "sha256": "f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.3.1" }, "universal_platform": { "dependency": "transitive", @@ -2162,11 +2194,11 @@ "dependency": "transitive", "description": { "name": "uri_parser", - "sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270", + "sha256": "051c62e5f693de98ca9f130ee707f8916e2266945565926be3ff20659f7853ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.0.2" }, "url_launcher": { "dependency": "direct main", @@ -2182,41 +2214,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.22" + "version": "6.3.28" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", + "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.4" + "version": "6.3.6" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.3" + "version": "3.2.5" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2242,21 +2274,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "uuid": { "dependency": "direct main", "description": { "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.1" + "version": "4.5.2" }, "value_layout_builder": { "dependency": "transitive", @@ -2352,11 +2384,11 @@ "dependency": "transitive", "description": { "name": "watcher", - "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c", + "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.1.4" }, "weak_map": { "dependency": "transitive", @@ -2402,11 +2434,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.14.0" + "version": "5.15.0" }, "win32_registry": { "dependency": "transitive", From 7e9d258320da8d523124cfc6708fad74b125e734 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 14:04:25 +0000 Subject: [PATCH 06/65] log4cxx: 1.5.0 -> 1.6.0 --- pkgs/by-name/lo/log4cxx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/log4cxx/package.nix b/pkgs/by-name/lo/log4cxx/package.nix index 56965768132e..b9cca68a18f4 100644 --- a/pkgs/by-name/lo/log4cxx/package.nix +++ b/pkgs/by-name/lo/log4cxx/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "log4cxx"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "mirror://apache/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz"; - hash = "sha256-qiP0fDFkqiz4SMIli0tLw3Lnlk1KPtR8K0pKkVxd+jc="; + hash = "sha256-R9doxXZcVyHPJ9Ug+H7ycikboPTg0yHHJzXVrshwGKc="; }; postPatch = '' From 453683bd48b5e8f85ec688461f01f27aa1cc01fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 16:38:23 +0000 Subject: [PATCH 07/65] squawk: 2.26.0 -> 2.32.0 --- pkgs/by-name/sq/squawk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index 2fdb56c428ce..c043e62664f2 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "2.26.0"; + version = "2.32.0"; src = fetchFromGitHub { owner = "sbdchd"; repo = "squawk"; tag = "v${version}"; - hash = "sha256-X1vr2WAWkv9puO5CCM6TrFg/5H5buemcplvIeYtk6Qo="; + hash = "sha256-k1UvK8OTY0CEjVFJ761jb52j05r/rzUDd+Jca/tVX1g="; }; - cargoHash = "sha256-eyQQ7bdbu/o5UQ7edjgs3ZLiya/q5c+jgLSWQfAs5ck="; + cargoHash = "sha256-QEbBfy4QqKfWO3SDq35HlUvB8FIbXVByM2c0OphfEsk="; nativeBuildInputs = [ pkg-config From e5d8625afb163b30120ef669e42d09120b56c777 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 19:27:21 +0000 Subject: [PATCH 08/65] nlohmann_json_schema_validator: 2.3.0 -> 2.4.0 --- pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix index 23498cb57ad8..f6f36f8b0497 100644 --- a/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix +++ b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "nlohmann_json_schema_validator"; - version = "2.3.0"; + version = "2.4.0"; outputs = [ "out" @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pboettch"; repo = "json-schema-validator"; rev = finalAttrs.version; - hash = "sha256-Ybr5dNmjBBPTYPvgorJ6t2+zvAjxYQISWXJmgUVHBVE="; + hash = "sha256-VTRnlkcSPMCRQiu5H2P44nHG1JMV9gl04xYjppstsk4="; }; buildInputs = [ nlohmann_json ]; From 5b6ebbcd364a6366617d9718b4eb3ca03372cb40 Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Sun, 9 Nov 2025 14:25:05 +0100 Subject: [PATCH 09/65] kicad: add option to disable STEP compression. step file compression into stpZ breaks compatibility with non-nixos Kicad installations https://github.com/NixOS/nixpkgs/issues/450219#issuecomment-3456394475. While disabling it altogether would break caching, adding a package option to disable it at least gives users the ability to manually build a more compatible version of Kicad. --- pkgs/by-name/ki/kicad/libraries.nix | 5 +++-- pkgs/by-name/ki/kicad/package.nix | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kicad/libraries.nix b/pkgs/by-name/ki/kicad/libraries.nix index c0026d382dc8..5a4504e1120d 100644 --- a/pkgs/by-name/ki/kicad/libraries.nix +++ b/pkgs/by-name/ki/kicad/libraries.nix @@ -3,6 +3,7 @@ stdenv, cmake, libSrc, + compressStep, stepreduce, parallel, zip, @@ -27,9 +28,9 @@ let postInstall = lib.optionalString (name == "packages3d") '' - find $out -type f -name '*.step' | parallel 'stepreduce {} {} && zip -9 {.}.stpZ {} && rm {}' + find $out -type f -name '*.step' | parallel 'stepreduce {} {} ${lib.optionalString compressStep "&& zip -9 {.}.stpZ {} && rm {}"}' '' - + lib.optionalString (name == "footprints") '' + + lib.optionalString ((name == "footprints") && compressStep) '' grep -rl '\.step' $out | xargs sed -i 's/\.step/.stpZ/g' ''; diff --git a/pkgs/by-name/ki/kicad/package.nix b/pkgs/by-name/ki/kicad/package.nix index 284c39c69cb4..80b1acb7b60e 100644 --- a/pkgs/by-name/ki/kicad/package.nix +++ b/pkgs/by-name/ki/kicad/package.nix @@ -23,6 +23,7 @@ pname ? "kicad", stable ? true, + compressStep ? true, testing ? false, withNgspice ? !stdenv.hostPlatform.isDarwin, libngspice, @@ -177,7 +178,7 @@ in stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. - passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; + passthru.libraries = callPackages ./libraries.nix { inherit libSrc compressStep; }; passthru.callPackage = newScope { inherit addonPath python3; }; base = callPackage ./base.nix { inherit stable testing; From e54a5b53301ac37351c790c68544722b2745fb8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 20:46:09 +0000 Subject: [PATCH 10/65] autobrr: 1.69.0 -> 1.71.0 --- pkgs/by-name/au/autobrr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index b2561d8a2978..6fb6328a2329 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -13,12 +13,12 @@ let pname = "autobrr"; - version = "1.69.0"; + version = "1.71.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-16C160Wg7pm3BoJyyC5tuHdp4H1BDO7GfnA5u0HJ8YM="; + hash = "sha256-JAWnH0S7gDBwmQXpogiTCIWWfQkrI5wOjWkV6+ANcnc="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -61,7 +61,7 @@ buildGoModule rec { src ; - vendorHash = "sha256-7gmF3yQFRqN7Oro/f+jhmxCUU9CltobY6EAoskCZISQ="; + vendorHash = "sha256-avgMRD5WSjXVVJ8r0Rq0IhfwPvxc/Sq9JxzX0rQimWI="; preBuild = '' cp -r ${autobrr-web}/* web/dist From 0a7fdb556a061d881862c2694cfc7beac78ae817 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 22:38:50 +0000 Subject: [PATCH 11/65] androidStudioPackages.canary: 2025.2.3.4 -> 2025.2.3.5 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 5d7e327670e7..f7ac5d8cf7be 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -24,8 +24,8 @@ let sha256Hash = "sha256-ciu+To5Kcus8FPDz1D43AD+qOqfPHaW4JsEBr9fx2PE="; }; latestVersion = { - version = "2025.2.3.4"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 Canary 4" - sha256Hash = "sha256-Oi+sGK8d7ms/BYt7F9xwEFGPdQUEHhfdclKQi9vAxgU="; + version = "2025.2.3.5"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 Canary 5" + sha256Hash = "sha256-gqJXOO7kW4orfsfCn5xOqLSpGu5apH4MpDhLAuOAG5w="; }; in { From 1ac27de21bdab016b61f4ec8d5b60619aac42963 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Dec 2025 15:39:18 +0000 Subject: [PATCH 12/65] wayscriber: 0.8.9 -> 0.9.1 --- pkgs/by-name/wa/wayscriber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wayscriber/package.nix b/pkgs/by-name/wa/wayscriber/package.nix index 51b762ac484f..0f838242f665 100644 --- a/pkgs/by-name/wa/wayscriber/package.nix +++ b/pkgs/by-name/wa/wayscriber/package.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wayscriber"; - version = "0.8.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "devmobasa"; repo = "wayscriber"; tag = "v${finalAttrs.version}"; - hash = "sha256-NQmi9JozGOD/EQ8dMiBCgIziUmjwhInxypX9dyk3TTY="; + hash = "sha256-lhETehKxu4mdQDzM0Lj0FMlrvBfrvEP1T4URyrDFEJ0="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango libxkbcommon ]; - cargoHash = "sha256-c/eSzYyAELeP8zU1nnkbmx1E8U1EY5zAR55Wp2zLn9k="; + cargoHash = "sha256-pnw6QNukzykYyNSJxG5gcnlOyGJOJrzfQJa5eb+mQmE="; passthru.updateScript = nix-update-script { }; meta = { From 14d03e2d98bd5c2f030735e40b7617b687e29ccd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Dec 2025 19:28:01 +0000 Subject: [PATCH 13/65] oxigraph: 0.5.2 -> 0.5.3 --- pkgs/by-name/ox/oxigraph/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix index 35e4fa2da880..f8c01ca4932d 100644 --- a/pkgs/by-name/ox/oxigraph/package.nix +++ b/pkgs/by-name/ox/oxigraph/package.nix @@ -13,17 +13,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "oxigraph"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "oxigraph"; repo = "oxigraph"; tag = "v${finalAttrs.version}"; - hash = "sha256-ptTrJbLGS7GkLGO40mbpdPkrcspaUE33kRZ8g9Qtb0o="; + hash = "sha256-hIB4/6D7AogEpNYyB95nDotspUyaiOW8X6KuVgyjj5Y="; fetchSubmodules = true; }; - cargoHash = "sha256-AuUGra9ejPRKWWpXWLmcwGuZRKIuCYTdifpnwuuHnnQ="; + cargoHash = "sha256-EhJQgYeeSln1bLLH3nEUFJ7q+PWA/DHAswh4ei4bHWY="; nativeBuildInputs = [ rustPlatform.bindgenHook From 629a4a3ee720976b3e455d5a4bd5aab43a982002 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 19 Dec 2025 23:01:34 +0100 Subject: [PATCH 14/65] docker-compose: fix version reporting --- pkgs/applications/virtualization/docker/compose.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index a9b33e10056b..73819b96e906 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule rec { @@ -17,17 +18,20 @@ buildGoModule rec { vendorHash = "sha256-EFbEd1UwrBnH6pSh+MvupYdie8SnKr8y6K9lQflBSlk="; + nativeInstallCheckInputs = [ versionCheckHook ]; + modPostBuild = '' patch -d vendor/github.com/docker/cli/ -p1 < ${./cli-system-plugin-dir-from-env.patch} ''; ldflags = [ - "-X github.com/docker/compose/v2/internal.Version=${version}" + "-X github.com/docker/compose/v5/internal.Version=${version}" "-s" "-w" ]; doCheck = false; + doInstallCheck = true; installPhase = '' runHook preInstall install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose From ab9c3197d34e5b41fe59467b8ef142eb4b3ca93f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Dec 2025 03:27:00 +0000 Subject: [PATCH 15/65] novelwriter: 2.7.5 -> 2.8 --- pkgs/by-name/no/novelwriter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index 44973af75deb..73f14d7f407f 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.7.5"; + version = "2.8"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; tag = "v${version}"; - hash = "sha256-qCbtQwV+dU/ypnb5UruTsXas9XUqlJweaxnfqTHsT+I="; + hash = "sha256-6OIDsmPVbpU90bbj4O2CO5YXNtz0bCrG2ygruxsl9Ec="; }; nativeBuildInputs = [ qt6.wrapQtAppsHook ]; From 6f517ecf428c979ce8f654ee48fc111ded5d901f Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 21 Dec 2025 16:03:15 +0100 Subject: [PATCH 16/65] docker_29: 29.1.2 -> 29.1.3 https://docs.docker.com/engine/release-notes/29/ --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c676e421804c..571b3116d8c0 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -431,14 +431,14 @@ in docker_29 = let - version = "29.1.2"; + version = "29.1.3"; in callPackage dockerGen { inherit version; cliRev = "v${version}"; - cliHash = "sha256-dmoCHxXOYalJCaqq32MdsAEJ+xq0aH/8fOpJHVnBxxU="; + cliHash = "sha256-8VpFDYn9mRFv7BnHek2+HvIu6jNPYNC1asozJvRX/A4="; mobyRev = "docker-v${version}"; - mobyHash = "sha256-SRMaPAdg2nlWuKKQILZEGHZO6TGLh2Ci1UIWqcyo6IM="; + mobyHash = "sha256-yB6FF4tzi6R+wH6U0JS8PMZGVRl1gWCY2Cjb/JR+62w="; runcRev = "v1.3.4"; runcHash = "sha256-1IfY08sBoDpbLrwz1AKBRSTuCZyOgQzYPHTDUI6fOZ8="; containerdRev = "v2.2.0"; From bdad1ac6ee73889fe2240ba1ead9930f55f23ba9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Dec 2025 00:49:07 +0000 Subject: [PATCH 17/65] qdl: 2.2 -> 2.4 --- pkgs/by-name/qd/qdl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qd/qdl/package.nix b/pkgs/by-name/qd/qdl/package.nix index ba99aa7cc4f3..81b455613c75 100644 --- a/pkgs/by-name/qd/qdl/package.nix +++ b/pkgs/by-name/qd/qdl/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qdl"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "linux-msm"; repo = "qdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-aC5c22gSrQ6EKEZ0vNdfBQF+ZKRN3jrgTB1KUXGLEPA="; + hash = "sha256-8jkuSNK7xTBUkBWzh766zKOlh+7pTr+e0xT1w3xifsw="; }; postPatch = '' From dd5db2c13c215ffb7c92cab5f6fefb6343170765 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Dec 2025 06:55:53 +0000 Subject: [PATCH 18/65] mangojuice: 0.8.8 -> 0.8.9 --- pkgs/by-name/ma/mangojuice/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix index 5372ee5cf470..a36a964f86e3 100644 --- a/pkgs/by-name/ma/mangojuice/package.nix +++ b/pkgs/by-name/ma/mangojuice/package.nix @@ -25,13 +25,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mangojuice"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "radiolamp"; repo = "mangojuice"; tag = finalAttrs.version; - hash = "sha256-M8aKS360AsgoSKCyZXdtD7SbMDvK6OgAuNoGa68NZRQ="; + hash = "sha256-+qcYtUAszfL54vsKkwHfhMamPvWUJkpgK1CktVgsoLA="; }; patches = [ From 0b77ded8db96f339901740ef2a401815b6e429aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Dec 2025 11:57:33 +0000 Subject: [PATCH 19/65] knowsmore: 0.1.49 -> 0.1.50 --- pkgs/by-name/kn/knowsmore/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix index 64a4ccc974a6..dd7e5d52a018 100644 --- a/pkgs/by-name/kn/knowsmore/package.nix +++ b/pkgs/by-name/kn/knowsmore/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knowsmore"; - version = "0.1.49"; + version = "0.1.50"; pyproject = true; src = fetchFromGitHub { owner = "helviojunior"; repo = "knowsmore"; tag = "v${version}"; - hash = "sha256-1qWbDf5lh9HogjjPoI51znpcQrriB2Eg4eA4xDQDYA8="; + hash = "sha256-D3WhlReBwQLU+U/389r5gR73+DNvFiVuSr6NQgG2oFY="; }; pythonRelaxDeps = [ From 8d1c6be162e214023476a3955a910d9b540d7582 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 22 Dec 2025 13:14:23 +0100 Subject: [PATCH 20/65] moosefs: 4.58.2 -> 4.58.3 --- pkgs/by-name/mo/moosefs/package.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix index 5a684078c050..2e682e9bfbaf 100644 --- a/pkgs/by-name/mo/moosefs/package.nix +++ b/pkgs/by-name/mo/moosefs/package.nix @@ -12,17 +12,18 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "4.58.2"; + version = "4.58.3"; src = fetchFromGitHub { owner = "moosefs"; repo = "moosefs"; rev = "v${version}"; - sha256 = "sha256-eywJ7MmCrwxqlbTDYEEPs6ego9Ivn+ziXCBNhcDfcmY="; + sha256 = "sha256-lEnCP+ORWdW52SVO7K3WxcjlFMrQFR9VT8fjquI/fZg="; }; nativeBuildInputs = [ pkg-config + python3 ]; buildInputs = [ @@ -50,10 +51,6 @@ stdenv.mkDerivation rec { "#undef HAVE_STRUCT_STAT_ST_BIRTHTIME" ''; - postInstall = '' - substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\"" - ''; - doCheck = true; passthru.tests = { From 261e6a65d9b171b6b9735b6757b08466ca9673e4 Mon Sep 17 00:00:00 2001 From: Red_M Date: Mon, 22 Dec 2025 22:13:16 +1000 Subject: [PATCH 21/65] xrizer: Allow multiarch builds to work --- pkgs/by-name/xr/xrizer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/xr/xrizer/package.nix b/pkgs/by-name/xr/xrizer/package.nix index 40796824ac14..fc77532e1949 100644 --- a/pkgs/by-name/xr/xrizer/package.nix +++ b/pkgs/by-name/xr/xrizer/package.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib/xrizer/$platformPath - ln -s "$out/lib/libxrizer.so" "$out/lib/xrizer/$platformPath/vrclient.so" + mv "$out/lib/libxrizer.so" "$out/lib/xrizer/$platformPath/vrclient.so" ''; platformPath = From fd8220a8b2116bf312a2618cae21ec99e76c9147 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 23 Dec 2025 15:47:16 +1100 Subject: [PATCH 22/65] simgear: 2024.1.1 -> 2024.1.3 Release notes: https://wiki.flightgear.org/Changelog_2024.1#2024.1.3 --- pkgs/by-name/si/simgear/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix index 21183bb8f83c..46bf323252e3 100644 --- a/pkgs/by-name/si/simgear/package.nix +++ b/pkgs/by-name/si/simgear/package.nix @@ -25,9 +25,10 @@ apr, xz, curl, + c-ares, }: let - version = "2024.1.1"; + version = "2024.1.3"; in stdenv.mkDerivation rec { pname = "simgear"; @@ -36,8 +37,8 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "flightgear"; repo = "simgear"; - tag = "v${version}"; - hash = "sha256-hOA/q/cTsqRy82rTAXRxyHBDdw93TW9UL+K5Jq5b/08="; + tag = "${version}"; + hash = "sha256-1zbw/lIjTbVwhxHPvXRlxPmYJeWmKvPE/RDrTL0PXb4="; }; nativeBuildInputs = [ cmake ]; @@ -66,6 +67,8 @@ stdenv.mkDerivation rec { xz ]; + propagatedBuildInputs = [ c-ares ]; + meta = { description = "Simulation construction toolkit"; homepage = "https://wiki.flightgear.org/SimGear"; From b4a87e5e2db8720a29d1f5e9091ca8c80574d334 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 23 Dec 2025 15:50:26 +1100 Subject: [PATCH 23/65] flightgear: 2024.1.1 -> 2024.1.3 Release notes: https://wiki.flightgear.org/Changelog_2024.1#2024.1.3 --- pkgs/by-name/fl/flightgear/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index e7dff70ac77d..dccb5368339a 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -33,7 +33,7 @@ }: let - version = "2024.1.1"; + version = "2024.1.3"; data = stdenv.mkDerivation rec { pname = "flightgear-data"; inherit version; @@ -41,8 +41,8 @@ let src = fetchFromGitLab { owner = "flightgear"; repo = "fgdata"; - tag = "v${version}"; - hash = "sha256-PdqsIZw9mSrvnqqB/fVFjWPW9njhXLWR/2LQCMoBLQI="; + tag = "${version}"; + hash = "sha256-LNHO/W8p4b8fYcehdfVecldKQ9uJp1zlg60xdgDC45c="; }; dontUnpack = true; @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "flightgear"; repo = "flightgear"; - tag = "v${version}"; - hash = "sha256-h4N18VAbJGQSBKA+eEQxej5e5MEwAcZpvH+dpTypM+k="; + tag = "${version}"; + hash = "sha256-m4bbWwMXwKJrMkb6svGrIZhcsPghrTMgFs8JCx3Wn/A="; }; nativeBuildInputs = [ From 81cbc50edb11df8885a01325284222a41d0a9f17 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 23 Dec 2025 16:22:24 +1100 Subject: [PATCH 24/65] flightgear: remove redundant appdir directory --- pkgs/by-name/fl/flightgear/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index dccb5368339a..d2d05b651f0d 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -104,6 +104,11 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ]; + postInstall = '' + # Remove redundant AppImage artifacts + rm -rf "$out/appdir" + ''; + meta = { description = "Flight simulator"; maintainers = with lib.maintainers; [ raskin ]; From 971961700b761ce7d47ce2c7454a20256266ff1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 07:00:44 +0000 Subject: [PATCH 25/65] mattermostLatest: 11.2.0 -> 11.2.1 --- pkgs/by-name/ma/mattermostLatest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index db10477f4643..49bcf1146148 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -11,8 +11,8 @@ mattermost.override { # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(11\\.[0-9]+\\.[0-9]+)$"; - version = "11.2.0"; - srcHash = "sha256-XVv0cmKkfA5MyZr/VuS7tGEteoSzhaKWq0Ae05jkRiQ="; + version = "11.2.1"; + srcHash = "sha256-y92zzL8yHlDxOStvAr1Mu+PPhTVlVQueBNtm4dhC/4w="; vendorHash = "sha256-mvQivHijLEdfTk7QzlfWQQn9S/9lMfrI+jSKKz0bh3M="; npmDepsHash = "sha256-YuJ0IfvhWb6kzBoTMYWV3mUhMuhrAelKoyXlmnQJovo="; lockfileOverlay = '' From 03d6e4bc46adfed68aab9969e6e61257d3177d2f Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 22 Dec 2025 23:45:00 -0800 Subject: [PATCH 26/65] androidenv: support nonstandard SDK versions Google have been releasing 'nonstandard' SDK versions for a while. Named things like CANARY, UpsideDownCake, 36x, and so on, androidenv has been generally unable to use them, instead preferring Google's officially supported Android SDKs corresponding to the [API levels](https://apilevels.com/) (e.g. "35" or "36"). Updates to those SDK versions have generally come in the form of updates to Google's repositories that repo.json picks up. These are mostly noneventful for end users, unless a user experienced a bug in an API definition, then it tended to be picked up with an androidenv repo update. API 36.1 changes this. It's not just a number (so it doesn't correspond to a unique API level). The previous attempt in #470569 simply preferred the newer version to attempt to emulate the old behavior. Unfortunately, this now requires a Gradle change (see #472561). So this means we should just support all the strange SDK versions now and have a test for it. Note that only depending on "latest" (the default) will properly pick these up as the latest, but using a min and max SDK version or numLatestPlatformVersions > 1 will create a range of SDK versions as before, which means you may miss (e.g.) 36.1 but will still have 36. Considering that this requires `compileSdk "android-36.1"` instead of a simple `compileSdk 36` in Gradle, it's recommended to explicitly specify platformVersions if you depend on this change, or use the defaults, where it will only install the latest. --- .../androidenv/compose-android-packages.nix | 69 ++++++++----------- .../examples/shell-with-emulator.nix | 15 ++-- .../examples/shell-without-emulator.nix | 17 +++-- .../mobile/androidenv/examples/shell.nix | 18 ++--- 4 files changed, 59 insertions(+), 60 deletions(-) diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index cce2f31a2797..4c5149032c02 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -24,7 +24,9 @@ let # Parses a list of versions, substituting "latest" with the latest version. parseVersions = repo: key: versions: - lib.unique (map (parseVersion repo key) versions); + lib.sort (a: b: lib.strings.compareVersions (toString a) (toString b) > 0) ( + lib.unique (map (parseVersion repo key) versions) + ); in { repoJson ? ./repo.json, @@ -98,14 +100,27 @@ in numLatestPlatformVersions ? 1, platformVersions ? if minPlatformVersion != null && maxPlatformVersion != null then + # Range between min and max, inclusive. let - minPlatformVersionInt = coerceIntVersion (parseVersion repo "platforms" minPlatformVersion); - maxPlatformVersionInt = coerceIntVersion (parseVersion repo "platforms" maxPlatformVersion); + minPlatformVersion' = parseVersion repo "platforms" minPlatformVersion; + maxPlatformVersion' = parseVersion repo "platforms" maxPlatformVersion; + minPlatformVersionInt = coerceIntVersion minPlatformVersion'; + maxPlatformVersionInt = coerceIntVersion maxPlatformVersion'; + range = lib.range (lib.min minPlatformVersionInt maxPlatformVersionInt) ( + lib.max minPlatformVersionInt maxPlatformVersionInt + ); in - lib.range (lib.min minPlatformVersionInt maxPlatformVersionInt) ( - lib.max minPlatformVersionInt maxPlatformVersionInt - ) + # Don't use the actual latest version in lieu of the rounded version here, + # since when Google upgrades it would have the nasty side effect of being + # unstable and picking 35 -> 36 -> 37 instead of 35 -> 36.1 -> 37. + # Best to stay consistent. + # + # However, if only one platform is requested and it's the latest (which is the default), + # we should use it. + if lib.length range == 1 then lib.singleton maxPlatformVersion' else range else + # Use numLatestPlatformVersions with a lower cutoff of minPlatformVersion (defaulting to 1) + # to determine how many of the latest *major* versions we should pick. let minPlatformVersionInt = if minPlatformVersion == null then @@ -116,8 +131,10 @@ in firstPlatformVersionInt = lib.max minPlatformVersionInt ( latestPlatformVersionInt - (lib.max 1 numLatestPlatformVersions) + 1 ); + range = lib.range firstPlatformVersionInt latestPlatformVersionInt; in - lib.range firstPlatformVersionInt latestPlatformVersionInt, + # Ditto, see above. + if lib.length range == 1 then lib.singleton repo.latest.platforms else range, includeSources ? false, includeSystemImages ? false, systemImageTypes ? [ @@ -144,7 +161,7 @@ in let # Resolve all the platform versions. - platformVersions' = map coerceIntVersion (parseVersions repo "platforms" platformVersions); + platformVersions' = parseVersions repo "platforms" platformVersions; # Determine the Android os identifier from Nix's system identifier os = @@ -220,28 +237,6 @@ let extras = fetchArchives repo.extras; }; - # Latest packages that are typically keyed by the API level. - archivesByApiLevel = - let - # Transforms the given attrset mapping API levels (with possible suffixes and minor versions) - # into the latest API level for each major version. - mkLatestByApiLevel = - packages: - lib.filterAttrs (_: value: value != null) ( - lib.mapAttrs ( - _: value: - (lib.findFirst (x: x.name == lib.versions.majorMinor x.name) { value = null; } ( - lib.lists.sort (x: y: lib.strings.versionOlder y.name x.name) value - )).value - ) (lib.groupBy (x: lib.versions.major x.name) (lib.attrsToList packages)) - ); - in - { - platforms = mkLatestByApiLevel allArchives.packages.platforms; - sources = mkLatestByApiLevel allArchives.packages.sources; - system-images = mkLatestByApiLevel allArchives.system-images; - }; - # Lift the archives to the package level for easy search, # and add recurseIntoAttrs to all of them. allPackages = @@ -547,17 +542,14 @@ lib.recurseIntoAttrs rec { platforms = map ( version: deployAndroidPackage { - package = checkVersion [ archivesByApiLevel allArchives.packages ] "platforms" version; + package = checkVersion allArchives.packages "platforms" version; } ) platformVersions'; - # This exposes the version strings (e.g. "36.1" for API 36). - platformVersionStrings = map (platform: platform.version) platforms; - sources = map ( version: deployAndroidPackage { - package = checkVersion [ archivesByApiLevel allArchives.packages ] "sources" version; + package = checkVersion allArchives.packages "sources" version; } ) platformVersions'; @@ -576,12 +568,7 @@ lib.recurseIntoAttrs rec { # ``` let availablePackages = - map - ( - abiVersion: - archivesByApiLevel.system-images.${toString apiVersion}.${type}.${abiVersion} - or allArchives.system-images.${toString apiVersion}.${type}.${abiVersion} - ) + map (abiVersion: allArchives.system-images.${toString apiVersion}.${type}.${abiVersion}) ( builtins.filter ( abiVersion: lib.hasAttrByPath [ (toString apiVersion) type abiVersion ] allArchives.system-images diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index 9c6d9ec60902..042ff4ef43d1 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -39,6 +39,8 @@ let }; */ + inherit (pkgs) lib; + # Otherwise, just use the in-tree androidenv: androidEnv = pkgs.callPackage ./.. { inherit pkgs licenseAccepted; @@ -77,10 +79,9 @@ let }; androidSdk = androidComposition.androidsdk; platformTools = androidComposition.platform-tools; - latestSdk = pkgs.lib.foldl' pkgs.lib.max 0 androidComposition.platformVersions; - latestSdkVersion = pkgs.lib.foldl' ( - s: x: if pkgs.lib.strings.compareVersions x s > 0 then x else s - ) "0" androidComposition.platformVersionStrings; + latestSdkVersion = lib.foldl' ( + s: x: if lib.strings.compareVersions (toString x) s > 0 then toString x else s + ) "0" androidComposition.platformVersions; jdk = pkgs.jdk; in pkgs.mkShell rec { @@ -129,7 +130,7 @@ pkgs.mkShell rec { "platform-tools" "platforms;android-${toString latestSdkVersion}" \ "system-images;android-${toString latestSdkVersion};google_apis;x86_64" ) - ${pkgs.lib.optionalString emulatorSupported ''packages+=("emulator")''} + ${lib.optionalString emulatorSupported ''packages+=("emulator")''} for package in "''${packages[@]}"; do if [[ ! $installed_packages_section =~ "$package" ]]; then @@ -154,7 +155,7 @@ pkgs.mkShell rec { installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}') excluded_packages=(ndk) - for x in $(seq 1 ${toString latestSdk}); do + for x in $(seq 1 ${lib.versions.major (toString latestSdkVersion)}); do excluded_packages+=( "platforms;android-$x" "sources;android-$x" @@ -182,7 +183,7 @@ pkgs.mkShell rec { ]; } ( - pkgs.lib.optionalString emulatorSupported '' + lib.optionalString emulatorSupported '' export ANDROID_USER_HOME=$PWD/.android mkdir -p $ANDROID_USER_HOME diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix index 58e7879dc3ee..353379aca50f 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix @@ -38,6 +38,8 @@ let }; */ + inherit (pkgs) lib; + # Otherwise, just use the in-tree androidenv: androidEnv = pkgs.callPackage ./.. { inherit pkgs licenseAccepted; @@ -48,7 +50,13 @@ let includeSystemImages = false; includeEmulator = false; - platformVersions = [ "latest" ]; + platformVersions = [ + "UpsideDownCake" + "36" + "36x" + "latest" + "CANARY" + ]; # Accepting more licenses declaratively: extraLicenses = [ @@ -70,7 +78,9 @@ let androidComposition = androidEnv.composeAndroidPackages sdkArgs; androidSdk = androidComposition.androidsdk; platformTools = androidComposition.platform-tools; - latestSdk = pkgs.lib.foldl' pkgs.lib.max 0 androidComposition.platformVersions; + latestSdkVersion = lib.foldl' ( + s: x: if lib.strings.compareVersions (toString x) s > 0 then toString x else s + ) "0" androidComposition.platformVersions; jdk = pkgs.jdk; in pkgs.mkShell { @@ -97,7 +107,6 @@ pkgs.mkShell { ''; passthru.tests = { - shell-without-emulator-sdkmanager-packages-test = pkgs.runCommand "shell-without-emulator-sdkmanager-packages-test" { @@ -113,7 +122,7 @@ pkgs.mkShell { packages=( "build-tools" "cmdline-tools" \ - "platform-tools" "platforms;android-${toString latestSdk}" + "platform-tools" "platforms;android-${toString latestSdkVersion}" ) for package in "''${packages[@]}"; do diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 7fc69c3c1ca8..5cf8383388f5 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -37,6 +37,8 @@ let }; */ + inherit (pkgs) lib; + # Otherwise, just use the in-tree androidenv: androidEnv = pkgs.callPackage ./.. { inherit pkgs licenseAccepted; @@ -109,8 +111,12 @@ let androidSdk = androidComposition.androidsdk; platformTools = androidComposition.platform-tools; - firstSdk = pkgs.lib.foldl' pkgs.lib.min 100 androidComposition.platformVersions; - latestSdk = pkgs.lib.foldl' pkgs.lib.max 0 androidComposition.platformVersions; + firstSdkVersion = lib.foldl' ( + s: x: if lib.strings.compareVersions (toString x) s < 0 then toString x else s + ) "100" androidComposition.platformVersions; + latestSdkVersion = lib.foldl' ( + s: x: if lib.strings.compareVersions (toString x) s > 0 then toString x else s + ) "0" androidComposition.platformVersions; jdk = pkgs.jdk; in pkgs.mkShell rec { @@ -181,15 +187,11 @@ pkgs.mkShell rec { "extras;google;gcm" ) - for x in $(seq ${toString firstSdk} ${toString latestSdk}); do - if [ $x -ne 34 ]; then - # FIXME couldn't find platforms;android-34, even though it's in the correct directory!! sdkmanager's bug?! - packages+=("platforms;android-$x") - fi + for x in $(seq ${toString firstSdkVersion} ${toString latestSdkVersion}); do packages+=("sources;android-$x") done - ${pkgs.lib.optionalString includeAuto ''packages+=("extras;google;auto")''} + ${lib.optionalString includeAuto ''packages+=("extras;google;auto")''} for package in "''${packages[@]}"; do if [[ ! $installed_packages_section =~ "$package" ]]; then From 6098679b4e96727e625e0800833ddd55b160cb39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 09:15:13 +0000 Subject: [PATCH 27/65] fabric-ai: 1.4.345 -> 1.4.357 --- pkgs/by-name/fa/fabric-ai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 42d20a27db7e..49b97f96ea7b 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.345"; + version = "1.4.357"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${version}"; - hash = "sha256-X4qdFSAO4bE3yVdpmq1r7rAEVAIOeQ4+YY/w4F86Fs8="; + hash = "sha256-h4BcHZHKseI+L3oabvLhs9NePZTZziQdBseYDSehJqc="; }; - vendorHash = "sha256-qWaMBhjt20WAIhDcjY4oOFBT+neJiXg0N2WsPasuHSU="; + vendorHash = "sha256-jseTLfBGUmwXz63+jTgv6k4RHh1cJVPQA/DI5OYlsdA="; # Fabric introduced plugin tests that fail in the nix build sandbox. doCheck = false; From bfacbb7fbacc7d5e7f07d01faaaab80fe48ab63f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 09:51:38 +0000 Subject: [PATCH 28/65] darkly: 0.5.29 -> 0.5.30 --- pkgs/by-name/da/darkly/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix index 7448ef850e7e..942b9e9a7942 100644 --- a/pkgs/by-name/da/darkly/package.nix +++ b/pkgs/by-name/da/darkly/package.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "darkly-qt${qtMajorVersion}"; - version = "0.5.29"; + version = "0.5.30"; src = fetchFromGitHub { owner = "Bali10050"; repo = "Darkly"; tag = "v${finalAttrs.version}"; - hash = "sha256-OT1QEHVcwz10ZUbEgvXnS/o28kvElKvswaJR6rW+PxI="; + hash = "sha256-REpIGNEntVGSffMhK1d3vz3QRfxjMiPpOLSuA1LOU74="; }; nativeBuildInputs = [ From e3b45e68c1ca8b7f812e05a28a96c7486cb5f1d6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 23 Dec 2025 10:04:55 +0000 Subject: [PATCH 29/65] python3Packages.datafusion: skip flaky test on darwin --- pkgs/development/python-modules/datafusion/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index 64d95c66e6e6..a9ca4e859d89 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, rustPlatform, @@ -73,6 +74,10 @@ buildPythonPackage rec { disabledTests = [ # Exception: DataFusion error (requires internet access) "test_register_http_csv" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Flaky: Failed: Query was not interrupted; got error: None + "test_collect_interrupted" ]; meta = { From e09cfc86a661ed21e283ea2ceca48754a1a81f53 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 22 Dec 2025 13:51:56 +0000 Subject: [PATCH 30/65] python3Packages.lancedb: unskip fixed test --- pkgs/development/python-modules/lancedb/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index 695014e408d0..cc87ea7c4a5c 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -105,12 +105,6 @@ buildPythonPackage rec { disabledTestMarks = [ "slow" ]; - disabledTests = [ - # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' - # https://github.com/lancedb/lancedb/issues/1539 - "test_polars" - ]; - disabledTestPaths = [ # touch the network "test_namespace_integration.py" From 3f6c674a0c0628c415f65862f8f4b0b24d6a9476 Mon Sep 17 00:00:00 2001 From: qzylinra <225773816+qzylinra@users.noreply.github.com> Date: Tue, 23 Dec 2025 19:46:14 +0800 Subject: [PATCH 31/65] flutter338: 3.38.4 -> 3.38.5 --- .../compilers/flutter/versions/3_38/data.json | 83 ++++++++++--------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json index 0e2ba5a70507..a398341749e3 100644 --- a/pkgs/development/compilers/flutter/versions/3_38/data.json +++ b/pkgs/development/compilers/flutter/versions/3_38/data.json @@ -1,68 +1,73 @@ { - "version": "3.38.4", - "engineVersion": "a5cb96369ef86c7e85abf5d662a1ca5d89775053", + "version": "3.38.5", + "engineVersion": "1527ae0ec577a4ef50e65f6fefcfc1326707d9bf", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "x86_64-linux": "sha256-ILLZMfXZ3p9fKMqyaectcaq9MCLWdEEoevKze+HDkyk=" + "aarch64-linux": "sha256-7eYbNWoKY9JYMAAJ+5cYPXnn15Mvahm6OeL0QVlhtXs=", + "x86_64-linux": "sha256-7eYbNWoKY9JYMAAJ+5cYPXnn15Mvahm6OeL0QVlhtXs=" + }, + "x86_64-linux": { + "aarch64-linux": "sha256-qrOzazP0ZrrzBpkt5dDJIFrHDvoLYcXOR6BqKxgr+h8=", + "x86_64-linux": "sha256-qrOzazP0ZrrzBpkt5dDJIFrHDvoLYcXOR6BqKxgr+h8=" } }, - "dartVersion": "3.10.3", + "dartVersion": "3.10.4", "dartHash": { - "x86_64-linux": "sha256-6Ov/vyLRHKVaUQ7cQPWUC44Rz/jUo0UpsYKXtnBz0wM=", - "aarch64-linux": "sha256-gxmQJaaBwcfjdYDCeFJM49AK9ZMRRV2JY7ME5xwpSMA=", - "x86_64-darwin": "sha256-UbNAcVUGsbNGnPpmFt/49vJcAXLpcZp7rSFiR7yJZMo=", - "aarch64-darwin": "sha256-Mb8sgvT6UsSmoGhh5tcqjRXcnDQPCXl/0SOon9jVNBM=" + "x86_64-linux": "sha256-ZePB4yLGh5TJVrgXPTv6EY1l5uHhpnD6j8AaErWVP8c=", + "aarch64-linux": "sha256-ALgFAnqBXK9NalTnypszhEz+yoUdW8nWU2IN6gWyOBI=", + "x86_64-darwin": "sha256-d3Q0hxTu5Q0i3XxKc7HMvq1X8gpHm744Q8HCh/E6JS8=", + "aarch64-darwin": "sha256-ha0VitYy4MIZE3U+Vy3bbZiH+0BAetH8CmPMmV8RRUQ=" }, - "flutterHash": "sha256-HuFi01uUgYFfghe5h7/Y6LoF6ikQGEXg0v9wTGeURvw=", + "flutterHash": "sha256-qIvmxEUHtahABuPFUR+JWfg6yHgNK/i//tnDCZ/aFTE=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-bzQDGeHb/RA4+t80TMTKExGutKXOeS2NoaMjE0nUnT4=", - "aarch64-linux": "sha256-hoFcKAv51lvwhreiEuOq4wbAGXPGIDDMyUrCGWbH+LQ=", - "x86_64-darwin": "sha256-bzQDGeHb/RA4+t80TMTKExGutKXOeS2NoaMjE0nUnT4=", - "x86_64-linux": "sha256-hoFcKAv51lvwhreiEuOq4wbAGXPGIDDMyUrCGWbH+LQ=" + "aarch64-darwin": "sha256-G3wi3eSoTKsiLw/GanLX62xMwjT5hVhbDZhhAUe9J7Q=", + "aarch64-linux": "sha256-uCtzsKrJtL6USbTS8z3xizoUJmxJuLq1fBDAT/exzOQ=", + "x86_64-darwin": "sha256-G3wi3eSoTKsiLw/GanLX62xMwjT5hVhbDZhhAUe9J7Q=", + "x86_64-linux": "sha256-uCtzsKrJtL6USbTS8z3xizoUJmxJuLq1fBDAT/exzOQ=" }, "fuchsia": { - "aarch64-darwin": "sha256-FKjIaWi5z7D+DMgJ1ZBOxawyGMSNdJewshiKjKy6wL8=", - "aarch64-linux": "sha256-FKjIaWi5z7D+DMgJ1ZBOxawyGMSNdJewshiKjKy6wL8=", - "x86_64-darwin": "sha256-FKjIaWi5z7D+DMgJ1ZBOxawyGMSNdJewshiKjKy6wL8=", - "x86_64-linux": "sha256-FKjIaWi5z7D+DMgJ1ZBOxawyGMSNdJewshiKjKy6wL8=" + "aarch64-darwin": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=", + "aarch64-linux": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=", + "x86_64-darwin": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=", + "x86_64-linux": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=" }, "ios": { - "aarch64-darwin": "sha256-ifkntEB5z3ZF0PJXAFOQyiM85NFHFwhS576/LTOJX4s=", - "aarch64-linux": "sha256-ifkntEB5z3ZF0PJXAFOQyiM85NFHFwhS576/LTOJX4s=", - "x86_64-darwin": "sha256-ifkntEB5z3ZF0PJXAFOQyiM85NFHFwhS576/LTOJX4s=", - "x86_64-linux": "sha256-ifkntEB5z3ZF0PJXAFOQyiM85NFHFwhS576/LTOJX4s=" + "aarch64-darwin": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=", + "aarch64-linux": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=", + "x86_64-darwin": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=", + "x86_64-linux": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=" }, "linux": { - "aarch64-darwin": "sha256-2/Te39U1JFMZp1eOvXdilOcxr2MldG56Rtf4yN2mB1A=", - "aarch64-linux": "sha256-2/Te39U1JFMZp1eOvXdilOcxr2MldG56Rtf4yN2mB1A=", - "x86_64-darwin": "sha256-SztFHRYhuuDHnD8YHX/V4CCZe2gSA3Y0iHZKfdPSnWU=", - "x86_64-linux": "sha256-SztFHRYhuuDHnD8YHX/V4CCZe2gSA3Y0iHZKfdPSnWU=" + "aarch64-darwin": "sha256-AzRBBnfcJ/AipXsvX3DO+D2bSy7dzooWXvAEOsj4Jsw=", + "aarch64-linux": "sha256-AzRBBnfcJ/AipXsvX3DO+D2bSy7dzooWXvAEOsj4Jsw=", + "x86_64-darwin": "sha256-IFHSkU99MKm9WSMCtR+uDfYX/UdgxzF3kYRdyHzAEO8=", + "x86_64-linux": "sha256-IFHSkU99MKm9WSMCtR+uDfYX/UdgxzF3kYRdyHzAEO8=" }, "macos": { - "aarch64-darwin": "sha256-hJvArMT4lEkD6dQeCMsN6E6+CPdvZn+SRRsyWId3HI8=", - "aarch64-linux": "sha256-hJvArMT4lEkD6dQeCMsN6E6+CPdvZn+SRRsyWId3HI8=", - "x86_64-darwin": "sha256-hJvArMT4lEkD6dQeCMsN6E6+CPdvZn+SRRsyWId3HI8=", - "x86_64-linux": "sha256-hJvArMT4lEkD6dQeCMsN6E6+CPdvZn+SRRsyWId3HI8=" + "aarch64-darwin": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=", + "aarch64-linux": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=", + "x86_64-darwin": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=", + "x86_64-linux": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=" }, "universal": { - "aarch64-darwin": "sha256-5e70BNMP5Gv+HM1WJEGyY2UFEf883y2lCbizbbxdoDM=", - "aarch64-linux": "sha256-VBkvDDHBDXxv69R3RXTMlmP29+vJCEq8/u9wlT60ib4=", - "x86_64-darwin": "sha256-+sgwalym3dreG8f8GYgSqIMjLK6yYPMOs74iyMk/y04=", - "x86_64-linux": "sha256-ugQmK2LbpF1v3v1Cd3VAFc6g/+NYEB/LcoZNp4FKCkA=" + "aarch64-darwin": "sha256-/hyLfGgHWAHE5W7IM533RMmqRLceSKBOEsC3t71cSQA=", + "aarch64-linux": "sha256-you7n+Z1uhZ1ZP1abSFGaUPZIcNstdz9Q6omn5F15z4=", + "x86_64-darwin": "sha256-wp5rokG074cPBFV5hzEpCumeatZ7Zsrp49b9imSNTyQ=", + "x86_64-linux": "sha256-8Sf61AZe+lMiXi2+R039tYKG9Y3/s5NxZIO65AehymU=" }, "web": { - "aarch64-darwin": "sha256-go3VRPPT1iwPJeh2WV/Q2nuPDOotkukR2B8d0ltF7To=", - "aarch64-linux": "sha256-go3VRPPT1iwPJeh2WV/Q2nuPDOotkukR2B8d0ltF7To=", - "x86_64-darwin": "sha256-go3VRPPT1iwPJeh2WV/Q2nuPDOotkukR2B8d0ltF7To=", - "x86_64-linux": "sha256-go3VRPPT1iwPJeh2WV/Q2nuPDOotkukR2B8d0ltF7To=" + "aarch64-darwin": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=", + "aarch64-linux": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=", + "x86_64-darwin": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=", + "x86_64-linux": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=" }, "windows": { - "x86_64-darwin": "sha256-CSaPe7IX34uTOJOHnRlGNujs4LoFWDGvNzHWlPjCzqE=", - "x86_64-linux": "sha256-CSaPe7IX34uTOJOHnRlGNujs4LoFWDGvNzHWlPjCzqE=" + "x86_64-darwin": "sha256-NkkcN9NTL8fQQqBldg0BDZvmg3f+BBMqyMq+X3SZaq0=", + "x86_64-linux": "sha256-NkkcN9NTL8fQQqBldg0BDZvmg3f+BBMqyMq+X3SZaq0=" } }, "pubspecLock": { From a5327dacc1f5ee19a4c33e293ef9fdf21ad82cdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 11:51:13 +0000 Subject: [PATCH 32/65] terraform-providers.hashicorp_azurerm: 4.56.0 -> 4.57.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 75e2ad6947de..838890d2a4b1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -526,11 +526,11 @@ "vendorHash": null }, "hashicorp_azurerm": { - "hash": "sha256-C/uh67joPBOaPZ/9q4KdxSIb8KF4tU0j6j2Uw6n5XvU=", + "hash": "sha256-aLBq+kMycLom6a+R5R+FxXzohHTX4yUHANXA1NGQ51k=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.56.0", + "rev": "v4.57.0", "spdx": "MPL-2.0", "vendorHash": null }, From f1f8826bd6eb611447d2ecef0ea18de0164debdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 12:02:36 +0000 Subject: [PATCH 33/65] terraform-providers.aviatrixsystems_aviatrix: 8.1.10 -> 8.2.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 75e2ad6947de..8bddb41fb476 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -82,11 +82,11 @@ "vendorHash": "sha256-2UfA1QHpVgRKi6PtZ5cHHuO4m5cN6KWlLt3hmPca6HY=" }, "aviatrixsystems_aviatrix": { - "hash": "sha256-V1JRVOMHQu5KlPFw7q/qZuHlJjdVSQotI9w7s88v8GM=", + "hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v8.1.10", + "rev": "v8.2.0", "spdx": "MPL-2.0", "vendorHash": null }, From 9d98fafe633a83db33b398d2eb4e7d8525521fb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 12:05:39 +0000 Subject: [PATCH 34/65] libretro-shaders-slang: 0-unstable-2025-12-13 -> 0-unstable-2025-12-22 --- pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index ecfcd6409ff9..b02a921ff74d 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-12-13"; + version = "0-unstable-2025-12-22"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "b80bba0c71e98250717acc5f4e6b9bb9f75bd091"; - hash = "sha256-CSe7tP8N1ubZ5igjoLpi/w3XmbH3tGpbjBfI4i9pd5o="; + rev = "92ec9ff8c2d53d397b6d943788c748c073ee1fe8"; + hash = "sha256-p2CmXbgd0oKibZa2PiS3xI6KXfsIWtJ+QyvLrc9PFWY="; }; dontConfigure = true; From 9f3584cf2c317049fe2ca0af5c31564c651cf9e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 12:21:53 +0000 Subject: [PATCH 35/65] wgpu-native: 27.0.2.0 -> 27.0.4.0 --- pkgs/by-name/wg/wgpu-native/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix index 0ac8d12ce6ed..9442c26b82df 100644 --- a/pkgs/by-name/wg/wgpu-native/package.nix +++ b/pkgs/by-name/wg/wgpu-native/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wgpu-native"; - version = "27.0.2.0"; + version = "27.0.4.0"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu-native"; tag = "v${finalAttrs.version}"; - hash = "sha256-sJEDCt8DTP6FjtbROVCZVD0we0OA07wjkiLnXoQfTuc="; + hash = "sha256-XOT6Wx5TfbFzwcSjoyqUwv7mbN0RShaMf99qADmCKxg="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "dev" ]; - cargoHash = "sha256-ZQiX7IZsbjlDzRNlYgpRnLfCKGAYnSwvACRMNkZPjbE="; + cargoHash = "sha256-PZHS2lUX6PbIG1xF6jhreGjdtCbS/GWeY1pHhRPo2aU="; nativeBuildInputs = [ rustPlatform.bindgenHook From d6940654f13d0341297f4b163a94d9c62e98ced8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 23 Dec 2025 12:25:21 +0000 Subject: [PATCH 36/65] radicle-node: cap test threads to fix timing-sensitive tests The rad_init_sync_preferred test has a 5-second timeout waiting for RefsSynced events. On loaded builders with many parallel tests, this timeout can be exceeded causing test failures. Cap RUST_TEST_THREADS to 4 (or NIX_BUILD_CORES if lower) to reduce contention and give timing-sensitive sync tests a better chance of completing within their timeouts. --- pkgs/by-name/ra/radicle-node/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index ee91336d5ada..e9a0806c5fa2 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -67,6 +67,12 @@ rustPlatform.buildRustPackage (finalAttrs: { export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release # Tests want to open many files. ulimit -n 4096 + # Cap test threads to avoid timing issues on loaded builders (sync timeout is 5s) + max_threads=4 + if [[ -n "$NIX_BUILD_CORES" && "$NIX_BUILD_CORES" -lt "$max_threads" ]]; then + max_threads=$NIX_BUILD_CORES + fi + export RUST_TEST_THREADS=$max_threads ''; checkFlags = [ "--skip=service::message::tests::test_node_announcement_validate" From 81467635743245ca8232c6039c05d7ce8aba8ad9 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 12 Sep 2025 18:18:50 +0200 Subject: [PATCH 37/65] nixos/ec2-data.nix: Print whole host pubkeys This prints the whole host public keys in the same format as cloud-init. The main benefit is that this allows the direct generation of a known_hosts file, simplifying client setup. This commit also provides a new NixOS test that's an alternative to the currently broken nixos/tests/ec2.nix tests. --- .../maintainers/scripts/ec2/amazon-image.nix | 1 + nixos/modules/virtualisation/ec2-data.nix | 16 ++ .../virtualisation/ec2-metadata-fetcher.sh | 2 +- nixos/tests/all-tests.nix | 1 + nixos/tests/ec2-image.nix | 263 ++++++++++++++++++ 5 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/ec2-image.nix diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index e0bb2b6d50ef..9ce667a30995 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -1,3 +1,4 @@ +# Tests in: nixos/tests/ec2-image.nix { config, lib, diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index f1b3dfe1bbad..2fe128a70caf 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -1,3 +1,5 @@ +# Tests in: nixos/tests/ec2-image.nix + # This module defines a systemd service that sets the SSH host key and # authorized client key and host name of virtual machines running on # Amazon EC2, Eucalyptus and OpenStack Compute (Nova). @@ -85,11 +87,25 @@ with lib; # Print the host public key on the console so that the user # can obtain it securely by parsing the output of # ec2-get-console-output. + # + # Format follows cloud-init conventions. The delimiters are based on: + # - cloud-init write-ssh-key-fingerprints tool: + # https://github.com/canonical/cloud-init/blob/main/tools/write-ssh-key-fingerprints + # + # FINGERPRINTS section: for pre-26.05 tooling and human interactive consumption echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console for i in /etc/ssh/ssh_host_*_key.pub; do ${config.programs.ssh.package}/bin/ssh-keygen -l -f "$i" > /dev/console || true done echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console + + # KEYS section: full public keys for provisioning tools + # Keys can be converted directly into SSH known_hosts files + echo "-----BEGIN SSH HOST KEY KEYS-----" > /dev/console + for i in /etc/ssh/ssh_host_*_key.pub; do + cat "$i" > /dev/console + done + echo "-----END SSH HOST KEY KEYS-----" > /dev/console ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.sh b/nixos/modules/virtualisation/ec2-metadata-fetcher.sh index 66a05e7a436f..3035b0bdd8f2 100644 --- a/nixos/modules/virtualisation/ec2-metadata-fetcher.sh +++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.sh @@ -42,7 +42,7 @@ while [ $try -le 3 ]; do done if [ "$IMDS_TOKEN" == "" ]; then - echo "failed to fetch an IMDS2v token." + echo "failed to fetch an IMDSv2 token." fi try=1 diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b63cdd007f82..0cc6942f10db 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -498,6 +498,7 @@ in earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix; easytier = runTest ./easytier.nix; ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { }; + ec2-image = runTest ./ec2-image.nix; ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { }; echoip = runTest ./echoip.nix; ecryptfs = runTest ./ecryptfs.nix; diff --git a/nixos/tests/ec2-image.nix b/nixos/tests/ec2-image.nix new file mode 100644 index 000000000000..f3aa68b9b1e1 --- /dev/null +++ b/nixos/tests/ec2-image.nix @@ -0,0 +1,263 @@ +# Run with: +# cd nixpkgs +# nix-build -A nixosTests.ec2-image + +{ + config, + lib, + hostPkgs, + ... +}: + +let + inherit (lib) mkAfter mkForce; + pkgs = config.node.pkgs; + + # Build an EC2 image configuration + imageCfg = + (import ../lib/eval-config.nix { + system = null; + modules = [ + ../maintainers/scripts/ec2/amazon-image.nix + ../modules/testing/test-instrumentation.nix + ../modules/profiles/qemu-guest.nix + { + amazonImage.format = "qcow2"; + + # In a NixOS test the serial console is occupied by the "backdoor" + # (see testing/test-instrumentation.nix) and is incompatible with + # the configuration in virtualisation/amazon-image.nix. + systemd.services."serial-getty@ttyS0".enable = mkForce false; + + # Make /dev/console point to serial console for proper capture + # test-instrumentation.nix adds console=tty0, so we need to add console=ttyS0 AFTER it + # The last console= parameter takes precedence for /dev/console + boot.kernelParams = mkAfter [ "console=ttyS0" ]; + + # Configure VLAN networking to match test framework setup + networking.interfaces.eth0 = { + ipv4.addresses = [ + { + address = config.nodes.machine.networking.primaryIPAddress; + prefixLength = 24; + } + ]; + }; + + nixpkgs.pkgs = pkgs; + } + ]; + }).config; + + image = "${imageCfg.system.build.amazonImage}/${imageCfg.image.fileName}"; + +in +{ + name = "ec2-image"; + meta = { + maintainers = with lib.maintainers; [ + roberth + arianvp + ]; + timeout = 600; + }; + nodes = { + machine = { ... }: { }; # Dummy node for network config - won't be launched + client = + { ... }: + { + # Configure SSH client for non-interactive, strict authentication + programs.ssh.extraConfig = '' + Host * + PasswordAuthentication no + ChallengeResponseAuthentication no + HostbasedAuthentication no + BatchMode yes + PubkeyAuthentication yes + StrictHostKeyChecking yes + ''; + }; + }; + + testScript = '' + import os + import re + import subprocess + import tempfile + + # Instance Metadata Service (IMDSv2 with 1.0 metadata version) + # TODO: Use 'latest' metadata version instead of '1.0' + # - Consider https://github.com/aws/amazon-ec2-metadata-mock + # - Blocked on https://github.com/aws/amazon-ec2-metadata-mock/issues/234 + # - Consider https://github.com/purpleclay/imds-mock + # - [Test matrix] also test providing the host key through IMDS + # - i.e. a test module argument to select between writing or reading the host key + def create_ec2_metadata_dir(temp_dir, client_pubkey): + """Create fake EC2 metadata directory structure with mock data""" + metadata_dir = os.path.join(temp_dir.name, "ec2-metadata") + + # Create directory structure + os.makedirs(os.path.join(metadata_dir, "1.0", "meta-data", "public-keys", "0"), exist_ok=True) + os.makedirs(os.path.join(metadata_dir, "latest", "api"), exist_ok=True) + + # Metadata version 1.0 endpoints (what fetch-ec2-metadata.sh actually fetches) + with open(os.path.join(metadata_dir, "1.0", "meta-data", "hostname"), "w") as f: + f.write("test-instance") + with open(os.path.join(metadata_dir, "1.0", "meta-data", "ami-manifest-path"), "w") as f: + f.write("(test)") + with open(os.path.join(metadata_dir, "1.0", "meta-data", "instance-id"), "w") as f: + f.write("i-1234567890abcdef0") + with open(os.path.join(metadata_dir, "1.0", "user-data"), "w") as f: + f.write("") + with open(os.path.join(metadata_dir, "1.0", "meta-data", "public-keys", "0", "openssh-key"), "w") as f: + f.write(client_pubkey) + + # IMDSv2 token endpoint - return a fake token + with open(os.path.join(metadata_dir, "latest", "api", "token"), "w") as f: + f.write("test-token-12345") + + return metadata_dir + + def generate_client_ssh_key(): + """Generate SSH key pair on VM host for client authentication""" + # Use temporary directory for key generation + import tempfile + with tempfile.TemporaryDirectory() as key_dir: + private_key = os.path.join(key_dir, "id_ed25519") + public_key = os.path.join(key_dir, "id_ed25519.pub") + + # Generate key pair using host SSH tools + ret = os.system(f"${hostPkgs.openssh}/bin/ssh-keygen -t ed25519 -f {private_key} -N \"\"") + if ret != 0: + raise Exception("Failed to generate SSH key pair") + + # Read the generated public key + with open(public_key, "r") as f: + client_pubkey = f.read().strip() + + # Read the private key + with open(private_key, "r") as f: + client_private_key = f.read() + + return client_pubkey, client_private_key + + def setup_client_ssh_key(client, client_private_key): + """Install the pre-generated SSH private key on client""" + client.succeed("mkdir -p /root/.ssh") + client.succeed(f"cat > /root/.ssh/id_ed25519 << 'EOF'\n{client_private_key}\nEOF") + client.succeed("chmod 600 /root/.ssh/id_ed25519") + + def setup_machine(temp_dir, client_pubkey): + """Initialize EC2 machine with disk image, metadata server, and networking""" + # Set up disk image + image_dir = os.path.join( + os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine" + ) + os.makedirs(image_dir, mode=0o700, exist_ok=True) + disk_image = os.path.join(image_dir, "machine.qcow2") + subprocess.check_call([ + "qemu-img", "create", "-f", "qcow2", "-F", "qcow2", + "-o", "backing_file=${image}", disk_image + ]) + subprocess.check_call(["qemu-img", "resize", disk_image, "10G"]) + + # Create fake EC2 metadata in temporary directory with client's public key + metadata_dir = create_ec2_metadata_dir(temp_dir, client_pubkey) + + # Add both VLAN networking (matching test framework) and EC2 metadata server + vlan_net = ( + " -device virtio-net-pci,netdev=vlan1,mac=52:54:00:12:01:02" + + ' -netdev vde,id=vlan1,sock="$QEMU_VDE_SOCKET_1"' + ) + metadata_net = ( + " -device virtio-net-pci,netdev=ec2meta" + + f" -netdev 'user,id=ec2meta,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd {metadata_dir}'" + ) + + start_command = ( + "qemu-kvm -m 1024" + + f" -drive file={disk_image},if=virtio,werror=report" + + vlan_net + + metadata_net + + " $QEMU_OPTS" + ) + + return create_machine(start_command) + + # Create temporary directory for metadata (scoped for cleanup) + temp_dir = tempfile.TemporaryDirectory() + + # Start client first (but don't wait for it to boot) + client.start() + + # Generate SSH key pair on VM host before starting machine + client_pubkey, client_private_key = generate_client_ssh_key() + + # Set up machine with client's public key in metadata service + machine = setup_machine(temp_dir, client_pubkey) + + try: + machine.start() + + # Wait for services to be ready + machine.wait_for_unit("sshd.service") + machine.wait_for_unit("print-host-key.service") + machine.wait_for_unit("apply-ec2-data.service") + + # Extract shared variables outside subtests + machine_ip = "${config.nodes.machine.networking.primaryIPAddress}" + + with subtest("EC2 metadata service connectivity"): + hostname_response = machine.succeed("curl --fail -s http://169.254.169.254/1.0/meta-data/hostname") + assert "test-instance" in hostname_response, f"Expected 'test-instance', got: {hostname_response}" + + with subtest("SSH host key extraction from console"): + console_log = machine.get_console_log() + assert "-----BEGIN SSH HOST KEY FINGERPRINTS-----" in console_log + assert "-----END SSH HOST KEY FINGERPRINTS-----" in console_log + assert "-----BEGIN SSH HOST KEY KEYS-----" in console_log + assert "-----END SSH HOST KEY KEYS-----" in console_log + + keys_pattern = r"-----BEGIN SSH HOST KEY KEYS-----(.*?)-----END SSH HOST KEY KEYS-----" + keys_match = re.search(keys_pattern, console_log, re.DOTALL) + assert keys_match, "Could not find SSH host keys section" + keys_content = keys_match.group(1).strip() + assert "ssh-" in keys_content, "SSH keys should contain ssh- prefix" + + with subtest("Network connectivity"): + client.succeed(f"ping -c 1 {machine_ip}") + + with subtest("SSH connectivity with strict host key checking"): + # Install the pre-generated private key on client + setup_client_ssh_key(client, client_private_key) + + # Get console log and extract host keys + console_log = machine.get_console_log() + keys_pattern = r"-----BEGIN SSH HOST KEY KEYS-----(.*?)-----END SSH HOST KEY KEYS-----" + keys_match = re.search(keys_pattern, console_log, re.DOTALL) + assert keys_match, "Could not find SSH host keys section" + + # Create known_hosts file from console-extracted host keys + keys_content = keys_match.group(1).strip() + known_hosts_entries = [] + for line in keys_content.split('\n'): + if line.strip() and line.startswith('ssh-'): + known_hosts_entries.append(f"{machine_ip} {line.strip()}") + + assert known_hosts_entries, "No SSH host keys found for known_hosts generation" + + known_hosts_content = '\n'.join(known_hosts_entries) + client.succeed(f"cat > /root/.ssh/known_hosts << 'EOF'\n{known_hosts_content}\nEOF") + + # Test SSH connectivity with strict host key checking + ssh_result = client.succeed(f"ssh -o ConnectTimeout=60 -o BatchMode=yes -i /root/.ssh/id_ed25519 root@{machine_ip} 'echo Hello from $(hostname)'") + assert "Hello from test-instance" in ssh_result, f"Unexpected SSH result: {ssh_result}" + + with subtest("Basic EC2 functionality"): + machine.succeed("findmnt / -o SIZE -n | grep -E '[0-9]+G'") + + finally: + machine.shutdown() + temp_dir.cleanup() + ''; +} From a41d898d29a89e45719613968278ab389c9bee44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 12:44:13 +0000 Subject: [PATCH 38/65] python3Packages.pyoxigraph: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/pyoxigraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyoxigraph/default.nix b/pkgs/development/python-modules/pyoxigraph/default.nix index 84b42ace2a53..e1b5f5f6efba 100644 --- a/pkgs/development/python-modules/pyoxigraph/default.nix +++ b/pkgs/development/python-modules/pyoxigraph/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "pyoxigraph"; pyproject = true; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "oxigraph"; repo = "oxigraph"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-ptTrJbLGS7GkLGO40mbpdPkrcspaUE33kRZ8g9Qtb0o="; + hash = "sha256-hIB4/6D7AogEpNYyB95nDotspUyaiOW8X6KuVgyjj5Y="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-AuUGra9ejPRKWWpXWLmcwGuZRKIuCYTdifpnwuuHnnQ="; + hash = "sha256-EhJQgYeeSln1bLLH3nEUFJ7q+PWA/DHAswh4ei4bHWY="; }; buildAndTestSubdir = "python"; From f94abb3afd3041f959562e56dae986fd8da1f676 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 23 Dec 2025 10:03:13 +0000 Subject: [PATCH 39/65] python3Packages.lancedb: skip flaky test on darwin --- pkgs/development/python-modules/lancedb/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index cc87ea7c4a5c..b459987f25c1 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -105,6 +105,13 @@ buildPythonPackage rec { disabledTestMarks = [ "slow" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # Flaky (even when the sandbox is disabled): + # FileNotFoundError: [Errno 2] Cannot delete directory '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts': + # Cannot get information for path '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts/.tmppyKXfw' + "test_create_index_from_table" + ]; + disabledTestPaths = [ # touch the network "test_namespace_integration.py" From 3e4e1fd55b7025ed30bad40b537682ac8cde1e63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 14:33:45 +0000 Subject: [PATCH 40/65] terraform-providers.temporalio_temporalcloud: 1.1.1 -> 1.1.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 75e2ad6947de..c5267ce6aa68 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1301,13 +1301,13 @@ "vendorHash": "sha256-Hzq97ElAjs7Y4tmJ2x7+g4j74MEdEvI2bD8pkvi5ZXg=" }, "temporalio_temporalcloud": { - "hash": "sha256-hHHZ+5LF5AoDB2JZyPRce6oEtOZOGi8lYNgbTlAqTuA=", + "hash": "sha256-Lwb/T2yz8/hfV8/WrD/AXunoUNg/QbF9VzWtxSBlUX0=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v1.1.1", + "rev": "v1.1.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14=" + "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o=" }, "tencentcloudstack_tencentcloud": { "hash": "sha256-VpaGrpwILnJroZ+4mAM9eVhxXAUl8QMShAwgCzNAi4Q=", From 8cc1e7887be75f69defe342869f4f28e9e32493a Mon Sep 17 00:00:00 2001 From: dish Date: Sun, 14 Dec 2025 17:33:26 -0500 Subject: [PATCH 41/65] mdbook-cmdrun: use nodejs, not nodePackages.nodejs --- pkgs/by-name/md/mdbook-cmdrun/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/md/mdbook-cmdrun/package.nix b/pkgs/by-name/md/mdbook-cmdrun/package.nix index a82528518412..125056be57e0 100644 --- a/pkgs/by-name/md/mdbook-cmdrun/package.nix +++ b/pkgs/by-name/md/mdbook-cmdrun/package.nix @@ -1,7 +1,7 @@ { lib, mdbook, - nodePackages, + nodejs, python3, util-linux, rustPlatform, @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { nativeCheckInputs = [ mdbook # used by tests/book.rs - nodePackages.nodejs # used by tests/regression/inline_call/input.md + nodejs # used by tests/regression/inline_call/input.md python3 # used by tests/regression/py_* util-linux # used by tests/regression/shell/input.md ]; From 94c6a8236ca536d236b1947f0e187acf56330439 Mon Sep 17 00:00:00 2001 From: dish Date: Sun, 14 Dec 2025 17:33:36 -0500 Subject: [PATCH 42/65] mealie: use nodejs, not nodePackages.nodejs --- pkgs/by-name/me/mealie/mealie-frontend.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index 5db17c2706ba..4b67cb496852 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -4,15 +4,12 @@ src: version: fetchFromGitHub, fetchYarnDeps, dart-sass, - nodePackages_latest, + nodejs, fixup-yarn-lock, stdenv, yarn, writableTmpDirAsHomeHook, }: -let - nodejs = nodePackages_latest.nodejs; -in stdenv.mkDerivation { name = "mealie-frontend"; inherit version; From e199adee2372c7f7d718aafb9188467105853688 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 17:19:49 +0000 Subject: [PATCH 43/65] terraform-providers.huaweicloud_huaweicloud: 1.82.2 -> 1.82.4 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 75e2ad6947de..8c6fe3762077 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -715,11 +715,11 @@ "vendorHash": "sha256-BUxnKxr0htpdSSTMzb3ix1nNlX7PTBv38ozDjnZ2eK8=" }, "huaweicloud_huaweicloud": { - "hash": "sha256-7Wj+JinSLsz+4UNaAM1YOQ6obGIrpctlD6BPAPpnSHQ=", + "hash": "sha256-MQq3fbDXJdULy0xutWmWRmgKa3STny3qsklxgL/z/28=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.82.2", + "rev": "v1.82.4", "spdx": "MPL-2.0", "vendorHash": null }, From 6d6bbe949b35a0d6b76faa7f38786b103d133201 Mon Sep 17 00:00:00 2001 From: locnide Date: Sun, 7 Dec 2025 19:45:35 +0100 Subject: [PATCH 44/65] maintainers: add locnide --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 418a048b1b62..0d26b97d639e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15071,6 +15071,12 @@ name = "Jan Schmitt"; keys = [ { fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991"; } ]; }; + locnide = { + email = "locnide@alpaga.dev"; + github = "locnide"; + githubId = 49921473; + name = "locnide"; + }; locochoco = { email = "contact@locochoco.dev"; github = "loco-choco"; From 8e4f748779b01426579e08a7d07ba2e03b22d04b Mon Sep 17 00:00:00 2001 From: locnide Date: Sat, 29 Nov 2025 00:21:10 +0100 Subject: [PATCH 45/65] furtherance: 1.8.3 -> 25.3.0 --- pkgs/by-name/fu/furtherance/package.nix | 79 +++++++++++++------------ 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix index b6ba69081280..112f4107ebd2 100644 --- a/pkgs/by-name/fu/furtherance/package.nix +++ b/pkgs/by-name/fu/furtherance/package.nix @@ -3,63 +3,68 @@ stdenv, fetchFromGitHub, rustPlatform, - appstream-glib, - cargo, - desktop-file-utils, - glib, - libadwaita, - meson, - ninja, + fontconfig, + libxkbcommon, + openssl, pkg-config, - rustc, - wrapGAppsHook4, - dbus, - gtk4, - sqlite, + xorg, + vulkan-loader, + wayland, }: - -stdenv.mkDerivation (finalAttrs: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "furtherance"; - version = "1.8.3"; + version = "25.3.0"; src = fetchFromGitHub { - owner = "lakoliu"; + owner = "unobserved-io"; repo = "Furtherance"; - rev = "v${finalAttrs.version}"; - hash = "sha256-TxYARpCqqjjwinoRU2Wjihp+FYIvcI0YCGlOuumX6To="; + rev = finalAttrs.version; + hash = "sha256-LyGO+fbsu16Us0+sK0T6HlGq7EwZWSetd+gCIKKEbkk="; }; - cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) pname version src; - hash = "sha256-SFp9YCmneOll2pItWmg2b2jrpRqPnvV9vwz4mjjvwM4="; - }; + cargoHash = "sha256-j/5O40k12rl/gmRc1obo9ImdkZ0Mdrke2PCf6tFCWIo="; nativeBuildInputs = [ - appstream-glib - desktop-file-utils - meson - ninja pkg-config - rustPlatform.cargoSetupHook - cargo - rustc - wrapGAppsHook4 ]; buildInputs = [ - dbus - glib - gtk4 - libadwaita - sqlite + fontconfig + openssl + libxkbcommon + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcursor + xorg.libXi + vulkan-loader + wayland ]; + checkFlags = [ + # panicked at src/tests/timer_tests.rs:30:9 + "--skip=tests::timer_tests::timer_tests::test_split_task_input_basic" + ]; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf $out/bin/${finalAttrs.pname} \ + --add-rpath ${ + lib.makeLibraryPath [ + vulkan-loader + libxkbcommon + wayland + ] + } + ''; + meta = { description = "Track your time without being tracked"; mainProgram = "furtherance"; - homepage = "https://github.com/lakoliu/Furtherance"; + homepage = "https://github.com/unobserved-io/Furtherance"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ CaptainJawZ ]; + maintainers = with lib.maintainers; [ + CaptainJawZ + locnide + ]; }; }) From cbd09c66a594f62566d2f4fbfaf2d1297cecc0fb Mon Sep 17 00:00:00 2001 From: okt Date: Tue, 23 Dec 2025 10:57:10 -0700 Subject: [PATCH 46/65] nixos/btrfs: use algorithm names instead of kernel module names The canonical names of kernel crypto modules are not stable across versions. Use the algorithm names from btrfs softdeps instead, which the kernel will resolve to the appropriate modules. Previously: xxhash_generic, blake2b_generic, sha256_generic Now: xxhash64, blake2b-256, sha256 This fixes initrd builds on kernel 6.19+ where blake2b_generic was renamed to blake2b, and is more resilient to future module renames. See: https://github.com/torvalds/linux/blob/v6.19-rc1/fs/btrfs/super.c#L2705-L2708 --- nixos/modules/tasks/filesystems/btrfs.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 9d3039fccbfb..1cff79f887b6 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -89,12 +89,11 @@ in "crc32c" ] ++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [ - # Needed for mounting filesystems with new checksums - "xxhash_generic" - "blake2b_generic" - - # `sha256` is always available, whereas `sha256_generic` is not available from 6.17 onwards + # The canonical names of these modules are not very stable, so use the algorithm names that the btrfs module expects. + # See: https://github.com/torvalds/linux/blob/v6.19-rc1/fs/btrfs/super.c#L2705-L2708 + "xxhash64" "sha256" # Should be baked into our kernel, just to be sure + "blake2b-256" ]; boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' From 02be8e4bd6d659b4f6da48f3fd9809d82ac7ccae Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Tue, 23 Dec 2025 09:29:45 -0500 Subject: [PATCH 47/65] snitch: init at 0.1.9 --- pkgs/by-name/sn/snitch/package.nix | 49 ++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/sn/snitch/package.nix diff --git a/pkgs/by-name/sn/snitch/package.nix b/pkgs/by-name/sn/snitch/package.nix new file mode 100644 index 000000000000..c8d44fbe9044 --- /dev/null +++ b/pkgs/by-name/sn/snitch/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + apple-sdk_15, +}: + +buildGoModule (finalAttrs: { + pname = "snitch"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "karol-broda"; + repo = "snitch"; + rev = "v${finalAttrs.version}"; + hash = "sha256-/0MYXKBat+OumuXnS8XSiMslNHUopVDFO4RdYGECfI8="; + }; + + vendorHash = "sha256-fX3wOqeOgjH7AuWGxPQxJ+wbhp240CW8tiF4rVUUDzk="; + + # these below settings (env, buildInputs, ldflags) copied from + # https://github.com/karol-broda/snitch/blob/master/flake.nix + + env = { + # darwin requires cgo for libproc, linux uses pure go with /proc + CGO_ENABLED = if stdenv.hostPlatform.isDarwin then 1 else 0; + }; + + # darwin: use macOS 15 SDK for SecTrustCopyCertificateChain (Go 1.25 crypto/x509) + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; + + ldflags = [ + "-s" + "-w" + "-X snitch/cmd.Version=${finalAttrs.version}" + "-X snitch/cmd.Commit=v${finalAttrs.version}" + "-X snitch/cmd.Date=1970-01-01" + ]; + + meta = { + description = "friendlier ss / netstat for humans"; + homepage = "https://github.com/karol-broda/snitch"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.DieracDelta ]; + platforms = lib.platforms.unix; + mainProgram = "snitch"; + }; +}) From 87deac77b1c7308e2e5dbcf5bffe99c05c354258 Mon Sep 17 00:00:00 2001 From: "M. Baeten" Date: Tue, 23 Dec 2025 19:04:49 +0100 Subject: [PATCH 48/65] maintainers: drop mbaeten --- maintainers/maintainer-list.nix | 5 ----- pkgs/by-name/pr/pragha/package.nix | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8b0e028e8fde..122cb8f7c33a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16619,11 +16619,6 @@ githubId = 22836301; name = "Mateusz Mazur"; }; - mbaeten = { - github = "mbaeten"; - githubId = 2649304; - name = "M. Baeten"; - }; mbaillie = { email = "martin@baillie.id"; github = "martinbaillie"; diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix index 067359851eb7..d388c8e7bada 100644 --- a/pkgs/by-name/pr/pragha/package.nix +++ b/pkgs/by-name/pr/pragha/package.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "pragha"; homepage = "https://pragha-music-player.github.io/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ mbaeten ]; + maintainers = with lib.maintainers; []; platforms = lib.platforms.unix; }; }) From 1451395b529d3be9f098c4a333eb1926a0c10de8 Mon Sep 17 00:00:00 2001 From: "M. Baeten" Date: Tue, 23 Dec 2025 19:16:10 +0100 Subject: [PATCH 49/65] maintainers: drop mbaeten --- pkgs/by-name/pr/pragha/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix index d388c8e7bada..eeeb9f4b0704 100644 --- a/pkgs/by-name/pr/pragha/package.nix +++ b/pkgs/by-name/pr/pragha/package.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "pragha"; homepage = "https://pragha-music-player.github.io/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; []; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) From 6cdf5a1b5ff0e73ef429dc81df950c01e1d9dcd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 18:24:10 +0000 Subject: [PATCH 50/65] python3Packages.smp: 4.0.1 -> 4.0.2 --- pkgs/development/python-modules/smp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smp/default.nix b/pkgs/development/python-modules/smp/default.nix index dad01fa37274..8ccfdc865738 100644 --- a/pkgs/development/python-modules/smp/default.nix +++ b/pkgs/development/python-modules/smp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "smp"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; src = fetchFromGitHub { owner = "JPHutchins"; repo = "smp"; tag = version; - hash = "sha256-UpzVyZxZjCOWJsQGaRXVwnKjuFISpxNidk0YkNQBqKM="; + hash = "sha256-dATsVGG0b5SBZh7R7NT1deJFDRYi7BwtWzT7/QPjkJw="; }; build-system = [ From 767ae315abb1ab4a7dfb5da94b7b26722d3bec55 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Tue, 23 Dec 2025 20:27:49 +0100 Subject: [PATCH 51/65] vlc: 3.0.23 -> 3.0.23-2 The only non-CI fix is a minor one [1]. Since they seem to know better than to retag now, let's try with the tag as rev again. [1] https://code.videolan.org/videolan/vlc/-/commit/b7c75b0c9925847518913a946bc25516e9885ab4 --- pkgs/by-name/vl/vlc/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index e3758a2e3f0e..3880b90314b7 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -103,15 +103,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.23"; + version = "3.0.23-2"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = "vlc"; - # 3.0.23 was retagged (3697ebcb2716cb4f9c7824b11ce33afefb0212ab -> 578d28f6c9f2379164516e689418f92ac74a3445) - rev = "578d28f6c9f2379164516e689418f92ac74a3445"; - hash = "sha256-/gopvzgtvbaIHq7VG8/edAelhSApQT7GxD5mN9nvfOw="; + rev = finalAttrs.version; + hash = "sha256-vg/kKNrIpGF7Olz8EiA1ZsW5SB4iHlvFbREDp4JokB0="; }; depsBuildBuild = optionals waylandSupport [ pkg-config ]; From 96e766ff5cdec1b34e598c80081d1e96ecd58b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 23 Dec 2025 16:41:00 -0300 Subject: [PATCH 52/65] lxqt.libfm-qt: 2.3.0 -> 2.3.1 Diff: https://github.com/lxqt/libfm-qt/compare/2.3.0...2.3.1 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 16c946f919be..86cdf13cdc8c 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -15,7 +15,7 @@ qttools, wrapQtAppsHook, gitUpdater, - version ? "2.3.0", + version ? "2.3.1", qtx11extras ? null, }: @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { hash = { "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; - "2.3.0" = "sha256-A0kBwLiPvHIsJWQvg6lwb5lrojU8oDDQYHuC2pTXdPc="; + "2.3.1" = "sha256-2PDVNMBwzDpUOkZ7GnrWDMlXBeUgCyZ6vHXurW6fr4s="; } ."${finalAttrs.version}"; }; From e26deebd974de019dde617517ba1615488f19f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 23 Dec 2025 16:45:13 -0300 Subject: [PATCH 53/65] lxqt.lxqt-notificationd: 2.3.0 -> 2.3.1 Diff: https://github.com/lxqt/lxqt-notificationd/compare/2.3.0...2.3.1 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index d17ab9e1d88d..79ec16557c71 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lxqt-notificationd"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-notificationd"; rev = version; - hash = "sha256-VmPVGqCmkTkib2T5ysov1hUY3J74GTuXdJsn5Sivreo="; + hash = "sha256-TfTOuarMq2m5rAdcfiKqjyGeJzKyUSvhkJ2EoGUMTUQ="; }; nativeBuildInputs = [ From 5e85e1ab9a6a4b2029e8d068a57e00427631f3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 23 Dec 2025 16:55:48 -0300 Subject: [PATCH 54/65] lxqt.lxqt-panel: 2.3.0 -> 2.3.2 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 74072939347d..424a9c1780b9 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxqt-panel"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-panel"; tag = finalAttrs.version; - hash = "sha256-cwemHe092vNRDeseXkGoWAEXawNTVbSiB87owfaLeAo="; + hash = "sha256-n/U2EgEZfh8mJWtEX+HByqHqtm9NqIXnURqUzSOcvns="; }; nativeBuildInputs = [ From 037f31491e7650ccbf74ee35119af4144d20677f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 20:11:28 +0000 Subject: [PATCH 55/65] terraform-providers.buildkite_buildkite: 1.27.1 -> 1.28.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 75e2ad6947de..735ec9a7d1d3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -128,13 +128,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite_buildkite": { - "hash": "sha256-tADvbxvLl0PgttK6x4Ngjs5UtteR9BCKJOSoX9oc/w8=", + "hash": "sha256-oQyhrDpxjCckqq+mtViswP1rPcgowEq4ZN5jHWa7UpY=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.27.1", + "rev": "v1.28.0", "spdx": "MIT", - "vendorHash": "sha256-IsviKF349jAXs55wadqWgjJMgwcAhU5MqZ0Tg9eGjeI=" + "vendorHash": "sha256-e9RWvfhn/jO44ljfzNjo2qCQZfVISg8DWQdvnTXbf8o=" }, "camptocamp_pass": { "hash": "sha256-GQ2g7VyK+eeBqW3LMR4U0gMYsvQnG3y+KEKKkvnmfsk=", From 722e8ee626922a059053f833cbd486e49a86b945 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 20:25:34 +0000 Subject: [PATCH 56/65] terraform-providers.fastly_fastly: 8.5.0 -> 8.6.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 75e2ad6947de..bcb1a0e8bf23 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -400,13 +400,13 @@ "vendorHash": null }, "fastly_fastly": { - "hash": "sha256-HP3pl1KLW8vPKI9FYZKViFQvslGuNmEJTw/nvjsDQRk=", + "hash": "sha256-FZNwWjgxdJ/g3ByjbsD5isMan7e7QUX2w5ZHR4qHJKw=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v8.5.0", + "rev": "v8.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-khWWD2JCiVnDQiz9AXAOaqHfYwCdmSq5Yj+AyrBc8Go=" + "vendorHash": "sha256-YgmjUSKq9wAkixq9oL5dXwNY2Yt/QRdOLj75M8UWj1w=" }, "flexibleenginecloud_flexibleengine": { "hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=", From 8938089444eddcafe455dbbb5c51ec76c4900589 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 23 Dec 2025 20:37:34 +0000 Subject: [PATCH 57/65] python3Packages.ultralytics: skip flaky test --- pkgs/development/python-modules/ultralytics/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index 27b8bfec9b36..7e9e98048e7a 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -120,6 +120,11 @@ buildPythonPackage rec { # RuntimeError: required keyword attribute 'value' has the wrong type "test_utils_benchmarks" + + # RuntimeError: Dataset 'https://github.com/ultralytics/assets/releases/download/v0.0.0/coco8-ndjson.ndjson' + # error <9D><8C> [Errno 13] Permission denied: + # '/nix/store/rnns5r21nibx26f2c2gxdk3h8l0jcg68-python3.12-ultralytics-8.3.221/datasets/coco8-ndjson/labels/train/000000000009.txt' + "test_train_ndjson" ]; meta = { From b6e9e39cd5b1a546113ba21648b59ef772c39560 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Dec 2025 20:48:02 +0000 Subject: [PATCH 58/65] avalanche-cli: 1.9.5 -> 1.9.6 --- pkgs/by-name/av/avalanche-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix index 887c4da17f16..956bf545bd4c 100644 --- a/pkgs/by-name/av/avalanche-cli/package.nix +++ b/pkgs/by-name/av/avalanche-cli/package.nix @@ -14,17 +14,17 @@ }: buildGoModule (finalAttrs: { pname = "avalanche-cli"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "ava-labs"; repo = "avalanche-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-jNDzN2kWjnY9yQaGjhIEvpoc+k1Q1tnDQkQtZvxBTSw="; + hash = "sha256-bAZJRFlry7vYTTf95kTOJwcjYelN40n264oeykx7nxc="; }; proxyVendor = true; - vendorHash = "sha256-reL1ZJc/Wuh0LH+S+ZV4eVgVP5gvv3tFqLWNNTL5CDI="; + vendorHash = "sha256-0+YwlCHjiU46y333RSuaha4pLKFTYlj+M9+TFAALamY="; # Fix error: 'Caught SIGILL in blst_cgo_init' # https://github.com/bnb-chain/bsc/issues/1521 From 734f354d9dba71b8324aa54b2616eb374f2eda21 Mon Sep 17 00:00:00 2001 From: cybardev <50134239+cybardev@users.noreply.github.com> Date: Tue, 9 Dec 2025 12:56:11 -0400 Subject: [PATCH 59/65] pyrefly: 0.44.2 -> 0.46.0 --- pkgs/by-name/py/pyrefly/fix-shebang.patch | 13 +++++++++++++ pkgs/by-name/py/pyrefly/package.nix | 19 +++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/py/pyrefly/fix-shebang.patch diff --git a/pkgs/by-name/py/pyrefly/fix-shebang.patch b/pkgs/by-name/py/pyrefly/fix-shebang.patch new file mode 100644 index 000000000000..c2e62633b04a --- /dev/null +++ b/pkgs/by-name/py/pyrefly/fix-shebang.patch @@ -0,0 +1,13 @@ +diff --git a/pyrefly/lib/test/lsp/lsp_interaction/configuration.rs b/pyrefly/lib/test/lsp/lsp_interaction/configuration.rs +index edc2db09f..ce33a2774 100644 +--- a/pyrefly/lib/test/lsp/lsp_interaction/configuration.rs ++++ b/pyrefly/lib/test/lsp/lsp_interaction/configuration.rs +@@ -56,7 +56,7 @@ fn setup_dummy_interpreter(custom_interpreter_path: &Path) -> PathBuf { + // Create a mock Python interpreter script that returns the environment info + // This simulates what a real Python interpreter would return when queried with the env script + let python_script = format!( +- r#"#!/usr/bin/env bash ++ r#"#!@bash@ + if [[ "$1" == "-c" && "$2" == *"import json, sys"* ]]; then + cat << 'EOF' + {{"python_platform": "linux", "python_version": "3.12.0", "site_package_path": ["{site_packages}"]}} diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index d3691243be57..1f1608d7ff49 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -1,5 +1,7 @@ { lib, + bash, + replaceVars, rustPlatform, fetchFromGitHub, versionCheckHook, @@ -8,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.44.2"; + version = "0.46.0"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-d0aZQkCt2Yypj2CSav585M6TuoUEwPXpz1oKLjFo6NI="; + hash = "sha256-Owsma92bEwjyYFOb2AOzdLmAYIY398NrR9ztZ0bYhMc="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-gXKLzD5JbG62pc0pW5sRQJvBwr1ftu/ZOOXsQ7ZdWIU="; + cargoHash = "sha256-U3VlzjnsPmFlgaXdogqWOyJAv63vpPDULfcmcB5IHXc="; buildInputs = [ rust-jemalloc-sys ]; @@ -26,18 +28,15 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + patches = [ + (replaceVars ./fix-shebang.patch { bash = lib.getExe bash; }) + ]; + # redirect tests writing to /tmp preCheck = '' export TMPDIR=$(mktemp -d) ''; - checkFlags = [ - # FIX: tracking on https://github.com/facebook/pyrefly/issues/1667 - "--skip=test::lsp::lsp_interaction::configuration::test_pythonpath_change" - "--skip=test::lsp::lsp_interaction::configuration::test_workspace_pythonpath_ignored_when_set_in_config_file" - "--skip=test::lsp::lsp_interaction::notebook_sync::test_notebook_publish_diagnostics" - ]; - # requires unstable rust features env.RUSTC_BOOTSTRAP = 1; From 729b61a8d07759b47df6a54fe23e253e7284ee9c Mon Sep 17 00:00:00 2001 From: sysraccoon Date: Tue, 23 Dec 2025 21:58:21 +0100 Subject: [PATCH 60/65] interception-tools: apply patch that fix udevmon Fixes #126681. --- .../interception-tools/default.nix | 3 ++ .../interception-tools-udevmon-path-fix.patch | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/inputmethods/interception-tools/interception-tools-udevmon-path-fix.patch diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index d8545c391284..36e311025bd0 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix PATH forwarding to child processes. + # See #126681 issue for more information + ./interception-tools-udevmon-path-fix.patch (fetchpatch { name = "Bump-CMake-minimum-version-to-3.10"; url = "https://gitlab.com/interception/linux/tools/-/commit/110c9b39b54eae9acd16fa6d64539ce9886b5684.patch"; diff --git a/pkgs/tools/inputmethods/interception-tools/interception-tools-udevmon-path-fix.patch b/pkgs/tools/inputmethods/interception-tools/interception-tools-udevmon-path-fix.patch new file mode 100644 index 000000000000..2f2062c3f49a --- /dev/null +++ b/pkgs/tools/inputmethods/interception-tools/interception-tools-udevmon-path-fix.patch @@ -0,0 +1,28 @@ +diff --git a/udevmon.cpp b/udevmon.cpp +index 70a28be..60fcbe2 100644 +--- a/udevmon.cpp ++++ b/udevmon.cpp +@@ -101,7 +101,11 @@ struct cmd { + for (size_t j = 0; j < cmds[i].size(); ++j) + command[j] = const_cast(cmds[i][j].c_str()); + command[cmds[i].size()] = nullptr; +- char *environment[] = {nullptr}; ++ std::string path_env = "PATH="; ++ path_env += std::getenv("PATH"); ++ char *environment[] = { ++ const_cast(path_env.c_str()), ++ nullptr}; + setpgid(0, 0); + execvpe(command[0], command.get(), environment); + std::string e = "exec failed for \""; +@@ -348,7 +352,10 @@ struct job { + command[j] = const_cast(cmds[i][j].c_str()); + command[cmds[i].size()] = nullptr; + std::string variables = "DEVNODE=" + devnode; ++ std::string path_env = "PATH="; ++ path_env += std::getenv("PATH"); + char *environment[] = { ++ const_cast(path_env.c_str()), + const_cast(variables.c_str()), nullptr}; + setpgid(0, 0); + execvpe(command[0], command.get(), environment); From fac5e8c43829bfb39a60f30a29f0b040acd10030 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Tue, 23 Dec 2025 14:05:03 -0500 Subject: [PATCH 61/65] sharedown: use latest commits, refactor for updateScript --- pkgs/by-name/sh/sharedown/package.nix | 27 ++++++++++++++++-------- pkgs/by-name/sh/sharedown/update.sh | 30 +++++++++++++++------------ 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/sh/sharedown/package.nix b/pkgs/by-name/sh/sharedown/package.nix index 5d8fa6f1c651..7e1f5d71d42d 100644 --- a/pkgs/by-name/sh/sharedown/package.nix +++ b/pkgs/by-name/sh/sharedown/package.nix @@ -17,6 +17,13 @@ chromium, }: +let + yarnLock = ./yarn.lock; + offlineCache = fetchYarnDeps { + inherit yarnLock; + hash = "sha256-9Mdn18jJTXyAVQMGl9ImIEbzlkK6walPrgkGzupLPFQ="; + }; +in stdenvNoCC.mkDerivation rec { pname = "Sharedown"; version = "5.3.6"; @@ -24,7 +31,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "kylon"; repo = "Sharedown"; - tag = version; + rev = "3d788aae37a026777d058ed44db07a667fc12be8"; hash = "sha256-5t/71T/eBg4vkDZTj7mtCkXhS+AuiVhBmx0Zzrry5Lg="; }; @@ -58,7 +65,12 @@ stdenvNoCC.mkDerivation rec { modules = yarn2nix-moretea.mkYarnModules rec { name = "Sharedown-modules-${version}"; - inherit pname version; + inherit + pname + version + offlineCache + yarnLock + ; yarnFlags = [ "--production" ]; @@ -93,12 +105,6 @@ stdenvNoCC.mkDerivation rec { ''; packageJSON = "${src}/package.json"; - yarnLock = ./yarn.lock; - - offlineCache = fetchYarnDeps { - inherit yarnLock; - hash = "sha256-9Mdn18jJTXyAVQMGl9ImIEbzlkK6walPrgkGzupLPFQ="; - }; }; in '' @@ -121,7 +127,10 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru = { + inherit offlineCache; + updateScript = ./update.sh; + }; meta = { description = "Application to save your Sharepoint videos for offline usage"; diff --git a/pkgs/by-name/sh/sharedown/update.sh b/pkgs/by-name/sh/sharedown/update.sh index 574f24c2273c..fc060df4a877 100755 --- a/pkgs/by-name/sh/sharedown/update.sh +++ b/pkgs/by-name/sh/sharedown/update.sh @@ -1,24 +1,28 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts curl jq yarn yarn2nix-moretea.yarn2nix nodejs +#!nix-shell -i bash -p common-updater-scripts curl gnugrep jq yarn yarn2nix-moretea.yarn2nix nix-update nodejs +# See git history for the version of this script that updated to tagged versions. set -euo pipefail -latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL "https://api.github.com/repos/kylon/Sharedown/releases/latest" | jq -r '.tag_name') -currentVersion=$(nix-instantiate --eval --expr 'with import ./. {}; sharedown.version' | tr -d '"') +nixpkgsDir="$PWD" -if [[ "$currentVersion" == "$latestVersion" && "${BUMP_LOCK-}" != "1" ]]; then +currentRev=$(nix-instantiate --eval --expr 'with import ./. {}; sharedown.src.rev' | tr -d '"') +nix-update --version=branch --src-only sharedown + +latestRev=$(nix-instantiate --eval --expr 'with import ./. {}; sharedown.src.rev' | tr -d '"') +dirname="$(realpath "$(dirname "$0")")" +sourceDir="$(nix-build -A sharedown.src --no-out-link)" +tempDir="$(mktemp -d)" +trap 'chmod -R u+w $tempDir && rm -rf $tempDir' EXIT + +if [[ "$currentRev" == "$latestRev" && "${BUMP_LOCK-}" != "1" ]]; then # Skip update when already on the latest version. exit 0 fi -update-source-version sharedown "$latestVersion" - -dirname="$(realpath "$(dirname "$0")")" -sourceDir="$(nix-build -A sharedown.src --no-out-link)" -tempDir="$(mktemp -d)" - cp -r "$sourceDir"/* "$tempDir" cd "$tempDir" -PUPPETEER_SKIP_DOWNLOAD=1 yarn install -yarn2nix >"$dirname/yarndeps.nix" -cp -r yarn.lock "$dirname" +PUPPETEER_SKIP_DOWNLOAD=1 yarn install --mode update-lockfile +cp yarn.lock "$dirname" +cd "$nixpkgsDir" +update-source-version sharedown --ignore-same-version --source-key=offlineCache From 8f360ef67cfda23d5d67ed7e7bef36248131f54d Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Tue, 23 Dec 2025 16:46:34 -0500 Subject: [PATCH 62/65] sharedown: 5.3.6 -> 5.3.6-unstable-2025-12-06 --- pkgs/by-name/sh/sharedown/package.nix | 8 +- pkgs/by-name/sh/sharedown/yarn.lock | 1148 ++++++++++++------------- 2 files changed, 549 insertions(+), 607 deletions(-) diff --git a/pkgs/by-name/sh/sharedown/package.nix b/pkgs/by-name/sh/sharedown/package.nix index 7e1f5d71d42d..37546166e72f 100644 --- a/pkgs/by-name/sh/sharedown/package.nix +++ b/pkgs/by-name/sh/sharedown/package.nix @@ -21,18 +21,18 @@ let yarnLock = ./yarn.lock; offlineCache = fetchYarnDeps { inherit yarnLock; - hash = "sha256-9Mdn18jJTXyAVQMGl9ImIEbzlkK6walPrgkGzupLPFQ="; + hash = "sha256-MRCrBvqDpPpwMg4A50RVKGp4GqRHNjNJzSpJz+14OG4="; }; in stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "5.3.6"; + version = "5.3.6-unstable-2025-12-06"; src = fetchFromGitHub { owner = "kylon"; repo = "Sharedown"; - rev = "3d788aae37a026777d058ed44db07a667fc12be8"; - hash = "sha256-5t/71T/eBg4vkDZTj7mtCkXhS+AuiVhBmx0Zzrry5Lg="; + rev = "c39f0c5bbf694c2cdfce4ef0b4381342fb535ecc"; + hash = "sha256-PsfE7v9yEeGC8rUzhj/klhqtKKzxCV+thwLnQlgfDxI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/sharedown/yarn.lock b/pkgs/by-name/sh/sharedown/yarn.lock index bc673f347033..252ac3092908 100644 --- a/pkgs/by-name/sh/sharedown/yarn.lock +++ b/pkgs/by-name/sh/sharedown/yarn.lock @@ -8,18 +8,18 @@ integrity sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A== "@babel/code-frame@^7.0.0": - version "7.26.2" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" - integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== + version "7.27.1" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be" + integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg== dependencies: - "@babel/helper-validator-identifier" "^7.25.9" + "@babel/helper-validator-identifier" "^7.27.1" js-tokens "^4.0.0" - picocolors "^1.0.0" + picocolors "^1.1.1" -"@babel/helper-validator-identifier@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" - integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== +"@babel/helper-validator-identifier@^7.27.1": + version "7.28.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4" + integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q== "@develar/schema-utils@~2.6.5": version "2.6.5" @@ -29,19 +29,10 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/asar@3.2.18": - version "3.2.18" - resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.18.tgz#fa607f829209bab8b9e0ce6658d3fe81b2cba517" - integrity sha512-2XyvMe3N3Nrs8cV39IKELRHTYUWFKrmqqSY1U+GMlc0jvqjIVnoxhNd2H4JolWQncbJi1DCvb5TNxZuI2fEjWg== - dependencies: - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - -"@electron/asar@^3.2.7": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.3.1.tgz#cd14e897770d9844673dd7c1dc8944e086e1e0ea" - integrity sha512-WtpC/+34p0skWZiarRjLAyqaAX78DofhDxnREy/V5XHfu1XEXbFCSSMcDQ6hNCPJFaPy8/NnUgYuf9uiCkvKPg== +"@electron/asar@3.4.1", "@electron/asar@^3.3.1": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.4.1.tgz#4e9196a4b54fba18c56cd8d5cac67c5bdc588065" + integrity sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA== dependencies: commander "^5.0.0" glob "^7.1.6" @@ -71,21 +62,6 @@ optionalDependencies: global-agent "^3.0.0" -"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2": - version "10.2.0-electron.1" - resolved "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2" - dependencies: - env-paths "^2.2.0" - exponential-backoff "^3.1.1" - glob "^8.1.0" - graceful-fs "^4.2.6" - make-fetch-happen "^10.2.1" - nopt "^6.0.0" - proc-log "^2.0.1" - semver "^7.3.5" - tar "^6.2.1" - which "^2.0.2" - "@electron/notarize@2.5.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.5.0.tgz#d4d25356adfa29df4a76bd64a8bd347237cd251e" @@ -95,10 +71,10 @@ fs-extra "^9.0.1" promise-retry "^2.0.1" -"@electron/osx-sign@1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.3.1.tgz#faf7eeca7ca004a6be541dc4cf7a1bd59ec59b1c" - integrity sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw== +"@electron/osx-sign@1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.3.3.tgz#af751510488318d9f7663694af85819690d75583" + integrity sha512-KZ8mhXvWv2rIEgMbWZ4y33bDHyUKMXnx4M0sTyPNK/vcB81ImdeY9Ggdqy0SWbMDgmbqyQ+phgejh6V3R2QuSg== dependencies: compare-version "^0.1.2" debug "^4.3.4" @@ -107,32 +83,32 @@ minimist "^1.2.6" plist "^3.0.5" -"@electron/rebuild@3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.0.tgz#82e20c467ddedbb295d7f641592c52e68c141e9f" - integrity sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw== +"@electron/rebuild@4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-4.0.1.tgz#0620d5bb71a0b8b09a86fb9fa979244e1fcc10bf" + integrity sha512-iMGXb6Ib7H/Q3v+BKZJoETgF9g6KMNZVbsO4b7Dmpgb5qTFqyFTzqW9F3TOSHdybv2vKYKzSS9OiZL+dcJb+1Q== dependencies: - "@electron/node-gyp" "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2" "@malept/cross-spawn-promise" "^2.0.0" chalk "^4.0.0" debug "^4.1.1" detect-libc "^2.0.1" - fs-extra "^10.0.0" got "^11.7.0" - node-abi "^3.45.0" - node-api-version "^0.2.0" + graceful-fs "^4.2.11" + node-abi "^4.2.0" + node-api-version "^0.2.1" + node-gyp "^11.2.0" ora "^5.1.0" read-binary-file-arch "^1.0.6" semver "^7.3.5" tar "^6.0.5" yargs "^17.0.1" -"@electron/universal@2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-2.0.1.tgz#7b070ab355e02957388f3dbd68e2c3cd08c448ae" - integrity sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA== +"@electron/universal@2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-2.0.3.tgz#1680df6ced8f128ca0ff24e29c2165d41d78b3ce" + integrity sha512-Wn9sPYIVFRFl5HmwMJkARCCf7rqK/EurkfQ/rJZ14mHP3iYTjZSIOSVonEAnhWeAXwtw7zOekGRlc6yTtZ0t+g== dependencies: - "@electron/asar" "^3.2.7" + "@electron/asar" "^3.3.1" "@malept/cross-spawn-promise" "^2.0.0" debug "^4.3.1" dir-compare "^4.2.0" @@ -140,15 +116,22 @@ minimatch "^9.0.3" plist "^3.1.0" -"@fortawesome/fontawesome-free@6.7.1": - version "6.7.1" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.1.tgz#160a48730d533ec77578ed0141661a8f0150a71d" - integrity sha512-ALIk/MOh5gYe1TG/ieS5mVUsk7VUIJTJKPMK9rFFqOgfp0Q3d5QiBXbcOMwUvs37fyZVCz46YjOE6IFeOAXCHA== +"@fortawesome/fontawesome-free@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-7.1.0.tgz#8eb76278515341720aa74485266f8be121089529" + integrity sha512-+WxNld5ZCJHvPQCr/GnzCTVREyStrAJjisUPtUxG5ngDA8TMlPnKp6dddlTpai4+1GNmltAeuk1hJEkBohwZYA== -"@gar/promisify@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" - integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== +"@isaacs/balanced-match@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29" + integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ== + +"@isaacs/brace-expansion@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3" + integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA== + dependencies: + "@isaacs/balanced-match" "^4.0.1" "@isaacs/cliui@^8.0.2": version "8.0.2" @@ -162,6 +145,13 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" +"@isaacs/fs-minipass@^4.0.0": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32" + integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w== + dependencies: + minipass "^7.0.4" + "@malept/cross-spawn-promise@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" @@ -179,39 +169,40 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@npmcli/fs@^2.1.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" - integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== +"@npmcli/agent@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-3.0.0.tgz#1685b1fbd4a1b7bb4f930cbb68ce801edfe7aa44" + integrity sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q== dependencies: - "@gar/promisify" "^1.1.3" - semver "^7.3.5" + agent-base "^7.1.0" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.1" + lru-cache "^10.0.1" + socks-proxy-agent "^8.0.3" -"@npmcli/move-file@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" - integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== +"@npmcli/fs@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-4.0.0.tgz#a1eb1aeddefd2a4a347eca0fab30bc62c0e1c0f2" + integrity sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q== dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" + semver "^7.3.5" "@pkgjs/parseargs@^0.11.0": version "0.11.0" resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@puppeteer/browsers@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.6.1.tgz#d75aec5010cae377c5e4742bf5e4f62a79c21315" - integrity sha512-aBSREisdsGH890S2rQqK82qmQYU3uFpSH8wcZWHgHzl3LfzsxAKbLNiAG9mO8v1Y0UICBeClICxPJvyr0rcuxg== +"@puppeteer/browsers@2.10.12": + version "2.10.12" + resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.10.12.tgz#9d9376c205aa38e7344cadb2809e786df2cf3e78" + integrity sha512-mP9iLFZwH+FapKJLeA7/fLqOlSUwYpMwjR1P5J23qd4e7qGJwecJccJqHYrjw33jmIZYV4dtiTHPD/J+1e7cEw== dependencies: - debug "^4.4.0" + debug "^4.4.3" extract-zip "^2.0.1" progress "^2.0.3" proxy-agent "^6.5.0" - semver "^7.6.3" - tar-fs "^3.0.6" - unbzip2-stream "^1.4.3" + semver "^7.7.3" + tar-fs "^3.1.1" yargs "^17.7.2" "@sindresorhus/is@^4.0.0": @@ -226,11 +217,6 @@ dependencies: 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== - "@tootallnate/quickjs-emscripten@^0.23.0": version "0.23.0" resolved "https://registry.yarnpkg.com/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz#db4ecfd499a9765ab24002c3b696d02e6d32a12c" @@ -278,18 +264,18 @@ integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA== "@types/node@*": - version "22.13.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.5.tgz#23add1d71acddab2c6a4d31db89c0f98d330b511" - integrity sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg== + version "25.0.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-25.0.3.tgz#79b9ac8318f373fbfaaf6e2784893efa9701f269" + integrity sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA== dependencies: - undici-types "~6.20.0" + undici-types "~7.16.0" -"@types/node@^20.9.0": - version "20.17.19" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.19.tgz#0f2869555719bef266ca6e1827fcdca903c1a697" - integrity sha512-LEwC7o1ifqg/6r2gn9Dns0f1rhK+fPFDoMiceTJ6kWmVk6bgXBI/9IOWfVan4WiAavK9pIVWdX0/e3J+eEUh5A== +"@types/node@^22.7.7": + version "22.19.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.3.tgz#8dfde7630d7a8528dc9b34db23d34f764467c02c" + integrity sha512-1N9SBnWYOJTrNZCdh/yJE+t910Y128BoyY+zBLWhL3r0TYzlTmFdXrPwHL9DyFZmlEXNQQolTZh3KHV31QDhyA== dependencies: - undici-types "~6.19.2" + undici-types "~6.21.0" "@types/plist@^3.0.1": version "3.0.5" @@ -319,41 +305,19 @@ "@types/node" "*" "@xmldom/xmldom@^0.8.8": - version "0.8.10" - resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" - integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== + version "0.8.11" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.11.tgz#b79de2d67389734c57c52595f7a7305e30c2d608" + integrity sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw== -abbrev@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -agent-base@6, agent-base@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" +abbrev@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-3.0.1.tgz#8ac8b3b5024d31464fe2a5feeea9f4536bf44025" + integrity sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg== agent-base@^7.1.0, agent-base@^7.1.2: - version "7.1.3" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1" - integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw== - -agentkeepalive@^4.2.1: - version "4.6.0" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.6.0.tgz#35f73e94b3f40bf65f105219c623ad19c136ea6a" - integrity sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ== - dependencies: - humanize-ms "^1.2.1" - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" + version "7.1.4" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8" + integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ== ajv-keywords@^3.4.1: version "3.5.2" @@ -376,9 +340,9 @@ ansi-regex@^5.0.1: integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-regex@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654" - integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA== + version "6.2.2" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1" + integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg== ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" @@ -388,52 +352,54 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: color-convert "^2.0.1" ansi-styles@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" - integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + version "6.2.3" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041" + integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg== app-builder-bin@5.0.0-alpha.12: version "5.0.0-alpha.12" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz#2daf82f8badc698e0adcc95ba36af4ff0650dc80" integrity sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w== -app-builder-lib@26.0.9: - version "26.0.9" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.9.tgz#b756d887dc2c9b9a57d412c9f976a0a1a83528ab" - integrity sha512-usROoLQLJDHEkLHF2nNQKWuT6Qbj1GnO+iNKVJQ7OvY7/K0/XTzr1i+gGgTmd02tQBCnBiBgNFSOw/NZZxomfg== +app-builder-lib@26.4.0: + version "26.4.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.4.0.tgz#649b4a98b51a90141b73e4f12a74ac5bc0f2eff4" + integrity sha512-Uas6hNe99KzP3xPWxh5LGlH8kWIVjZixzmMJHNB9+6hPyDpjc7NQMkVgi16rQDdpCFy22ZU5sp8ow7tvjeMgYQ== dependencies: "@develar/schema-utils" "~2.6.5" - "@electron/asar" "3.2.18" + "@electron/asar" "3.4.1" "@electron/fuses" "^1.8.0" "@electron/notarize" "2.5.0" - "@electron/osx-sign" "1.3.1" - "@electron/rebuild" "3.7.0" - "@electron/universal" "2.0.1" + "@electron/osx-sign" "1.3.3" + "@electron/rebuild" "4.0.1" + "@electron/universal" "2.0.3" "@malept/flatpak-bundler" "^0.4.0" "@types/fs-extra" "9.0.13" async-exit-hook "^2.0.1" - builder-util "26.0.7" - builder-util-runtime "9.3.1" + builder-util "26.3.4" + builder-util-runtime "9.5.1" chromium-pickle-js "^0.2.0" - config-file-ts "0.2.8-rc1" + ci-info "4.3.1" debug "^4.3.4" dotenv "^16.4.5" dotenv-expand "^11.0.6" ejs "^3.1.8" - electron-publish "26.0.7" + electron-publish "26.3.4" fs-extra "^10.1.0" hosted-git-info "^4.1.0" - is-ci "^3.0.0" isbinaryfile "^5.0.0" + jiti "^2.4.2" js-yaml "^4.1.0" json5 "^2.2.3" lazy-val "^1.0.5" - minimatch "^10.0.0" + minimatch "^10.0.3" + plist "3.1.0" resedit "^1.7.0" - semver "^7.3.8" + semver "~7.7.3" tar "^6.1.12" temp-file "^3.4.0" tiny-async-pool "1.3.0" + which "^5.0.0" arch@^2.1.1: version "2.2.0" @@ -467,7 +433,7 @@ async-exit-hook@^2.0.1: resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== -async@^3.2.3: +async@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== @@ -482,43 +448,45 @@ 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.7.9: - version "1.8.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.1.tgz#7c118d2146e9ebac512b7d1128771cdd738d11e3" - integrity sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g== +axios@^1.13.1: + version "1.13.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.2.tgz#9ada120b7b5ab24509553ec3e40123521117f687" + integrity sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA== dependencies: follow-redirects "^1.15.6" - form-data "^4.0.0" + form-data "^4.0.4" proxy-from-env "^1.1.0" b4a@^1.6.4: - version "1.6.7" - resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.7.tgz#a99587d4ebbfbd5a6e3b21bdb5d5fa385767abe4" - integrity sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg== + version "1.7.3" + resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.7.3.tgz#24cf7ccda28f5465b66aec2bac69e32809bf112f" + integrity sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q== balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -bare-events@^2.0.0, bare-events@^2.2.0: - version "2.5.4" - resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.4.tgz#16143d435e1ed9eafd1ab85f12b89b3357a41745" - integrity sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA== +bare-events@^2.5.4, bare-events@^2.7.0: + version "2.8.2" + resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.8.2.tgz#7b3e10bd8e1fc80daf38bb516921678f566ab89f" + integrity sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ== bare-fs@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-4.0.1.tgz#85844f34da819c76754d545323a8b23ed3617c76" - integrity sha512-ilQs4fm/l9eMfWY2dY0WCIUplSUp7U0CT1vrqMg1MUdeZl4fypu5UP0XcDBK5WBQPJAKP1b7XEodISmekH/CEg== + version "4.5.2" + resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-4.5.2.tgz#d80ff8a9177e0db4818e7ba44b9302c0cf0788af" + integrity sha512-veTnRzkb6aPHOvSKIOy60KzURfBdUflr5VReI+NSaPL6xf+XLdONQgZgpYvUuZLVQ8dCqxpBAudaOM1+KpAUxw== dependencies: - bare-events "^2.0.0" + bare-events "^2.5.4" bare-path "^3.0.0" - bare-stream "^2.0.0" + bare-stream "^2.6.4" + bare-url "^2.2.2" + fast-fifo "^1.3.2" bare-os@^3.0.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-3.5.1.tgz#8e59ad8db6d0eab35cfe499208db643fd5f4c594" - integrity sha512-LvfVNDcWLw2AnIw5f2mWUgumW3I3N/WYGiWeimhQC1Ybt71n2FjlS9GJKeCnFeg1MKZHxzIFmpFnBXDI+sBeFg== + version "3.6.2" + resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-3.6.2.tgz#b3c4f5ad5e322c0fd0f3c29fc97d19009e2796e5" + integrity sha512-T+V1+1srU2qYNBmJCXZkUY5vQ0B4FSlL3QDROnKQYOqeiQR8UbjNHlPa+TIbM4cuidiN9GaTaOZgSEgsvPbh5A== bare-path@^3.0.0: version "3.0.0" @@ -527,13 +495,20 @@ bare-path@^3.0.0: dependencies: bare-os "^3.0.1" -bare-stream@^2.0.0: - version "2.6.5" - resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-2.6.5.tgz#bba8e879674c4c27f7e27805df005c15d7a2ca07" - integrity sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA== +bare-stream@^2.6.4: + version "2.7.0" + resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-2.7.0.tgz#5b9e7dd0a354d06e82d6460c426728536c35d789" + integrity sha512-oyXQNicV1y8nc2aKffH+BUHFRXmx6VrPzlnaEvMhram0nPBrKcEdcyBg5r08D0i8VxngHFAiVyn1QKXpSG0B8A== dependencies: streamx "^2.21.0" +bare-url@^2.2.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/bare-url/-/bare-url-2.3.2.tgz#4aef382efa662b2180a6fe4ca07a71b39bdf7ca3" + integrity sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw== + dependencies: + bare-path "^3.0.0" + base64-js@^1.3.1, base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -558,23 +533,23 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== -bootstrap@5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38" - integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg== +bootstrap@5.3.8: + version "5.3.8" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.8.tgz#6401a10057a22752d21f4e19055508980656aeed" + integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg== brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + version "1.1.12" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843" + integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7" + integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ== dependencies: balanced-match "^1.0.0" @@ -588,7 +563,7 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0: +buffer@^5.1.0, buffer@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -596,30 +571,29 @@ buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.3.1: - version "9.3.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.3.1.tgz#0daedde0f6d381f2a00a50a407b166fe7dca1a67" - integrity sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ== +builder-util-runtime@9.5.1: + version "9.5.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.5.1.tgz#74125fb374d1ecbf472ae1787485485ff7619702" + integrity sha512-qt41tMfgHTllhResqM5DcnHyDIWNgzHvuY2jDcYP9iaGpkWxTUzV6GQjDeLnlR1/DtdlcsWQbA7sByMpmJFTLQ== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@26.0.7: - version "26.0.7" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-26.0.7.tgz#ca420095038d30bd60c4bb1bc3c6879334b0f6cd" - integrity sha512-rZL8wTMtpAM8CZO4l6eIM36oie95LP7de4nEp7ZhQ94JsL7kKT4orPwp6weRzxldXPzNyalUPkhCxJcFDanFIg== +builder-util@26.3.4: + version "26.3.4" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-26.3.4.tgz#eb20e2e2895fe360360eddded5d8cf12ad2aad60" + integrity sha512-aRn88mYMktHxzdqDMF6Ayj0rKoX+ZogJ75Ck7RrIqbY/ad0HBvnS2xA4uHfzrGr5D2aLL3vU6OBEH4p0KMV2XQ== dependencies: "7zip-bin" "~5.2.0" "@types/debug" "^4.1.6" app-builder-bin "5.0.0-alpha.12" - builder-util-runtime "9.3.1" + builder-util-runtime "9.5.1" chalk "^4.1.2" cross-spawn "^7.0.6" debug "^4.3.4" fs-extra "^10.1.0" http-proxy-agent "^7.0.0" https-proxy-agent "^7.0.0" - is-ci "^3.0.0" js-yaml "^4.1.0" sanitize-filename "^1.6.3" source-map-support "^0.5.19" @@ -627,29 +601,23 @@ builder-util@26.0.7: temp-file "^3.4.0" tiny-async-pool "1.3.0" -cacache@^16.1.0: - version "16.1.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" - integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== +cacache@^19.0.1: + version "19.0.1" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-19.0.1.tgz#3370cc28a758434c85c2585008bd5bdcff17d6cd" + integrity sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ== dependencies: - "@npmcli/fs" "^2.1.0" - "@npmcli/move-file" "^2.0.0" - chownr "^2.0.0" - fs-minipass "^2.1.0" - glob "^8.0.1" - infer-owner "^1.0.4" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" + "@npmcli/fs" "^4.0.0" + fs-minipass "^3.0.0" + glob "^10.2.2" + lru-cache "^10.0.1" + minipass "^7.0.3" + minipass-collect "^2.0.1" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - mkdirp "^1.0.4" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^9.0.0" - tar "^6.1.11" - unique-filename "^2.0.0" + p-map "^7.0.2" + ssri "^12.0.0" + tar "^7.4.3" + unique-filename "^4.0.0" cacheable-lookup@^5.0.3: version "5.0.4" @@ -682,7 +650,7 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -700,29 +668,28 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -chromium-bidi@0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.8.0.tgz#ffd79dad7db1fcc874f1c55fcf46ded05a884269" - integrity sha512-uJydbGdTw0DEUjhoogGveneJVWX/9YuqkWePzMmkBYwtdAqo5d3J/ovNKFr+/2hWXYmYCr6it8mSSTIj6SS6Ug== +chownr@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4" + integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g== + +chromium-bidi@10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-10.5.1.tgz#2aad9791509442bb39e96c4f3aeef4dfdb424979" + integrity sha512-rlj6OyhKhVTnk4aENcUme3Jl9h+cq4oXu4AzBcvr8RMmT6BR4a3zSNT9dbIfXr9/BS6ibzRyDhowuw4n2GgzsQ== dependencies: - mitt "3.0.1" - urlpattern-polyfill "10.0.0" - zod "3.23.8" + mitt "^3.0.1" + zod "^3.24.1" chromium-pickle-js@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== -ci-info@^3.2.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" - integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== +ci-info@4.3.1, ci-info@^4.2.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.3.1.tgz#355ad571920810b5623e11d40232f443f16f1daa" + integrity sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA== cli-cursor@^3.1.0: version "3.1.0" @@ -808,14 +775,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -config-file-ts@0.2.8-rc1: - version "0.2.8-rc1" - resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz#fb7fc6ccb2e313f69dbeb78f1db0b00038049de0" - integrity sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg== - dependencies: - glob "^10.3.12" - typescript "^5.4.3" - 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" @@ -863,10 +822,10 @@ data-uri-to-buffer@^6.0.2: resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz#8a58bb67384b261a38ef18bea1810cb01badd28b" integrity sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw== -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4, debug@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" - integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4, debug@^4.4.3: + version "4.4.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a" + integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA== dependencies: ms "^2.1.3" @@ -927,19 +886,19 @@ delayed-stream@~1.0.0: integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== detect-libc@^2.0.0, detect-libc@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" - integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== + version "2.1.2" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad" + integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ== detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.1367902: - version "0.0.1367902" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1367902.tgz#7333bfc4466c5a54a4c6de48a9dfbcb4b811660c" - integrity sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg== +devtools-protocol@0.0.1521046: + version "0.0.1521046" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1521046.tgz#918e6175ea83100fefcb2b78779f15a77aa8a41b" + integrity sha512-vhE6eymDQSKWUXwwA37NtTTVEzjtGVfDr3pRbsWEQ5onH/Snp2c+2xZHWJJawG/0hCCJLRGt4xVtEVUVILol4w== dir-compare@^4.2.0: version "4.2.0" @@ -949,14 +908,13 @@ dir-compare@^4.2.0: minimatch "^3.0.5" p-limit "^3.1.0 " -dmg-builder@26.0.9: - version "26.0.9" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.9.tgz#855f987d977e8f2599b3f07ab1bf34e53b9e1759" - integrity sha512-qDR9jFsJjFaaFZcvOBi2uMfDILnD6OsobW3akHg5IaxjG/15LuX5YkxcF1buqPhtTaPf1Oi+q155RsQmqe19qA== +dmg-builder@26.4.0: + version "26.4.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.4.0.tgz#dc7edec167b06b1542804e6e4220d1bcaf952b71" + integrity sha512-ce4Ogns4VMeisIuCSK0C62umG0lFy012jd8LMZ6w/veHUeX4fqfDrGe+HTWALAEwK6JwKP+dhPvizhArSOsFbg== dependencies: - app-builder-lib "26.0.9" - builder-util "26.0.7" - builder-util-runtime "9.3.1" + app-builder-lib "26.4.0" + builder-util "26.3.4" fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -985,9 +943,9 @@ dotenv-expand@^11.0.6: dotenv "^16.4.5" dotenv@^16.4.5: - version "16.4.7" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26" - integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ== + version "16.6.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.6.1.tgz#773f0e69527a8315c7285d5ee73c4459d20a8020" + integrity sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow== dunder-proto@^1.0.1: version "1.0.1" @@ -1010,43 +968,43 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -electron-builder@^26.0.0-alpha.7: - version "26.0.9" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.9.tgz#3e10d85b2eda36a177d66eca0f74a965f09904bd" - integrity sha512-ea27aPZEw2x83XakzT+f1H+G1VOs8jIN++NVhy2srmdjX0pGpaaxYvHJSZgEcY+ev/20ArroJtOcSqvCo2Rwzg== +electron-builder@^26.1.0: + version "26.4.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.4.0.tgz#f9a8598f045ded4cbaf41efb7bb18a89619c5dd2" + integrity sha512-FCUqvdq2AULL+Db2SUGgjOYTbrgkPxZtCjqIZGnjH9p29pTWyesQqBIfvQBKa6ewqde87aWl49n/WyI/NyUBog== dependencies: - app-builder-lib "26.0.9" - builder-util "26.0.7" - builder-util-runtime "9.3.1" + app-builder-lib "26.4.0" + builder-util "26.3.4" + builder-util-runtime "9.5.1" chalk "^4.1.2" - dmg-builder "26.0.9" + ci-info "^4.2.0" + dmg-builder "26.4.0" fs-extra "^10.1.0" - is-ci "^3.0.0" lazy-val "^1.0.5" simple-update-notifier "2.0.0" yargs "^17.6.2" -electron-publish@26.0.7: - version "26.0.7" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.0.7.tgz#b16cd31122233c228c4459cc7ab8dc25c67b6cb3" - integrity sha512-zSCBtAXnLi1QhCDEomIEu22mjKgsf17VYW3fMyZ4Y9Q7s+Ftu9dqbTMaM/e/FBCn9VthnG7C/zPCr1yKpkI+dg== +electron-publish@26.3.4: + version "26.3.4" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.3.4.tgz#ed05f1ccbb7ee1e53b4140d92735e26fa4bfefd7" + integrity sha512-5/ouDPb73SkKuay2EXisPG60LTFTMNHWo2WLrK5GDphnWK9UC+yzYrzVeydj078Yk4WUXi0+TaaZsNd6Zt5k/A== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "26.0.7" - builder-util-runtime "9.3.1" + builder-util "26.3.4" + builder-util-runtime "9.5.1" chalk "^4.1.2" form-data "^4.0.0" fs-extra "^10.1.0" lazy-val "^1.0.5" mime "^2.5.2" -electron@^33.2.1: - version "33.4.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-33.4.2.tgz#607870f0bb99c803e0e15d3966633234e15bddb5" - integrity sha512-kBoY1jlOCgQQJsVhaO4rYjKXL4FAsh6v42IzV5devYFFeMnciAPl02klrK5gD0VT8A2MeE4nulH32uYafca/VQ== +electron@^39.0.0: + version "39.2.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-39.2.7.tgz#1cf2371304994fe26c564764bd50878fe405fb4b" + integrity sha512-KU0uFS6LSTh4aOIC3miolcbizOFP7N1M46VTYVfqIgFiuA2ilfNaOHLDS9tCMvwwHRowAsvqBrh9NgMXcTOHCQ== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^20.9.0" + "@types/node" "^22.7.7" extract-zip "^2.0.1" emoji-regex@^8.0.0: @@ -1067,9 +1025,9 @@ encoding@^0.1.13: iconv-lite "^0.6.2" 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" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + version "1.4.5" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c" + integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg== dependencies: once "^1.4.0" @@ -1084,9 +1042,9 @@ err-code@^2.0.2: integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== 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== + version "1.3.4" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.4.tgz#b3a8d8bb6f92eecc1629e3e27d3c8607a8a32414" + integrity sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ== dependencies: is-arrayish "^0.2.1" @@ -1158,6 +1116,13 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +events-universal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/events-universal/-/events-universal-1.0.1.tgz#b56a84fd611b6610e0a2d0f09f80fdf931e2dfe6" + integrity sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw== + dependencies: + bare-events "^2.7.0" + execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -1177,9 +1142,9 @@ expand-template@^2.0.3: integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== exponential-backoff@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.2.tgz#a8f26adb96bf78e8cd8ad1037928d5e5c0679d91" - integrity sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.3.tgz#51cf92c1c0493c766053f9d3abee4434c244d2f6" + integrity sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA== extract-zip@^2.0.1: version "2.0.1" @@ -1219,6 +1184,11 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" +fdir@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350" + integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg== + fessonia@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/fessonia/-/fessonia-2.2.2.tgz#c8f9da5701d2e63efc9fd5793368929ddfaaf776" @@ -1232,9 +1202,9 @@ filelist@^1.0.4: minimatch "^5.0.1" follow-redirects@^1.15.6: - version "1.15.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" - integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== + version "1.15.11" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340" + integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ== foreground-child@^3.1.0: version "3.3.1" @@ -1244,14 +1214,15 @@ foreground-child@^3.1.0: cross-spawn "^7.0.6" signal-exit "^4.0.1" -form-data@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c" - integrity sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w== +form-data@^4.0.0, form-data@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053" + integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" es-set-tostringtag "^2.1.0" + hasown "^2.0.2" mime-types "^2.1.12" fs-constants@^1.0.0: @@ -1269,9 +1240,9 @@ fs-extra@^10.0.0, fs-extra@^10.1.0: universalify "^2.0.0" fs-extra@^11.1.1: - version "11.3.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.0.tgz#0daced136bbaf65a555a326719af931adc7a314d" - integrity sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew== + version "11.3.3" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.3.tgz#a27da23b72524e81ac6c3815cc0179b8c74c59ee" + integrity sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -1296,13 +1267,20 @@ fs-extra@^9.0.0, fs-extra@^9.0.1: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^2.0.0, fs-minipass@^2.1.0: +fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== dependencies: minipass "^3.0.0" +fs-minipass@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54" + integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw== + dependencies: + minipass "^7.0.3" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -1357,9 +1335,9 @@ get-stream@^5.1.0: pump "^3.0.0" get-uri@^6.0.1: - version "6.0.4" - resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.4.tgz#6daaee9e12f9759e19e55ba313956883ef50e0a7" - integrity sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ== + version "6.0.5" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.5.tgz#714892aa4a871db671abc5395e5e9447bc306a16" + integrity sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg== dependencies: basic-ftp "^5.0.2" data-uri-to-buffer "^6.0.2" @@ -1370,10 +1348,10 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== -glob@^10.3.12: - version "10.4.5" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" - integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== +glob@^10.2.2: + version "10.5.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c" + integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg== dependencies: foreground-child "^3.1.0" jackspeak "^3.1.2" @@ -1382,7 +1360,7 @@ glob@^10.3.12: package-json-from-dist "^1.0.0" path-scurry "^1.11.1" -glob@^7.1.3, glob@^7.1.6: +glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -1394,17 +1372,6 @@ glob@^7.1.3, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1, glob@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - global-agent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" @@ -1447,7 +1414,7 @@ got@^11.7.0, got@^11.8.5: p-cancelable "^2.0.0" responselike "^2.0.0" -graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: +graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -1490,19 +1457,10 @@ hosted-git-info@^4.1.0: dependencies: lru-cache "^6.0.0" -http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: - 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" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" - integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== - dependencies: - "@tootallnate/once" "2" - agent-base "6" - debug "4" +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5" + integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ== http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.1: version "7.0.2" @@ -1520,15 +1478,7 @@ http2-wrapper@^1.0.0-beta.5.2: quick-lru "^5.1.1" resolve-alpn "^1.0.0" -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" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - -https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.6: +https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1, https-proxy-agent@^7.0.6: version "7.0.6" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9" integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw== @@ -1536,13 +1486,6 @@ https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.6: agent-base "^7.1.2" debug "4" -humanize-ms@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== - dependencies: - ms "^2.0.0" - iconv-corefoundation@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" @@ -1576,16 +1519,6 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -infer-owner@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1604,26 +1537,16 @@ ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -ip-address@^9.0.5: - version "9.0.5" - resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" - integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g== - dependencies: - jsbn "1.1.0" - sprintf-js "^1.1.3" +ip-address@^10.0.1: + version "10.1.0" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4" + integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q== 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" - integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== - dependencies: - ci-info "^3.2.0" - is-docker@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" @@ -1639,11 +1562,6 @@ is-interactive@^1.0.0: resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== -is-lambda@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== - is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -1667,19 +1585,24 @@ isbinaryfile@^4.0.8: integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== isbinaryfile@^5.0.0: - version "5.0.4" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.4.tgz#2a2edefa76cafa66613fe4c1ea52f7f031017bdf" - integrity sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ== + version "5.0.7" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.7.tgz#19a73f2281b7368dca9d3b3ac8a0434074670979" + integrity sha512-gnWD14Jh3FzS3CPhF0AxNOJ8CxqeblPTADzI38r0wt8ZyQl5edpy75myt08EG2oKvpyiqSqsx+Wkz9vtkbTqYQ== isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -iso8601-duration@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-2.1.2.tgz#b13f14068fe5890c91b91e1f74e474a49f355028" - integrity sha512-yXteYUiKv6x8seaDzyBwnZtPpmx766KfvQuaVNyPifYOjmPdOo3ajd4phDNa7Y5mTQGnXsNEcXFtVun1FjYXxQ== +isexe@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d" + integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ== + +iso8601-duration@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-2.1.3.tgz#02eb767bcce0bed93684ead66a2b1b886fd7bf21" + integrity sha512-OwkROKDXYhqKTl9uyB+/+lQ/Tx+L9LVb9tNRcsO4LtCSBDrmYbzyJLg9rGjYKAPDabD6IVdjMyUnnULHpejrCg== jackspeak@^3.1.2: version "3.4.3" @@ -1691,14 +1614,18 @@ jackspeak@^3.1.2: "@pkgjs/parseargs" "^0.11.0" jake@^10.8.5: - version "10.9.2" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f" - integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA== + version "10.9.4" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.4.tgz#d626da108c63d5cfb00ab5c25fadc7e0084af8e6" + integrity sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA== dependencies: - async "^3.2.3" - chalk "^4.0.2" + async "^3.2.6" filelist "^1.0.4" - minimatch "^3.1.2" + picocolors "^1.1.1" + +jiti@^2.4.2: + version "2.6.1" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.6.1.tgz#178ef2fc9a1a594248c20627cd820187a4d78d92" + integrity sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ== js-tokens@^4.0.0: version "4.0.0" @@ -1706,17 +1633,12 @@ js-tokens@^4.0.0: 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" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + version "4.1.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b" + integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA== dependencies: argparse "^2.0.1" -jsbn@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" - integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== - json-buffer@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" @@ -1750,9 +1672,9 @@ jsonfile@^4.0.0: graceful-fs "^4.1.6" jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + version "6.2.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62" + integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg== dependencies: universalify "^2.0.0" optionalDependencies: @@ -1801,7 +1723,7 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== -lru-cache@^10.2.0: +lru-cache@^10.0.1, lru-cache@^10.2.0: version "10.4.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ== @@ -1813,32 +1735,27 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^7.14.1, lru-cache@^7.7.1: +lru-cache@^7.14.1: version "7.18.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== -make-fetch-happen@^10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" - integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== +make-fetch-happen@^14.0.3: + version "14.0.3" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz#d74c3ecb0028f08ab604011e0bc6baed483fcdcd" + integrity sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ== dependencies: - agentkeepalive "^4.2.1" - cacache "^16.1.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" - minipass-fetch "^2.0.3" + "@npmcli/agent" "^3.0.0" + cacache "^19.0.1" + http-cache-semantics "^4.1.1" + minipass "^7.0.2" + minipass-fetch "^4.0.0" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - negotiator "^0.6.3" + negotiator "^1.0.0" + proc-log "^5.0.0" promise-retry "^2.0.1" - socks-proxy-agent "^7.0.0" - ssri "^9.0.0" + ssri "^12.0.0" matcher@^3.0.0: version "3.0.0" @@ -1884,14 +1801,14 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -minimatch@^10.0.0: - version "10.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b" - integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ== +minimatch@^10.0.3: + version "10.1.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55" + integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ== dependencies: - brace-expansion "^2.0.1" + "@isaacs/brace-expansion" "^5.0.0" -minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -1917,21 +1834,21 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== -minipass-collect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" - integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== +minipass-collect@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863" + integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw== dependencies: - minipass "^3.0.0" + minipass "^7.0.3" -minipass-fetch@^2.0.3: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" - integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== +minipass-fetch@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-4.0.1.tgz#f2d717d5a418ad0b1a7274f9b913515d3e78f9e5" + integrity sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ== dependencies: - minipass "^3.1.6" + minipass "^7.0.3" minipass-sized "^1.0.3" - minizlib "^2.1.2" + minizlib "^3.0.1" optionalDependencies: encoding "^0.1.13" @@ -1956,7 +1873,7 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: +minipass@^3.0.0: version "3.3.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== @@ -1968,12 +1885,12 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2: +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4, minipass@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== -minizlib@^2.1.1, minizlib@^2.1.2: +minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -1981,7 +1898,14 @@ minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" -mitt@3.0.1: +minizlib@^3.0.1, minizlib@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-3.1.0.tgz#6ad76c3a8f10227c9b51d1c9ac8e30b27f5a251c" + integrity sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw== + dependencies: + minipass "^7.1.2" + +mitt@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1" integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw== @@ -1991,12 +1915,12 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@^1.0.3, mkdirp@^1.0.4: +mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -ms@^2.0.0, ms@^2.1.3: +ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -2006,10 +1930,10 @@ napi-build-utils@^2.0.0: resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-2.0.0.tgz#13c22c0187fcfccce1461844136372a47ddc027e" integrity sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA== -negotiator@^0.6.3: - version "0.6.4" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" - integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== +negotiator@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a" + integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg== netmask@^2.0.2: version "2.0.2" @@ -2021,13 +1945,20 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abi@^3.3.0, node-abi@^3.45.0: - version "3.74.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.74.0.tgz#5bfb4424264eaeb91432d2adb9da23c63a301ed0" - integrity sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w== +node-abi@^3.3.0: + version "3.85.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.85.0.tgz#b115d575e52b2495ef08372b058e13d202875a7d" + integrity sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg== dependencies: semver "^7.3.5" +node-abi@^4.2.0: + version "4.24.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-4.24.0.tgz#fcc1b4c645ffb4c0f39e2dbfb9c41698ba7e782e" + integrity sha512-u2EC1CeNe25uVtX3EZbdQ275c74zdZmmpzrHEQh2aIYqoVjlglfUpOX9YY85x1nlBydEKDVaSmMNhR7N82Qj8A== + dependencies: + semver "^7.6.3" + node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" @@ -2038,19 +1969,35 @@ node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -node-api-version@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.0.tgz#5177441da2b1046a4d4547ab9e0972eed7b1ac1d" - integrity sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg== +node-api-version@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.1.tgz#19bad54f6d65628cbee4e607a325e4488ace2de9" + integrity sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q== dependencies: semver "^7.3.5" -nopt@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" - integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== +node-gyp@^11.2.0: + version "11.5.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-11.5.0.tgz#82661b5f40647a7361efe918e3cea76d297fcc56" + integrity sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ== dependencies: - abbrev "^1.0.0" + env-paths "^2.2.0" + exponential-backoff "^3.1.1" + graceful-fs "^4.2.6" + make-fetch-happen "^14.0.3" + nopt "^8.0.0" + proc-log "^5.0.0" + semver "^7.3.5" + tar "^7.4.3" + tinyglobby "^0.2.12" + which "^5.0.0" + +nopt@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-8.1.0.tgz#b11d38caf0f8643ce885818518064127f602eae3" + integrity sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A== + dependencies: + abbrev "^3.0.0" normalize-url@^6.0.1: version "6.1.0" @@ -2115,12 +2062,10 @@ p-finally@^1.0.0: dependencies: yocto-queue "^0.1.0" -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" +p-map@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-7.0.4.tgz#b81814255f542e252d5729dca4d66e5ec14935b8" + integrity sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ== pac-proxy-agent@^7.1.0: version "7.2.0" @@ -2199,12 +2144,17 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== -picocolors@^1.0.0: +picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== -plist@^3.0.4, plist@^3.0.5, plist@^3.1.0: +picomatch@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042" + integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q== + +plist@3.1.0, plist@^3.0.4, plist@^3.0.5, plist@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== @@ -2231,21 +2181,16 @@ prebuild-install@^7.0.1: tar-fs "^2.0.0" tunnel-agent "^0.6.0" -proc-log@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685" - integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw== +proc-log@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-5.0.0.tgz#e6c93cf37aef33f835c53485f314f50ea906a9d8" + integrity sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ== 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== -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== - promise-retry@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" @@ -2274,9 +2219,9 @@ proxy-from-env@^1.1.0: integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== pump@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8" - integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw== + version "3.0.3" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.3.tgz#151d979f1a29668dc0025ec589a455b53282268d" + integrity sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA== dependencies: end-of-stream "^1.1.0" once "^1.3.1" @@ -2286,28 +2231,29 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -puppeteer-core@23.10.4: - version "23.10.4" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-23.10.4.tgz#f0a70a0df6a0afd43e787b658064ddb062c07b5a" - integrity sha512-pQAY7+IFAndWDkDodsQGguW1/ifV5OMlGXJDspwtK49Asb7poJZ/V5rXJxVSpq57bWrJasjQBZ1X27z1oWVq4Q== +puppeteer-core@24.27.0: + version "24.27.0" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-24.27.0.tgz#dd81d615fc8e4bafad500442e798323f920c89b8" + integrity sha512-yubwj2XXmTM3wRIpbhO5nCjbByPgpFHlgrsD4IK+gMPqO7/a5FfnoSXDKjmqi8A2M1Ewusz0rTI/r+IN0GU0MA== dependencies: - "@puppeteer/browsers" "2.6.1" - chromium-bidi "0.8.0" - debug "^4.4.0" - devtools-protocol "0.0.1367902" + "@puppeteer/browsers" "2.10.12" + chromium-bidi "10.5.1" + debug "^4.4.3" + devtools-protocol "0.0.1521046" typed-query-selector "^2.12.0" - ws "^8.18.0" + webdriver-bidi-protocol "0.3.8" + ws "^8.18.3" -puppeteer@23.10.4: - version "23.10.4" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-23.10.4.tgz#398ff9f04924c05334514d73b61a03a7a36ad101" - integrity sha512-i0sYIAIjdO9MoRfFqbkoWFnQYZVmNp8msbztTgG46KbOdoYAv4f56MFzdFwtC0lyZHtkP+yl0H7tP0dNg3RQYA== +puppeteer@24.27.0: + version "24.27.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-24.27.0.tgz#4867c3a3f028de8491114d253808f20757436830" + integrity sha512-eEcAFGxmHRSrk74DVkFAMAwfj4l3Ak8avBuA2bZaAoocY1+Fb9WLS3I7jlOc/tIOU7EmGLiDdVP08R44wADpHw== dependencies: - "@puppeteer/browsers" "2.6.1" - chromium-bidi "0.8.0" + "@puppeteer/browsers" "2.10.12" + chromium-bidi "10.5.1" cosmiconfig "^9.0.0" - devtools-protocol "0.0.1367902" - puppeteer-core "23.10.4" + devtools-protocol "0.0.1521046" + puppeteer-core "24.27.0" typed-query-selector "^2.12.0" quick-lru@^5.1.1: @@ -2383,13 +2329,6 @@ retry@^0.12.0: resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - roarr@^2.15.3: version "2.15.4" resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" @@ -2420,9 +2359,9 @@ sanitize-filename@^1.6.3: truncate-utf8-bytes "^1.0.0" sax@^1.2.4: - version "1.4.1" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" - integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== + version "1.4.3" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.3.tgz#fcebae3b756cdc8428321805f4b70f16ec0ab5db" + integrity sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ== semver-compare@^1.0.0: version "1.0.0" @@ -2439,10 +2378,10 @@ semver@^6.2.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.2, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.6.3: - version "7.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f" - integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA== +semver@^7.3.2, semver@^7.3.5, semver@^7.5.3, semver@^7.6.3, semver@^7.7.3, semver@~7.7.3: + version "7.7.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946" + integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q== serialize-error@^7.0.1: version "7.0.1" @@ -2520,16 +2459,7 @@ smart-buffer@^4.0.2, smart-buffer@^4.2.0: resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -socks-proxy-agent@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" - integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== - dependencies: - agent-base "^6.0.2" - debug "^4.3.3" - socks "^2.6.2" - -socks-proxy-agent@^8.0.5: +socks-proxy-agent@^8.0.3, socks-proxy-agent@^8.0.5: version "8.0.5" resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz#b9cdb4e7e998509d7659d689ce7697ac21645bee" integrity sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw== @@ -2538,12 +2468,12 @@ socks-proxy-agent@^8.0.5: debug "^4.3.4" socks "^2.8.3" -socks@^2.6.2, socks@^2.8.3: - version "2.8.4" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.4.tgz#07109755cdd4da03269bda4725baa061ab56d5cc" - integrity sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ== +socks@^2.8.3: + version "2.8.7" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.7.tgz#e2fb1d9a603add75050a2067db8c381a0b5669ea" + integrity sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A== dependencies: - ip-address "^9.0.5" + ip-address "^10.0.1" smart-buffer "^4.2.0" source-map-support@^0.5.19: @@ -2559,17 +2489,17 @@ source-map@^0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -sprintf-js@^1.1.2, sprintf-js@^1.1.3: +sprintf-js@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== -ssri@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" - integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== +ssri@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-12.0.0.tgz#bcb4258417c702472f8191981d3c8a771fee6832" + integrity sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ== dependencies: - minipass "^3.1.1" + minipass "^7.0.3" stat-mode@^1.0.0: version "1.0.0" @@ -2577,14 +2507,13 @@ stat-mode@^1.0.0: integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== streamx@^2.15.0, streamx@^2.21.0: - version "2.22.0" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.22.0.tgz#cd7b5e57c95aaef0ff9b2aef7905afa62ec6e4a7" - integrity sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw== + version "2.23.0" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.23.0.tgz#7d0f3d00d4a6c5de5728aecd6422b4008d66fd0b" + integrity sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg== dependencies: + events-universal "^1.0.0" fast-fifo "^1.3.2" text-decoder "^1.1.0" - optionalDependencies: - bare-events "^2.2.0" "string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" @@ -2635,9 +2564,9 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: ansi-regex "^5.0.1" strip-ansi@^7.0.1: - version "7.1.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" - integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + version "7.1.2" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba" + integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA== dependencies: ansi-regex "^6.0.1" @@ -2666,19 +2595,19 @@ supports-color@^7.1.0: has-flag "^4.0.0" tar-fs@^2.0.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5" - integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA== + version "2.1.4" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.4.tgz#800824dbf4ef06ded9afea4acafe71c67c76b930" + integrity sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ== dependencies: chownr "^1.1.1" mkdirp-classic "^0.5.2" pump "^3.0.0" tar-stream "^2.1.4" -tar-fs@^3.0.6: - version "3.0.8" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.8.tgz#8f62012537d5ff89252d01e48690dc4ebed33ab7" - integrity sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg== +tar-fs@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.1.1.tgz#4f164e59fb60f103d472360731e8c6bb4a7fe9ef" + integrity sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg== dependencies: pump "^3.0.0" tar-stream "^3.1.5" @@ -2706,7 +2635,7 @@ tar-stream@^3.1.5: fast-fifo "^1.2.0" streamx "^2.15.0" -tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.2.1: +tar@^6.0.5, tar@^6.1.12: version "6.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== @@ -2718,6 +2647,17 @@ tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.2.1: mkdirp "^1.0.3" yallist "^4.0.0" +tar@^7.4.3: + version "7.5.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.2.tgz#115c061495ec51ff3c6745ff8f6d0871c5b1dedc" + integrity sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg== + dependencies: + "@isaacs/fs-minipass" "^4.0.0" + chownr "^3.0.0" + minipass "^7.1.2" + minizlib "^3.1.0" + yallist "^5.0.0" + temp-file@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" @@ -2733,11 +2673,6 @@ text-decoder@^1.1.0: dependencies: b4a "^1.6.4" -through@^2.3.8: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - tiny-async-pool@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz#c013e1b369095e7005db5595f95e646cca6ef8a5" @@ -2745,6 +2680,14 @@ tiny-async-pool@1.3.0: dependencies: semver "^5.5.0" +tinyglobby@^0.2.12: + version "0.2.15" + resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2" + integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ== + dependencies: + fdir "^6.5.0" + picomatch "^4.0.3" + tmp-promise@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" @@ -2753,9 +2696,9 @@ tmp-promise@^3.0.2: tmp "^0.2.0" tmp@^0.2.0: - version "0.2.3" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae" - integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w== + version "0.2.5" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8" + integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow== truncate-utf8-bytes@^1.0.0: version "1.0.2" @@ -2786,40 +2729,27 @@ typed-query-selector@^2.12.0: resolved "https://registry.yarnpkg.com/typed-query-selector/-/typed-query-selector-2.12.0.tgz#92b65dbc0a42655fccf4aeb1a08b1dddce8af5f2" integrity sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg== -typescript@^5.4.3: - version "5.8.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4" - integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ== +undici-types@~6.21.0: + version "6.21.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" + integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== -unbzip2-stream@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" - integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== +undici-types@~7.16.0: + version "7.16.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46" + integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw== + +unique-filename@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-4.0.0.tgz#a06534d370e7c977a939cd1d11f7f0ab8f1fed13" + integrity sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ== dependencies: - buffer "^5.2.1" - through "^2.3.8" + unique-slug "^5.0.0" -undici-types@~6.19.2: - version "6.19.8" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" - integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== - -undici-types@~6.20.0: - version "6.20.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" - integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== - -unique-filename@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" - integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== - dependencies: - unique-slug "^3.0.0" - -unique-slug@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" - integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== +unique-slug@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-5.0.0.tgz#ca72af03ad0dbab4dad8aa683f633878b1accda8" + integrity sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg== dependencies: imurmurhash "^0.1.4" @@ -2840,11 +2770,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -urlpattern-polyfill@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz#f0a03a97bfb03cdf33553e5e79a2aadd22cac8ec" - integrity sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg== - utf8-byte-length@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz#f9f63910d15536ee2b2d5dd4665389715eac5c1e" @@ -2871,6 +2796,11 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +webdriver-bidi-protocol@0.3.8: + version "0.3.8" + resolved "https://registry.yarnpkg.com/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.3.8.tgz#9c822b2647fd16d22b1b6fd730d4a3b863c93b93" + integrity sha512-21Yi2GhGntMc671vNBCjiAeEVknXjVRoyu+k+9xOMShu+ZQfpGQwnBqbNz/Sv4GXZ6JmutlPAi2nIJcrymAWuQ== + which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -2878,13 +2808,20 @@ which@^1.2.9: dependencies: isexe "^2.0.0" -which@^2.0.1, which@^2.0.2: +which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" +which@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/which/-/which-5.0.0.tgz#d93f2d93f79834d4363c7d0c23e00d07c466c8d6" + integrity sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ== + dependencies: + isexe "^3.1.1" + "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -2917,10 +2854,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@^8.18.0: - version "8.18.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb" - integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w== +ws@^8.18.3: + version "8.18.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472" + integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg== xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" @@ -2937,6 +2874,11 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +yallist@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533" + integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw== + yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" @@ -2968,7 +2910,7 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -zod@3.23.8: - version "3.23.8" - resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d" - integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g== +zod@^3.24.1: + version "3.25.76" + resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34" + integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ== From 410a48ac630e0e36d26900e6b33ef764488fc125 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Tue, 23 Dec 2025 23:48:03 +0100 Subject: [PATCH 63/65] ty: 0.0.5 -> 0.0.6 Changelog: https://github.com/astral-sh/ty/releases/tag/0.0.6 Diff: https://github.com/astral-sh/ty/compare/0.0.5...0.0.6 --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index a8fade03051e..7a20acc1b4ea 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-G9sVPg1fe35CNYJlRO/1zm3gOY78qfmU/RwKw2iG7o8="; + hash = "sha256-bmzbEbpr7ZF0p9cqNf04v0Ql3PWaQByf0UCHArffhzI="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-NyNXR1PGds+GXAha9u4DglUyy7T+yqLjNpGnchYn6oc="; + cargoHash = "sha256-d5F9xp770b4M5T5k04/1DiMsXm9RwkL6IZuaSrACfvM="; nativeBuildInputs = [ installShellFiles ]; From 4d214d0e6edd49627a13701a4cb17e0a65ae0aad Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 23 Dec 2025 14:24:56 -0500 Subject: [PATCH 64/65] aws-cdk-cli: init at 2.1100.1 Co-authored-by: Tomodachi94 --- pkgs/by-name/aw/aws-cdk-cli/package.nix | 121 ++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 pkgs/by-name/aw/aws-cdk-cli/package.nix diff --git a/pkgs/by-name/aw/aws-cdk-cli/package.nix b/pkgs/by-name/aw/aws-cdk-cli/package.nix new file mode 100644 index 000000000000..2af3ec060406 --- /dev/null +++ b/pkgs/by-name/aw/aws-cdk-cli/package.nix @@ -0,0 +1,121 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + nodejs, + yarnBuildHook, + yarnConfigHook, + yarnInstallHook, + diffutils, + zip, + jq, + unzip, + testers, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aws-cdk-cli"; + version = "2.1100.1"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-cdk-cli"; + tag = "cdk@v${finalAttrs.version}"; + hash = "sha256-GIW6y2njqZExAiegDXNWUQB0HzNvXlg02L9DBo4oQnI="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-oUsH7ccuHFgZw9cnwhIq/mbEgNdJJv9GzBh6HsJT+kU="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + zip + jq + # tests + diffutils + unzip + ]; + + env = { + NX_DISABLE_REMOTE_CACHE = "true"; + NX_TASKS_RUNNER_DYNAMIC_OUTPUT = "false"; + NX_VERBOSE_LOGGING = "true"; + # Needed to properly embed version info + CODEBUILD_RESOLVED_SOURCE_VERSION = finalAttrs.version; + }; + + # Regular "build" is very heavy and does things we don't need. + yarnBuildScript = "compile"; + + postPatch = + let + cliVersionJson = builtins.toJSON { + inherit (finalAttrs) version; + }; + in + '' + echo '${cliVersionJson}' > packages/@aws-cdk/cloud-assembly-schema/cli-version.json + ''; + + preBuild = '' + export NX_PARALLEL="$NIX_BUILD_CORES" + pushd packages/@aws-cdk/integ-runner + patchShebangs build-tools/generate.sh + build-tools/generate.sh + popd + pushd packages/aws-cdk + patchShebangs generate.sh + ./generate.sh + popd + ''; + + postInstall = '' + # Manually bundle non-bundled dependencies + cp -r packages/@aws-cdk/cloud-assembly-schema/node_modules/jsonschema $out/lib/node_modules/aws-cdk-cli/node_modules/jsonschema + cp -r packages/aws-cdk/node_modules/decamelize $out/lib/node_modules/aws-cdk-cli/node_modules/decamelize + + patchShebangs "$out/lib/node_modules/aws-cdk-cli/node_modules/aws-cdk/bin" + ln -s "$out/lib/node_modules/aws-cdk-cli/node_modules/aws-cdk/bin" "$out/bin" + # Delete broken symlinks + find "$out/lib/node_modules" -xtype l -delete + + # Fix version + pushd $out/lib/node_modules/aws-cdk-cli/packages/aws-cdk + mv package.json package.json.bak + jq '.version = "${finalAttrs.version}"' < package.json.bak > package.json + rm package.json.bak + mv build-info.json bi.json + jq '.commit = "nixpkgs"' < bi.json > build-info.json + rm bi.json + popd + ''; + + # Fixup takes an absurdly long time, so disable it + dontFixup = true; + + passthru = { + tests.version = testers.testVersion { package = finalAttrs.package; }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "cdk@v(.*)" + ]; + }; + }; + + meta = { + description = "AWS CDK Toolkit"; + homepage = "https://docs.aws.amazon.com/cdk/v2/guide/cli.html"; + license = lib.licenses.asl20; + maintainers = [ ]; + mainProgram = "cdk"; + platforms = lib.platforms.all; + }; +}) From 0f7c85720063775bf88605928f8275379b5b1821 Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 23 Dec 2025 14:26:20 -0500 Subject: [PATCH 65/65] nodePackages.aws-cdk: drop and alias to aws-cdk-cli --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 100191e6ff7d..b6a1f90d49d9 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -73,6 +73,7 @@ mapAliases { inherit (pkgs) asar; # added 2023-08-26 inherit (pkgs) auto-changelog; # added 2024-06-25 inherit (pkgs) aws-azure-login; # added 2023-09-30 + aws-cdk = pkgs.aws-cdk-cli; # Added 2025-12-23 awesome-lint = throw "'awesome-lint' has been removed because it was unmaintainable in nixpkgs"; # Added 2025-11-17 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 inherit (pkgs) bash-language-server; # added 2024-06-07 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 37c3f2e57592..26e89128eb93 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -5,7 +5,6 @@ # Packages that provide a single executable. "@angular/cli" = "ng"; - aws-cdk = "cdk"; grunt-cli = "grunt"; gulp-cli = "gulp"; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 40abd112e972..f5dda4fdd2eb 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -6,7 +6,6 @@ , "@tailwindcss/line-clamp" , "@tailwindcss/typography" , "alex" -, "aws-cdk" , "browserify" , "browser-sync" , "coc-go" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index fc6963f1cc93..bc19ca668283 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -19471,24 +19471,6 @@ in bypassCache = true; reconstructLock = true; }; - aws-cdk = nodeEnv.buildNodePackage { - name = "aws-cdk"; - packageName = "aws-cdk"; - version = "2.1004.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.1004.0.tgz"; - sha512 = "3E5ICmSc7ZCZCwLX7NY+HFmmdUYgRaL+67h/BDoDQmkhx9StC8wG4xgzHFY9k8WQS0+ib/MP28f2d9yzHtQLlQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "AWS CDK CLI, the command line tool for CDK apps"; - homepage = "https://github.com/aws/aws-cdk"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify";