From 21a266b618bdcd483ccd62a2e5b1a3fdf97cfd46 Mon Sep 17 00:00:00 2001 From: hlad Date: Thu, 6 Mar 2025 11:52:15 +0100 Subject: [PATCH 01/48] errbot: missing setuptools dependency for pkg_resources --- pkgs/by-name/er/errbot/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/er/errbot/package.nix b/pkgs/by-name/er/errbot/package.nix index 8ff4c4cf431a..f17bfa6abbd3 100644 --- a/pkgs/by-name/er/errbot/package.nix +++ b/pkgs/by-name/er/errbot/package.nix @@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { pygments-markdown-lexer pyopenssl requests + setuptools slixmpp python-telegram-bot webtest From 03a49014345335ba90bbca782f2c61a7a0db35d9 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 21 Apr 2025 15:00:50 -0500 Subject: [PATCH 02/48] fastlane: 2.227.0 -> 2.227.1 --- pkgs/by-name/fa/fastlane/Gemfile.lock | 12 ++++++------ pkgs/by-name/fa/fastlane/gemset.nix | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/fa/fastlane/Gemfile.lock b/pkgs/by-name/fa/fastlane/Gemfile.lock index e19da6e89c5d..6f670951d9cf 100644 --- a/pkgs/by-name/fa/fastlane/Gemfile.lock +++ b/pkgs/by-name/fa/fastlane/Gemfile.lock @@ -11,8 +11,8 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.2) - aws-partitions (1.1075.0) - aws-sdk-core (3.221.0) + aws-partitions (1.1090.0) + aws-sdk-core (3.222.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -22,7 +22,7 @@ GEM aws-sdk-kms (1.99.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) + aws-sdk-s3 (1.183.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -71,7 +71,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.227.0) + fastlane (2.227.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -111,7 +111,7 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.4.0) + xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-sirp (1.0.0) sysrandom (~> 1.0) @@ -225,4 +225,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.6.2 + 2.6.6 diff --git a/pkgs/by-name/fa/fastlane/gemset.nix b/pkgs/by-name/fa/fastlane/gemset.nix index 2d5101d1b85f..84d17a97be9d 100644 --- a/pkgs/by-name/fa/fastlane/gemset.nix +++ b/pkgs/by-name/fa/fastlane/gemset.nix @@ -55,10 +55,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jb72jj18a9l98ghmi8ny9nys4w3hcny0xyi0dzl3ms0knsrrn3i"; + sha256 = "15nkd4iskiy2c2lh1w499978zvnxkirpdm2i0y5i0yvym43kkycx"; type = "gem"; }; - version = "1.1075.0"; + version = "1.1090.0"; }; aws-sdk-core = { dependencies = [ @@ -73,10 +73,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jmd8rf68jf99ksklwaflym07issvr1il1qpzmpaf59avhcxgjjy"; + sha256 = "1lf8aykj9ybs7mvfk27ccs221z7rhqm3lxqx6zy27lf6jl2hff86"; type = "gem"; }; - version = "3.221.0"; + version = "3.222.2"; }; aws-sdk-kms = { dependencies = [ @@ -102,10 +102,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; + sha256 = "0k4zg6i7xrgqv4s66hxj0l5icx44bb1ax52al2s5gz3n1hrv01lc"; type = "gem"; }; - version = "1.182.0"; + version = "1.183.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -461,10 +461,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb"; + sha256 = "124ijrgr9w709093g7p7hvhg1l4wy4kr1c8rn82krri89pl4q6y2"; type = "gem"; }; - version = "2.227.0"; + version = "2.227.1"; }; fastlane-sirp = { dependencies = [ "sysrandom" ]; From 178e64c9ffe5728675f75bdf6c3f7c0b25860ab5 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:35:15 +0200 Subject: [PATCH 03/48] grafanaPlugins.grafana-clickhouse-datasource: 4.4.0 -> 4.8.2 --- .../plugins/grafana-clickhouse-datasource/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix index b80f1bedcaa1..028c75b93fd4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin rec { pname = "grafana-clickhouse-datasource"; - version = "4.4.0"; + version = "4.8.2"; zipHash = { - x86_64-linux = "sha256-rh+oTJrW7WxLHG7jSkT1Pog+/tqhE+j/0jdbgaHu1a4="; - aarch64-linux = "sha256-uV+WKh3/jBgOwX2lrwC3Q7TGr3/BH83QZhwmtL4G3qo="; - x86_64-darwin = "sha256-Y6Xp4HCYF+Nkw8CNrfEMOtpNgKunMI/4oVqD8Wq5VEI="; - aarch64-darwin = "sha256-x/Z5BA9N5sZurQ5K1NQCYXQPZ/yF1p/372GPIeVU0ps="; + x86_64-linux = "sha256-gegkpks7KIHKUG3nmNzEulbhH18eOsx8Afr0tprHFkk="; + aarch64-linux = "sha256-wvde2c+goezC1xFPZZ9MnHEk287E2ScyExKNXDTbcT8="; + x86_64-darwin = "sha256-zS9LfvSOWCKQIv5GsRS48taM31ZN4i2REY+IIQbqisk="; + aarch64-darwin = "sha256-0QfTdgOkfs27EW1VB+AgHPwF1GRcFBxMPBZ9nRyovrs="; }; meta = with lib; { description = "Connects Grafana to ClickHouse"; From 0bc2e0c61f7fddefd5667a608476c062666bc34a Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:35:50 +0200 Subject: [PATCH 04/48] grafanaPlugins.grafana-lokiexplore-app: 1.0.10 -> 1.0.13 --- .../grafana/plugins/grafana-lokiexplore-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index 0b2e0a09aa33..8f8b4e216091 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-lokiexplore-app"; - version = "1.0.10"; - zipHash = "sha256-1+5xil0XmcLCDKpObuxpnoMnQZaT1I62zL6xatlyKc4="; + version = "1.0.13"; + zipHash = "sha256-oTiwvkKiKpeI7MUxyaRuxXot4UhMeSvuJh0N1VIfA5Q="; meta = with lib; { description = "The Grafana Logs Drilldown app offers a queryless experience for browsing Loki logs without the need for writing complex queries."; license = licenses.agpl3Only; From bb76c06cf203448931b4054c969d20ca9eabfe74 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:36:48 +0200 Subject: [PATCH 05/48] grafanaPlugins.grafana-mqtt-datasource: 1.1.0-beta.2 -> 1.1.0-beta.3 --- .../plugins/grafana-mqtt-datasource/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix index 1441713a4aeb..98d9df69bcad 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin { pname = "grafana-mqtt-datasource"; - version = "1.1.0-beta.2"; + version = "1.1.0-beta.3"; zipHash = { - x86_64-linux = "sha256-QYv+6zDLSYiB767A3ODgZ1HzPd7Hpa90elKDV1+dNx8="; - aarch64-linux = "sha256-cquaTD3e40vj7PuQDHvODHOpXeWx3AaN6Mv+Vu+ikbI="; - x86_64-darwin = "sha256-PZmUkghYawU5aKA536u3/LCzsvkIFVJIzl1FVWcrKTI="; - aarch64-darwin = "sha256-9FP7UbNI4q4nqRTzlNKcEPnJ9mdqzOL4E0nuEAdFNJw="; + x86_64-linux = "sha256-/0hZc0lFV1LXl6532nLJmJ6fJPdRx+sMt7Uep4GTeX0="; + aarch64-linux = "sha256-KPIa/yYkzbKm4/mB84/DdIsdqfQBOc0+LGxl2GHDVGk="; + x86_64-darwin = "sha256-7gGw/RCuzHmj/vaIAweXLPqQYAl0EMSXXjPCtjRC4vU="; + aarch64-darwin = "sha256-i2/lE7QickowFSvHoo7CuaZ1ChFVpsQgZjvuBTQapq4="; }; meta = with lib; { description = "The MQTT data source plugin allows you to visualize streaming MQTT data from within Grafana."; From a2b90c76406e4f22f779e511d28d2e1c86098f30 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:37:36 +0200 Subject: [PATCH 06/48] grafanaPlugins.grafana-oncall-app: 1.10.2 -> 1.15.6 --- .../monitoring/grafana/plugins/grafana-oncall-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix index 8767f2b51e88..ef196c4eadd6 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-oncall-app"; - version = "1.10.2"; - zipHash = "sha256-wRgzdPKSA24O4kSDhaO/09uOG6lIoJGWUGOgX1vdjlU="; + version = "1.15.6"; + zipHash = "sha256-2BlR8dKcfevkajT571f2vSn+YOzfrjUaY+dmN0SSZHE="; meta = with lib; { description = "Developer-friendly incident response for Grafana"; license = licenses.agpl3Only; From 18e7b544c8aa8796512803e795c41b9484b3eea8 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:38:07 +0200 Subject: [PATCH 07/48] grafanaPlugins.grafana-opensearch-datasource: 2.19.0 -> 2.24.0 --- .../plugins/grafana-opensearch-datasource/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix index a3b36da66dd2..c7408576b357 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin { pname = "grafana-opensearch-datasource"; - version = "2.19.0"; + version = "2.24.0"; zipHash = { - x86_64-linux = "sha256-jTeiIbaM2wPBTxFyXPQhBXxxzgRZbaXkqeN9+tHgWPc="; - aarch64-linux = "sha256-8ti5CibWbycAO9o3Wse/CuE07JjwV1Quhy/Vm6BDmyM="; - x86_64-darwin = "sha256-6rqdTsYcqjqcXtM20ekJguT42w5dr4EUHvNuRDIU6k0="; - aarch64-darwin = "sha256-Z4ISwwkFJXXdVcLOspAK8euI4yor4Ii08K7zZffY9tM="; + x86_64-linux = "sha256-ZxlHl08pSqnVKZvVph5Bqjki7ukrV3UScJFRwW4y97o="; + aarch64-linux = "sha256-ZwPq3Xz4Rcm2JiAZnZ0D/Z6SamlCnj0/PgXeT6rrxcQ="; + x86_64-darwin = "sha256-HMifdRPl8RNb+m/eFaXATNRgDYLMG1UA6N/rWHMTR04="; + aarch64-darwin = "sha256-MLVyOeVZ42zJjLpOnGSa5ogGNa7rlcA4qjASCVeA3eU="; }; meta = with lib; { description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; From fd3644d770f7a64de0480c23a21e973520a6d273 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:38:46 +0200 Subject: [PATCH 08/48] grafanaPlugins.grafana-polystat-panel: 2.1.13 -> 2.1.14 --- .../grafana/plugins/grafana-polystat-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index c877e46a112b..0f1b75bed404 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-polystat-panel"; - version = "2.1.13"; - zipHash = "sha256-O8YOSVLhJ1hDNbBHKwkikNBOjQTrGofGklVTalgDH4I="; + version = "2.1.14"; + zipHash = "sha256-W6qx3b8rmIQV6Sm2rUsCDKrWi69N2S31hbmuqjYt25M="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; From 17c380c1f064a98965c95a2c739e64d751226b4b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:39:34 +0200 Subject: [PATCH 09/48] grafanaPlugins.marcusolsson-calendar-panel: 3.7.0 -> 3.9.1 --- .../grafana/plugins/marcusolsson-calendar-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix index 63d447f3cca4..9b7e9c602316 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "marcusolsson-calendar-panel"; - version = "3.7.0"; - zipHash = "sha256-O8EvkS+lWq2qaIj1HJzPagRGhrEENvY1YDBusvUejM0="; + version = "3.9.1"; + zipHash = "sha256-52MhkjsTke256cId6BtgjdRiU4w9cA6MTWA79/UfHQw="; meta = with lib; { description = "Calendar Panel is a Grafana plugin that displays events from various data sources."; license = licenses.asl20; From 51666c82c80821b27aab9eb544160cab815d2bd0 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:40:06 +0200 Subject: [PATCH 10/48] grafanaPlugins.marcusolsson-dynamictext-panel: 5.6.0 -> 5.7.0 --- .../plugins/marcusolsson-dynamictext-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix index ff9cafd08ffc..cc469de1f3a3 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "marcusolsson-dynamictext-panel"; - version = "5.6.0"; - zipHash = "sha256-UDJG6KAaothSv26SHKo1HNQwVHg5slI01rmDnGgGBWs="; + version = "5.7.0"; + zipHash = "sha256-HYmSj3DUdDM5m+D/nXNGmP2YpsljS895kOl+Ki1Zz88="; meta = with lib; { description = "Dynamic, data-driven text panel for Grafana"; license = licenses.asl20; From 9cf81be3b9284e2e7deb4addbb9c7740dd4bcc15 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:40:35 +0200 Subject: [PATCH 11/48] grafanaPlugins.marcusolsson-json-datasource: 1.3.17 -> 1.3.24 --- .../grafana/plugins/marcusolsson-json-datasource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix index e9d25c6c7849..e39595932788 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "marcusolsson-json-datasource"; - version = "1.3.17"; - zipHash = "sha256-L1G5s9fEEuvNs5AWXlT00f+dU2/2Rtjm4R3kpFc4NRg="; + version = "1.3.24"; + zipHash = "sha256-gKFy7T5FQU2OUGBDokNWj0cT4EuOLLMcOFezlArtdww="; meta = with lib; { description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; license = licenses.asl20; From 58ce177dcdd8f37c2633862ca81deb5bba475500 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:41:16 +0200 Subject: [PATCH 12/48] grafanaPlugins.ventura-psychrometric-panel: 4.5.1 -> 5.0.0 --- .../grafana/plugins/ventura-psychrometric-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix index d8a96be6c264..4e75c01cfe1b 100644 --- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "ventura-psychrometric-panel"; - version = "4.5.1"; - zipHash = "sha256-Y/Eh3eWZkPS8Q1eha7sEJ3wTMI7QxOr7MEbPc25fnGg="; + version = "5.0.0"; + zipHash = "sha256-g14Xosk48dslNROidRDRJGzrDSkeB3cr1PxNrsLMEAA="; meta = with lib; { description = "Grafana plugin to display air conditions on a psychrometric chart."; license = licenses.bsd3Lbnl; From d79059f649618bdde55e5dcc6bb4c110fa5921dd Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:41:52 +0200 Subject: [PATCH 13/48] grafanaPlugins.volkovlabs-echarts-panel: 6.4.1 -> 6.6.0 --- .../grafana/plugins/volkovlabs-echarts-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix index eb380bc05d87..1aab3b40e183 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-echarts-panel"; - version = "6.4.1"; - zipHash = "sha256-RHOfFKplZs0gbD/esvrpXkkPKPfo5R4zjCUJWPpkDNU="; + version = "6.6.0"; + zipHash = "sha256-SjZl33xoHVmE6y0D7FT9x2wVPil7HK1rYVgTXICpXZ4="; meta = with lib; { description = "The Apache ECharts plugin is a visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard."; license = licenses.asl20; From e40cc470439e713267bee67215cdfb3ea83dfd0c Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:42:17 +0200 Subject: [PATCH 14/48] grafanaPlugins.volkovlabs-form-panel: 4.6.0 -> 5.1.0 --- .../grafana/plugins/volkovlabs-form-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix index 73f76d3c78b1..e558c7e1f16d 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-form-panel"; - version = "4.6.0"; - zipHash = "sha256-ne2dfCr+PBodeaxGfZL0VrAxHLYEAaeQfuZQf2F3s0s="; + version = "5.1.0"; + zipHash = "sha256-aFIrKrfcTk4dGBaGVMv6mMLQqys5QaD9XgZIGmtgA5s="; meta = with lib; { description = "The Data Manipulation Panel is the first plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard."; license = licenses.asl20; From d43cbff8e13f7e2dfb15410a83a0af2b8c54b36b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:42:51 +0200 Subject: [PATCH 15/48] grafanaPlugins.volkovlabs-form-panel: 4.2.0 -> 4.3.0 --- .../grafana/plugins/volkovlabs-rss-datasource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix index 246abd3a4107..3d428ccff1d5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-rss-datasource"; - version = "4.2.0"; - zipHash = "sha256-+3tgvpH6xlJORqN4Sx7qwzsiQZoLwdarzhx6kHvtOoY="; + version = "4.3.0"; + zipHash = "sha256-HF37azbhlYp8RndUMr7Xs1ajgOTJplVP7rQzGQ0GrU4="; meta = with lib; { description = "The RSS/Atom data source is a plugin for Grafana that retrieves RSS/Atom feeds and allows visualizing them using Dynamic Text and other panels."; license = licenses.asl20; From f60294243a8eadad3cd17094cf3ee7790e0f8e6e Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:43:19 +0200 Subject: [PATCH 16/48] grafanaPlugins.volkovlabs-variable-panel: 3.5.0 -> 3.9.0 --- .../grafana/plugins/volkovlabs-variable-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix index 6cd53b80f2fd..893c3ed635b0 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-variable-panel"; - version = "3.5.0"; - zipHash = "sha256-SqMTCdB+8OUo94zJ3eS5NoCeyjc7sdMCR0CTvVe/L1g="; + version = "3.9.0"; + zipHash = "sha256-M9upfNMK45dPnouSO6Do3Li833q9NI0H2gc6DaLEsbA="; meta = with lib; { description = "The Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard."; license = licenses.asl20; From 8b3ea3ef33a2b3f8e5b5c0f2275abe1af8297a46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 20:15:40 +0000 Subject: [PATCH 17/48] corrosion: 0.5.1 -> 0.5.2 --- pkgs/by-name/co/corrosion/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/corrosion/package.nix b/pkgs/by-name/co/corrosion/package.nix index cdd2debdaa61..54e30851a464 100644 --- a/pkgs/by-name/co/corrosion/package.nix +++ b/pkgs/by-name/co/corrosion/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-/Xq0SKaKuOgrMXbgw+Aa59NEnU1mPQhARoh7EqV01K8="; + hash = "sha256-sO2U0llrDOWYYjnfoRZE+/ofg3kb+ajFmqvaweRvT7c="; }; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; From 73e7919437a29a0ad25ae95b13c38c5eb2c5e4d4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 27 Apr 2025 20:57:20 +0200 Subject: [PATCH 18/48] abracadabra: 3.1.0 -> 3.2.0 --- pkgs/by-name/ab/abracadabra/package.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix index e79cfc8f87a3..08fac458cdb1 100644 --- a/pkgs/by-name/ab/abracadabra/package.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, qt6, faad2, @@ -16,29 +15,15 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-kH84xDK1873ekxIYlOw6M3kVH+Sm/Sofb3AAbs4XzE0="; + hash = "sha256-4M/LrM1Edu9isvpKPArir7UwPJ0u0Yjl4ttFtxcqYtM="; }; - patches = [ - # upstream patches, remove with next upgrade - (fetchpatch { - name = "no-qcustomplot"; - url = "https://github.com/KejPi/AbracaDABra/commit/b0800cfe7abebf79f1edb915b3cf55fe96129017.patch"; - hash = "sha256-8FiXix/riLvkxd2uTJCoUESInPiCsF6B+qaxRGbeUcs="; - }) - (fetchpatch { - name = "fix-missing-include"; - url = "https://github.com/KejPi/AbracaDABra/commit/8f88a3351fccea93c3c83bbfa94e98fb0823b0ae.patch"; - hash = "sha256-9AloBgpUuewUBGM/NTHYUqd0uctJ17QJ0GA5RJN1GLQ="; - }) - ]; - nativeBuildInputs = [ cmake qt6.wrapQtAppsHook From 073e4bd689e0f8294d10d7a7b6885da34342331a Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sat, 16 Nov 2024 21:55:45 +0700 Subject: [PATCH 19/48] nixos/i18n: add extraLocales option --- nixos/modules/config/i18n.nix | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index d36d4c3ecdfd..0213274ec3a6 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -42,6 +42,17 @@ ''; }; + extraLocales = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ "nl_NL.UTF-8" ]; + description = '' + Additional locales that the system should support, besides the ones + configured with {option}`i18n.defaultLocale` and + {option}`i18n.extraLocaleSettings`. + ''; + }; + extraLocaleSettings = lib.mkOption { type = lib.types.attrsOf lib.types.str; default = { }; @@ -67,18 +78,24 @@ "en_US.UTF-8" config.i18n.defaultLocale ] + ++ config.i18n.extraLocales ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) ) ); defaultText = lib.literalExpression '' - lib.unique - (builtins.map (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") ( - [ - "C.UTF-8" - "en_US.UTF-8" - config.i18n.defaultLocale - ] ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) - )) + lib.unique ( + builtins.map + (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") + ( + [ + "C.UTF-8" + "en_US.UTF-8" + config.i18n.defaultLocale + ] + ++ config.i18n.extraLocales + ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) + ) + ) ''; example = [ "en_US.UTF-8/UTF-8" From 09ccc46de20f54b6102db39cb695f8b1cf5d15d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Apr 2025 12:50:50 +0000 Subject: [PATCH 20/48] apache-jena: 5.3.0 -> 5.4.0 --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 65ae74386203..a46081d3c7d5 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-TMvQb2cU+uz4CeyWksWYfueyQ7NpUsG4saoJVXVkd7Y="; + hash = "sha256-KQoBKPAetKI3ySWvsRn5yrtf5T5ldWiqKGrRDK8O/4Q="; }; nativeBuildInputs = [ makeWrapper From 37c90f2fd20598ccd21e9a89bfb9b24059ca276e Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 11 Apr 2025 14:00:57 +0200 Subject: [PATCH 21/48] electron_33-bin: mark as insecure because it's EOL https://github.com/electron/electron/blob/3041fd66cddac32cd1dc6a129e1edd46fe2c77ce/docs/tutorial/electron-timelines.md --- pkgs/development/tools/electron/binary/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index a000917e6136..fc526ec15c7f 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -58,7 +58,7 @@ let ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # https://www.electronjs.org/docs/latest/tutorial/electron-timelines - knownVulnerabilities = optional (versionOlder version "33.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "34.0.0") "Electron version ${version} is EOL"; }; fetcher = From 1509396b4e482530a4c10d1975801bb0ee55ea98 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 11 Apr 2025 14:02:28 +0200 Subject: [PATCH 22/48] electron-source.electron_33: remove as it's EOL https://github.com/electron/electron/blob/3041fd66cddac32cd1dc6a129e1edd46fe2c77ce/docs/tutorial/electron-timelines.md --- pkgs/development/tools/electron/info.json | 1261 --------------------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 1 insertion(+), 1266 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 41f7c2dcd1bc..e2f7e7564b35 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1,1265 +1,4 @@ { - "33": { - "chrome": "130.0.6723.191", - "chromium": { - "deps": { - "gn": { - "hash": "sha256-iNXRq3Mr8+wmY1SR4sV7yd2fDiIZ94eReelwFI0UhGU=", - "rev": "20806f79c6b4ba295274e3a589d85db41a02fdaa", - "url": "https://gn.googlesource.com/gn", - "version": "2024-09-09" - } - }, - "version": "130.0.6723.191" - }, - "chromium_npm_hash": "sha256-4w5m/bTMygidlb4TZHMx1Obp784DLxMwrfe1Uvyyfp8=", - "deps": { - "src": { - "args": { - "hash": "sha256-Vk3D3w8molUl0Gsg/LbgCktU2JQ3TzOhrwC/t2LuOy0=", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "130.0.6723.191", - "url": "https://chromium.googlesource.com/chromium/src.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/chrome/test/data/perf/canvas_bench": { - "args": { - "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/chrome/test/data/perf/frame_rate/content": { - "args": { - "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/chrome/test/data/xr/webvr_info": { - "args": { - "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/docs/website": { - "args": { - "hash": "sha256-XK22S9WwNN4zQZ5teiQ1sZA5m/8rArwq3jCgM6H9KQY=", - "rev": "052e29447b43b18da32fff653b9d58ef79fbc836", - "url": "https://chromium.googlesource.com/website.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/electron": { - "args": { - "hash": "sha256-5r6sCfGOwMJhn20LIKxeaM1AyHbN0jgr1YxhFvCxZo0=", - "owner": "electron", - "repo": "electron", - "rev": "v33.4.10" - }, - "fetcher": "fetchFromGitHub" - }, - "src/media/cdm/api": { - "args": { - "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "rev": "eb21edc44e8e5a82095037be80c8b15c51624293", - "url": "https://chromium.googlesource.com/chromium/cdm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/net/third_party/quiche/src": { - "args": { - "hash": "sha256-NJKJ5cc+wEcmCIFYXWQX4x9BZblbS+wqj+25CcUiPZM=", - "rev": "9808dac40e034f09d7af53d3d79589a02e39c211", - "url": "https://quiche.googlesource.com/quiche.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/testing/libfuzzer/fuzzers/wasm_corpus": { - "args": { - "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=", - "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", - "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/accessibility_test_framework/src": { - "args": { - "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", - "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", - "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/angle": { - "args": { - "hash": "sha256-OtpF7+KQzk0MWhgBlNV1DheHywtBMDQIPhGUOss9Dtg=", - "rev": "fffbc739779a2df56a464fd6853bbfb24bebb5f6", - "url": "https://chromium.googlesource.com/angle/angle.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "args": { - "hash": "sha256-yPQG/Ddat9H4XZq6Zu5S3VzcZeMhLBcM//KI/3Kxaxg=", - "rev": "1df39e522f4aa358012180fd4cf876af68aff78d", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/angle/third_party/glmark2/src": { - "args": { - "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/angle/third_party/rapidjson/src": { - "args": { - "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/anonymous_tokens/src": { - "args": { - "hash": "sha256-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI=", - "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/beto-core/src": { - "args": { - "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=", - "rev": "89563fec14c756482afa08b016eeba9087c8d1e3", - "url": "https://beto-core.googlesource.com/beto-core.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/boringssl/src": { - "args": { - "hash": "sha256-on+VonYXZ710oqgaK/OKa9Huq2mSXp8SJcj9CciHsf8=", - "rev": "58f3bc83230d2958bb9710bc910972c4f5d382dc", - "url": "https://boringssl.googlesource.com/boringssl.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/breakpad/breakpad": { - "args": { - "hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g=", - "rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cast_core/public/src": { - "args": { - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd", - "url": "https://chromium.googlesource.com/cast_core/public" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/catapult": { - "args": { - "hash": "sha256-IHubCuEBE9W0wRudOmjUoaOvT66JuVTzEBUOTvdnXqQ=", - "rev": "296226a4a0067c8cffeb8831fb87526a8035f3cc", - "url": "https://chromium.googlesource.com/catapult.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ced/src": { - "args": { - "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/chromium-variations": { - "args": { - "hash": "sha256-DR5rJdnDKunS/PHtVK1n4zk0MmK54LhlawZW74711LY=", - "rev": "6aa57f2c6b49402b55ec607c17bd7ee8946970b0", - "url": "https://chromium.googlesource.com/chromium-variations.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/clang-format/script": { - "args": { - "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=", - "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cld_3/src": { - "args": { - "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/colorama/src": { - "args": { - "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49", - "url": "https://chromium.googlesource.com/external/colorama.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/content_analysis_sdk/src": { - "args": { - "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", - "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cpu_features/src": { - "args": { - "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "rev": "936b9ab5515dead115606559502e3864958f7f6e", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cpuinfo/src": { - "args": { - "hash": "sha256-UKy9TIiO/UJ5w+qLRlMd085CX2qtdVH2W3rtxB5r6MY=", - "rev": "ca678952a9a8eaa6de112d154e8e104b22f9ab3f", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/crabbyavif/src": { - "args": { - "hash": "sha256-9ooMkYOHRYbV2kdxu8VWUNgBeBsrN4kWUb8cZJwZfiU=", - "rev": "adfb834d76c6a064f28bb3a694689fc14a42425e", - "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/crc32c/src": { - "args": { - "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=", - "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cros-components/src": { - "args": { - "hash": "sha256-gEhAwW6u8VgBRFmAddRBlosbf/a9lhRLgs70Dvh1zos=", - "rev": "08a6ca6559c8d07c79fb5576a44e016e3126c221", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cros_system_api": { - "args": { - "hash": "sha256-9rM9m6VRX7B+h9JiICN5O9rBYdQEHNlCUnQMuaTy/1s=", - "rev": "2f88f9c4581a9c854604fa23516de8c9c13b227b", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/crossbench": { - "args": { - "hash": "sha256-7IuhXuxXD3xBkgazg3B9GZknlNv8Xi0eTHkeQv63ayk=", - "rev": "2b812597dd143dbdc560ff2f28d5f8d3adc700d4", - "url": "https://chromium.googlesource.com/crossbench.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dav1d/libdav1d": { - "args": { - "hash": "sha256-qJSUt8gMFB+IhOnEAw3t6nj1y7XUY91pLQBF8CeYtas=", - "rev": "6b3c489a2ee2c030f351f21987c27611b4cbe725", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn": { - "args": { - "hash": "sha256-T3uqU4eTYDFPrDkUCro/RjNUwCEoFUu6n+wzmkYgO1U=", - "rev": "f1041a163d06fb86b082e29260ab53a4637b0e98", - "url": "https://dawn.googlesource.com/dawn.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/dxc": { - "args": { - "hash": "sha256-CrR08tw9e+4U+fa6E9xoP/4puPNHEjLrxtSju8psLlk=", - "rev": "05334a70d3e5355fc86c94bb4e3cfe1c31a65999", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/dxheaders": { - "args": { - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/glfw": { - "args": { - "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=", - "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "args": { - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "args": { - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "args": { - "hash": "sha256-heIL8hhaVr0uRi2lD+7RFltggVFW48ZY9Tdl0yVRdac=", - "rev": "a5065e398d2430c83e17ef9cbad6eae31d1efa8f", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/webgpu-headers": { - "args": { - "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=", - "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686", - "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/depot_tools": { - "args": { - "hash": "sha256-C8U5BFLBCorwHvfKvh1xmAzOaDcBAbe3GhwJebENZD4=", - "rev": "22df6f8e622dc3e8df8dc8b5d3e3503b169af78e", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/devtools-frontend/src": { - "args": { - "hash": "sha256-gRc2ei5m7a5KVKEMIivPGy1IQqDIaJxUJHLd5k2F+GQ=", - "rev": "deee9c11c9f76ef595b7d0b52fcf677d25aac5f2", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dom_distiller_js/dist": { - "args": { - "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/domato/src": { - "args": { - "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=", - "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e", - "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/eigen3/src": { - "args": { - "hash": "sha256-U4SMReXTFZg7YGyefI6MXIB66nt5OiANMH0HUyr/xIc=", - "rev": "134b526d6110061469168e7e0511822a8e30bcaf", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/electron_node": { - "args": { - "hash": "sha256-ta9gw6A0aYguKYNRBW2nSPC3UTU5/7GNUPS02yyByis=", - "owner": "nodejs", - "repo": "node", - "rev": "v20.18.3" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/emoji-segmenter/src": { - "args": { - "hash": "sha256-sI6UgXTWxXJajB2h2LH3caf7cqRbBshD5GoLocrUivk=", - "rev": "6b8f235b72deba7d6ef113631129b274c14941ef", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/engflow-reclient-configs": { - "args": { - "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", - "owner": "EngFlow", - "repo": "reclient-configs", - "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/expat/src": { - "args": { - "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=", - "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/farmhash/src": { - "args": { - "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fast_float/src": { - "args": { - "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao=", - "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f", - "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ffmpeg": { - "args": { - "hash": "sha256-HnpWlSfXxa951UkFgL/2zKoaBeveuVkTZz/iqYXjkH8=", - "rev": "91903c28af60a732a051c343b496e1188eec9b05", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/flac": { - "args": { - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/flatbuffers/src": { - "args": { - "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=", - "rev": "8db59321d9f02cdffa30126654059c7d02f70c32", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fontconfig/src": { - "args": { - "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", - "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", - "url": "https://chromium.googlesource.com/external/fontconfig.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fp16/src": { - "args": { - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/freetype-testing/src": { - "args": { - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/freetype/src": { - "args": { - "hash": "sha256-w5Zd4yvGoMQ0BmDGa2b9gK/+7f+UaZDRYqEdMGH/zKg=", - "rev": "83af801b552111e37d9466a887e1783a0fb5f196", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fuzztest/src": { - "args": { - "hash": "sha256-g+iJrywURQfdYpco26VN+OlhZkVcFzmAK18C7W7/WLU=", - "rev": "a29e31cb00ec9b123dec5a0c6b8d4bc12c2480c8", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fxdiv/src": { - "args": { - "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/gemmlowp/src": { - "args": { - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/glslang/src": { - "args": { - "hash": "sha256-6lVjQb8FOyGmRGEcNDzL55s/9bcDY3jIz4Xm3BK3GoI=", - "rev": "dc1012140e015d43711514d1294ac6f626890a40", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/google_benchmark/src": { - "args": { - "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=", - "rev": "344117638c8ff7e239044fd0fa7085839fc03021", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/googletest/src": { - "args": { - "hash": "sha256-jccFUondvjWgCBC3oCLUXqtLV07pkEq8IEZ+FLu1MrE=", - "rev": "0953a17a4281fc26831da647ad3fcd5e21e6473b", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/grpc/src": { - "args": { - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/harfbuzz-ng/src": { - "args": { - "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=", - "rev": "1da053e87f0487382404656edca98b85fe51f2fd", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/highway/src": { - "args": { - "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=", - "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/hunspell_dictionaries": { - "args": { - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/icu": { - "args": { - "hash": "sha256-YlX+PaPhvYh9JzHT9WtS1beUK+cQrHGVUl+IBbv7GeQ=", - "rev": "9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/instrumented_libs": { - "args": { - "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=", - "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9", - "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/jsoncpp/source": { - "args": { - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/leveldatabase/src": { - "args": { - "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=", - "rev": "23e35d792b9154f922b8b575b12596a4d8664c65", - "url": "https://chromium.googlesource.com/external/leveldb.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libFuzzer/src": { - "args": { - "hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo=", - "rev": "487e79376394754705984c5de7c4ce7f82f2bd7c", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libaddressinput/src": { - "args": { - "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", - "url": "https://chromium.googlesource.com/external/libaddressinput.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libaom/source/libaom": { - "args": { - "hash": "sha256-uFUIodoC9qpLycwtWRgc0iqaqcUsvVmwAAQGHKolWto=", - "rev": "d5265b173616ce62de231cd1b1eae853ad03641e", - "url": "https://aomedia.googlesource.com/aom.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libavif/src": { - "args": { - "hash": "sha256-2GKqPgWs1TD0nPW7VoSo8dz3ugPsZhcy2K1V35XflSk=", - "rev": "c2177c3316a49505dcd592ba21073f7abc25cd37", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libavifinfo/src": { - "args": { - "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=", - "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514", - "url": "https://aomedia.googlesource.com/libavifinfo.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libc++/src": { - "args": { - "hash": "sha256-hKlmY2Bn1f6w0Gmx/Le/LwWk/Gf6hzXqR5C+/w+0CNA=", - "rev": "50ab693ecb611942ce4440d8c9ed707ee65ed5e8", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libc++abi/src": { - "args": { - "hash": "sha256-GtK8z2jn4es3uuxpAgm5AoQvUjvhAunAyUwm3HEqLVA=", - "rev": "29b2e9a0f48688da116692cb04758393053d269c", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libdrm/src": { - "args": { - "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=", - "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libgav1/src": { - "args": { - "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=", - "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd", - "url": "https://chromium.googlesource.com/codecs/libgav1.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libipp/libipp": { - "args": { - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libjpeg_turbo": { - "args": { - "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=", - "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/liblouis/src": { - "args": { - "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", - "url": "https://chromium.googlesource.com/external/liblouis-github.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libphonenumber/dist": { - "args": { - "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", - "url": "https://chromium.googlesource.com/external/libphonenumber.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libprotobuf-mutator/src": { - "args": { - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libsrtp": { - "args": { - "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=", - "rev": "000edd791434c8738455f10e0dd6b268a4852c0b", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libsync/src": { - "args": { - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libunwind/src": { - "args": { - "hash": "sha256-5xsrVVSu9b+78GEKeLGNpo7ySxrJ2SeuuKghN6NHlSU=", - "rev": "dc70138c3e68e2f946585f134e20815851e26263", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libvpx/source/libvpx": { - "args": { - "hash": "sha256-fXEPPgUdTsvzbLc8mp7v0MWw/9FfOooIIKjRshvYi2o=", - "rev": "fbf63dff1f528d44f24bd662abb89fd01a4a1c25", - "url": "https://chromium.googlesource.com/webm/libvpx.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libwebm/source": { - "args": { - "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0=", - "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda", - "url": "https://chromium.googlesource.com/webm/libwebm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libwebp/src": { - "args": { - "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=", - "rev": "845d5476a866141ba35ac133f856fa62f0b7445f", - "url": "https://chromium.googlesource.com/webm/libwebp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libyuv": { - "args": { - "hash": "sha256-tQ7eCY1udoGHRoFr83obQ994IMfxqaH68StvXJ6obZ8=", - "rev": "4620f1705822fd6ab99939f43ce63099bd3d9ae0", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/lss": { - "args": { - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", - "url": "https://chromium.googlesource.com/linux-syscall-support.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/material_color_utilities/src": { - "args": { - "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", - "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/minigbm/src": { - "args": { - "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/nan": { - "args": { - "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", - "owner": "nodejs", - "repo": "nan", - "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/nasm": { - "args": { - "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", - "rev": "f477acb1049f5e043904b87b825c5915084a9a29", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/nearby/src": { - "args": { - "hash": "sha256-RZsdeT1gkbrOuHvngs+Iavl9YE27jLx4AXXYOvSXZoI=", - "rev": "3c8737f92d765407e4ff6c87b8758ba99ede40ed", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/neon_2_sse/src": { - "args": { - "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/openh264/src": { - "args": { - "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=", - "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/openscreen/src": { - "args": { - "hash": "sha256-y2XOZ3CmGdI0S/DLnOwAhm0kGTf/ayJ6OwPVlQCQqBw=", - "rev": "b720e33d337c68353e5d80a72491fb438f27d93a", - "url": "https://chromium.googlesource.com/openscreen" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/openscreen/src/buildtools": { - "args": { - "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=", - "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b", - "url": "https://chromium.googlesource.com/chromium/src/buildtools" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/openscreen/src/third_party/tinycbor/src": { - "args": { - "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ots/src": { - "args": { - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/pdfium": { - "args": { - "hash": "sha256-znfeKj2ttFWalFPeP9o8NPYLHD+pWAKuWVudX59MhLw=", - "rev": "2b675cf15ab4b68bf1ed4e0511ba2479e11f1605", - "url": "https://pdfium.googlesource.com/pdfium.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/perfetto": { - "args": { - "hash": "sha256-ej8yXGOlmqwnWBbKR99qtIn3MvImaqV5ResVp95zdcM=", - "rev": "9170899ab284db894f14439e561f02f83a04d88e", - "url": "https://android.googlesource.com/platform/external/perfetto.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/protobuf-javascript/src": { - "args": { - "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=", - "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", - "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/pthreadpool/src": { - "args": { - "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE=", - "rev": "560c60d342a76076f0557a3946924c6478470044", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/pyelftools": { - "args": { - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/pywebsocket3/src": { - "args": { - "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/quic_trace/src": { - "args": { - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/re2/src": { - "args": { - "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=", - "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ruy/src": { - "args": { - "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=", - "rev": "c08ec529fc91722bde519628d9449258082eb847", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/securemessage/src": { - "args": { - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/skia": { - "args": { - "hash": "sha256-jwZUcrrya3xGmcocgvLFYGY75uoRwMJRphKBzjVW73Y=", - "rev": "d41eba845cdb7ade07e68f20676675c25e2734fc", - "url": "https://skia.googlesource.com/skia.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/smhasher/src": { - "args": { - "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", - "url": "https://chromium.googlesource.com/external/smhasher.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/snappy/src": { - "args": { - "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/speedometer/v3.0": { - "args": { - "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", - "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/spirv-cross/src": { - "args": { - "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", - "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/spirv-headers/src": { - "args": { - "hash": "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ=", - "rev": "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/spirv-tools/src": { - "args": { - "hash": "sha256-13y7Z6wMeAmV2dgMepgQPB+c+Pjc2O3C2G0kdlBVsNE=", - "rev": "37d2fcb485bf3fcadb18ef90aab6f283dcc4be72", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/sqlite/src": { - "args": { - "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=", - "rev": "567495a62a62dc013888500526e82837d727fe01", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/squirrel.mac": { - "args": { - "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", - "owner": "Squirrel", - "repo": "Squirrel.Mac", - "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "args": { - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "args": { - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/swiftshader": { - "args": { - "hash": "sha256-U29q1G3gnJdoucdLGZEbwpkGpDE4C2lv2b5WqpUf2Ho=", - "rev": "2afc8c97882a5c66abf5f26670ae420d2e30adc3", - "url": "https://swiftshader.googlesource.com/SwiftShader.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/text-fragments-polyfill/src": { - "args": { - "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/tflite/src": { - "args": { - "hash": "sha256-HtvrZur/vifocB/TKLDkzTLjFbGee4xGUhRLShozo9M=", - "rev": "d29299c16ec49623af1294900dba53fc8864f0bb", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ukey2/src": { - "args": { - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-deps": { - "args": { - "hash": "sha256-U8iB5HlLHzpeBJjd9XODWONDy7GTfNbM2kjGBIAhabU=", - "rev": "c045c2192ab45a144b419033dffe6190be5d8c93", - "url": "https://chromium.googlesource.com/vulkan-deps" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-headers/src": { - "args": { - "hash": "sha256-8q6uu3v7j7poTMkn0oxj+RewIqhjCOuBz/QG/oFnWBI=", - "rev": "c6391a7b8cd57e79ce6b6c832c8e3043c4d9967b", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-loader/src": { - "args": { - "hash": "sha256-dA9yc8nv8HDF8WA7bSReqI2JtUU41/Xl4J/CQlq0nuU=", - "rev": "1108bba6c97174d172d45470a7470a3d6a564647", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-tools/src": { - "args": { - "hash": "sha256-eEJ9S1/fF5WMT+fRq+ZTzRfb+gxDA8drK8uwPVrFoNc=", - "rev": "4c63e845962ff3b197855f3ae4907a47d0863f5a", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-utility-libraries/src": { - "args": { - "hash": "sha256-4jK6OQT5Za46HixUe1kOay2NlTYtf9OHkbZrZ0y6pdI=", - "rev": "ea5774a13e3017b6d5d79af6fba9f0d72ca5c61a", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-validation-layers/src": { - "args": { - "hash": "sha256-vwd7n30odVW/Q39lIiVuhyWhnm20giEHlzP14ONXyuw=", - "rev": "ef846ac0883cde5e69ced0e7d7af59fe92f34e25", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan_memory_allocator": { - "args": { - "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", - "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wayland-protocols/gtk": { - "args": { - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wayland-protocols/kde": { - "args": { - "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wayland-protocols/src": { - "args": { - "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=", - "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wayland/src": { - "args": { - "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=", - "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/webdriver/pylib": { - "args": { - "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/webgl/src": { - "args": { - "hash": "sha256-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=", - "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/webgpu-cts/src": { - "args": { - "hash": "sha256-3ruYKYHOkqlJcrjl4xvQV+OtULbgNUvXGBfrd5WTGyY=", - "rev": "2f55512456a725e77f3baac3d951de5c6c5e28a3", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/webrtc": { - "args": { - "hash": "sha256-4URlxWupNm67GeUGLJe3Dz1IONIq1mCjG5Lf4csKFKo=", - "rev": "28b793b4dd275bf2b901b87e01c0ee8d4f5732fc", - "url": "https://webrtc.googlesource.com/src.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/weston/src": { - "args": { - "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", - "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wuffs/src": { - "args": { - "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", - "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/xdg-utils": { - "args": { - "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", - "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/xnnpack/src": { - "args": { - "hash": "sha256-VBrBNjoF3hsRXpBfXP2g9xOujVsmm7AkV6wE4ZwW2ts=", - "rev": "c4a28daf28c98300da9d9b5213c53f762908825e", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/zstd/src": { - "args": { - "hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8=", - "rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/tools/page_cycler/acid3": { - "args": { - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/v8": { - "args": { - "hash": "sha256-9TZ8a0ufsG/gWM2nYAWDymWeDlDg23Dgy/G6ic67QBI=", - "rev": "3551594a5f6604c7e5070f408cc81d60d08ddbbf", - "url": "https://chromium.googlesource.com/v8/v8.git" - }, - "fetcher": "fetchFromGitiles" - } - }, - "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8", - "modules": "130", - "node": "20.18.3", - "version": "33.4.10" - }, "34": { "chrome": "132.0.6834.210", "chromium": { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb5d067c88fd..a245a4f6a42f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7844,11 +7844,7 @@ with pkgs; ; electron_32 = electron_32-bin; - electron_33 = - if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_33 then - electron-source.electron_33 - else - electron_33-bin; + electron_33 = electron_33-bin; electron_34 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_34 then electron-source.electron_34 From 401ec59a17127a755a097267b3156458fb8236c0 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sun, 27 Apr 2025 18:29:09 +0700 Subject: [PATCH 23/48] nixos/i18n: hide supportedLocales from the manual --- .../configuration/profiles/minimal.section.md | 2 +- nixos/modules/config/i18n.nix | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/configuration/profiles/minimal.section.md b/nixos/doc/manual/configuration/profiles/minimal.section.md index 5b72112477f7..cfbd7ae6067b 100644 --- a/nixos/doc/manual/configuration/profiles/minimal.section.md +++ b/nixos/doc/manual/configuration/profiles/minimal.section.md @@ -1,6 +1,6 @@ # Minimal {#sec-profile-minimal} This profile defines a small NixOS configuration. It does not contain any -graphical stuff. It's a very short file that sets [](#opt-i18n.supportedLocales) +graphical stuff. It's a very short file that sets the supported locales to only support the user-selected locale, and [disables packages' documentation](#opt-documentation.enable). diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 0213274ec3a6..8aba9e9f9c92 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -69,6 +69,7 @@ supportedLocales = lib.mkOption { type = lib.types.listOf lib.types.str; + visible = false; default = lib.unique ( builtins.map (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") @@ -82,21 +83,6 @@ ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) ) ); - defaultText = lib.literalExpression '' - lib.unique ( - builtins.map - (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") - ( - [ - "C.UTF-8" - "en_US.UTF-8" - config.i18n.defaultLocale - ] - ++ config.i18n.extraLocales - ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) - ) - ) - ''; example = [ "en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" From 0f13f78d026a556b894cdcc66d0dae276e305da1 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sun, 27 Apr 2025 18:30:11 +0700 Subject: [PATCH 24/48] nixos/i18n: warn when the user has a badly-configured supportedLocales --- nixos/modules/config/i18n.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 8aba9e9f9c92..0a46c193b473 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -103,6 +103,29 @@ ###### implementation config = { + warnings = + lib.optional + ( + (lib.subtractLists config.i18n.supportedLocales ( + builtins.map + (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") + ( + [ config.i18n.defaultLocale ] + ++ config.i18n.extraLocales + ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) + ) + )) != [ ] + ) + '' + `i18n.supportedLocales` is deprecated in favor of `i18n.extraLocales`, + and it seems you are using `i18n.supportedLocales` and forgot to + include some locales specified in `i18n.defaultLocale`, + `i18n.extraLocales` or `i18n.extraLocaleSettings`. + + If you're trying to install additional locales not specified in + `i18n.defaultLocale` or `i18n.extraLocaleSettings`, consider adding + only those locales to `i18n.extraLocales`. + ''; environment.systemPackages = # We increase the priority a little, so that plain glibc in systemPackages can't win. From e19d0c2f38a0e481cb56acdee1c084bf5614b62e Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sun, 27 Apr 2025 18:30:45 +0700 Subject: [PATCH 25/48] nixos/i18n: document the change in the release notes --- doc/release-notes/rl-2505.section.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 639a89d883b5..a257ca8cdffe 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -344,6 +344,11 @@ ## Other Notable Changes {#sec-nixpkgs-release-25.05-notable-changes} +- `i18n` module improvements: + - `i18n.extraLocales` should now be the preferred way to install additional locales. + - `i18n.supportedLocales` is now considered an implementation detail and will be hidden from the documentation. But the option will still continue to work. + - `i18n.supportedLocales` will now trigger a warning when it omits any locale set in `i18n.defaultLocale`, `i18n.extraLocales` or `i18n.extraLocaleSettings`. + - `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs []{#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}. - androidenv has been improved: From 07dde5f4c4682fe96b645724f6f46277c964871e Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Mon, 28 Apr 2025 21:54:33 +0700 Subject: [PATCH 26/48] nixos/i18n: refactor aggregated locales into a variable --- nixos/modules/config/i18n.nix | 39 ++++++++++++++--------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 0a46c193b473..782d645cab07 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -4,6 +4,16 @@ pkgs, ... }: +let + aggregatedLocales = + builtins.map + (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") + ( + [ config.i18n.defaultLocale ] + ++ config.i18n.extraLocales + ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) + ); +in { ###### interface @@ -71,17 +81,11 @@ type = lib.types.listOf lib.types.str; visible = false; default = lib.unique ( - builtins.map - (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") - ( - [ - "C.UTF-8" - "en_US.UTF-8" - config.i18n.defaultLocale - ] - ++ config.i18n.extraLocales - ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) - ) + [ + "C.UTF-8/UTF-8" + "en_US.UTF-8/UTF-8" + ] + ++ aggregatedLocales ); example = [ "en_US.UTF-8/UTF-8" @@ -104,18 +108,7 @@ config = { warnings = - lib.optional - ( - (lib.subtractLists config.i18n.supportedLocales ( - builtins.map - (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") - ( - [ config.i18n.defaultLocale ] - ++ config.i18n.extraLocales - ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) - ) - )) != [ ] - ) + lib.optional ((lib.subtractLists config.i18n.supportedLocales aggregatedLocales) != [ ]) '' `i18n.supportedLocales` is deprecated in favor of `i18n.extraLocales`, and it seems you are using `i18n.supportedLocales` and forgot to From f113a61f4dc1e5903882ddf310b5bd93024350ef Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Apr 2025 11:18:59 +0200 Subject: [PATCH 27/48] alsa-firmware: fix loongarch64-linux build --- pkgs/by-name/al/alsa-firmware/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/al/alsa-firmware/package.nix b/pkgs/by-name/al/alsa-firmware/package.nix index 2bf35a11a63c..af5cae0fb1f4 100644 --- a/pkgs/by-name/al/alsa-firmware/package.nix +++ b/pkgs/by-name/al/alsa-firmware/package.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { depsBuildBuild = lib.optional ( stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isAarch64 + || stdenv.hostPlatform.isLoongArch64 || stdenv.hostPlatform.isRiscV64 ) buildPackages.stdenv.cc; From 5fe151516aac45ffb13bea446d713f9de5491c17 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Apr 2025 11:19:57 +0200 Subject: [PATCH 28/48] jemalloc: fix loongarch64-linux build --- pkgs/development/libraries/jemalloc/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 05a82ccffb13..b6ad34e05f40 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -74,7 +74,14 @@ stdenv.mkDerivation rec { # The upstream default is dependent on the builders' page size # https://github.com/jemalloc/jemalloc/issues/467 # https://sources.debian.org/src/jemalloc/5.3.0-3/debian/rules/ - ++ [ (if stdenv.hostPlatform.isAarch64 then "--with-lg-page=16" else "--with-lg-page=12") ] + ++ [ + ( + if (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isLoongArch64) then + "--with-lg-page=16" + else + "--with-lg-page=12" + ) + ] # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--with-lg-vaddr=48"; From c24fc57520ab1e541ac8f6021c899a4b356f1e3a Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 29 Apr 2025 11:52:23 +0200 Subject: [PATCH 29/48] dpdk: 24.07 -> 25.03 Signed-off-by: Markus Theil --- pkgs/by-name/dp/dpdk/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix index 442095436484..2bee92b61cf9 100644 --- a/pkgs/by-name/dp/dpdk/package.nix +++ b/pkgs/by-name/dp/dpdk/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "dpdk"; - version = "24.07"; + version = "25.03"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "sha256-mUT35fJo56ybQZPizVTvbZj24dfd3JZ8d65PZhbW+70="; + sha256 = "sha256-akCnMTKChuvXloWxj/pZkua3cME4Q9Zf0NEVfPzP9j0="; }; nativeBuildInputs = [ @@ -69,14 +69,6 @@ stdenv.mkDerivation rec { libbsd ]; - patches = [ - (fetchpatch { - name = "CVE-2024-11614.patch"; - url = "https://git.dpdk.org/dpdk-stable/patch/?id=fdf13ea6fede07538fbe5e2a46fa6d4b2368fa81"; - hash = "sha256-lD2mhPm5r1tWZb4IpzHa2SeK1DyQ3rwjzArRTpAgZAY="; - }) - ]; - postPatch = '' patchShebangs config/arm buildtools ''; From 86e82adddd7bb51d6e9ea8e0307d2024abfb7ea9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Apr 2025 16:46:21 +0000 Subject: [PATCH 30/48] monkeysAudio: 11.08 -> 11.09 --- pkgs/by-name/mo/monkeysAudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index bfa87faf91f7..218a22d01508 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.08"; + version = "11.09"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-iy/WFFRv3/ZJoGCAKH2+rYnyIdvaO+kgxaH/XeKWtbs="; + hash = "sha256-kGlrCeyozEQbiccqL5Xf9Iqwo5xkcunhNw4oMZZDZo0="; stripRoot = false; }; From 18f1ddf4a7812ba8d3e93e94fef5b216a2226b51 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 28 Apr 2025 16:08:53 +0300 Subject: [PATCH 31/48] lcevcdec: only include arm & x86 in meta.platforms --- pkgs/by-name/lc/lcevcdec/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix index bf6d52bf6b75..48c3edb438b2 100644 --- a/pkgs/by-name/lc/lcevcdec/package.nix +++ b/pkgs/by-name/lc/lcevcdec/package.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3Clear; pkgConfigModules = [ "lcevc_dec" ]; maintainers = with lib.maintainers; [ jopejoe1 ]; - platforms = lib.platforms.all; + # https://github.com/v-novaltd/LCEVCdec/blob/bf7e0d91c969502e90a925942510a1ca8088afec/cmake/modules/VNovaProject.cmake#L29 + platforms = lib.platforms.aarch ++ lib.platforms.x86; }; }) From 94e294941b7a3adfce77c77cab981d1abb13f695 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Apr 2025 21:37:06 +0200 Subject: [PATCH 32/48] ffmpeg-headless: fix loongarch64-linux build --- pkgs/development/libraries/ffmpeg/generic.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 02821bc0fe0c..a013456cc403 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -72,7 +72,12 @@ withNvcodec ? withHeadlessDeps && ( - with stdenv; !isDarwin && !isAarch32 && !hostPlatform.isRiscV && hostPlatform == buildPlatform + with stdenv; + !isDarwin + && !isAarch32 + && !hostPlatform.isLoongArch64 + && !hostPlatform.isRiscV + && hostPlatform == buildPlatform ), # dynamically linked Nvidia code withFlite ? withFullDeps, # Voice Synthesis withFontconfig ? withHeadlessDeps, # Needed for drawtext filter From aa65ba9a4f1769ffbbf7ee386fecf677a8be0c0a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 29 Apr 2025 23:20:25 +0200 Subject: [PATCH 33/48] python312Packages.hf-xet: 1.0.5 -> 1.1.0 Diff: https://github.com/huggingface/xet-core/compare/refs/tags/v1.0.5...refs/tags/v1.1.0 Changelog: https://github.com/huggingface/xet-core/releases/tag/v1.1.0 --- pkgs/development/python-modules/hf-xet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hf-xet/default.nix b/pkgs/development/python-modules/hf-xet/default.nix index ebdc9c7fc423..ce9781022171 100644 --- a/pkgs/development/python-modules/hf-xet/default.nix +++ b/pkgs/development/python-modules/hf-xet/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hf-xet"; - version = "1.0.5"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "xet-core"; tag = "v${version}"; - hash = "sha256-SBL2s5+hbB7G5Qzo/nF+PXp2zuce4HKWG2cgyY41G8I="; + hash = "sha256-bE3uioAn4I65tOItKzDddAWTP4ZlNUZbfMaSD2anhNk="; }; sourceRoot = "${src.name}/hf_xet"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-gDHBnNWpCHwxbwYKQZQEfClXUPtWesb+cxtPXEOj1Us="; + hash = "sha256-D6R2FFGDKB4VgMkflF441Ki8o1RCwBoumQ4oeNL/fnc="; }; nativeBuildInputs = [ From 471f7f889193d224053d0509c137402bc23465b4 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Tue, 29 Apr 2025 23:09:06 +0000 Subject: [PATCH 34/48] uv: 0.6.16 -> 0.7.0 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 40a9078906db..cc9848ff37ba 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.6.17"; + version = "0.7.0"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-Cbk7doAz7meokxUhDMMMB21t6WMr2s+ypvYbVEmmGM8="; + hash = "sha256-D/3YqhIjXhvH7hn/dmJ2Xmf1riGjVc9jqbqVJSD5EyA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jruywuF3CEfBV58QKq/22Y7ueXoEKQWPJ0DmAdo7hrY="; + cargoHash = "sha256-QQv3uAtqC24UkZ1pp7D0izu7xMQGtUPg2iQkp+k9IMI="; buildInputs = [ rust-jemalloc-sys From 30335ce69b16719a2238d007e7b7ce34877348d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Apr 2025 23:22:52 +0000 Subject: [PATCH 35/48] q2pro: 0-unstable-2025-04-18 -> 0-unstable-2025-04-27 --- pkgs/by-name/q2/q2pro/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index b4cc6047b1b7..876f86337c99 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -32,18 +32,18 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "q2pro"; - version = "0-unstable-2025-04-18"; + version = "0-unstable-2025-04-27"; src = fetchFromGitHub { owner = "skullernet"; repo = "q2pro"; - rev = "1cc95be8bb967f4274e54a6d7251e4cd7f5ed9c1"; - hash = "sha256-7dsFzCnWiVNioyRIW0KjicfgGTxjozicUpDJG5jGvB0="; + rev = "9d3b9d1628a0fcd17eb1cf8bb65cff6d917c9a25"; + hash = "sha256-MyEAoBEASfB4MQdVTu6O8YcZCUWtuIijN34dpwsELPs="; }; # build date and rev number is displayed in the game's console - revCount = "3782"; # git rev-list --count ${src.rev} - SOURCE_DATE_EPOCH = "1744997502"; # git show -s --format=%ct ${src.rev} + revCount = "3812"; # git rev-list --count ${src.rev} + SOURCE_DATE_EPOCH = "1745703870"; # git show -s --format=%ct ${src.rev} nativeBuildInputs = [ From b4d31d66efecdc166edeb59208a5619e13ff68f5 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 30 Apr 2025 08:24:02 +0200 Subject: [PATCH 36/48] cc-wrapper: autofix code style Issue introduced in https://github.com/NixOS/nixpkgs/pull/389028 --- pkgs/build-support/cc-wrapper/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 3cc35a946164..8101394088fd 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -745,9 +745,17 @@ stdenvNoCC.mkDerivation { # no `/usr/include`, there’s essentially no risk to dropping # the flag there. See discussion in NixOS/nixpkgs#191152. # - + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin && !targetPlatform.isAndroid) '' - echo " -nostdlibinc" >> $out/nix-support/cc-cflags - '' + + + optionalString + ( + (cc.isClang or false) + && !(cc.isROCm or false) + && !targetPlatform.isDarwin + && !targetPlatform.isAndroid + ) + '' + echo " -nostdlibinc" >> $out/nix-support/cc-cflags + '' ## ## Man page and info support From 9971cc7a0e633f060747e27d72b2f8570c1e9ea9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 29 Apr 2025 22:29:50 +0200 Subject: [PATCH 37/48] ghmap: init at 1.0.2 --- pkgs/by-name/gh/ghmap/package.nix | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/gh/ghmap/package.nix diff --git a/pkgs/by-name/gh/ghmap/package.nix b/pkgs/by-name/gh/ghmap/package.nix new file mode 100644 index 000000000000..fb581633c697 --- /dev/null +++ b/pkgs/by-name/gh/ghmap/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "ghmap"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "uhourri"; + repo = "ghmap"; + tag = "v${version}"; + hash = "sha256-ZA7jtcmvjZEIS3iYaTv9rFqeQSqsh8pCxcbpQDUPDfs="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + tqdm + ]; + + pythonImportsCheck = [ + "ghmap" + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + meta = { + description = "Python tool for mapping GitHub events to contributor activities"; + homepage = "https://github.com/uhourri/ghmap"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "ghmap"; + }; +} From e31e0aee18fe4d60aa682249867c9cc0d5183d67 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Wed, 30 Apr 2025 12:14:05 +0800 Subject: [PATCH 38/48] coc-basedpyright: init at 0-unstable-2025-04-30 --- .../editors/vim/plugins/cocPlugins.nix | 6 +++++ pkgs/by-name/co/coc-basedpyright/package.nix | 27 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/by-name/co/coc-basedpyright/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 508f0452724b..5d7496000268 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -1,5 +1,6 @@ { buildVimPlugin, + coc-basedpyright, coc-clangd, coc-css, coc-diagnostic, @@ -7,6 +8,11 @@ coc-toml, }: final: prev: { + coc-basedpyright = buildVimPlugin { + inherit (coc-basedpyright) pname version meta; + src = "${coc-basedpyright}/lib/node_modules/coc-basedpyright"; + }; + coc-clangd = buildVimPlugin { inherit (coc-clangd) pname version meta; src = "${coc-clangd}/lib/node_modules/coc-clangd"; diff --git a/pkgs/by-name/co/coc-basedpyright/package.nix b/pkgs/by-name/co/coc-basedpyright/package.nix new file mode 100644 index 000000000000..a5e4d87253c6 --- /dev/null +++ b/pkgs/by-name/co/coc-basedpyright/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage { + pname = "coc-basedpyright"; + # No tagged releases, this version is inferred from + version = "1.19.0-unstable-2025-04-30"; + + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-basedpyright"; + rev = "7d944083c7d4843b1dfa9e05014873b0b5bbb85b"; + hash = "sha256-5Vuw54bSk3WMy8bMsIvtkfDmlx3oocxmD1ykfpErbkc="; + }; + + npmDepsHash = "sha256-hn+Y1f7o/Oz37XXJUPF2CJbrPzZYOY0njrJv+T3ve6w="; + + meta = { + description = "Basedpyright extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-basedpyright"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wrvsrx ]; + }; +} From ec6d0a3753234ebd1127d01ee943b2daf16f696b Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Thu, 17 Apr 2025 12:42:41 +0200 Subject: [PATCH 39/48] maintainers: add hoh --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d24a98d724f0..e18c09209be6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9903,6 +9903,12 @@ githubId = 57007241; name = "hogcycle"; }; + hoh = { + email = "git@hugoherter.com"; + github = "hoh"; + githubId = 404665; + name = "Hugo Herter"; + }; holgerpeters = { name = "Holger Peters"; email = "holger.peters@posteo.de"; From ac3441361a9d2de4b68f54c48dc1978960a3a37b Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Thu, 17 Apr 2025 12:43:23 +0200 Subject: [PATCH 40/48] python312Packages.cut-cross-entropy: init at 25.3.1 Co-authored-by: OTABI Tomoya --- .../cut-cross-entropy/default.nix | 83 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/python-modules/cut-cross-entropy/default.nix diff --git a/pkgs/development/python-modules/cut-cross-entropy/default.nix b/pkgs/development/python-modules/cut-cross-entropy/default.nix new file mode 100644 index 000000000000..df404e9c508a --- /dev/null +++ b/pkgs/development/python-modules/cut-cross-entropy/default.nix @@ -0,0 +1,83 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + torch, + triton, + + # optional-dependencies + accelerate, + datasets, + fire, + huggingface-hub, + pandas, + pytestCheckHook, + pythonAtLeast, + tqdm, + transformers, +}: + +buildPythonPackage { + pname = "cut-cross-entropy"; + version = "25.3.1"; + pyproject = true; + + # The `ml-cross-entropy` Pypi comes from a third-party. + # Apple recommends installing from the repo's main branch directly + src = fetchFromGitHub { + owner = "apple"; + repo = "ml-cross-entropy"; + rev = "24fbe4b5dab9a6c250a014573613c1890190536c"; # no tags + hash = "sha256-BVPon+T7chkpozX/IZU3KZMw1zRzlYVvF/22JWKjT2Y="; + }; + + # Python 3.13 support requires PyTorch 2.6, which is not merged into master yet + # https://github.com/NixOS/nixpkgs/pull/377785 + disabled = pythonAtLeast "3.13"; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + torch + triton + ]; + + optional-dependencies = { + transformers = [ transformers ]; + all = [ + accelerate + datasets + fire + huggingface-hub + pandas + tqdm + transformers + ]; + # `deepspeed` is not yet packaged in nixpkgs + # ++ lib.optionals (!stdenv.isDarwin) [ + # deepspeed + # ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "cut_cross_entropy" + ]; + + meta = { + description = "Memory-efficient cross-entropy loss implementation using Cut Cross-Entropy (CCE)"; + homepage = "https://github.com/apple/ml-cross-entropy"; + license = lib.licenses.aml; + maintainers = with lib.maintainers; [ hoh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1419c3fe8f7..dfce50496beb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3042,6 +3042,8 @@ self: super: with self; { customtkinter = callPackage ../development/python-modules/customtkinter { }; + cut-cross-entropy = callPackage ../development/python-modules/cut-cross-entropy { }; + cvelib = callPackage ../development/python-modules/cvelib { }; cvss = callPackage ../development/python-modules/cvss { }; From b457279ba3e79cafe8b07a644493a2b37f50fde1 Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Thu, 17 Apr 2025 12:48:29 +0200 Subject: [PATCH 41/48] python312Packages.trl: init at 0.15.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- .../python-modules/trl/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/trl/default.nix diff --git a/pkgs/development/python-modules/trl/default.nix b/pkgs/development/python-modules/trl/default.nix new file mode 100644 index 000000000000..1c75339a5fae --- /dev/null +++ b/pkgs/development/python-modules/trl/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + accelerate, + datasets, + rich, + transformers, +}: + +buildPythonPackage rec { + pname = "trl"; + version = "0.15.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = "trl"; + tag = "v${version}"; + hash = "sha256-HsSmFXFqDOWVLa6VXdPZVS9C3bjYcsliR0TwNpPiQx4="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + accelerate + datasets + rich + transformers + ]; + + # Many tests require internet access. + doCheck = false; + + pythonImportsCheck = [ "trl" ]; + + meta = { + description = "Train transformer language models with reinforcement learning"; + homepage = "https://github.com/huggingface/trl"; + changelog = "https://github.com/huggingface/trl/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hoh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dfce50496beb..7bb745602db0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17667,6 +17667,8 @@ self: super: with self; { tritonclient = callPackage ../development/python-modules/tritonclient { }; + trl = callPackage ../development/python-modules/trl { }; + trlib = toPythonModule ( pkgs.trlib.override { pythonSupport = true; From 4dfea7e0c0a40a0b7e891ea148968ea01e145599 Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Thu, 17 Apr 2025 12:49:35 +0200 Subject: [PATCH 42/48] python312Packages.tyro: init at 0.9.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> Co-authored-by: OTABI Tomoya --- .../python-modules/tyro/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/python-modules/tyro/default.nix diff --git a/pkgs/development/python-modules/tyro/default.nix b/pkgs/development/python-modules/tyro/default.nix new file mode 100644 index 000000000000..c0d4ccddee26 --- /dev/null +++ b/pkgs/development/python-modules/tyro/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + docstring-parser, + rich, + shtab, + typeguard, + typing-extensions, + + # tests + attrs, + flax, + jax, + ml-collections, + omegaconf, + pydantic, + pytestCheckHook, + torch, +}: + +buildPythonPackage rec { + pname = "tyro"; + version = "0.9.19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "brentyi"; + repo = "tyro"; + tag = "v${version}"; + hash = "sha256-A1Vplc84Xy8TufqmklPUzIdgiPpFcIjqV0eUgdKmYRM="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + docstring-parser + rich + shtab + typeguard + typing-extensions + ]; + + nativeCheckInputs = [ + attrs + flax + jax + ml-collections + omegaconf + pydantic + pytestCheckHook + torch + ]; + + pythonImportsCheck = [ "tyro" ]; + + meta = { + description = "CLI interfaces & config objects, from types"; + homepage = "https://github.com/brentyi/tyro"; + changelog = "https://github.com/brentyi/tyro/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hoh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bb745602db0..10acc3e55614 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18277,6 +18277,8 @@ self: super: with self; { typst = callPackage ../development/python-modules/typst { }; + tyro = callPackage ../development/python-modules/tyro { }; + tzdata = callPackage ../development/python-modules/tzdata { }; tzlocal = callPackage ../development/python-modules/tzlocal { }; From 81b8490b10cbb7afe3d219bac85571aa2a76f619 Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Thu, 17 Apr 2025 12:51:35 +0200 Subject: [PATCH 43/48] python312Packages.unsloth-zoo: init at 2025.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> Co-authored-by: OTABI Tomoya --- .../python-modules/unsloth-zoo/default.nix | 86 +++++++++++++++++++ .../unsloth-zoo/dont-require-unsloth.patch | 18 ++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 106 insertions(+) create mode 100644 pkgs/development/python-modules/unsloth-zoo/default.nix create mode 100644 pkgs/development/python-modules/unsloth-zoo/dont-require-unsloth.patch diff --git a/pkgs/development/python-modules/unsloth-zoo/default.nix b/pkgs/development/python-modules/unsloth-zoo/default.nix new file mode 100644 index 000000000000..163361671cae --- /dev/null +++ b/pkgs/development/python-modules/unsloth-zoo/default.nix @@ -0,0 +1,86 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + accelerate, + cut-cross-entropy, + datasets, + hf-transfer, + huggingface-hub, + packaging, + peft, + psutil, + sentencepiece, + torch, + tqdm, + transformers, + trl, + tyro, +}: + +buildPythonPackage rec { + pname = "unsloth-zoo"; + version = "2025.4.1"; + pyproject = true; + + # no tags on GitHub + src = fetchPypi { + pname = "unsloth_zoo"; + inherit version; + hash = "sha256-mRs/NMCNJWT52S7mtbQI332IQR6+/IaL29XmtMOz3fE="; + }; + + # pyproject.toml requires an obsolete version of protobuf, + # but it is not used. + # Upstream issue: https://github.com/unslothai/unsloth-zoo/pull/68 + pythonRelaxDeps = [ + "protobuf" + ]; + + patches = [ + # Avoid circular dependency in Nix, since `unsloth` depends on `unsloth-zoo`. + ./dont-require-unsloth.patch + ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + accelerate + cut-cross-entropy + datasets + hf-transfer + huggingface-hub + packaging + peft + psutil + sentencepiece + torch + tqdm + transformers + trl + tyro + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ + "unsloth_zoo" + ]; + + meta = { + description = "Utils for Unsloth"; + homepage = "https://github.com/unslothai/unsloth_zoo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hoh ]; + }; +} diff --git a/pkgs/development/python-modules/unsloth-zoo/dont-require-unsloth.patch b/pkgs/development/python-modules/unsloth-zoo/dont-require-unsloth.patch new file mode 100644 index 000000000000..6c06b8537115 --- /dev/null +++ b/pkgs/development/python-modules/unsloth-zoo/dont-require-unsloth.patch @@ -0,0 +1,18 @@ +diff --git a/unsloth_zoo/__init__.py b/unsloth_zoo/__init__.py +--- a/unsloth_zoo/__init__.py ++++ b/unsloth_zoo/__init__.py +@@ -17,14 +17,10 @@ + __version__ = "2025.3.17" + + from importlib.util import find_spec +-if find_spec("unsloth") is None: +- raise ImportError("Please install Unsloth via `pip install unsloth`!") + pass + del find_spec + + import os +-if not ("UNSLOTH_IS_PRESENT" in os.environ): +- raise ImportError("Please install Unsloth via `pip install unsloth`!") + pass + + try: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10acc3e55614..163f241b590f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18433,6 +18433,8 @@ self: super: with self; { unrpa = callPackage ../development/python-modules/unrpa { }; + unsloth-zoo = callPackage ../development/python-modules/unsloth-zoo { }; + unstructured = callPackage ../development/python-modules/unstructured { }; unstructured-api-tools = callPackage ../development/python-modules/unstructured-api-tools { }; From a7a65d53a2e2a0825fb12477f6c4e82b065755fa Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Thu, 17 Apr 2025 12:52:37 +0200 Subject: [PATCH 44/48] python312Packages.unsloth: init at 2025.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> Co-authored-by: OTABI Tomoya --- .../python-modules/unsloth/default.nix | 92 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 94 insertions(+) create mode 100644 pkgs/development/python-modules/unsloth/default.nix diff --git a/pkgs/development/python-modules/unsloth/default.nix b/pkgs/development/python-modules/unsloth/default.nix new file mode 100644 index 000000000000..797dc6e51ac3 --- /dev/null +++ b/pkgs/development/python-modules/unsloth/default.nix @@ -0,0 +1,92 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + bitsandbytes, + numpy, + packaging, + torch, + unsloth-zoo, + xformers, + tyro, + transformers, + datasets, + sentencepiece, + tqdm, + accelerate, + trl, + peft, + protobuf, + huggingface-hub, + hf-transfer, + diffusers, + torchvision, +}: + +buildPythonPackage rec { + pname = "unsloth"; + version = "2025.4.1"; + pyproject = true; + + # Tags on the GitHub repo don't match + src = fetchPypi { + pname = "unsloth"; + inherit version; + hash = "sha256-9LtDGfdWH7R3U/xi+aK3V4zA+vs83S6Cp0F2NQKvSdY="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + bitsandbytes + numpy + packaging + torch + unsloth-zoo + xformers + tyro + transformers + datasets + sentencepiece + tqdm + accelerate + trl + peft + protobuf + huggingface-hub + hf-transfer + diffusers + torchvision + ]; + + # pyproject.toml requires an obsolete version of protobuf, + # but it is not used. + # Upstream issue: https://github.com/unslothai/unsloth-zoo/pull/68 + pythonRelaxDeps = [ + "protobuf" + ]; + + # The source repository contains no test + doCheck = false; + + # Importing requires a GPU, else the following error is raised: + # NotImplementedError: Unsloth: No NVIDIA GPU found? Unsloth currently only supports GPUs! + dontUsePythonImportsCheck = true; + + meta = { + description = "Finetune Llama 3.3, DeepSeek-R1 & Reasoning LLMs 2x faster with 70% less memory"; + homepage = "https://github.com/unslothai/unsloth"; + changelog = "https://github.com/unslothai/unsloth/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hoh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 163f241b590f..1613dfd9e0b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18433,6 +18433,8 @@ self: super: with self; { unrpa = callPackage ../development/python-modules/unrpa { }; + unsloth = callPackage ../development/python-modules/unsloth { }; + unsloth-zoo = callPackage ../development/python-modules/unsloth-zoo { }; unstructured = callPackage ../development/python-modules/unstructured { }; From 97c362cbfb004289d4848ae7953ca1bad30bdabe Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 29 Apr 2025 11:52:54 +0200 Subject: [PATCH 45/48] spdk: fix build with dpdk 25.03 Signed-off-by: Markus Theil --- pkgs/by-name/sp/spdk/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix index 7a3e57071253..58cd81ccdbce 100644 --- a/pkgs/by-name/sp/spdk/package.nix +++ b/pkgs/by-name/sp/spdk/package.nix @@ -69,6 +69,10 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + + # can be removed again with next release, check is already in master + substituteInPlace module/scheduler/dpdk_governor/dpdk_governor.c \ + --replace-fail "" " " ''; enableParallelBuilding = true; From fbb2875fe1acb8b9b5afa7679de1b79c3598612c Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 29 Apr 2025 11:53:16 +0200 Subject: [PATCH 46/48] vpp: 24.10 -> 25.02 Signed-off-by: Markus Theil --- pkgs/by-name/vp/vpp/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix index d69af5c172a9..296301581582 100644 --- a/pkgs/by-name/vp/vpp/package.nix +++ b/pkgs/by-name/vp/vpp/package.nix @@ -20,10 +20,10 @@ rdma-core, libbpf, xdp-tools, + writeText, enableDpdk ? true, enableRdma ? true, - # FIXME: broken: af_xdp plugins - no working libbpf found - af_xdp plugin disabled - enableAfXdp ? false, + enableAfXdp ? true, }: let @@ -42,23 +42,27 @@ let postInstall = ""; dontDisableStatic = true; }); + + # in 25.02 only ID seems to be of interest, so keep it simple + os-release-fake = writeText "os-release-fake" '' + ID=nixos + ''; in stdenv.mkDerivation rec { pname = "vpp"; - version = "24.10"; + version = "25.02"; src = fetchFromGitHub { owner = "FDio"; repo = "vpp"; rev = "v${version}"; - hash = "sha256-GcmblIAu/BDbqZRycmnBsHkvzJe07qB2lSfDnO7ZYtg="; + hash = "sha256-UDO1mlOEQNCmtR18CCTF+ng5Ms9gfTsnohSygLlPopY="; }; postPatch = '' patchShebangs scripts/ - substituteInPlace CMakeLists.txt \ - --replace "plugins tools/vppapigen tools/g2 tools/perftool cmake pkg" \ - "plugins tools/vppapigen tools/g2 tools/perftool cmake" + substituteInPlace pkg/CMakeLists.txt \ + --replace-fail "/etc/os-release" "${os-release-fake}" ''; preConfigure = '' From 40a218f9f80cd4a0ef7dbe3d11ab5fe3ad455dda Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 29 Apr 2025 13:50:12 +0200 Subject: [PATCH 47/48] pktgen: 23.10.0 -> 24.10.3 Signed-off-by: Markus Theil --- pkgs/by-name/pk/pktgen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pk/pktgen/package.nix b/pkgs/by-name/pk/pktgen/package.nix index 6f7e723450c5..095196a6eaa9 100644 --- a/pkgs/by-name/pk/pktgen/package.nix +++ b/pkgs/by-name/pk/pktgen/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "pktgen"; - version = "23.10.0"; + version = "24.10.3"; src = fetchFromGitHub { owner = "pktgen"; repo = "Pktgen-DPDK"; rev = "pktgen-${version}"; - sha256 = "sha256-eujVEU+XkxF1kIGQJoBW3oXXNSqBEzx6mwR2XYoHinM="; + sha256 = "sha256-6KC1k+LWNSU/mdwcUKjCaq8pGOcO+dFzeXX4PJm0QgE="; }; nativeBuildInputs = [ From a9f57280edf0e6fb527a876d7e8317b4aa57de75 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 29 Apr 2025 13:50:40 +0200 Subject: [PATCH 48/48] odp-dpdk: fixes for dpdk 25.03 Signed-off-by: Markus Theil --- pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch | 46 +++++++++++++++++ pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch | 50 +++++++++++++++++++ pkgs/by-name/od/odp-dpdk/package.nix | 10 +++- 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch create mode 100644 pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch diff --git a/pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch b/pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch new file mode 100644 index 000000000000..daafdfad8584 --- /dev/null +++ b/pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch @@ -0,0 +1,46 @@ +diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h +index deb1fd43f2..0f63ebe1d5 100644 +--- a/lib/eal/include/rte_bitops.h ++++ b/lib/eal/include/rte_bitops.h +@@ -525,10 +525,12 @@ __rte_bit_ ## variant ## flip ## size(qualifier uint ## size ## _t *addr, unsign + __RTE_GEN_BIT_OPS(,, size) \ + __RTE_GEN_BIT_OPS(v_, volatile, size) + ++#ifndef __cplusplus + #ifdef ALLOW_EXPERIMENTAL_API + __RTE_GEN_BIT_OPS_SIZE(32) + __RTE_GEN_BIT_OPS_SIZE(64) + #endif ++#endif + + #define __RTE_GEN_BIT_ATOMIC_TEST(variant, qualifier, size) \ + __rte_experimental \ +@@ -653,10 +655,12 @@ __rte_bit_atomic_ ## variant ## test_and_assign ## size( \ + __RTE_GEN_BIT_ATOMIC_OPS(,, size) \ + __RTE_GEN_BIT_ATOMIC_OPS(v_, volatile, size) + ++#ifndef __cplusplus + #ifdef ALLOW_EXPERIMENTAL_API + __RTE_GEN_BIT_ATOMIC_OPS_SIZE(32) + __RTE_GEN_BIT_ATOMIC_OPS_SIZE(64) + #endif ++#endif + + /*------------------------ 32-bit relaxed operations ------------------------*/ + +@@ -1485,6 +1489,7 @@ rte_bit_ ## family ## fun(qualifier uint ## size ## _t *addr, arg1_type arg1_nam + __RTE_BIT_OVERLOAD_SZ_4R(family, fun, qualifier, 64, ret_type, arg1_type, arg1_name, \ + arg2_type, arg2_name, arg3_type, arg3_name) + ++#ifndef __cplusplus + #ifdef ALLOW_EXPERIMENTAL_API + __RTE_BIT_OVERLOAD_2R(, test, const, bool, unsigned int, nr) + __RTE_BIT_OVERLOAD_2(, set,, unsigned int, nr) +@@ -1502,6 +1507,7 @@ __RTE_BIT_OVERLOAD_3R(atomic_, test_and_clear,, bool, unsigned int, nr, int, mem + __RTE_BIT_OVERLOAD_4R(atomic_, test_and_assign,, bool, unsigned int, nr, bool, value, + int, memory_order) + #endif ++#endif + + #endif + diff --git a/pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch b/pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch new file mode 100644 index 000000000000..a62c9a0796a3 --- /dev/null +++ b/pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch @@ -0,0 +1,50 @@ +diff --git a/platform/linux-dpdk/odp_packet_dpdk.c b/platform/linux-dpdk/odp_packet_dpdk.c +index cd95ba0f9..7e8b7e3f1 100644 +--- a/platform/linux-dpdk/odp_packet_dpdk.c ++++ b/platform/linux-dpdk/odp_packet_dpdk.c +@@ -372,13 +372,18 @@ static void prepare_rss_conf(pktio_entry_t *pktio_entry, + uint64_t rss_hf_capa; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); + uint16_t port_id = pkt_dpdk->port_id; ++ int ret; + + memset(&pkt_dpdk->rss_conf, 0, sizeof(struct rte_eth_rss_conf)); + + if (!p->hash_enable) + return; + +- rte_eth_dev_info_get(port_id, &dev_info); ++ ret = rte_eth_dev_info_get(port_id, &dev_info); ++ if (ret) { ++ _ODP_ERR("Failed to read device info: %d\n", ret); ++ return; ++ } + rss_hf_capa = dev_info.flow_type_rss_offloads; + + /* Print debug info about unsupported hash protocols */ +@@ -842,7 +847,11 @@ static int dpdk_start(pktio_entry_t *pktio_entry) + pktio_entry->state == PKTIO_STATE_STOP_PENDING) + rte_eth_dev_stop(pkt_dpdk->port_id); + +- rte_eth_dev_info_get(port_id, &dev_info); ++ ret = rte_eth_dev_info_get(port_id, &dev_info); ++ if (ret) { ++ _ODP_ERR("Failed to read device info: %d\n", ret); ++ return -1; ++ } + + /* Pcap driver reconfiguration may fail if number of rx/tx queues is set to zero */ + if (!strncmp(dev_info.driver_name, PCAP_DRV_NAME, strlen(PCAP_DRV_NAME))) { +@@ -1258,7 +1267,11 @@ static uint32_t _dpdk_vdev_mtu(uint16_t port_id) + int ret; + int sockfd; + +- rte_eth_dev_info_get(port_id, &dev_info); ++ ret = rte_eth_dev_info_get(port_id, &dev_info); ++ if (ret) { ++ _ODP_ERR("Failed to read device info: %d\n", ret); ++ return 0; ++ } + if_indextoname(dev_info.if_index, ifr.ifr_name); + sockfd = socket(AF_INET, SOCK_DGRAM, 0); + ret = ioctl(sockfd, SIOCGIFMTU, &ifr); diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix index 0c8ef1005e6f..5134a82a6987 100644 --- a/pkgs/by-name/od/odp-dpdk/package.nix +++ b/pkgs/by-name/od/odp-dpdk/package.nix @@ -29,13 +29,21 @@ stdenv.mkDerivation rec { hash = "sha256-9stWGupRSQwUXOdPEQ9Rhkim22p5BBA5Z+2JCYS7Za0="; }; + patches = [ + ./odp-dpdk_25.03.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - dpdk + (dpdk.overrideAttrs { + patches = [ + ./dpdk_25.03.patch + ]; + }) libconfig libpcap numactl