From bfc1d590a84023507bfbcfa0a9476dc7eac1a7f6 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 15 May 2026 12:33:39 +0200 Subject: [PATCH 01/73] python3Packages.cartopy: add geospatial team --- pkgs/development/python-modules/cartopy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 2c82eae651f0..fca8fde9ec84 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -95,6 +95,7 @@ buildPythonPackage rec { changelog = "https://github.com/SciTools/cartopy/releases/tag/v${version}"; license = lib.licenses.lgpl3Plus; maintainers = [ ]; + teams = [ lib.teams.geospatial ]; mainProgram = "feature_download"; }; } From 96de2ba261e7fdf8fb5d1b9bde2ab4d991ad567c Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 15 May 2026 12:44:45 +0200 Subject: [PATCH 02/73] ifcopenshell: add geospatial team --- pkgs/development/python-modules/ifcopenshell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index bcdde4021d10..151303f6bb8e 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -210,6 +210,6 @@ buildPythonPackage rec { description = "Open source IFC library and geometry engine"; homepage = "https://ifcopenshell.org/"; license = lib.licenses.lgpl3; - maintainers = with lib.maintainers; [ autra ]; + teams = [ lib.teams.geospatial ]; }; } From 285d04c859afbbac1cf9666adc4f9c7f36d1d7ff Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 15 May 2026 13:05:29 +0200 Subject: [PATCH 03/73] python3Packages.opensfm: add geospatial team --- pkgs/development/python-modules/opensfm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix index 2a7a13e7924c..8be40ab1731a 100644 --- a/pkgs/development/python-modules/opensfm/default.nix +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -173,6 +173,7 @@ buildPythonPackage (finalAttrs: { lib.maintainers.pbsds lib.maintainers.SomeoneSerge ]; + teams = [ lib.teams.geospatial ]; license = lib.licenses.bsd2; changelog = "https://github.com/mapillary/OpenSfM/blob/${finalAttrs.src.rev}/CHANGELOG.md"; description = "Open source Structure-from-Motion pipeline from Mapillary"; From 43d722b1e032fdde6d16ded1815606956e002be7 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 15 May 2026 13:05:40 +0200 Subject: [PATCH 04/73] python3Packages.streamlit-folium: add geospatial team --- pkgs/development/python-modules/streamlit-folium/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/streamlit-folium/default.nix b/pkgs/development/python-modules/streamlit-folium/default.nix index 91bd46677919..6dced922d4b1 100644 --- a/pkgs/development/python-modules/streamlit-folium/default.nix +++ b/pkgs/development/python-modules/streamlit-folium/default.nix @@ -64,5 +64,6 @@ buildPythonPackage (finalAttrs: { changelog = "https://github.com/randyzwitch/streamlit-folium/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; + teams = [ lib.teams.geospatial ]; }; }) From be59fc82760a4bbc5a56144010372eb1dda5173a Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:17:17 +0200 Subject: [PATCH 05/73] python3Packages.azure-mgmt-domainregistration: init at 1.0.0b1 Signed-off-by: Paul Meyer --- .../azure-mgmt-domainregistration/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-domainregistration/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-domainregistration/default.nix b/pkgs/development/python-modules/azure-mgmt-domainregistration/default.nix new file mode 100644 index 000000000000..605ad5a8e97e --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-domainregistration/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + wheel, + azure-mgmt-core, + isodate, + typing-extensions, + nix-update-script, +}: + +buildPythonPackage (finalAttrs: { + pname = "azure-mgmt-domainregistration"; + version = "1.0.0b1"; + pyproject = true; + __structuredAttrs = true; + + src = fetchPypi { + pname = "azure_mgmt_domainregistration"; + inherit (finalAttrs) version; + hash = "sha256-9ayRrmCqmTY8yMLtrj/IIUb5xONb9SQoz8wvN29Wvy0="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + azure-mgmt-core + isodate + typing-extensions + ]; + + pythonImportsCheck = [ + "azure.mgmt.domainregistration" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "This package will be released in the near future. Stay tuned"; + homepage = "https://pypi.org/project/azure-mgmt-domainregistration"; + license = lib.licenses.mit; + maintainers = [ ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 135ff46d3ec3..5731cb8982bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1551,6 +1551,10 @@ self: super: with self; { azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { }; + azure-mgmt-domainregistration = + callPackage ../development/python-modules/azure-mgmt-domainregistration + { }; + azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { }; azure-mgmt-eventhub = callPackage ../development/python-modules/azure-mgmt-eventhub { }; From 5d06290ba0a0cca7f0f117f0f030f4c18c331e6e Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:17:55 +0200 Subject: [PATCH 06/73] azure-cli: 2.86.0 -> 2.87.0 Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/package.nix | 5 +++-- pkgs/by-name/az/azure-cli/python-packages.nix | 10 ---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 01c2a4516808..17bf6dfa2a85 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -26,14 +26,14 @@ }: let - version = "2.86.0"; + version = "2.87.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; tag = "azure-cli-${version}"; - hash = "sha256-3C39e9C3m9M0faGUgOEWo66fFGDytfGohgUYX55VN8g="; + hash = "sha256-08GmSGjPt+veulW6d/03bKUeyhedQ0JfsFT9VDkaQ7w="; }; # put packages that needs to be overridden in the py package scope @@ -192,6 +192,7 @@ py.pkgs.toPythonApplication ( azure-mgmt-cosmosdb azure-mgmt-datalake-store azure-mgmt-datamigration + azure-mgmt-domainregistration azure-mgmt-eventgrid azure-mgmt-eventhub azure-mgmt-extendedlocation diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 01232e27aaad..ccea48c9e783 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -251,16 +251,6 @@ let overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip" "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k="; - # ModuleNotFoundError: No module named 'azure.mgmt.web.v2024_11_01' - azure-mgmt-web = super.azure-mgmt-web.overridePythonAttrs (attrs: rec { - version = "9.0.0"; - src = fetchPypi { - pname = "azure_mgmt_web"; - inherit version; - hash = "sha256-RFXs07SYV3CFwZBObRcTklTjWLoH/mxINaiRu697BsI="; - }; - }); - # Attribute virtual_machines does not exist - nixpkgs has 37.x but azure-cli 2.82.0 requires ~=34.1.0 azure-mgmt-compute = super.azure-mgmt-compute.overridePythonAttrs (attrs: rec { version = "34.1.0"; From e863f1b77d3dcb803e1a2da400eb68bbec350906 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:22 +0200 Subject: [PATCH 07/73] azure-cli-extensions.fileshare: init at 1.0.2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 9b8e401f8b39..b7846fa1d8da 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -496,6 +496,13 @@ "hash": "sha256-x1mbd/Y28BcYqEf+T1rZcOHT8wrq9VnWnCfw9rBnl80=", "description": "Microsoft Azure Command-Line Tools ExpressRouteCrossConnection Extension" }, + "fileshare": { + "pname": "fileshare", + "version": "1.0.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fileshare-1.0.2-py3-none-any.whl", + "hash": "sha256-Oxrgvsm6K2msHxNUZ5S4FUz7BPucrxHpyLdGf5ucKkA=", + "description": "Microsoft Azure Command-Line Tools Fileshare Extension" + }, "fileshares": { "pname": "fileshares", "version": "1.0.0b1", From d213b25fa3a89de52a7b505bff07523296dc602a Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:23 +0200 Subject: [PATCH 08/73] azure-cli-extensions.quantum: 1.0.0b13 -> 1.0.0b16 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index b7846fa1d8da..a6de2cd6b252 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -932,9 +932,9 @@ }, "quantum": { "pname": "quantum", - "version": "1.0.0b13", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b13-py3-none-any.whl", - "hash": "sha256-zNyvYvtJY2AgASUoMvN/cCXWIOJ1d3JEQ7G/tuyV/o4=", + "version": "1.0.0b16", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b16-py3-none-any.whl", + "hash": "sha256-hhDQzA4jtmPyLbd703EYDCmBDjJS2rBTj7Qgx4T4dxQ=", "description": "Microsoft Azure Command-Line Tools Quantum Extension" }, "qumulo": { From d94d053017fdee4220120cadc0bcde266e47aaf1 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:25 +0200 Subject: [PATCH 09/73] azure-cli-extensions.oracle-database: 2.0.1 -> 2.0.3 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index a6de2cd6b252..803ca2c442fc 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -862,9 +862,9 @@ }, "oracle-database": { "pname": "oracle-database", - "version": "2.0.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-2.0.1-py3-none-any.whl", - "hash": "sha256-VlKOK9xP9e3NfPTO8jiqjdhJMkKzRpR8IWZ1hh0Z86Y=", + "version": "2.0.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-2.0.3-py3-none-any.whl", + "hash": "sha256-Qd9WtF7opKFbotazhgJsCb6CdGO/xQ1/5De+LcIaAiY=", "description": "Microsoft Azure Command-Line Tools OracleDatabase Extension" }, "orbital": { From 8d6b29a81ce5d57e695152c70335ba156b88fba1 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:26 +0200 Subject: [PATCH 10/73] azure-cli-extensions.fleet: 1.10.0 -> 1.10.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 803ca2c442fc..34357b4dcb0a 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -519,9 +519,9 @@ }, "fleet": { "pname": "fleet", - "version": "1.10.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.10.0-py3-none-any.whl", - "hash": "sha256-hgAwdLExAvKR0G9Ey81rTSa2QLxeoMnUZ7KRaCYhfM8=", + "version": "1.10.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.10.1-py3-none-any.whl", + "hash": "sha256-MEtlIj9z69GM/vktWbethZEr6hXyBpH310PT9A5Rtk8=", "description": "Microsoft Azure Command-Line Tools Fleet Extension" }, "fluid-relay": { From 5abf4a5c15d57abd7199e7f2217d560a7c34994c Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:27 +0200 Subject: [PATCH 11/73] azure-cli-extensions.dataprotection: 1.10.0 -> 1.11.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 34357b4dcb0a..2fbe0b0094bc 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -351,9 +351,9 @@ }, "dataprotection": { "pname": "dataprotection", - "version": "1.10.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.10.0-py3-none-any.whl", - "hash": "sha256-cssrKqmWbQv3qlr8A3GUNklnIGOQ9V2x3e+YWpXeCvQ=", + "version": "1.11.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.11.1-py3-none-any.whl", + "hash": "sha256-h/BgaqXzZYS8vZ8xQO1iuiZ1yTPjYa8IGzI0k4GNakY=", "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension" }, "datashare": { From 40ce78a18aa49254f8f0e8d017605eee87ae9061 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:28 +0200 Subject: [PATCH 12/73] azure-cli-extensions.appservice-kube: 0.1.11 -> 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 2fbe0b0094bc..f74293ceafd8 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -99,9 +99,9 @@ }, "appservice-kube": { "pname": "appservice-kube", - "version": "0.1.11", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-0.1.11-py2.py3-none-any.whl", - "hash": "sha256-gTI/rjFHJ8mx1QfWeWgJStemOubwqEPqKuS3jCPnuKI=", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-85HDcR5CwGoGG2ZXOK0aPGyUoE4aXK7QMnJH2vcohac=", "description": "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension" }, "arcgateway": { From c372859756181f1877d874e22b481279d811edf2 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:30 +0200 Subject: [PATCH 13/73] azure-cli-extensions.azure-changesafety: 1.0.0b1 -> 1.0.0b2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index f74293ceafd8..631dc6738aee 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -155,9 +155,9 @@ }, "azure-changesafety": { "pname": "azure-changesafety", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_changesafety-1.0.0b1-py3-none-any.whl", - "hash": "sha256-ZR2Bm9U9C4rXrCfPVGRu65MBFjZ4iUtXS44l+ClJXsY=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_changesafety-1.0.0b2-py3-none-any.whl", + "hash": "sha256-HTnRKs0YDqHH1tNgrbHdMOFChY7+G6Q4duHTD3KWtPA=", "description": "Microsoft Azure Command-Line Tools ChangeSafety Extension" }, "azure-firewall": { From a734b579cda3e30d023d0d551aa888080ceff92f Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:31 +0200 Subject: [PATCH 14/73] azure-cli-extensions.aks-preview: 20.0.0b8 -> 21.0.0b4 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 631dc6738aee..fe6e05fb905d 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "20.0.0b8", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-20.0.0b8-py2.py3-none-any.whl", - "hash": "sha256-ugLew461nhWWg73OZJW7g/xblclV5IfNHKm1it6j+Dc=", + "version": "21.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-21.0.0b4-py2.py3-none-any.whl", + "hash": "sha256-SQVpyKPmiVfN1gX7CnqhgAIoYVc8+ViPT/y0u8Km/EM=", "description": "Provides a preview for upcoming AKS features" }, "alb": { From 1aa7e6b7aea755d0f80be6e07aae03cf1705668a Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:32 +0200 Subject: [PATCH 15/73] azure-cli-extensions.site: 1.0.0b1 -> 1.0.0b2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index fe6e05fb905d..aa21875699dc 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -1030,9 +1030,9 @@ }, "site": { "pname": "site", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/site-1.0.0b1-py3-none-any.whl", - "hash": "sha256-OZ2569Gt1U+UzNHe4jsO3nTMUjipqGaCKoKbN0PDXpA=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/site-1.0.0b2-py3-none-any.whl", + "hash": "sha256-soEnNlH5/Mvzgj++o6LvpIheUrV13ZSQfWS4hNJZaeI=", "description": "Microsoft Azure Command-Line Tools Site Extension" }, "site-recovery": { From 91aa08a4dfb35026a3dbde9bce450290c0939896 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:34 +0200 Subject: [PATCH 16/73] azure-cli-extensions.amg: 2.8.1 -> 3.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index aa21875699dc..87d71fa00ed0 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -71,9 +71,9 @@ }, "amg": { "pname": "amg", - "version": "2.8.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.8.1-py3-none-any.whl", - "hash": "sha256-nsp7EJIf9/hfpbbpAlNQBQ//U2oR0zWV+LqJtlyCoLM=", + "version": "3.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-3.0.0-py3-none-any.whl", + "hash": "sha256-dTenG/ZarhJyREsCBigfy3zCpQ7VmK3Z4feLU4CzFtk=", "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" }, "amlfs": { From f226a076c98243852e35a94abdd0859f5a47322e Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:35 +0200 Subject: [PATCH 17/73] azure-cli-extensions.computelimit: 1.0.0b1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 87d71fa00ed0..aa4e84aa0f1d 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -239,9 +239,9 @@ }, "computelimit": { "pname": "computelimit", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/computelimit-1.0.0b1-py3-none-any.whl", - "hash": "sha256-Om6Hp12RxcajwQDUL/APXQpNjZNsJin/ad93hPfTOCg=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/computelimit-1.0.0-py3-none-any.whl", + "hash": "sha256-/jvHC7wLD7BVVgFIu2souEQs/o6Uaw9qsqXnoWt632E=", "description": "Microsoft Azure Command-Line Tools Computelimit Extension" }, "computeschedule": { From be5ab44c632a00fa8f5b5d2730ee4173951750e3 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:36 +0200 Subject: [PATCH 18/73] azure-cli-extensions.networkcloud: 5.0.0b1 -> 5.0.0b2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index aa4e84aa0f1d..da2da166bd58 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -813,10 +813,10 @@ }, "networkcloud": { "pname": "networkcloud", - "version": "5.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-5.0.0b1-py3-none-any.whl", - "hash": "sha256-q6F3dUqkhngm6/8Xe7Aki6OUTKbCpGCwy/bIcoPpmlM=", - "description": "Support for Azure Operator Nexus network cloud commands based on 2026-01-01-preview API version" + "version": "5.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-5.0.0b2-py3-none-any.whl", + "hash": "sha256-npgLkxwwn3FL7w4q5bpUq2Gghuy/4zsmikW7qs86Fe0=", + "description": "Support for Azure Operator Nexus network cloud commands based on 2026-05-01-preview API version" }, "new-relic": { "pname": "new-relic", From c696831a2c33558cdff18522fce2c6ff4ae0e0f2 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sat, 6 Jun 2026 13:18:37 +0200 Subject: [PATCH 19/73] azure-cli-extensions.fileshares: remove Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 ------- pkgs/by-name/az/azure-cli/extensions-manual.nix | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index da2da166bd58..704233a1d483 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -503,13 +503,6 @@ "hash": "sha256-Oxrgvsm6K2msHxNUZ5S4FUz7BPucrxHpyLdGf5ucKkA=", "description": "Microsoft Azure Command-Line Tools Fileshare Extension" }, - "fileshares": { - "pname": "fileshares", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fileshares-1.0.0b1-py3-none-any.whl", - "hash": "sha256-IrJwPQaMuX9VItIEkJzK3cmANHzU50fIaWn2s32nDVk=", - "description": "Commands for managing Azure file shares, snapshots, and private endpoint connections" - }, "firmwareanalysis": { "pname": "firmwareanalysis", "version": "2.0.1", diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 00c7f6e1c2b1..e0dca6490e74 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -389,5 +389,6 @@ sap-hana = throw "The 'sap-hana' extension for azure-cli was deprecated upstream"; # Added 2025-07-01, https://github.com/Azure/azure-cli-extensions/pull/8904 spring = throw "The 'spring' extension for azure-cli was deprecated upstream"; # Added 2025-05-07, https://github.com/Azure/azure-cli-extensions/pull/8652 spring-cloud = throw "The 'spring-cloud' extension for azure-cli was deprecated upstream"; # Added 2025-07-01 https://github.com/Azure/azure-cli-extensions/pull/8897 - weights-and-biases = throw "The 'weights-and-biases' was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8764 + weights-and-biases = throw "The 'weights-and-biases' extension for azure-cli was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8764 + fileshares = throw "The 'fileshares' extensions for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/9910 } From 6b23142a1b30a31bc8aca22ce4749d7eada1b870 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 8 Jun 2026 02:52:49 +0200 Subject: [PATCH 20/73] simulide: 1.1.0-SR1 -> 1.1.0-SR2 --- pkgs/by-name/si/simulide/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index 3dfb24aafb63..32885ea59133 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -29,19 +29,20 @@ let }; }; "1.1.0" = rec { - release = "SR1"; - rev = "2005"; - src = fetchbzr { - url = "https://code.launchpad.net/~arcachofo/simulide/1.1.0"; - sha256 = "sha256-YVQduUjPQF5KxMlm730FZTShHP/7JEcAMIFn+mQITrQ="; + release = "SR2"; + rev = "28965e3bd6dd118598db1f5639ce1cf2e3c56e36"; + src = fetchFromGitHub { + owner = "Arcachofo"; + repo = "SimuliDE_110"; inherit rev; + hash = "sha256-Ec72OE4xBlanFFzrrGu0lTY2BEVu7slc1+ZDFr8lUT8="; }; }; "1.2.0" = rec { release = "RC1"; rev = "da3a925491fab9fa2a8633d18e45f8e1b576c9d2"; src = fetchFromGitHub { - owner = "eeTools"; + owner = "Arcachofo"; repo = "SimulIDE-dev"; hash = "sha256-6Gh0efBizDK1rUNkyU+/ysj7QwkAs3kTA1mQZYFb/pI="; inherit rev; From 124317ad25cd677a767cca632976ffdcc1360e73 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 9 Jun 2026 10:53:43 +0200 Subject: [PATCH 21/73] upx: 5.1.1 -> 5.2.0 Signed-off-by: Paul Meyer --- pkgs/by-name/up/upx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/upx/package.nix b/pkgs/by-name/up/upx/package.nix index a77410b743e4..b5d602ca9f83 100644 --- a/pkgs/by-name/up/upx/package.nix +++ b/pkgs/by-name/up/upx/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "upx"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "upx"; repo = "upx"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-+ugYimeeBFAUGdBUtwasYSOZzBqQEC00N6R+GNSp9uI="; + hash = "sha256-6LTDz4gMak0V7KiZOeuQgm+RubKRp3zhF6T6SZzZ5Dk="; }; nativeBuildInputs = [ cmake ]; From e45516ba3bf2cccc2bb34fec7e4e4477a71a365b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 10 Jun 2026 07:55:22 +0200 Subject: [PATCH 22/73] rocqPackages.micromega-plugin: fix hash --- pkgs/development/rocq-modules/micromega-plugin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/rocq-modules/micromega-plugin/default.nix b/pkgs/development/rocq-modules/micromega-plugin/default.nix index 5be07cf07077..cc0be5454447 100644 --- a/pkgs/development/rocq-modules/micromega-plugin/default.nix +++ b/pkgs/development/rocq-modules/micromega-plugin/default.nix @@ -19,7 +19,7 @@ mkRocqDerivation { ] null; release = { - "1.1.0".sha256 = "sha256-OszFXGLnm0rGAZVRCq/riQUK1DuhPyfv49GBePkQWAI="; + "1.1.0".hash = "sha256-CWMbGErC5bu20Yu9eskgslLkzmSof6klNlOYEkQjUjc="; }; releaseRev = v: "v${v}"; From 854bc198f2d3b2c047fe8bfcc42f7665c7cf2d56 Mon Sep 17 00:00:00 2001 From: Katsumi Takeuchi Date: Wed, 10 Jun 2026 21:35:18 +0900 Subject: [PATCH 23/73] blesh: build from source --- pkgs/by-name/bl/blesh/package.nix | 76 ++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix index 0a6cbbe79977..cb50132b7b39 100644 --- a/pkgs/by-name/bl/blesh/package.nix +++ b/pkgs/by-name/bl/blesh/package.nix @@ -1,36 +1,56 @@ { lib, stdenvNoCC, - fetchzip, - runtimeShell, + fetchFromGitHub, bashInteractive, - glibcLocales, + gawk, + runtimeShell, + unstableGitUpdater, }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "blesh"; version = "0.4.0-devel3-unstable-2026-03-10"; - src = fetchzip { - url = "https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly-20260310%2Bb99cadb.tar.xz"; - name = "ble-nightly-20260310+b99cadb.tar.xz"; - sha256 = "sha256-rJnSEY7J4wfy8dnL9Bg59u0epPe0HL1J7piPbkNyes0="; + src = fetchFromGitHub { + owner = "akinomyoga"; + repo = "ble.sh"; + rev = "b99cadb4520a1fdec0067fdc007b39cc905ecbad"; + fetchSubmodules = true; + hash = "sha256-LXDow/4yv3V0Liy12bXQ1qwO5z4u0equRO9xeJaDaWo="; }; - dontBuild = true; + nativeBuildInputs = [ + gawk + ]; + + # Fix the cache invalidation not working; see + # https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4641313131 + postPatch = '' + substituteInPlace ble.pp \ + --replace-fail \ + 'local ver=''${BLE_VERSINFO[0]}.''${BLE_VERSINFO[1]}' \ + 'local ver=$BLE_VERSION' + ''; + + # ble.sh embeds the commit id, normally read from .git, which fetchFromGitHub omits. + makeFlags = [ + "PREFIX=$(out)" + "BLE_GIT_COMMIT_ID=${builtins.substring 0 7 finalAttrs.src.rev}" + "BLE_GIT_BRANCH=master" + ]; doCheck = true; - nativeCheckInputs = [ - bashInteractive - glibcLocales - ]; - preCheck = "export LC_ALL=en_US.UTF-8"; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/blesh/lib" + # auto-detection runs `make -n check` without makeFlags, which fails without BLE_GIT_COMMIT_ID + checkTarget = "check"; + nativeCheckInputs = [ bashInteractive ]; + preCheck = '' + export HOME=$TMPDIR + # upstream skips its flaky sleep-timing tests under GitHub CI + export CI=true GITHUB_ACTION=nix + ''; + postInstall = '' cat <"$out/share/blesh/lib/_package.sh" _ble_base_package_type=nix @@ -40,12 +60,6 @@ stdenvNoCC.mkDerivation { } EOF - cp -rv $src/* $out/share/blesh - - runHook postInstall - ''; - - postInstall = '' mkdir -p "$out/bin" cat <"$out/bin/blesh-share" #!${runtimeShell} @@ -54,8 +68,18 @@ stdenvNoCC.mkDerivation { echo "$out/share/blesh" EOF chmod +x "$out/bin/blesh-share" + + rm -rf "$out/share/blesh/cache.d" "$out/share/blesh/run" ''; + # tagFormat skips the "nightly"/"spike-*" tags; the newest tag is too far + # behind HEAD for shallow deepening, so clone fully. + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + tagFormat = "v*"; + shallowClone = false; + }; + meta = { homepage = "https://github.com/akinomyoga/ble.sh"; description = "Bash Line Editor -- a full-featured line editor written in pure Bash"; @@ -67,4 +91,4 @@ stdenvNoCC.mkDerivation { ]; platforms = lib.platforms.unix; }; -} +}) From 51c2ff341a00095efd1cf7b315529a345937ff39 Mon Sep 17 00:00:00 2001 From: Katsumi Takeuchi Date: Wed, 10 Jun 2026 21:41:50 +0900 Subject: [PATCH 24/73] blesh: 0.4.0-devel3-unstable-2026-03-10 -> 0.4.0-devel3-unstable-2026-05-28 --- pkgs/by-name/bl/blesh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix index cb50132b7b39..2c73550db045 100644 --- a/pkgs/by-name/bl/blesh/package.nix +++ b/pkgs/by-name/bl/blesh/package.nix @@ -10,14 +10,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "blesh"; - version = "0.4.0-devel3-unstable-2026-03-10"; + version = "0.4.0-devel3-unstable-2026-05-28"; src = fetchFromGitHub { owner = "akinomyoga"; repo = "ble.sh"; - rev = "b99cadb4520a1fdec0067fdc007b39cc905ecbad"; + rev = "f38850cb0add16f110341a517ff7c849adb43e57"; fetchSubmodules = true; - hash = "sha256-LXDow/4yv3V0Liy12bXQ1qwO5z4u0equRO9xeJaDaWo="; + hash = "sha256-EtOCZvUkzstXaT7N9qe+oT7+7ExlREsobzY+ylNy/7Y="; }; nativeBuildInputs = [ From 408759f3731cdfff9be5b52c68b37d7f1299194f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 12 Jun 2026 11:18:13 +0000 Subject: [PATCH 25/73] pnpm_11: 11.5.3 -> 11.6.0 --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index b8fdc30fd0f6..bf61aef988c7 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -26,8 +26,8 @@ let hash = "sha256-WOFDJYhx31FYm2UcBiBdq+xIdmpdu6PCWZm2m1C+WY4="; }; "11" = { - version = "11.5.3"; - hash = "sha256-I41jmkdxIni7cui22ywpesHM2A3XZC98kztzrr3ntR8="; + version = "11.6.0"; + hash = "sha256-oBYpSdGrGeEuizzZ8PWe8C1750oouAbPf0n7f0wH5c4="; }; }; From 516749bbd430fce8129875fe8774595815f5fc03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jun 2026 21:46:50 +0000 Subject: [PATCH 26/73] bitrise: 2.40.4 -> 2.40.5 --- pkgs/by-name/bi/bitrise/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index 1cef5d7995b2..81e9b035babc 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "bitrise"; - version = "2.40.4"; + version = "2.40.5"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${finalAttrs.version}"; - hash = "sha256-8Ec6It0haw2PC0HZPxbu2H+J0ltJ3vzsBaWytDiJzx4="; + hash = "sha256-wuvtkbQ3QmYc/ZO/QDpq1DDoLUE3Hcq5H7oWpCdZVVg="; }; # many tests rely on writable $HOME/.bitrise and require network access From 2dc5868ed98ba5ddac598ad57f5a1f3f0e60b38f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 06:18:01 +0000 Subject: [PATCH 27/73] python3Packages.cryptodatahub: 1.1.0 -> 1.2.1 --- pkgs/development/python-modules/cryptodatahub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix index a07509e65f98..f1b83ac239f4 100644 --- a/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "cryptodatahub"; - version = "1.1.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitLab { owner = "coroner"; repo = "cryptodatahub"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tz2VbWS5/sGjRsOKR7eWpWAJVNv1QMSjkepI7fVZq6w="; + hash = "sha256-Zu8E3k6jHFK+IIHWOalmdv/mPGhT7JjgjFkGiLxA4iI="; }; build-system = [ From 16a9a6dc0dff6b8fbabde7caa7455bf22f36860c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 00:26:06 +0000 Subject: [PATCH 28/73] waffle: 1.8.1 -> 1.8.2 --- pkgs/by-name/wa/waffle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix index 4ca8a12233fe..c8948023ae74 100644 --- a/pkgs/by-name/wa/waffle/package.nix +++ b/pkgs/by-name/wa/waffle/package.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "waffle"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "Mesa"; repo = "waffle"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Y7GRYLqSO572qA1eZ3jS8QlZ1X9xKpDtScaySTuPK/U="; + sha256 = "sha256-1yAg8ws4GIs/IHGVbfUKTXkD9JVRtjuH0REFIfDqXtc="; }; buildInputs = [ From 946ec48ea11b539034d491045632cc6f834efec7 Mon Sep 17 00:00:00 2001 From: Katsumi Takeuchi Date: Mon, 15 Jun 2026 10:08:34 +0900 Subject: [PATCH 29/73] blesh: move source fixes to patch files --- .../bl/blesh/fix-cache-invalidation.patch | 11 +++++++++++ pkgs/by-name/bl/blesh/package.nix | 17 +++++++++-------- .../bl/blesh/skip-readonly-runtime-dir.patch | 10 ++++++++++ 3 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/bl/blesh/fix-cache-invalidation.patch create mode 100644 pkgs/by-name/bl/blesh/skip-readonly-runtime-dir.patch diff --git a/pkgs/by-name/bl/blesh/fix-cache-invalidation.patch b/pkgs/by-name/bl/blesh/fix-cache-invalidation.patch new file mode 100644 index 000000000000..1fa4803f3156 --- /dev/null +++ b/pkgs/by-name/bl/blesh/fix-cache-invalidation.patch @@ -0,0 +1,11 @@ +--- a/ble.pp ++++ b/ble.pp +@@ -2063,7 +2063,7 @@ + return 1 + fi + +- local ver=${BLE_VERSINFO[0]}.${BLE_VERSINFO[1]} ++ local ver=$BLE_VERSION + ble/base/.create-user-directory _ble_base_cache "$cache_dir/blesh/$ver" + } + function ble/base/initialize-cache-directory { diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix index 2c73550db045..ba69473aef0d 100644 --- a/pkgs/by-name/bl/blesh/package.nix +++ b/pkgs/by-name/bl/blesh/package.nix @@ -24,14 +24,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { gawk ]; - # Fix the cache invalidation not working; see - # https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4641313131 - postPatch = '' - substituteInPlace ble.pp \ - --replace-fail \ - 'local ver=''${BLE_VERSINFO[0]}.''${BLE_VERSINFO[1]}' \ - 'local ver=$BLE_VERSION' - ''; + patches = [ + # Fix the cache invalidation not working; see + # https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4641313131 + ./fix-cache-invalidation.patch + # ble.sh reaches a runtime-dir fallback under the install base when the + # others are unusable (always on WSL); see + # https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4686973408 + ./skip-readonly-runtime-dir.patch + ]; # ble.sh embeds the commit id, normally read from .git, which fetchFromGitHub omits. makeFlags = [ diff --git a/pkgs/by-name/bl/blesh/skip-readonly-runtime-dir.patch b/pkgs/by-name/bl/blesh/skip-readonly-runtime-dir.patch new file mode 100644 index 000000000000..e03f56fc2646 --- /dev/null +++ b/pkgs/by-name/bl/blesh/skip-readonly-runtime-dir.patch @@ -0,0 +1,10 @@ +--- a/ble.pp ++++ b/ble.pp +@@ -1934,6 +1934,7 @@ + function ble/base/initialize-runtime-directory/.base { + local tmp_dir=$_ble_base/run + if [[ ! -d $tmp_dir ]]; then ++ [[ -w $_ble_base ]] || return 1 + ble/bin/mkdir -p "$tmp_dir" || return 1 + ble/bin/chmod a+rwxt "$tmp_dir" || return 1 + fi From 4d8211ff1d4239a9a59a6547ba3db4c005710759 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 14 Jun 2026 21:54:54 -0700 Subject: [PATCH 30/73] llvmPackages_git: 23.0.0-unstable-2026-06-07 -> 23.0.0-unstable-2026-06-14 --- pkgs/development/compilers/llvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index ac4a5ef58288..42b0dabf6e1b 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,9 +28,9 @@ let "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0="; "22.1.7".officialRelease.sha256 = "sha256-AmozlrL8AAlfr+F7OrJqr3ecd/KhBx5Bngj3SopPdyY="; "23.0.0-git".gitRelease = { - rev = "47ef7495ad781b742a0c4435ca72590d297ba8bf"; - rev-version = "23.0.0-unstable-2026-06-07"; - sha256 = "sha256-5x3wvNti/OCmdam0tUmkiiq/ONn23m4mcTh491hWLVA="; + rev = "625facd4375f6bfa5de501d0559bd262062e2dc3"; + rev-version = "23.0.0-unstable-2026-06-14"; + sha256 = "sha256-myNSe9+nBTd28BnEmq+Ysp0kiY6KtOJSmbnGjQgGxRI="; }; } // llvmVersions; From 069e192d02b2df8d2c9830cc1646bf7b3a03f9ea Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 15 Jun 2026 20:58:48 +0300 Subject: [PATCH 31/73] lasuite-meet: 1.17.0 -> 1.21.0 --- pkgs/by-name/la/lasuite-meet/addon-outlook.nix | 2 +- pkgs/by-name/la/lasuite-meet/frontend.nix | 2 +- pkgs/by-name/la/lasuite-meet/mail.nix | 2 +- pkgs/by-name/la/lasuite-meet/package.nix | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/la/lasuite-meet/addon-outlook.nix b/pkgs/by-name/la/lasuite-meet/addon-outlook.nix index f578f0635d9a..3dfb7faf8ec7 100644 --- a/pkgs/by-name/la/lasuite-meet/addon-outlook.nix +++ b/pkgs/by-name/la/lasuite-meet/addon-outlook.nix @@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) version src sourceRoot; - hash = "sha256-ReYXXYFzqZl0HWAgLdlw25ZamZJ06Aez8g1Tv/Nt3cE="; + hash = "sha256-1CoY0A4KMdn76SbgfRULn+O4yZhJgwNdk/bZ9Fk2rwY="; }; npmBuildScript = "build"; diff --git a/pkgs/by-name/la/lasuite-meet/frontend.nix b/pkgs/by-name/la/lasuite-meet/frontend.nix index 620641681dbe..a6ff5debfd6e 100644 --- a/pkgs/by-name/la/lasuite-meet/frontend.nix +++ b/pkgs/by-name/la/lasuite-meet/frontend.nix @@ -13,7 +13,7 @@ buildNpmPackage (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) version src sourceRoot; - hash = "sha256-Dd0wqssmLBfHkOHI5aactLnCPG4JxPLhNC+eo//QRXM="; + hash = "sha256-YnHjuwDp293KVNTYTd4KcZqMamZNeccOdpSGgJ9a3G8="; }; npmBuildScript = "build"; diff --git a/pkgs/by-name/la/lasuite-meet/mail.nix b/pkgs/by-name/la/lasuite-meet/mail.nix index 542433488845..128b5f6e8dee 100644 --- a/pkgs/by-name/la/lasuite-meet/mail.nix +++ b/pkgs/by-name/la/lasuite-meet/mail.nix @@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: { pname = "${finalAttrs.pname}-npm-deps"; inherit version src; inherit (finalAttrs) sourceRoot; - hash = "sha256-dvOmSQjtw7Qv3H+flOcXDaIxQzf9YBmsQo7jmSTA7tI="; + hash = "sha256-yq88kbrKn9HMwvxcWNXm7zonAqTs8T2i7iQAsD0TtnU="; }; npmBuildScript = "build"; diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index aef6663aaed2..ee61defe5c5e 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -6,13 +6,13 @@ python3, }: let - version = "1.17.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-hmkJwFYTBTbYsroegaRp/dcaNmeyPQ0Rbh/D1PGbh04="; + hash = "sha256-pUCSdnTBj/qwc0cya3P96r89r2K1GNSGg4DeIhxUKwI="; }; meta = { @@ -46,7 +46,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "uv_build>=0.10.9,<0.11.0" "uv_build" + --replace-fail "uv_build>=0.11.16,<0.12.0" "uv_build" ''; build-system = with python.pkgs; [ uv-build ]; From c67573daa23b2377e9ea8e370e6d231b54e12794 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Mon, 15 Jun 2026 11:18:13 -0700 Subject: [PATCH 32/73] abc-verifier: update license to be more precise --- pkgs/by-name/ab/abc-verifier/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ab/abc-verifier/package.nix b/pkgs/by-name/ab/abc-verifier/package.nix index d88b202e3419..f992190b36b0 100644 --- a/pkgs/by-name/ab/abc-verifier/package.nix +++ b/pkgs/by-name/ab/abc-verifier/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tool for sequential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; - license = lib.licenses.mit; + license = lib.licenses.mit-modern; maintainers = with lib.maintainers; [ thoughtpolice Luflosi From 1b09198aab53ea7c87d51091ab2fa5f8b0e00a70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 21:30:17 +0000 Subject: [PATCH 33/73] matlab-language-server: 1.3.11 -> 1.3.12 --- pkgs/by-name/ma/matlab-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matlab-language-server/package.nix b/pkgs/by-name/ma/matlab-language-server/package.nix index d65b973762e7..ff77f8ba723f 100644 --- a/pkgs/by-name/ma/matlab-language-server/package.nix +++ b/pkgs/by-name/ma/matlab-language-server/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "matlab-language-server"; - version = "1.3.11"; + version = "1.3.12"; src = fetchFromGitHub { owner = "mathworks"; repo = "matlab-language-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-UY+rYWfLHSc+1wDZsRfttX9asFOmV4i42/vxdqLQSuw="; + hash = "sha256-+0aVg5SesV8zOndRLTpz3WwLW32GxLLVlMcWj46vVIM="; }; - npmDepsHash = "sha256-r4GE9uQwjyPWUitaxXLejH4Ej8SWw+slGlYIo0OX3HM="; + npmDepsHash = "sha256-SQtUgX3yNXwUxZxPvNdYAtLBAu++2DiAx301X0LnAQo="; npmBuildScript = "package"; From e8edee782352f6740a51bcb4f2adb0d2c297d5c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 21:30:30 +0000 Subject: [PATCH 34/73] mcaselector: 2.7 -> 2.8 --- pkgs/by-name/mc/mcaselector/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mc/mcaselector/package.nix b/pkgs/by-name/mc/mcaselector/package.nix index 2c68d9a303cf..12fe6b32bbfb 100644 --- a/pkgs/by-name/mc/mcaselector/package.nix +++ b/pkgs/by-name/mc/mcaselector/package.nix @@ -13,11 +13,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "mcaselector"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar"; - hash = "sha256-pdJIQmoZhIfvQAHMGy0+IjQviMjFOrNsI69PHLQ9WpE="; + hash = "sha256-ZFBfOe35ybXUfmZpgfgePDqInU8SKzBlr34mn0jlNCM="; }; dontUnpack = true; From d6caed0ac68c1366601342568a6edc8fd5cddfae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Jun 2026 15:12:16 -0700 Subject: [PATCH 35/73] weblate: make pythonRelaxDeps more robust --- pkgs/by-name/we/weblate/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 892d9a778806..7d7514eedcf1 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -111,7 +111,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; in lib.concatMap ( - p: if p == null || lib.elem p.pname coreDeps then [ ] else [ p.pname ] + p: if !p ? "pname" || lib.elem p.pname coreDeps then [ ] else [ p.pname ] ) finalAttrs.passthru.dependencies; dependencies = From b393a9f05ebbcc58fcb61ca7fd7addeeab350230 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Mon, 15 Jun 2026 04:19:54 +0300 Subject: [PATCH 36/73] ieda: `enableParallelBuilding` & `__structuredAttrs` --- pkgs/by-name/ie/ieda/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix index e39620b0e801..81d65eaf289f 100644 --- a/pkgs/by-name/ie/ieda/package.nix +++ b/pkgs/by-name/ie/ieda/package.nix @@ -81,12 +81,10 @@ stdenv.mkDerivation { (lib.cmakeBool "CMD_BUILD" true) (lib.cmakeBool "SANITIZER" false) (lib.cmakeBool "BUILD_STATIC_LIB" false) + (lib.cmakeOptionType "filepath" "CMAKE_RUNTIME_OUTPUT_DIRECTORY" "${placeholder "out"}/bin") + (lib.cmakeOptionType "filepath" "CMAKE_LIBRARY_OUTPUT_DIRECTORY" "${placeholder "out"}/lib") ]; - preConfigure = '' - cmakeFlags+=" -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:FILEPATH=$out/bin -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:FILEPATH=$out/lib" - ''; - buildInputs = [ rustpkgs.iir-rust rustpkgs.sdf_parse @@ -130,7 +128,8 @@ stdenv.mkDerivation { doInstallCheck = !stdenv.hostPlatform.isAarch64; # Tests will fail on aarch64-linux, wait for upstream fix: https://github.com/microsoft/onnxruntime/issues/10038 - enableParallelBuild = true; + enableParallelBuilding = true; + __structuredAttrs = true; passthru.updateScript = ./update.sh; From e1080ada14f55c1bd555dd63f6c60c09514e5c67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 22:26:49 +0000 Subject: [PATCH 37/73] meilisearch: 1.45.2 -> 1.47.0 --- pkgs/by-name/me/meilisearch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 9a1bbe6f1be8..7f3dce98d76e 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.45.2"; + version = "1.47.0"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-hEMOyvFtbrOkN0I9F20NxdCLg+gYKDghZqXQ4T74Gsc="; + hash = "sha256-LEO8D4OgTjYdBMyOM8RG298+gj2iWN1TVUhYWvOCkns="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-R7q3TkmHBhKzfX+pVfh27UHBNtmMVwx0pjbqX+FCsWI="; + cargoHash = "sha256-frYHEeJOmPNAd/tt762qRBbSrXZ3/ZDjc8wZynuEDL4="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; From 3efefab24fad46feb3edcebfbb5cebae25ee39be Mon Sep 17 00:00:00 2001 From: yvnth Date: Tue, 16 Jun 2026 04:11:43 +0530 Subject: [PATCH 38/73] maintainers: add yvnth --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 630ade480827..a7b732e4b09f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -30725,6 +30725,12 @@ githubId = 65394961; name = "Yves Straten"; }; + yvnth = { + email = "yashupress@gmail.com"; + github = "yvnth"; + githubId = 201552597; + name = "Yashwanth Prasannakumar"; + }; yzx9 = { email = "yuan.zx@outlook.com"; github = "yzx9"; From 9011f88fe4d89ae0466c147e3f9c8f27245eb256 Mon Sep 17 00:00:00 2001 From: yvnth Date: Tue, 16 Jun 2026 04:11:44 +0530 Subject: [PATCH 39/73] tombi: add yvnth as maintainer --- pkgs/by-name/to/tombi/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 822be4dda1d9..b83b2178fbf9 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -55,6 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ faukah psibi + yvnth ]; mainProgram = "tombi"; }; From 486069670130e10aeabdd3b3b5c96336853a2ea0 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 11 Jun 2026 12:40:32 +0200 Subject: [PATCH 40/73] github-act-runner: init at 0.13.0 --- pkgs/by-name/gi/github-act-runner/package.nix | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/gi/github-act-runner/package.nix diff --git a/pkgs/by-name/gi/github-act-runner/package.nix b/pkgs/by-name/gi/github-act-runner/package.nix new file mode 100644 index 000000000000..d1c1a04cc61c --- /dev/null +++ b/pkgs/by-name/gi/github-act-runner/package.nix @@ -0,0 +1,63 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + makeWrapper, + nodejs_24, + gitMinimal, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "github-act-runner"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "ChristopherHX"; + repo = "github-act-runner"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Bcpaw3tVCkpxMmjxKTxu1H3amlawbIS0UdH0+qWEv18="; + }; + + vendorHash = "sha256-JS+8A6/JiIctCFzZQl1GqfSGv5yZT64++0BgYC8sulE="; + + ldflags = [ + "-s" + "-X main.version=v${finalAttrs.version}" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/github-act-runner \ + --prefix PATH : ${ + lib.makeBinPath [ + nodejs_24 + gitMinimal + ] + } + ''; + + __structuredAttrs = true; + strictDeps = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Reverse-engineered self-hosted GitHub Actions runner (Go)"; + homepage = "https://github.com/ChristopherHX/github-act-runner"; + changelog = "https://github.com/ChristopherHX/github-act-runner/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ liberodark ]; + platforms = lib.platforms.linux; + mainProgram = "github-act-runner"; + }; +}) From 1dc640aa8ea8282882b8678254fc9d2606028e54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 23:40:46 +0000 Subject: [PATCH 41/73] anda: 0.7.0 -> 0.7.1 --- pkgs/by-name/an/anda/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/anda/package.nix b/pkgs/by-name/an/anda/package.nix index 949f0b0ba872..b494810cee55 100644 --- a/pkgs/by-name/an/anda/package.nix +++ b/pkgs/by-name/an/anda/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "anda"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "FyraLabs"; repo = "anda"; tag = finalAttrs.version; - hash = "sha256-bnjTXLxFDc/blyu2Ns8EV5ZCh97RLJpQsGtavxP9W+4="; + hash = "sha256-4KiqIBWQfI8IagSoa39+bh0bVdhbuwTmxPdNkRlNEdA="; }; - cargoHash = "sha256-GWPl91Y2DDrFMvsUAZBYburNpPgl2O/ZLeYy0ivclOA="; + cargoHash = "sha256-EWPahdExDi0TFVVMPljTb+j8iUtoqYOqU8LI621gj30="; __structuredAttrs = true; From 7179ad701dbc7715ccf6d4af972cd9381974bcd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 23:45:02 +0000 Subject: [PATCH 42/73] python3Packages.smg-grpc-proto: 0.4.8 -> 0.4.10 --- pkgs/development/python-modules/smg-grpc-proto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smg-grpc-proto/default.nix b/pkgs/development/python-modules/smg-grpc-proto/default.nix index 5f25a0871d70..e4b35d5210df 100644 --- a/pkgs/development/python-modules/smg-grpc-proto/default.nix +++ b/pkgs/development/python-modules/smg-grpc-proto/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage (finalAttrs: { pname = "smg-grpc-proto"; - version = "0.4.8"; + version = "0.4.10"; pyproject = true; __structuredAttrs = true; @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { format = "setuptools"; pname = "smg_grpc_proto"; inherit (finalAttrs) version; - hash = "sha256-BK2sEbhHsa5/+yej9SB5A06SHB+9oCuuMmwENHJPyHY="; + hash = "sha256-VBVhjSUuWitD0du9LB6uMFdgBw3SRzUwgUCu0Gp0hr4="; }; build-system = [ From e9fd13d9588532fcc9b74a0d32702df7470acea3 Mon Sep 17 00:00:00 2001 From: Gareth Pye Date: Mon, 15 Jun 2026 12:45:36 +1000 Subject: [PATCH 43/73] chhoto-url: Enable git LFS for pulling the images Upstream switched to using LFS for storing the images (favicon, etc): https://github.com/SinTan1729/chhoto-url/commit/fcbb3e13e503163075061553430453d5e16e758a --- pkgs/by-name/ch/chhoto-url/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix index 7f3a2ec9ba89..e40b1fb1ca42 100644 --- a/pkgs/by-name/ch/chhoto-url/package.nix +++ b/pkgs/by-name/ch/chhoto-url/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "SinTan1729"; repo = "chhoto-url"; tag = finalAttrs.version; - hash = "sha256-B6bMuy/EEveYtQtGBO5CNeEUlPK8eQ412k+SwlRPm2M="; + hash = "sha256-n8fCQeY0gIyZuACKWa8Fk9TQ680PpVS2MHMFy7UgDwk="; + fetchLFS = true; }; sourceRoot = "${finalAttrs.src.name}/actix"; From a997fe11409089f4e9db39b5b223046ce963b92c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 00:39:40 +0000 Subject: [PATCH 44/73] inventree: 1.3.3 -> 1.3.5 --- pkgs/by-name/in/inventree/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/inventree/package.nix b/pkgs/by-name/in/inventree/package.nix index b40201deee1e..fc63844cbdf9 100644 --- a/pkgs/by-name/in/inventree/package.nix +++ b/pkgs/by-name/in/inventree/package.nix @@ -14,12 +14,12 @@ }: let - version = "1.3.3"; + version = "1.3.5"; src = fetchFromGitHub { owner = "inventree"; repo = "inventree"; tag = "${version}"; - hash = "sha256-Xh3YcVz5OLQ596uWUEac87CKi62xgr63dYiYb6U6qXQ="; + hash = "sha256-SxJc09zy7aKW+PVl4My3jzwsktkbsvNnyXMTMs/NzUA="; postCheckout = '' git -C $out rev-parse HEAD > $out/commit_hash.txt git -C $out show -s --format=%cd --date=short HEAD > $out/commit_date.txt From 3e397c5775dcf26c4ac86e01e79c5ff0535dd9cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 01:15:42 +0000 Subject: [PATCH 45/73] terraform-providers.launchdarkly_launchdarkly: 2.29.0 -> 2.30.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3f42d79daa0b..60e73e9bf1b2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -842,11 +842,11 @@ "vendorHash": "sha256-PIltVJ3o3ROFi1ensrJyFYEsCm6nEFXHkkTPU3ho+gU=" }, "launchdarkly_launchdarkly": { - "hash": "sha256-DCc+qQdVVDdFiHaDv6jc4MUuWPemk3XEeBEKAbTUi7M=", + "hash": "sha256-PgAK0BUTSyW4CXssQkENohnhtd2O5GPuFVvSDcHWjQ8=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.29.0", + "rev": "v2.30.0", "spdx": "MPL-2.0", "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM=" }, From eb573783ad8c78085ddf4a4b075d3675e77f091e Mon Sep 17 00:00:00 2001 From: Sapi <144389458+tree-sapii@users.noreply.github.com> Date: Fri, 12 Jun 2026 22:24:15 -0400 Subject: [PATCH 46/73] tailwindcss-language-server: 0.14.28 -> 0.14.29 --- .../tailwindcss-language-server/package.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 0a4b336074c2..0f31a49b3ec1 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -3,20 +3,20 @@ stdenv, fetchFromGitHub, nodejs, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "tailwindcss-language-server"; - version = "0.14.28"; + version = "0.14.29"; src = fetchFromGitHub { owner = "tailwindlabs"; repo = "tailwindcss-intellisense"; tag = "v${finalAttrs.version}"; - hash = "sha256-jds6Wq4rcR4wXonZ1v9JITiEc4gflT0sTc3KUSBCMFc="; + hash = "sha256-o5NyU52j3ZyuKWT4lL5U78qz4TBbXerylTl2fdvwqlk="; }; pnpmDeps = fetchPnpmDeps { @@ -25,15 +25,21 @@ stdenv.mkDerivation (finalAttrs: { version src pnpmWorkspaces + patchPhase ; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-3pHEmYMgQuHFFMyGeFzo9BWRFt6yvWzFFMJEdRhwS2w="; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-excPYLP+81ftU/LwBeO/lmj4Nbefb4dNvpvudg/sx+w="; }; + patchPhase = '' + substituteInPlace ./packages/tailwindcss-language-server/package.json \ + --replace '"@tailwindcss/oxide": "^4.1.15",' '"@tailwindcss/oxide": "^4.1.14",' + ''; + nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_10 ]; buildInputs = [ From b63f17f386203c04444d3044c40c27aa952d789d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 03:31:49 +0000 Subject: [PATCH 47/73] terraform-providers.lxc_incus: 1.1.0 -> 1.1.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3f42d79daa0b..fc9c0ee7c8de 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -878,13 +878,13 @@ "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8=" }, "lxc_incus": { - "hash": "sha256-m3xUqIUvowu+SZ7TxXYKjOv0Th/Pah0MXVAdaaSPeCo=", + "hash": "sha256-Jabbg13UetT4B+kGNP2DDEXFALR8apqjPB5xWkHF5UA=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v1.1.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-vTJXA7vHVE/m68gr1nHInGs/2T/4OzwS6T3BAAJ+ATo=" + "vendorHash": "sha256-nRkttehaieVOcTBJ3rIU/JHtv/q4fU18z8MUo3xtE28=" }, "marcofranssen_dexidp": { "hash": "sha256-Aby3FNEA6LgsGM/N10LNu9sCv3f2N8WIrmWoqEqTa8E=", From 03d85ef09e519ae3b75b6603c2ee1195e462a784 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 03:38:25 +0000 Subject: [PATCH 48/73] libretro.fceumm: 0-unstable-2026-05-06 -> 0-unstable-2026-06-15 --- pkgs/applications/emulators/libretro/cores/fceumm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index 3abd97a160f1..af55857f56dc 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2026-05-06"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "3a84a6fd0ba20dd4877c06b1d58741172148395f"; - hash = "sha256-4+kEoN0+SWl284n7tIR76aysf0GlLdxELDXfpEK6mi8="; + rev = "c0c52ad0eb36cdbfc66e9bdb72efc83103e85e22"; + hash = "sha256-e81kpVUTz3l9wqCwN9Zf4LrnskPRW7Ewy78/1BApZlg="; }; meta = { From efac900ca7c422ed85600d6b4aea685dfdb00fbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 03:52:09 +0000 Subject: [PATCH 49/73] just-lsp: 0.4.5 -> 0.4.6 --- pkgs/by-name/ju/just-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix index 0d928cc1c41e..eb9ea1b0f1b1 100644 --- a/pkgs/by-name/ju/just-lsp/package.nix +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "just-lsp"; - version = "0.4.5"; + version = "0.4.6"; __structuredAttrs = true; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "terror"; repo = "just-lsp"; tag = finalAttrs.version; - hash = "sha256-Ly+9JXZNCQ3uFt2r6Cte88Hzr6VxpKFHYx29SdngfuE="; + hash = "sha256-x58iZ1TSwMZSPQsxlXeMgBxBMezCLJkbGFMWE4gV2PE="; }; - cargoHash = "sha256-nsTC4ks81F0E8OqOaRXYlzi/RTg+ywpiCsTwKFGwCt0="; + cargoHash = "sha256-XSXzCTbacnxuK9rjuRhnNu9uglK+H1Ixfm00A+6O5MM="; nativeInstallCheckInputs = [ versionCheckHook From 44bd912379d63e12515eff9391cf9d3420afbb9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 04:40:20 +0000 Subject: [PATCH 50/73] cudaPackages.cutlass: 4.5.1 -> 4.5.2 --- pkgs/development/cuda-modules/packages/cutlass.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/cuda-modules/packages/cutlass.nix b/pkgs/development/cuda-modules/packages/cutlass.nix index 8f3c492a20c3..1866bba22a03 100644 --- a/pkgs/development/cuda-modules/packages/cutlass.nix +++ b/pkgs/development/cuda-modules/packages/cutlass.nix @@ -46,13 +46,13 @@ backendStdenv.mkDerivation (finalAttrs: { # NOTE: Depends on the CUDA package set, so use cudaNamePrefix. name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "cutlass"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "cutlass"; tag = "v${finalAttrs.version}"; - hash = "sha256-rW//OyY9fZjxavT5QYjLvc5oOpQhrXiDGwM2NTFuehY="; + hash = "sha256-5SMEfoqB2QXRfH5wBwTKKjez0x2zhR8T8EA0bqPMqwM="; }; # TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a From 9318361ec3293610e3639c76e018e50c3ed07ef8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 05:13:59 +0000 Subject: [PATCH 51/73] python3Packages.jupyterhub: 5.4.6 -> 5.5.0 --- pkgs/development/python-modules/jupyterhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 2c2cc5f927f5..005420dfa09a 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: { pname = "jupyterhub"; - version = "5.4.6"; + version = "5.5.0"; pyproject = true; __structuredAttrs = true; @@ -59,7 +59,7 @@ buildPythonPackage (finalAttrs: { owner = "jupyterhub"; repo = "jupyterhub"; tag = finalAttrs.version; - hash = "sha256-ndL5pE332VDlCk16XYUDaXhsg/J8ndGtgDhKct+y26c="; + hash = "sha256-BDU0RP6NRRnSZelRadhvSm2mfsuewyMwpcRlDBPDC0E="; }; npmDeps = fetchNpmDeps { From 13a377738beb89a6efd698bfab85b5cc537cd601 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 06:03:55 +0000 Subject: [PATCH 52/73] tgeraser: 1.6.0 -> 1.6.2 --- pkgs/by-name/tg/tgeraser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tg/tgeraser/package.nix b/pkgs/by-name/tg/tgeraser/package.nix index a16e3597813e..2cb85c8f5262 100644 --- a/pkgs/by-name/tg/tgeraser/package.nix +++ b/pkgs/by-name/tg/tgeraser/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "tgeraser"; - version = "1.6.0"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "en9inerd"; repo = "tgeraser"; tag = "v${finalAttrs.version}"; - hash = "sha256-8RcOfA7rGgVjkOrsBpCf9RsJ93xtS65hIUe1vPDpPNI="; + hash = "sha256-oX4bLbTFnWzuPLqygGDMAT7ObUMDS1nD1fGFqCa9SJQ="; }; build-system = [ python3Packages.setuptools ]; From bffcba3931e07ae04ad373b604a501ca02b7366e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 06:08:54 +0000 Subject: [PATCH 53/73] terraform-providers.aiven_aiven: 4.57.0 -> 4.58.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3f42d79daa0b..88782f0f1efe 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": null }, "aiven_aiven": { - "hash": "sha256-Yevs7mUu5Mr9JBbPE8CIKufYCLKealbBXrNL+mRH2Yw=", + "hash": "sha256-LfchOoquLq6YwRqwWv+q4V2+0wRE1zehWddlwf3GItI=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.57.0", + "rev": "v4.58.0", "spdx": "MIT", - "vendorHash": "sha256-ndIxcO14+NAKmRs9wVEE/HhBx9Wj4AwiMv+nus6BDK4=" + "vendorHash": "sha256-0ttD+LdZaIKiVMRsck4o0ibKHpAGfYMSSOanUKq89Js=" }, "akamai_akamai": { "hash": "sha256-M6Btq8wX1lsEs1HUaaTwGspnvS2IyE0L2ITe+ogDTlc=", From 067bec3626d88bcde44afa9d9f75d0d9050b0a87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 06:09:43 +0000 Subject: [PATCH 54/73] terraform-providers.hashicorp_google-beta: 7.35.0 -> 7.36.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3f42d79daa0b..f2339b9a87ce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -589,13 +589,13 @@ "vendorHash": "sha256-Ub+Dvddw5jcSy2hR72OSsy4EgHphhCW1kekPyrQGc9E=" }, "hashicorp_google-beta": { - "hash": "sha256-WsZY4O5kUoOkDcP2iKmkLo85XaBM2oQxaB/7ibJMDwA=", + "hash": "sha256-eqbMR7U6hBZ6eue7QTPeA1YeRBxk/XerbmZ+FP4oHQM=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.35.0", + "rev": "v7.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-CjrVDZpRlnPA1MnWEZdFyO3YzgaHqTsiw+kKOW+//2g=" + "vendorHash": "sha256-JAxI/E8GlUZd3RlhsrIhGm4+G18/obms+czJORYCENY=" }, "hashicorp_helm": { "hash": "sha256-Dw6khnp0pronRKbBv2gx8ygtVvRV9uQIHCXj2BblZ6k=", From 58b384f3d8aaace114f87b7ed4e20e182d6fe141 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 15 Jun 2026 17:52:28 -0600 Subject: [PATCH 55/73] maintainers: update ryand56 --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 630ade480827..fd09e562c491 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24257,6 +24257,7 @@ }; ryand56 = { email = "git@ryand.ca"; + matrix = "@ryan:ryand.ca"; github = "ryand56"; githubId = 22267679; name = "Ryan Omasta"; From cc01a06290339c73c643e092784d76051759fcdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 06:23:58 +0000 Subject: [PATCH 56/73] rucio: 39.4.2 -> 40.3.0 --- pkgs/development/python-modules/rucio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix index 8385c8a03ce8..5d6ca8cd696e 100644 --- a/pkgs/development/python-modules/rucio/default.nix +++ b/pkgs/development/python-modules/rucio/default.nix @@ -40,13 +40,13 @@ }: let - version = "39.4.2"; + version = "40.3.0"; src = fetchFromGitHub { owner = "rucio"; repo = "rucio"; tag = version; - hash = "sha256-xLOSdpkBjku3AehH6n9+hT1HM5QCwr1Sh7KEQRHr7jg="; + hash = "sha256-HJE4isk+1eOyfIzjVKg888CxW/JuKFGtTbjZNEfodt4="; }; in buildPythonPackage { From 526b6b177011d040f11053132d96aaefb2fbe16e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 06:28:13 +0000 Subject: [PATCH 57/73] plasmavantage: 0.30 -> 0.31 --- pkgs/by-name/pl/plasmavantage/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasmavantage/package.nix b/pkgs/by-name/pl/plasmavantage/package.nix index dfc6c10b34c3..aaf2a023991d 100644 --- a/pkgs/by-name/pl/plasmavantage/package.nix +++ b/pkgs/by-name/pl/plasmavantage/package.nix @@ -6,12 +6,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasmavantage"; - version = "0.30"; + version = "0.31"; src = fetchFromGitLab { owner = "Scias"; repo = "plasmavantage"; tag = finalAttrs.version; - hash = "sha256-++WewCzTWGrMTXhBQQ339W/bDgKO040xeBNhozljsko="; + hash = "sha256-SUsPb7NblnTpcju1d1km5877IPnaykiKd1bHJ/D6wyw="; }; strictDeps = true; From 54645c4980121d8f8b5f56338b531ea1a4935d2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 06:36:38 +0000 Subject: [PATCH 58/73] python3Packages.spotipyfree: 1.9.5 -> 1.9.12 --- pkgs/development/python-modules/spotipyfree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotipyfree/default.nix b/pkgs/development/python-modules/spotipyfree/default.nix index 962ab48a0e67..7713d203429b 100644 --- a/pkgs/development/python-modules/spotipyfree/default.nix +++ b/pkgs/development/python-modules/spotipyfree/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "spotipyfree"; - version = "1.9.5"; + version = "1.9.12"; pyproject = true; # no tags on GitHub src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-1QvcyQcQsLXsEzk6fbNw9lga4KCcoPpxJGorJoacHto="; + hash = "sha256-66SITvhrKd1dJucd626Qy9jW9qZYgH/PWYyto3F4Big="; }; build-system = [ setuptools ]; From ebdef1a337de8ecffe42ca558021dd33aa941982 Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 16 Jun 2026 09:01:10 +0200 Subject: [PATCH 59/73] python3Packages.cryptoparser: 1.1.0 -> 1.2.1 Changelog: https://gitlab.com/coroner/cryptoparser/-/blob/v1.2.1/CHANGELOG.md --- pkgs/development/python-modules/cryptoparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index 6c814655ae8f..232c5ada513f 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "cryptoparser"; - version = "1.1.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitLab { owner = "coroner"; repo = "cryptoparser"; tag = "v${finalAttrs.version}"; - hash = "sha256-Zd305BFM3G8LMQqDwtbwRPy6ooNXJ61UzWBwVewh0F4="; + hash = "sha256-thhpXfLH5yB3pMUKFrMUJ8+8IGchF813ApKUrN+UuZA="; }; patches = [ From 783f6a6cb5c79cb60caef96082eca8f6726d5abf Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 16 Jun 2026 09:01:40 +0200 Subject: [PATCH 60/73] python3Packages.cryptolyzer: 1.1.0 -> 1.2.1 Changelog: https://gitlab.com/coroner/cryptolyzer/-/blob/v1.2.1/CHANGELOG.md --- pkgs/development/python-modules/cryptolyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index e8cc54e9632d..3acb13a63ce1 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "cryptolyzer"; - version = "1.1.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitLab { owner = "coroner"; repo = "cryptolyzer"; tag = "v${finalAttrs.version}"; - hash = "sha256-z9RuboCWHEqw4aFfQTjWly/UP9Yed0R+VdMLVXxdBmc="; + hash = "sha256-v+himg/DOBlIRiWBIGkxiahT3JGp384Ed4cUCIq6TOw="; }; patches = [ From c2d9735104a5fa7035f533563f9a8e9f44e5031e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 16 Jun 2026 07:03:09 +0000 Subject: [PATCH 61/73] nixl: 1.2.0 -> 1.3.0 Diff: https://github.com/ai-dynamo/nixl/compare/v1.2.0...v1.3.0 Changelog: https://github.com/ai-dynamo/nixl/releases/tag/v1.3.0 --- pkgs/by-name/ni/nixl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixl/package.nix b/pkgs/by-name/ni/nixl/package.nix index 44c8fac0e236..9d23e3be2808 100644 --- a/pkgs/by-name/ni/nixl/package.nix +++ b/pkgs/by-name/ni/nixl/package.nix @@ -36,7 +36,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "nixl"; - version = "1.2.0"; + version = "1.3.0"; __structuredAttrs = true; strictDeps = true; @@ -45,7 +45,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ai-dynamo"; repo = "nixl"; tag = "v${finalAttrs.version}"; - hash = "sha256-viyoFc8g0B8kXW2umd7vdAAu+XMk0CJwQEGw+ll3AJ4="; + hash = "sha256-rEeR7UnpIill/QLNZAbjPhtggJn/fO9SNEcPwqKgTGc="; }; postPatch = From afc84f9983bc93fb3e2d4fbca555a51ea1d64bc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 07:37:17 +0000 Subject: [PATCH 62/73] libretro.genesis-plus-gx: 0-unstable-2026-06-05 -> 0-unstable-2026-06-12 --- .../emulators/libretro/cores/genesis-plus-gx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index 04d25dced59e..ad5a4b148996 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "f2b40ca6c97b2ff7f70d3c00d7ace84200bb31eb"; - hash = "sha256-mvPRDQpRFClcQS26ARf7Mp2eEhf8AbvDG9DdTGHOrlI="; + rev = "d046ec708d443ec7d9d38f757fa8e01099dd5c5a"; + hash = "sha256-Q3eqYnoGAUcQOSt33lcQHHDqc7aLGcxaf+gcRUC4FGs="; }; meta = { From 5d55e94980c92734046cf3840e90cc747aea686b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 07:51:41 +0000 Subject: [PATCH 63/73] samrewritten: 1.4.2 -> 1.4.3 --- pkgs/by-name/sa/samrewritten/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index aa52a1cff34e..4129393a225d 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -15,16 +15,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "samrewritten"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "PaulCombal"; repo = "SamRewritten"; tag = "v${finalAttrs.version}"; - hash = "sha256-p24V0rUnCPanci8KqxGhWA793HVcqO8VSHzabSAOR0A="; + hash = "sha256-zfjAdInF/Sy9FRALlwGtEvp2K9xCReqpbMvVNPho+Ic="; }; - cargoHash = "sha256-beHc4EETX6cyRFEHaiCghvaRZ6uYQOfllygdkiMg+OA="; + cargoHash = "sha256-DWt98XoLBShfhfFu1mI7f5Ke/jDIjtllWSpYPS1Sygc="; # Tests require network access and a running Steam client. Skipping. doCheck = false; From 0eee16e9cc2ab4a3d91878bad8aa61bdd8b4fd70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 08:08:05 +0000 Subject: [PATCH 64/73] terraform-providers.ubiquiti-community_unifi: 0.42.0 -> 0.49.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3f42d79daa0b..c68720918a88 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1409,13 +1409,13 @@ "vendorHash": null }, "ubiquiti-community_unifi": { - "hash": "sha256-STJXSLtAN1HR46p/Vs3E0ZB/DQ1NW5HTPK50k9kk3EY=", + "hash": "sha256-S2/7ESs7YaTmRn7luJgENk1eZXe/tnIYaNuprnUObv0=", "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi", "owner": "ubiquiti-community", "repo": "terraform-provider-unifi", - "rev": "v0.42.0", + "rev": "v0.49.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1leizEFn+5VFy3LOAFAogtDT4pyuaG5in0hMat1sORg=" + "vendorHash": "sha256-ciATeythUzo+DqLA4g1Vpq4Agc9KjKatpmpXOOOjxA8=" }, "ucloud_ucloud": { "hash": "sha256-k+NkB1q0oiasLc4+b+mbJ0TNUD67XR9ga9MwSbEXjKQ=", From 2c38756fc126401e5ae40b32c482325c40a366b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 09:22:14 +0000 Subject: [PATCH 65/73] tusd: 2.9.2 -> 2.10.0 --- pkgs/by-name/tu/tusd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/tusd/package.nix b/pkgs/by-name/tu/tusd/package.nix index f85925edcc68..1bf4bce2b6df 100644 --- a/pkgs/by-name/tu/tusd/package.nix +++ b/pkgs/by-name/tu/tusd/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "tusd"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "tus"; repo = "tusd"; tag = "v${finalAttrs.version}"; - hash = "sha256-bHC1pUx/GW3IWtGqsGOOBMWTRM65oCKg9gTL5L8GT+0="; + hash = "sha256-rG86IibKEjJ4/JNEBpU9APIrS57b4XL/9/HQIRWb5PM="; }; - vendorHash = "sha256-sNWB/qiF/DhRpF0Z+m1NQ3ydUWAr9NdsSaRx0BT8C98="; + vendorHash = "sha256-5Sh4u+tW9TPJUNQiBWmG1fQUYVtO+plT4ZZ49iQeXSU="; ldflags = [ "-X github.com/tus/tusd/v2/cmd/tusd/cli.VersionName=v${finalAttrs.version}" From fcd31344c3da2cbd921c5852e3c935a5facf5429 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 16 Jun 2026 17:26:39 +0800 Subject: [PATCH 66/73] python3Packages.smg-grpc-servicer: 0.5.3 -> 0.5.5 --- pkgs/development/python-modules/smg-grpc-servicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smg-grpc-servicer/default.nix b/pkgs/development/python-modules/smg-grpc-servicer/default.nix index 701466ef7a54..c367990e4103 100644 --- a/pkgs/development/python-modules/smg-grpc-servicer/default.nix +++ b/pkgs/development/python-modules/smg-grpc-servicer/default.nix @@ -14,7 +14,7 @@ }: buildPythonPackage (finalAttrs: { pname = "smg-grpc-servicer"; - version = "0.5.3"; + version = "0.5.5"; pyproject = true; __structuredAttrs = true; @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { format = "setuptools"; pname = "smg_grpc_servicer"; inherit (finalAttrs) version; - hash = "sha256-/stjZWK+5XSTmD9iIRWq+dqthd5kRhty6F7Ffvbfr74="; + hash = "sha256-g3SCR/WjoSpxoq1a+Elvf9z+kAvb8nGgayMRMR/q4d8="; }; build-system = [ From 09ddbaf6f8797c20847c681b333eeec0e60b9d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 8 May 2026 14:50:14 +0200 Subject: [PATCH 67/73] e57inspector.tests: Add VLM screenshot analysis for automatic test checking On an AMD Ryzen 9 5950X I got: VLM inference took 29.9s Smaller LLMs are faster, but the current (Gemma4 E2B Q4) is more reliable in its outputs and can correctly describe what's on screen. Allowing more than `--threads 1` makes it much faster, but at the potential cost of nondeterministic output of `llama-cli`. The VLM screenshot analysis running in CI makes it slower, but spending < 1 minute single-core seems worth it given that it quite robustly removes the need for a human to check if the GUI renders correctly. Potential future improvement: A bit benefit would be content-addressing of the screenshot: Most nixpkgs update would likely not change the screenshot pixels at all, reproducing it bit-identically. In that case, there's no need to re-run the VLM at all. Doing the VLM analysis in a separate derivation that takes the screenshot as only input would make it ossible to cache these results, while still being less maintenance than having a "golden" screenshot that needs to be updated by a human when screenshots actually change. --- nixos/tests/all-tests.nix | 2 +- nixos/tests/e57inspector.nix | 71 ++++++++------ nixos/tests/vlm-screenshot-question.nix | 118 +++++++++++++++++++++++ pkgs/by-name/e5/e57inspector/package.nix | 4 +- 4 files changed, 163 insertions(+), 32 deletions(-) create mode 100644 nixos/tests/vlm-screenshot-question.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5b17b838e343..d5e9eefc83dd 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -495,7 +495,7 @@ in drupal = runTest ./drupal.nix; dublin-traceroute = runTest ./dublin-traceroute.nix; dwl = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./dwl.nix; - e57inspector = runTest ./e57inspector.nix; + e57inspector = import ./e57inspector.nix { inherit pkgs runTest; }; early-mount-options = runTest ./early-mount-options.nix; earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix; easytier = runTest ./easytier.nix; diff --git a/nixos/tests/e57inspector.nix b/nixos/tests/e57inspector.nix index d421b69f2101..91c4bb90e996 100644 --- a/nixos/tests/e57inspector.nix +++ b/nixos/tests/e57inspector.nix @@ -1,38 +1,53 @@ -{ pkgs, ... }: -{ - name = "e57inspector"; - meta.maintainers = with pkgs.lib.maintainers; [ - nh2 - chpatrick - ]; +{ pkgs, runTest }: +let + testFile = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/asmaloney/libE57Format-test-data/bbcacec05d60f923869545c5eab33d94c390d50e/self/ColouredCubeFloat.e57"; + hash = "sha256-bb95crNYvX3Qhkx4k6Sqe2GjOf1u4nxxswMfdjyXfTM="; + }; - nodes.machine = - { ... }: - { - imports = [ - ./common/x11.nix - ]; + vmTest = runTest { + name = "e57inspector-vm"; + meta.maintainers = with pkgs.lib.maintainers; [ + nh2 + chpatrick + ]; - services.xserver.enable = true; - environment.systemPackages = [ - pkgs.e57inspector - pkgs.xdotool - ]; - }; + nodes.machine = + { ... }: + { + imports = [ + ./common/x11.nix + ]; - testScript = - let - testFile = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/asmaloney/libE57Format-test-data/bbcacec05d60f923869545c5eab33d94c390d50e/self/ColouredCubeFloat.e57"; - hash = "sha256-bb95crNYvX3Qhkx4k6Sqe2GjOf1u4nxxswMfdjyXfTM="; + services.xserver.enable = true; + environment.systemPackages = [ + pkgs.e57inspector + ]; }; - in - '' + enableOCR = true; + + testScript = '' start_all() machine.wait_for_x() machine.execute("e57inspector ${testFile} >&2 &") - machine.wait_until_succeeds("xdotool search --pid $(pidof .e57inspector-wrapped)") - machine.screenshot("screen") + machine.wait_for_text("File") # menu visible + + machine.screenshot("screen.png") ''; + }; +in +{ + vm = vmTest; + + screenshot-analysis = pkgs.callPackage ./vlm-screenshot-question.nix { + name = "e57inspector-screenshot-analysis"; + screenshot = "${vmTest}/screen.png"; + question = '' + Look at this screenshot of a desktop application. + Answer: Does the application show that a file was loaded into it successfully? + For this, only scans matter, as there are no images in the file. + The inspector on the left should show child elements below 'Data 3D'. + ''; + }; } diff --git a/nixos/tests/vlm-screenshot-question.nix b/nixos/tests/vlm-screenshot-question.nix new file mode 100644 index 000000000000..9009f4a21d84 --- /dev/null +++ b/nixos/tests/vlm-screenshot-question.nix @@ -0,0 +1,118 @@ +# Reusable VLM screenshot analysis derivation. +# +# Similar to `wait_for_text()` in NixOS VM tests. +# +# Runs a VLM (Vision Language Model) on a screenshot and asserts that the +# model's answer to a yes/no question ends with "YES". +# +# This is useful to automatically test software that is otherwise +# hard to test, e.g. "does this 3D program render the bunny correctly?". +# It is especially useful to judge screenshots made in NixOS VM tests. +{ + lib, + writers, + fetchurl, + llama-cpp, + runCommand, + # VLM defaults, chosen to pick a model smart enough to be useful + # for screenshot analysis, but small enough to not consume too much RAM + # or be too slow for CI. + model ? ( + fetchurl { + url = "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/90f9618340396838ee7ff5b0ba2da27da62953d3/gemma-4-E2B-it-Q4_0.gguf"; + hash = "sha256-nEwdSKRi9/iDsomErE9C02bJxXNDTqtoVT4POL9+tQw="; + } + ), + mmproj ? ( + fetchurl { + url = "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/90f9618340396838ee7ff5b0ba2da27da62953d3/mmproj-F16.gguf"; + hash = "sha256-FAvo14SXQfiMUHV9UpuENz7o4nBSzCI2hVtTf0qCFfo="; + } + ), + # User-provided arguments: + name, + screenshot, + question, +}: +let + + analysisScript = + writers.writePython3 "${name}-script" { flakeIgnore = [ "E501" ]; } # allow long lines + '' + import os + import re + import subprocess + import time + + out = os.environ["out"] + screenshot = "${screenshot}" + # Using JSON here even permits preserving multi-line ASCII art questions and so on. + question = ${builtins.toJSON question} + + # Build the full prompt with output markers for reliable extraction. + prompt = ( + "Start your output with [output-start]." + f" {question}" + " Explain what you see, and your judgment." + " Then answer that question with exactly YES or NO, followed by [output-end]." + ) + + vlm_start = time.time() + result = subprocess.run( + [ + "${lib.getExe llama-cpp}", + "--single-turn", "--no-display-prompt", "--log-verbosity", "0", "--jinja", + "--simple-io", # disables the spinner whose backspace chars would corrupt captured output + "--reasoning", "off", "--temp", "0", + "--threads", "1", # for determinism + "--n-gpu-layers", "0", # force CPU-only (results on GPUs might be different and nondeterministic, see https://github.com/ggml-org/llama.cpp/pull/16016#issuecomment-3293505238) + "--model", "${model}", + "--mmproj", "${mmproj}", + "--image", screenshot, + "-p", prompt, + ], + capture_output=True, + text=True, + # `OMP_NUM_THREADS=1` prevents OpenMP from spawning extra threads in the BLAS backend + # (OpenBLAS), which causes nondeterminism with `--image`; without `--image`, `--threads 1` + # alone is already deterministic (BLAS is not used for short text prompts). + # Relevant code: https://github.com/ggml-org/llama.cpp/blob/80afa33aadcc4f71212b17e5e52904491c76b63e/ggml/src/ggml-blas/ggml-blas.cpp#L30-L148 + # PR to fix it in OpenBLAS: https://github.com/OpenMathLib/OpenBLAS/pull/5808 + env={**os.environ, "OMP_NUM_THREADS": "1"}, + ) + vlm_elapsed = time.time() - vlm_start + output = result.stdout + print(f"VLM inference took {vlm_elapsed:.1f}s") + print(f"VLM raw output: {repr(output)}") + if result.returncode != 0: + print(f"VLM stderr: {result.stderr}") + assert result.returncode == 0, f"llama-cli failed with exit code {result.returncode}" + + print() + + # Post-process: extract the answer between `[output-start]` and `[output-end]` markers. + # This is needed because llama-cli prints UI noise (banner, + # spinner, stats) to stdout alongside the model's response. + # TODO: Replace with `--quiet` once https://github.com/ggml-org/llama.cpp/pull/22848 is merged; + # then also remove the markers from the prompt and the extraction below. + matches = re.findall(r"\[output-start\](.*?)\[output-end\]", output, re.DOTALL) + assert matches, ( + f"VLM output did not contain [output-start]...[output-end] markers." + f" Raw output: {repr(output)}" + ) + answer = matches[-1].strip() # use last match (first may be prompt echo) + print("VLM answer:") + print(answer) + assert answer.upper().endswith("YES"), ( + f"VLM did not confirm expected answer. Answer: {answer}" + ) + + os.makedirs(out, exist_ok=True) + with open(os.path.join(out, "vlm-answer.txt"), "w") as f: + f.write(answer + "\n") + os.symlink(screenshot, os.path.join(out, "screen.png")) + ''; +in +runCommand name { } '' + ${analysisScript} +'' diff --git a/pkgs/by-name/e5/e57inspector/package.nix b/pkgs/by-name/e5/e57inspector/package.nix index 895ced7a183c..3b9305bc3af6 100644 --- a/pkgs/by-name/e5/e57inspector/package.nix +++ b/pkgs/by-name/e5/e57inspector/package.nix @@ -62,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = { - e57inspector = nixosTests.e57inspector; - }; + passthru.tests = nixosTests.e57inspector; meta = { description = "Cross-platform E57 file viewer to list and view stored point clouds, images and metadata"; From 3f8f339a7be547aaf142e053e5beff6b33a7950d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 16 May 2026 22:43:28 +0200 Subject: [PATCH 68/73] cloudcompare.tests: Add VLM screenshot analysis --- nixos/tests/all-tests.nix | 1 + nixos/tests/cloudcompare.nix | 55 ++++++++++++++++++++++++ pkgs/by-name/cl/cloudcompare/package.nix | 3 ++ 3 files changed, 59 insertions(+) create mode 100644 nixos/tests/cloudcompare.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d5e9eefc83dd..48566863b223 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -364,6 +364,7 @@ in }; cloud-init = runTest ./cloud-init.nix; cloud-init-hostname = runTest ./cloud-init-hostname.nix; + cloudcompare = import ./cloudcompare.nix { inherit pkgs runTest; }; cloudlog = runTest ./cloudlog.nix; cntr = import ./cntr.nix { inherit (pkgs) lib; diff --git a/nixos/tests/cloudcompare.nix b/nixos/tests/cloudcompare.nix new file mode 100644 index 000000000000..0e9b72da3a41 --- /dev/null +++ b/nixos/tests/cloudcompare.nix @@ -0,0 +1,55 @@ +{ pkgs, runTest }: +let + testFile = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/asmaloney/libE57Format-test-data/bbcacec05d60f923869545c5eab33d94c390d50e/self/ColouredCubeFloat.e57"; + hash = "sha256-bb95crNYvX3Qhkx4k6Sqe2GjOf1u4nxxswMfdjyXfTM="; + }; + + vmTest = runTest { + name = "cloudcompare-vm"; + meta.maintainers = with pkgs.lib.maintainers; [ + nh2 + ]; + + enableOCR = true; + + nodes.machine = + { ... }: + { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + environment.systemPackages = [ + pkgs.cloudcompare + ]; + }; + + testScript = '' + start_all() + machine.wait_for_x() + + machine.execute("CloudCompare ${testFile} >&2 &") + machine.wait_for_window("CloudCompare") + + # Wait for the file to be loaded; CloudCompare shows "loaded successfully" in its log panel at the bottom. + machine.wait_for_text("loaded successfully") + + machine.screenshot("screen.png") + ''; + }; +in +{ + vm = vmTest; + + screenshot-analysis = pkgs.callPackage ./vlm-screenshot-question.nix { + name = "cloudcompare-screenshot-analysis"; + screenshot = "${vmTest}/screen.png"; + question = '' + Look at this screenshot of a desktop application. + Answer: Does the application show a 3D point cloud viewer (CloudCompare) that has successfully loaded and is displaying a coloured point cloud? + Evidence of success: a 3D viewport with coloured points is visible AND there are no error dialogs or error messages. + ''; + }; +} diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix index a736269cf28a..28b69ee1ecee 100644 --- a/pkgs/by-name/cl/cloudcompare/package.nix +++ b/pkgs/by-name/cl/cloudcompare/package.nix @@ -16,6 +16,7 @@ mpfr, pcl, libsForQt5, + nixosTests, onetbb, xercesc, wrapGAppsHook3, @@ -162,6 +163,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + passthru.tests = nixosTests.cloudcompare; + meta = { description = "3D point cloud and mesh processing software"; homepage = "https://cloudcompare.org"; From 77a1e765537d1ec41ba91335bea87d6c037c1ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 11:05:43 +0000 Subject: [PATCH 69/73] ananicy-rules-cachyos: 0-unstable-2026-06-03 -> 0-unstable-2026-06-15 --- pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index b3d263bd6fc8..9f082fd2af32 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2026-06-03"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "422e807d3376dc9d07e7acfa82b62b5d62275486"; - hash = "sha256-wDlAbb9O0I7WXsvQ+xLBPRt+haKJjvCJR56TGRC9auA="; + rev = "70bc1a2c935518461e4e8d53d7c454489e26565d"; + hash = "sha256-KJnZRXyl/iagknbFGh06dEtedMzJKZ+uDiXuP2OpMZE="; }; dontConfigure = true; From 1de59e443d65aa1de4921da608accced378828b7 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 16 Jun 2026 13:26:24 +0200 Subject: [PATCH 70/73] simulide: use correct license above 1.1.0 --- pkgs/by-name/si/simulide/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index 32885ea59133..6064a90e2e41 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -168,7 +168,8 @@ stdenv.mkDerivation { It supports PIC, AVR, Arduino and other MCUs and MPUs. ''; homepage = "https://simulide.com/"; - license = lib.licenses.gpl3Only; + license = + if lib.versionAtLeast versionNum "1.1.0" then lib.licenses.agpl3Only else lib.licenses.gpl3Only; mainProgram = "simulide"; maintainers = with lib.maintainers; [ carloscraveiro From fd3b782a5534275b8b788272aaced96d67cec5d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 12:01:25 +0000 Subject: [PATCH 71/73] terraform-providers.spotinst_spotinst: 1.236.1 -> 1.237.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3f42d79daa0b..c3cbc217af23 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1256,13 +1256,13 @@ "vendorHash": "sha256-27mA2OAApUtPawZZk7Wxme9TfQY19TraIJSqHh8MFZg=" }, "spotinst_spotinst": { - "hash": "sha256-cZ2gKgXLM/0msBvtlWn16TdM1kwd2wRUyV7bvVEd+SE=", + "hash": "sha256-rdE1+XqafMMF9+posQ4K1X1NmXdFcw/F3ivVpfYvcD8=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.236.1", + "rev": "v1.237.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Gb07NAvZowWIUokmjLq2IOvg4El2hGwJ6J2J9hBj+eg=" + "vendorHash": "sha256-sg4ql1YKi+2PMLuKJOmOpr3XUdsHlBmyhPFwGIQ4Dxg=" }, "statuscakedev_statuscake": { "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=", From 65ccb6f831a38059ff8df891a983959d9f3df2b5 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 8 Jun 2026 23:12:43 +0300 Subject: [PATCH 72/73] kdePackages: Plasma 6.6.5 -> 6.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 𝑷𝒉𝒊𝒍𝒐𝒄𝒂𝒍𝒚𝒔𝒕 Co-authored-by: adisbladis --- maintainers/scripts/kde/collect-logs.nu | 4 +- maintainers/scripts/kde/generate-sources.py | 1 + .../services/desktop-managers/plasma6.nix | 3 + pkgs/kde/default.nix | 1 + pkgs/kde/generated/licenses.json | 33 +- pkgs/kde/generated/projects.json | 46 +- pkgs/kde/generated/sources/plasma.json | 448 +++++++++--------- pkgs/kde/misc/cxx-rust-cssparser/default.nix | 55 +++ pkgs/kde/plasma/default.nix | 2 + pkgs/kde/plasma/kdeplasma-addons/default.nix | 32 +- .../plasma/kinfocenter/0001-tool-paths.patch | 75 +-- pkgs/kde/plasma/krdp/default.nix | 3 + pkgs/kde/plasma/kscreen/default.nix | 8 +- ...er-CAP_SYS_NICE-from-the-ambient-set.patch | 40 -- ...lugins-qpa-allow-using-nixos-wrapper.patch | 21 +- pkgs/kde/plasma/kwin/default.nix | 2 - pkgs/kde/plasma/plasma-bigscreen/default.nix | 39 ++ pkgs/kde/plasma/plasma-desktop/default.nix | 5 - .../plasma/plasma-desktop/hwclock-path.patch | 24 - pkgs/kde/plasma/plasma-desktop/tzdir.patch | 18 - pkgs/kde/plasma/plasma-keyboard/default.nix | 4 + .../plasma-login-manager/config-mtime.patch | 14 - .../plasma/plasma-login-manager/default.nix | 1 - .../plasma-login-manager/kwin-path.patch | 5 +- pkgs/kde/plasma/plasma-nm/default.nix | 2 + .../plasma/plasma-vault/hardcode-paths.patch | 20 +- pkgs/kde/plasma/plasma-workspace/default.nix | 2 + .../plasma-workspace/dependency-paths.patch | 24 +- pkgs/kde/plasma/powerdevil/default.nix | 4 - .../plasma/powerdevil/rb-batterymonitor.patch | 10 - pkgs/kde/plasma/print-manager/default.nix | 6 +- pkgs/kde/plasma/spectacle/default.nix | 10 - pkgs/kde/plasma/union/default.nix | 11 + 33 files changed, 539 insertions(+), 434 deletions(-) create mode 100644 pkgs/kde/misc/cxx-rust-cssparser/default.nix delete mode 100644 pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch create mode 100644 pkgs/kde/plasma/plasma-bigscreen/default.nix delete mode 100644 pkgs/kde/plasma/plasma-desktop/hwclock-path.patch delete mode 100644 pkgs/kde/plasma/plasma-desktop/tzdir.patch delete mode 100644 pkgs/kde/plasma/plasma-login-manager/config-mtime.patch delete mode 100644 pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch create mode 100644 pkgs/kde/plasma/union/default.nix diff --git a/maintainers/scripts/kde/collect-logs.nu b/maintainers/scripts/kde/collect-logs.nu index 1d07fa9d2caf..656a97a0ce38 100755 --- a/maintainers/scripts/kde/collect-logs.nu +++ b/maintainers/scripts/kde/collect-logs.nu @@ -6,6 +6,8 @@ mkdir logs nix-env -qaP -f . -A kdePackages --json --out-path | from json | values | par-each { |it| echo $"Processing ($it.pname)..." if "outputs" in $it { - nix-store --read-log $it.outputs.out | save -f $"logs/($it.pname).log" + try { + nix-store --read-log $it.outputs.out | save -f $"logs/($it.pname).log" + } } } diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index 2966e7ef9675..11a24f7c47ed 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -37,6 +37,7 @@ PROJECTS_WITH_RUST = { "akonadi-search", "angelfish", "kdepim-addons", + "kdeplasma-addons", } def to_sri(hash): diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 0785f4f809d1..0813b1b6b84c 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -172,6 +172,9 @@ in # touch keyboard plasma-keyboard qtvirtualkeyboard # used by plasma-keyboard KCM + + # experimental(?) Union theme + union ] ++ lib.optional config.networking.networkmanager.enable qrca ++ lib.optionals config.hardware.sensor.iio.enable [ diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 58cdeab2dfc8..e97e6d866a7d 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -69,6 +69,7 @@ let selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub alpaka = self.callPackage ./misc/alpaka { }; + cxx-rust-cssparser = self.callPackage ./misc/cxx-rust-cssparser { }; glaxnimate = self.callPackage ./misc/glaxnimate { }; kdiagram = self.callPackage ./misc/kdiagram { }; kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { }; diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json index c0fe90c9efe5..f7210a6880d8 100644 --- a/pkgs/kde/generated/licenses.json +++ b/pkgs/kde/generated/licenses.json @@ -236,6 +236,7 @@ "LicenseRef-SJFonts" ], "bluedevil": [ + "BSD-2-Clause", "CC0-1.0", "GPL-2.0-only", "GPL-2.0-or-later", @@ -278,6 +279,7 @@ "breeze-grub": [ "BSD-2-Clause", "CC-BY-SA-4.0", + "CC0-1.0", "Font-exception-2.0", "GPL-2.0-or-later", "GPL-3.0-only", @@ -2674,6 +2676,19 @@ "LicenseRef-KDE-Accepted-GPL", "LicenseRef-KDE-Accepted-LGPL" ], + "plasma-bigscreen": [ + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], "plasma-browser-integration": [ "BSD-2-Clause", "CC0-1.0", @@ -2897,6 +2912,7 @@ ], "plasma-welcome": [ "BSD-2-Clause", + "CC-BY-SA-4.0", "CC0-1.0", "GPL-2.0-only", "GPL-2.0-or-later", @@ -2911,6 +2927,7 @@ "GPL-2.0-or-later", "GPL-3.0-only", "GPL-3.0-or-later", + "ISC", "LGPL-2.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", @@ -2964,20 +2981,19 @@ "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", - "GPL-3.0-or-later", "LGPL-2.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", "LGPL-2.1-or-later", "LGPL-3.0-only", "LicenseRef-KDE-Accepted-GPL", - "LicenseRef-KDE-Accepted-LGPL", - "MIT" + "LicenseRef-KDE-Accepted-LGPL" ], "poxml": [ "CC0-1.0" ], "print-manager": [ + "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", "GPL-2.0-or-later", @@ -3204,6 +3220,17 @@ "LicenseRef-KDE-Accepted-GPL", "MIT" ], + "union": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], "wacomtablet": [], "xdg-desktop-portal-kde": [ "BSD-2-Clause", diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index 2c7c29ac958c..f873a3b645f8 100644 --- a/pkgs/kde/generated/projects.json +++ b/pkgs/kde/generated/projects.json @@ -83,6 +83,12 @@ "project_path": "pim/akonadi-contacts", "repo_path": "pim/akonadi-contacts" }, + "akonadi-e2e-tests": { + "description": "Test suite for end-to-end testing of Akonadi Resources against real servers.", + "name": "akonadi-e2e-tests", + "project_path": "pim/akonadi-e2e-tests", + "repo_path": "pim/akonadi-e2e-tests" + }, "akonadi-exchange": { "description": "Akonadi plugin for Exchange groupware functionality", "name": "akonadi-exchange", @@ -1715,6 +1721,12 @@ "project_path": "frameworks/kconfig", "repo_path": "frameworks/kconfig" }, + "kconfigeditor": { + "description": "Graphical editor for KConfig files", + "name": "kconfigeditor", + "project_path": "system/kconfigeditor", + "repo_path": "system/kconfigeditor" + }, "kconfigwidgets": { "description": "Widgets for KConfig", "name": "kconfigwidgets", @@ -2531,6 +2543,12 @@ "project_path": "utilities/keepsecret", "repo_path": "utilities/keepsecret" }, + "kemoji": { + "description": "Framework providing an emoji dictionary, model, search and basic components for use in applications.", + "name": "kemoji", + "project_path": "libraries/kemoji", + "repo_path": "libraries/kemoji" + }, "kemoticons": { "description": "KEmoticons", "name": "kemoticons", @@ -2897,6 +2915,12 @@ "project_path": "libs/kirigami-addons", "repo_path": "libraries/kirigami-addons" }, + "kirigami-app-components": { + "description": "Kirigami addons and modules necessary to do a full featured KDE application, such as integration with configurable keyboard shortcuts and standard actions.", + "name": "kirigami-app-components", + "project_path": "libraries/kirigami-app-components", + "repo_path": "libraries/kirigami-app-components" + }, "kirigami-gallery": { "description": "Kirigami component gallery application", "name": "kirigami-gallery", @@ -3089,6 +3113,12 @@ "project_path": "pim/kmbox", "repo_path": "pim/kmbox" }, + "kmcpclientinspector": { + "description": "App which allows the user to inspect apps which implement MCP protocol support.", + "name": "kmcpclientinspector", + "project_path": "sdk/kmcpclientinspector", + "repo_path": "sdk/kmcpclientinspector" + }, "kmediaplayer": { "description": "KMediaPlayer", "name": "kmediaplayer", @@ -3104,8 +3134,8 @@ "kmime": { "description": "Library to assist handling MIME data", "name": "kmime", - "project_path": "pim/kmime", - "repo_path": "pim/kmime" + "project_path": "frameworks/kmime", + "repo_path": "frameworks/kmime" }, "kmines": { "description": "KMines is the classic Minesweeper game", @@ -5399,6 +5429,12 @@ "project_path": "graphics/optiimage", "repo_path": "graphics/optiimage" }, + "os-autoinst-distri-kdelinux": { + "description": "End-to-end tests for KDE Linux using openQA", + "name": "os-autoinst-distri-kdelinux", + "project_path": "kde-linux/os-autoinst-distri-kdelinux", + "repo_path": "kde-linux/os-autoinst-distri-kdelinux" + }, "osx-patches": { "description": "Fixes for KDE problems that occur on Apple OS X", "name": "osx-patches", @@ -8015,6 +8051,12 @@ "project_path": "websites/libregraphicsmeeting-org-2026", "repo_path": "websites/libregraphicsmeeting-org-2026" }, + "websites-linux-kde-org": { + "description": "Website for KDE Linux - linux.kde.org", + "name": "websites-linux-kde-org", + "project_path": "websites/linux-kde-org", + "repo_path": "websites/linux-kde-org" + }, "websites-lists-kde-org": { "description": "Necessary code to redirect from lists.kde.org to appropriate mail archives", "name": "websites-lists-kde-org", diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 991bcead5d2c..5f74fe6626b9 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,367 +1,377 @@ { "aurorae": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/aurorae-6.6.5.tar.xz", - "hash": "sha256-58PecQp1+Z34xPgKdB49HpDlxcra5Eo9GAhh0PXJ3Pk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/aurorae-6.7.0.tar.xz", + "hash": "sha256-U4Ij6+dSEwXSmHPCePheeRDreBCjHSppaY7edqXA2jw=" }, "bluedevil": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/bluedevil-6.6.5.tar.xz", - "hash": "sha256-Q5ZEeoO12rXEhnaQgkGAw29POSIQdGNyL+1CIC2KRf8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/bluedevil-6.7.0.tar.xz", + "hash": "sha256-P9q0pyS6JGoQ8mNwdspTMniP/1w8YZPM806wMeiXPp0=" }, "breeze": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/breeze-6.6.5.tar.xz", - "hash": "sha256-BsTD5GbNA6jB5BGjiwR1a24UWHmlYFNLL8RGZtQTMPQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/breeze-6.7.0.tar.xz", + "hash": "sha256-zzdbuqpF9bobPfA2vwxAt+39eJ6yb25G+d0dMldpy9U=" }, "breeze-grub": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/breeze-grub-6.6.5.tar.xz", - "hash": "sha256-Ww6HUYdDOwyBDFb732sTpeYPcXdBIqYZNwmc63MPpUY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/breeze-grub-6.7.0.tar.xz", + "hash": "sha256-x+atJoKHKWS9cJucyrD8uTKKz1YpQHwji3XvfYA8+iE=" }, "breeze-gtk": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/breeze-gtk-6.6.5.tar.xz", - "hash": "sha256-dsqtTKLjzosCrh6+DAaBAbsH21HaR/iPo6QM3OOTq/Y=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/breeze-gtk-6.7.0.tar.xz", + "hash": "sha256-KFmeF3tBZqezMvg0pyaWz4gs+fap7hknCKJ/R0wQJ8A=" }, "breeze-plymouth": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/breeze-plymouth-6.6.5.tar.xz", - "hash": "sha256-0QLuiuPG/pNTVTqPxPxfFSwSh+UEws6XXCxyHzwsiBo=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/breeze-plymouth-6.7.0.tar.xz", + "hash": "sha256-2gNHVU33S38RsXA71s3eF2kXQuMqXMzfyTJaGzJhBqU=" }, "discover": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/discover-6.6.5.tar.xz", - "hash": "sha256-DRRxrfSws7+SrJMiXi5IYEk2d/P7mgLb9EsZOufBU1c=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/discover-6.7.0.tar.xz", + "hash": "sha256-A9SisXVxdla/7pB/T7lBILhs3MhmPZTnkkrG8nelWyc=" }, "drkonqi": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/drkonqi-6.6.5.tar.xz", - "hash": "sha256-srEE1fMCJLyogoAkbKmQrDFNgcsb8NOFdhP/aD25LYI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/drkonqi-6.7.0.tar.xz", + "hash": "sha256-VeZibrxQCJmKInVcjNJx8jNYcqUM3fZfFY/dXNI319M=" }, "flatpak-kcm": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/flatpak-kcm-6.6.5.tar.xz", - "hash": "sha256-BhN3wGTCrAb3fShQ5xGGfpF2jDyDM9/7jysLohgDsBo=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/flatpak-kcm-6.7.0.tar.xz", + "hash": "sha256-SmSQaW60yGQ4sE6X3BY75QsM17t+rPuyBGkglP9gt2s=" }, "kactivitymanagerd": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kactivitymanagerd-6.6.5.tar.xz", - "hash": "sha256-hZu456bvtCEKglEqvsTXtuqaxviDorHbTT3lyhFFIiQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kactivitymanagerd-6.7.0.tar.xz", + "hash": "sha256-7QZcLXbIXPjhDdcv+PiechNvxMhVYabJheuX3FGERqE=" }, "kde-cli-tools": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kde-cli-tools-6.6.5.tar.xz", - "hash": "sha256-F+ygLPPVDSZshfREv+87fBwHpZss3r9sok5v2BuA0SI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kde-cli-tools-6.7.0.tar.xz", + "hash": "sha256-JyD/fvv5e+9GmwL1RInz2bKguYyHGu25Fazbr5nzGZg=" }, "kde-gtk-config": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kde-gtk-config-6.6.5.tar.xz", - "hash": "sha256-KQKgErqF0tIB+HnRfwtPUZEOQ6HLDXYXiLBjsMF9exA=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kde-gtk-config-6.7.0.tar.xz", + "hash": "sha256-2W5YIUxmMrSR0yyqSusVrihPg+inXTu5SFl49Cr0q9k=" }, "kdecoration": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kdecoration-6.6.5.tar.xz", - "hash": "sha256-BujtBLjzzc0wV6ni0jKR70Gjl2+W/Iz5F0eSGIcaqf0=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kdecoration-6.7.0.tar.xz", + "hash": "sha256-rP5WV9iJvw3VuLUBMrvpxi9ItQdPy6gmWhy4TWwie10=" }, "kdeplasma-addons": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kdeplasma-addons-6.6.5.tar.xz", - "hash": "sha256-SP2ufPqiYEKlkCf76N+DeJsXJFi8KvCiOgFaBLgHGvk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kdeplasma-addons-6.7.0.tar.xz", + "hash": "sha256-i4awt5sK8toJfYHc4JmRPUNXTgjEQop5JYcGkheLQpg=" }, "kgamma": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kgamma-6.6.5.tar.xz", - "hash": "sha256-+rcERciMmM6QfoltjHHL93cQRIgLXvEW/ulphj5TNgo=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kgamma-6.7.0.tar.xz", + "hash": "sha256-6MM9ukfaPqD4kFPpQCmCqx+9tpwlm/CLEEegUEsH3ZI=" }, "kglobalacceld": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kglobalacceld-6.6.5.tar.xz", - "hash": "sha256-M8lft7PN2rV2bgywY6chr195ayhBEUGDpiRuDvVX7cM=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kglobalacceld-6.7.0.tar.xz", + "hash": "sha256-/1423Ly4GC8baVBimTqeosxz0mdTay9ZJt4Dn6dzLGU=" }, "kinfocenter": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kinfocenter-6.6.5.tar.xz", - "hash": "sha256-m3d/hw8SCTnjdCFc4s7TiVcdS9609vAJLJCLjC4ML9Y=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kinfocenter-6.7.0.tar.xz", + "hash": "sha256-303tKcuH12W31fSxYcKaQlWGOES+5kJH5vDT8Miz5aM=" }, "kmenuedit": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kmenuedit-6.6.5.tar.xz", - "hash": "sha256-HCTxXhPRatnAZD6ioISUIDKf0Qti/SYrSM2t5ngnSCg=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kmenuedit-6.7.0.tar.xz", + "hash": "sha256-8n/tXImJrQCtxxS8fzd638qXQsTM06//lHjVAu6v/6s=" }, "knighttime": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/knighttime-6.6.5.tar.xz", - "hash": "sha256-XyZpKoZFQLmTNREG9Uaf0Xk5vVXnn5Mcj5c5XZxagJ0=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/knighttime-6.7.0.tar.xz", + "hash": "sha256-wvx1Kc7zs6gL5HFShtAn/IkI7w/oBArqEGgxpSZfwRM=" }, "kpipewire": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kpipewire-6.6.5.tar.xz", - "hash": "sha256-eu1/chxboF8ggS6ozeBH3MbjN1ulIbvd2CwlkVq/M00=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kpipewire-6.7.0.tar.xz", + "hash": "sha256-2/g5t3nFCMICC9+dZCdiOHy6hQWSkd6rOOigwVIjuts=" }, "krdp": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/krdp-6.6.5.tar.xz", - "hash": "sha256-heNRMfZAwmn422svhY+wQ/b2JmsfZQMBKdEQwK3LgGE=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/krdp-6.7.0.tar.xz", + "hash": "sha256-5lylbPL5ZplFENzOzVOJKSLiYa19upkR0vN0BgKTxts=" }, "kscreen": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kscreen-6.6.5.tar.xz", - "hash": "sha256-dT68AM91NZwue6OquyD/NZbQ+74vC20+1gmNJygqMnY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kscreen-6.7.0.tar.xz", + "hash": "sha256-rVekMmpkl5poqlBopxUXAtmwLbByBnDkvj4XiQW+2lY=" }, "kscreenlocker": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kscreenlocker-6.6.5.tar.xz", - "hash": "sha256-m6Cu4yNkBR7rIT1I3TwgiuDOcGIZCjD4VXNbpO/jicw=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kscreenlocker-6.7.0.tar.xz", + "hash": "sha256-wxVLaKiF7VXUzVd/gT9VU+oLMdvdMbMrN0SQVVD+w9E=" }, "ksshaskpass": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/ksshaskpass-6.6.5.tar.xz", - "hash": "sha256-sOiKJUajmiaVeO7e9eooFJpxmnrJdXAZ6f8/klTXWkI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/ksshaskpass-6.7.0.tar.xz", + "hash": "sha256-TY7lYdv64xjil4QR2z1/3wkmY/XUXTafHjqSNNhyzuA=" }, "ksystemstats": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/ksystemstats-6.6.5.tar.xz", - "hash": "sha256-a14vKmqq6XSJ51gY5/g8JYZXgCJ2CCHGd83rzvpULjY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/ksystemstats-6.7.0.tar.xz", + "hash": "sha256-IiTOQeQudYRaqIbhkueDPOY4uGqjHKDk48sx7zbkBms=" }, "kwallet-pam": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwallet-pam-6.6.5.tar.xz", - "hash": "sha256-VDSlD0IYZ/wRGQOJvevENAS2TK3MfYex8I/5XvGZhT4=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwallet-pam-6.7.0.tar.xz", + "hash": "sha256-cdvV1qtSQ+eMUjzjgtU70Uw1cxrwlJf76Sm8pBtprtk=" }, "kwayland": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwayland-6.6.5.tar.xz", - "hash": "sha256-r7zVPKil+1AQOEFfFHPD0RVW61btj2U+zgP3fXmcrQE=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwayland-6.7.0.tar.xz", + "hash": "sha256-hiHRfpEAvmDqNAI1II0ET9ApMdvvdqMtmkd94xyOM/Q=" }, "kwayland-integration": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwayland-integration-6.6.5.tar.xz", - "hash": "sha256-JyB2THOWP+Br144uyjKeumH7Yl3/bT3PSmjsFndmzm4=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwayland-integration-6.7.0.tar.xz", + "hash": "sha256-IRld2c69WlxzhmOybw4dFaspj1ncqvkkNethi540JcM=" }, "kwin": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwin-6.6.5.tar.xz", - "hash": "sha256-bBh856VQYJC0OO+QAQODb6BTdnTd6LMeW0l+8yFkPLQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwin-6.7.0.tar.xz", + "hash": "sha256-0gt5gJSp9Y5X3lXso9WLHNy32yk564v3ORjE+rbZrsU=" }, "kwin-x11": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwin-x11-6.6.5.tar.xz", - "hash": "sha256-1RcnctW53W7w8yMMtfinjfkUjdBwGdjygqCTHK2UayQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwin-x11-6.7.0.tar.xz", + "hash": "sha256-msC4W1kBbfuRWH+MGXD71cbyFdEsmkGazQv30PBJNgY=" }, "kwrited": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwrited-6.6.5.tar.xz", - "hash": "sha256-ud9jS+KqFELYJH1iUKh9ffsczW+bzQHA5iEC1atpNqc=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwrited-6.7.0.tar.xz", + "hash": "sha256-dUOaklYfbDMoBNHSfa4VvFdVuMmvKNp50WwDLVCQOxA=" }, "layer-shell-qt": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/layer-shell-qt-6.6.5.tar.xz", - "hash": "sha256-6MFFVFrEnVMl8W/3ELUh3qtuW5dF/MGKtDElIiSo+YI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/layer-shell-qt-6.7.0.tar.xz", + "hash": "sha256-5vSLbr4sPKqjwu9thHBVCQTQMK00lrwQpUCYddstqrA=" }, "libkscreen": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/libkscreen-6.6.5.tar.xz", - "hash": "sha256-8v0R8vZf+cpP87ULmVMBipKbG/MmOzLsFxxCmORmIUk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/libkscreen-6.7.0.tar.xz", + "hash": "sha256-bvulgFeiY12m8YVbprCOV+Y2yXZCG6Xj9fZn5qV7DOE=" }, "libksysguard": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/libksysguard-6.6.5.tar.xz", - "hash": "sha256-8IiFSgIQKLew9qc1yJ6apTvRPpA68R7RaknJROM7AN8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/libksysguard-6.7.0.tar.xz", + "hash": "sha256-40wBQ4OZ/CMJDN5NRyJbzY9giZ0TjsrpnMWZZZU2rOM=" }, "libplasma": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/libplasma-6.6.5.tar.xz", - "hash": "sha256-guArIJj0uskPKM3U+dOk2kVXRA7INHIg2P7ik8H5jYs=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/libplasma-6.7.0.tar.xz", + "hash": "sha256-ioXkyessPAC1aDzOOqLJSdBrlWyIeJwbHBELarriAxI=" }, "milou": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/milou-6.6.5.tar.xz", - "hash": "sha256-P2KF5ftqncdjQ1K7Ov+ALcORBA6SzTx/G5YB3Z1cVNA=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/milou-6.7.0.tar.xz", + "hash": "sha256-jJSkw875vGJbVByz1MLwqVv6E9MfPBgGM/fvnScB2x4=" }, "ocean-sound-theme": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/ocean-sound-theme-6.6.5.tar.xz", - "hash": "sha256-RrdhYOaZjgOzmQxmnW2hZr14XaNWhBGT61SLNYEdxt8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/ocean-sound-theme-6.7.0.tar.xz", + "hash": "sha256-ELK6ypKrcZirzCDVjdrTGRDIxr7uRxH8KkohUFRG8TU=" }, "oxygen": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/oxygen-6.6.5.tar.xz", - "hash": "sha256-QDSMe+uRHsYcuWxMu16i5hHhifr05MnSspgTvCj3K0o=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/oxygen-6.7.0.tar.xz", + "hash": "sha256-ER+2K8PZ86lZ53/TX+VWLKNK14PLzcDBZFh/Vklc/ww=" }, "oxygen-sounds": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/oxygen-sounds-6.6.5.tar.xz", - "hash": "sha256-TGSFVf58y5vPRvsLRFLahcWCEgFEXrcuxFtdleV5QvY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/oxygen-sounds-6.7.0.tar.xz", + "hash": "sha256-YqPdeoilcNacNwpxomHI3QTZLa+QJQyiqdI8KeZ+HIo=" }, "plasma-activities": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-activities-6.6.5.tar.xz", - "hash": "sha256-VNBqIqV2WqHpKDSIXQKrx84b+Na9qVM7s0ctT+9XVWI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-activities-6.7.0.tar.xz", + "hash": "sha256-OP+VeZagnBUjbpOwNboSNICliv90iUtht98QIOxEK1k=" }, "plasma-activities-stats": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-activities-stats-6.6.5.tar.xz", - "hash": "sha256-k6929cQXHQic2aT1ArumOmXyo3GqGoPAxs+wAhpe+6Y=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-activities-stats-6.7.0.tar.xz", + "hash": "sha256-K0qu2cRoW8LAVqDLqE1CfvLx63pPhB1Yd9A0e1sRzBM=" + }, + "plasma-bigscreen": { + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-bigscreen-6.7.0.tar.xz", + "hash": "sha256-IS6811bk2oY4UsvKj9qPE+h/6IDSKSy9S+iPJs8k9IY=" }, "plasma-browser-integration": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-browser-integration-6.6.5.tar.xz", - "hash": "sha256-PFS/Fc1wxI8mu2Xm14egE6hvI3XY/v0sCsq2ULN4Rvk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-browser-integration-6.7.0.tar.xz", + "hash": "sha256-zVtIPuKJHea7Bi3q62r+DAop6VHgclEMASwVtJsblUs=" }, "plasma-desktop": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-desktop-6.6.5.tar.xz", - "hash": "sha256-HXWN/8xC4dP7v+oFAACdPceVzxMTuTtXTag2JBdwhfM=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-desktop-6.7.0.tar.xz", + "hash": "sha256-Y1E7VPb2CzzX7DXKLwlivfJWaXKTiOhRWsHTuIme5H8=" }, "plasma-dialer": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-dialer-6.6.5.tar.xz", - "hash": "sha256-LfdMa2g78IA06CyvYLquTV26VB9U2Lp/44r8eomprK0=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-dialer-6.7.0.tar.xz", + "hash": "sha256-CKULmVTY8yxCgJknsUz7Kg/GaKc1XhdWGbsNL86izUc=" }, "plasma-disks": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-disks-6.6.5.tar.xz", - "hash": "sha256-ZgYJofSJwZfTVBmurLwI7HJMXhNTinNus9gawzG59jk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-disks-6.7.0.tar.xz", + "hash": "sha256-mYiOJyaPD1q9+9hd42KxjxymxnDps5LnbaMPUafVzc8=" }, "plasma-firewall": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-firewall-6.6.5.tar.xz", - "hash": "sha256-1KytApwk6qqY8wfl/zmQOqanLzc8gPOjwX7e36RQ+Ow=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-firewall-6.7.0.tar.xz", + "hash": "sha256-eHwVBebooyw/hVu2X0YVY3fuItbcMhpyB5sWB68N8n0=" }, "plasma-integration": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-integration-6.6.5.tar.xz", - "hash": "sha256-woSC3I0zh7mncP3Jmd0TSAsUcUVoOVyNhr1WiwGBkgo=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-integration-6.7.0.tar.xz", + "hash": "sha256-U3sFzUurGwcG+zH5gj+GZt9yleZH51YU8Ctr8UWO/x0=" }, "plasma-keyboard": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-keyboard-6.6.5.tar.xz", - "hash": "sha256-O7i+EJzESa9U0D8ozBwank1BUMsBua+RalUW7WR0BnE=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-keyboard-6.7.0.tar.xz", + "hash": "sha256-gxGV8wjQgRuNeLTIRYFdyhZIuz/sg8nsY30b4ltTq3Q=" }, "plasma-login-manager": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-login-manager-6.6.5.tar.xz", - "hash": "sha256-F1jwAAMTMmXUljravgaPVXAotTWPQx/ESPWL7txND38=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-login-manager-6.7.0.tar.xz", + "hash": "sha256-A8WFlhQcwSYsKxxXSdm2TW5yJclyjUIcblr7ZJNWbuE=" }, "plasma-mobile": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-mobile-6.6.5.tar.xz", - "hash": "sha256-FkOApuHXXcb7ByCQyqPE5fuAu7PxiNMFvOdnyQueRgA=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-mobile-6.7.0.tar.xz", + "hash": "sha256-NCaqC2KblFsHbqzhMMSrvG//b2xd0cK/9/8Ney1HfkI=" }, "plasma-nano": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-nano-6.6.5.tar.xz", - "hash": "sha256-5RQ97bvNDXW73ktEJ4DMfzeSRw7ngvxFX8sVGQpXllg=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-nano-6.7.0.tar.xz", + "hash": "sha256-xOL0nSQVfO62vCWYHi1xYA3SEXJJ6CsMwE+klAEZMYE=" }, "plasma-nm": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-nm-6.6.5.tar.xz", - "hash": "sha256-yS0J0peNu+a1yJe+rIIs0FPBdHPx1hUG4VK/y0a3C5s=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-nm-6.7.0.tar.xz", + "hash": "sha256-spaAzBfEu+UuO5iNW+Q37EtSS1VPoYDq0TvIkQFEz5g=" }, "plasma-pa": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-pa-6.6.5.tar.xz", - "hash": "sha256-tjwBmB6g0yn9CAE+/ySyR7YJIqvhSXvgEjRmDBXLOCY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-pa-6.7.0.tar.xz", + "hash": "sha256-utzogREH7ldyBxYnWsX8EhFmibw0zkk8q+cijhtlj1E=" }, "plasma-sdk": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-sdk-6.6.5.tar.xz", - "hash": "sha256-7VQKi9oaYziB/KQfff6WrhfJplS3E3SnnobPVH78yVk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-sdk-6.7.0.tar.xz", + "hash": "sha256-1G1SKRVGImSuXUl7rBb3U7DQtrW1uZtG/fiCP0xWLtM=" }, "plasma-setup": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-setup-6.6.5.tar.xz", - "hash": "sha256-z756OF13wLUHaJXJ/N3BPHFYBebvEWxzkRNlQGTXxe8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-setup-6.7.0.tar.xz", + "hash": "sha256-3I+l3XRXBW3hwtAEPw83zTBhAg/s0hmMq/83i9XJVx4=" }, "plasma-systemmonitor": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-systemmonitor-6.6.5.tar.xz", - "hash": "sha256-tuv3web3pCyRoLURlx/WcEHU2bYX7cOk/AsIr0oOx48=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-systemmonitor-6.7.0.tar.xz", + "hash": "sha256-9lthyXWIbtxXSZVnAKWkxAWeeRXEl4aFeI/oGKFxS0I=" }, "plasma-thunderbolt": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-thunderbolt-6.6.5.tar.xz", - "hash": "sha256-VuOigzCWJ5w6nsHbtLU6X6S8NrNWnj9+wZHwAvQL9x8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-thunderbolt-6.7.0.tar.xz", + "hash": "sha256-Pepo91aAHJVHM2ykFVJnLDaTCRwpu/iWjuAf8pKHk6A=" }, "plasma-vault": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-vault-6.6.5.tar.xz", - "hash": "sha256-aKTjzRYNsVZGiCxaQK7Dqj63CXAaO0J00Ctjk/6rsmg=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-vault-6.7.0.tar.xz", + "hash": "sha256-i9cLPTeHidOWpm5pOoCd1rIe3EgWYnWTL399AgdPzhw=" }, "plasma-welcome": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-welcome-6.6.5.tar.xz", - "hash": "sha256-vJQn1znNyLp/Sf5i0CpxY1Gnct8bK2lsbB8IaVxBJqI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-welcome-6.7.0.tar.xz", + "hash": "sha256-SD8WkxtswsVmaPVCBBjnsvja1XarqgG8dVRsE2HyGQM=" }, "plasma-workspace": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-workspace-6.6.5.tar.xz", - "hash": "sha256-ZNdTyty5zeasCe7t9rAuxczfvQFyLF6fJTP9CZOw2FQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-workspace-6.7.0.tar.xz", + "hash": "sha256-mn8qBOikS/JNpNKUu6JwmEoJDvF6CCzR6yXLgYJlHTw=" }, "plasma-workspace-wallpapers": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-workspace-wallpapers-6.6.5.tar.xz", - "hash": "sha256-SgIdvadh2nqvcZLo0DiqHyMFpXalfyOE9UvI7ZBzFBg=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-workspace-wallpapers-6.7.0.tar.xz", + "hash": "sha256-DpIiDArgt8QmROvtb+FZ+wCXqJLmQMsSQgR8kpkx6go=" }, "plasma5support": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma5support-6.6.5.tar.xz", - "hash": "sha256-X0Vofi0oHN/AZmoK13et/Lu7JTQoTKZFDTqn1wC592M=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma5support-6.7.0.tar.xz", + "hash": "sha256-5g4eR6Pe6TUYZH1mOTwh4kBvd3np6eQ4LXzqaM67+3s=" }, "plymouth-kcm": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plymouth-kcm-6.6.5.tar.xz", - "hash": "sha256-eUbJGS4+/JCLtHH+ZCSHgNyBQk2Fs3N60q9o+l5Br6o=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plymouth-kcm-6.7.0.tar.xz", + "hash": "sha256-KrVY7wsm/U4C+iZ4ZBL28be8UHZAe7nuR6fByffgJUc=" }, "polkit-kde-agent-1": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/polkit-kde-agent-1-6.6.5.tar.xz", - "hash": "sha256-kZkLnNE/IFqZY/iP5gWUK56LbunpEDQxIWv1EZRM4Sc=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/polkit-kde-agent-1-6.7.0.tar.xz", + "hash": "sha256-Dyf/KqNhBBhiDEKAS5w9wi9peeXAOCL5OXnUT77R2r8=" }, "powerdevil": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/powerdevil-6.6.5.tar.xz", - "hash": "sha256-sSX2TnPMjc+ePn4/FU9P67RAZCZZfK1uu+jEgzLjXns=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/powerdevil-6.7.0.tar.xz", + "hash": "sha256-djXv/9UD542SvMAwM9VoHlFXfskrxtpy8qsoKLsKNNs=" }, "print-manager": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/print-manager-6.6.5.tar.xz", - "hash": "sha256-ZeHm9VlBGZXGhRb0XF57f8JCv6K2hxHmIEsxmYGjrm0=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/print-manager-6.7.0.tar.xz", + "hash": "sha256-v3tqkw7cG4Ped65YV0O9pOGjpYKt5tICovuiYWrcpbM=" }, "qqc2-breeze-style": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/qqc2-breeze-style-6.6.5.tar.xz", - "hash": "sha256-jSeflmkDIZchlB6p9BaBYw3BT6RXadnGcsV0k/bJlgM=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/qqc2-breeze-style-6.7.0.tar.xz", + "hash": "sha256-gfsPQ/4VwrzRxi50LKuoTWCk65OAwLzsRHtbdyjin7s=" }, "sddm-kcm": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/sddm-kcm-6.6.5.tar.xz", - "hash": "sha256-RJgRgj8faK3ZZC6uISfiqh8HYc+M48N9t8J+YW6L/9g=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/sddm-kcm-6.7.0.tar.xz", + "hash": "sha256-A7Heo6c4BIoGRjO57bgCcWAE9GMLP2p/Bo/QdNcZ700=" }, "spacebar": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/spacebar-6.6.5.tar.xz", - "hash": "sha256-wULqeA4Qp0QjK2dKAlFvJ4KJ2SBON3VxJgmNKBio4fQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/spacebar-6.7.0.tar.xz", + "hash": "sha256-XwtcSkDFHaPKxaXWg6uDq/2KNX5FkXYmjs7RWPAxSIU=" }, "spectacle": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/spectacle-6.6.5.tar.xz", - "hash": "sha256-o333cxpryJvCOsCK0fmVzp8e+zMPPrrZv5Jtym67X8c=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/spectacle-6.7.0.tar.xz", + "hash": "sha256-Sw5J3iGyGP9fEwLQzebgZyC8RSQ5bIUA02zWRMnVDGQ=" }, "systemsettings": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/systemsettings-6.6.5.tar.xz", - "hash": "sha256-YTNO/2RWetIJ4nn2DG0asTtnD5owD96UgP6TWWIyqYY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/systemsettings-6.7.0.tar.xz", + "hash": "sha256-WfJKRQRrZp0awW+A7ngyPrbxchMKusMcbWXPYfBfp58=" + }, + "union": { + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/union-6.7.0.tar.xz", + "hash": "sha256-0JJd9wpnQiRuadl3btE508UuPDzNtoaT66vKLE6M9Fk=" }, "wacomtablet": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/wacomtablet-6.6.5.tar.xz", - "hash": "sha256-RLZfANmwMjbTm64P5BPZ9TE32cuWrpabRxDg+xFKDx4=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/wacomtablet-6.7.0.tar.xz", + "hash": "sha256-4lBGcIom7JKbkTYcPYZAgu3m/toDgrcSntOKl1SiwKw=" }, "xdg-desktop-portal-kde": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/xdg-desktop-portal-kde-6.6.5.tar.xz", - "hash": "sha256-IdaZWFKUBk/OfHTe5oXCCT73PdCVeXkT5o7xR4CFayc=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/xdg-desktop-portal-kde-6.7.0.tar.xz", + "hash": "sha256-9a/Ab5SLc7KgED2e5uV3RKmISj8uCBCAd3bsS/cQKto=" } } \ No newline at end of file diff --git a/pkgs/kde/misc/cxx-rust-cssparser/default.nix b/pkgs/kde/misc/cxx-rust-cssparser/default.nix new file mode 100644 index 000000000000..17b0cf8a5f0e --- /dev/null +++ b/pkgs/kde/misc/cxx-rust-cssparser/default.nix @@ -0,0 +1,55 @@ +{ + lib, + mkKdeDerivation, + fetchFromGitLab, + rustPlatform, + rustc, + cargo, + cxx-rs, + corrosion, +}: + +mkKdeDerivation rec { + pname = "cxx-rust-cssparser"; + version = "1.0.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = "cxx-rust-cssparser"; + tag = "v${version}"; + hash = "sha256-zYY9GmQb/Qbbu8AhOGHfrrQ563cIrnx9KMGkdledURw="; + }; + + extraNativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustc + cargo + cxx-rs + ]; + + extraBuildInputs = [ + corrosion + ]; + + cargoRoot = "rust"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit + pname + version + src + cargoRoot + ; + hash = "sha256-CdOvP7VxS2JMD3MlRtc6QNUCGiVMGxiKayLG6vn6n+8="; + }; + + dontWrapQtApps = true; + + meta.license = with lib.licenses; [ + bsd2 + cc0 + lgpl2Only + lgpl3Only + ]; +} diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index 18a9a67a9162..56b463830ad5 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -41,6 +41,7 @@ oxygen-sounds = callPackage ./oxygen-sounds { }; plasma-activities = callPackage ./plasma-activities { }; plasma-activities-stats = callPackage ./plasma-activities-stats { }; + plasma-bigscreen = callPackage ./plasma-bigscreen { }; plasma-browser-integration = callPackage ./plasma-browser-integration { }; plasma-desktop = callPackage ./plasma-desktop { }; plasma-dialer = callPackage ./plasma-dialer { }; @@ -71,6 +72,7 @@ spacebar = callPackage ./spacebar { }; spectacle = callPackage ./spectacle { }; systemsettings = callPackage ./systemsettings { }; + union = callPackage ./union { }; wacomtablet = callPackage ./wacomtablet { }; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { }; } diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix index e23fdacdf158..1e33f1fcdc5b 100644 --- a/pkgs/kde/plasma/kdeplasma-addons/default.nix +++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix @@ -1,9 +1,37 @@ { mkKdeDerivation, + sources, + rustPlatform, + rustc, + cargo, + pkg-config, + corrosion, qtwebengine, + hidapi, }: -mkKdeDerivation { +mkKdeDerivation rec { pname = "kdeplasma-addons"; - extraBuildInputs = [ qtwebengine ]; + inherit (sources.${pname}) version; + + cargoRoot = "kdeds/kameleon/qmk/kameleon-qmk-helper"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version cargoRoot; + src = sources.${pname}; + hash = "sha256-2gtz9D05VloEKkQGF9/0fuMrFUtp2NpE/mcEd7D3Gkc="; + }; + + extraNativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustc + cargo + pkg-config + ]; + + extraBuildInputs = [ + corrosion + qtwebengine + hidapi + ]; } diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch index fcf367a9ffdd..d696d3c095bf 100644 --- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -1,8 +1,8 @@ diff --git a/kcms/audio_information/kcm_audio_information.json b/kcms/audio_information/kcm_audio_information.json -index 5648bb73..28db7ffb 100644 +index baa7fbea..24b3c30b 100644 --- a/kcms/audio_information/kcm_audio_information.json +++ b/kcms/audio_information/kcm_audio_information.json -@@ -82,7 +82,7 @@ +@@ -90,7 +90,7 @@ "Name[zh_CN]": "音频", "Name[zh_TW]": "音訊" }, @@ -25,10 +25,10 @@ index adb196fd..9d6c8675 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/block_devices/kcm_block_devices.json b/kcms/block_devices/kcm_block_devices.json -index 5d864d49..8ea55707 100644 +index 37912e43..1adfadb3 100644 --- a/kcms/block_devices/kcm_block_devices.json +++ b/kcms/block_devices/kcm_block_devices.json -@@ -82,7 +82,7 @@ +@@ -90,7 +90,7 @@ "Name[zh_CN]": "块设备", "Name[zh_TW]": "區塊裝置" }, @@ -51,10 +51,10 @@ index 2de923f3..6b14f7fb 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/cpu/kcm_cpu.json b/kcms/cpu/kcm_cpu.json -index 7541b258..3ba7f289 100644 +index 05b3b039..e769cdba 100644 --- a/kcms/cpu/kcm_cpu.json +++ b/kcms/cpu/kcm_cpu.json -@@ -102,7 +102,7 @@ +@@ -104,7 +104,7 @@ "Name[zh_CN]": "CPU", "Name[zh_TW]": "CPU" }, @@ -90,10 +90,10 @@ index da803598..4e24eaaf 100755 printf "%s\n\n" "$data" done diff --git a/kcms/edid/kcm_edid.json b/kcms/edid/kcm_edid.json -index 4639da41..1afb5522 100644 +index cf0f6cfe..2e6650a1 100644 --- a/kcms/edid/kcm_edid.json +++ b/kcms/edid/kcm_edid.json -@@ -74,7 +74,7 @@ +@@ -82,7 +82,7 @@ "Name[zh_CN]": "EDID", "Name[zh_TW]": "EDID" }, @@ -116,10 +116,10 @@ index 9f04e7fd..8ef37d2c 100644 [[nodiscard]] CommandOutputContext *outputContext() const { diff --git a/kcms/egl/kcm_egl.json b/kcms/egl/kcm_egl.json -index a5a21cd6..cddef596 100644 +index 8af87ff5..42382afe 100644 --- a/kcms/egl/kcm_egl.json +++ b/kcms/egl/kcm_egl.json -@@ -102,7 +102,7 @@ +@@ -104,7 +104,7 @@ "Name[zh_CN]": "OpenGL (EGL)", "Name[zh_TW]": "OpenGL (EGL)" }, @@ -155,10 +155,10 @@ index eab20e0f..5a0d2499 100644 {executable}, Qt::TextFormat::RichText, diff --git a/kcms/glx/kcm_glx.json b/kcms/glx/kcm_glx.json -index 900d8d6a..c1bef34f 100644 +index b3525b4f..e2e237a7 100644 --- a/kcms/glx/kcm_glx.json +++ b/kcms/glx/kcm_glx.json -@@ -101,7 +101,7 @@ +@@ -103,7 +103,7 @@ "Name[zh_CN]": "OpenGL (GLX)", "Name[zh_TW]": "OpenGL (GLX)" }, @@ -197,10 +197,10 @@ index 2c009acd..f6c1c8e5 100644 KAuth::ActionReply DMIDecodeHelper::memoryinformation(const QVariantMap &args) diff --git a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in -index d173229d..71815467 100644 +index d3a071a5..43cc1c38 100644 --- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in +++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in -@@ -95,7 +95,7 @@ +@@ -99,7 +99,7 @@ "Name[zh_CN]": "窗口管理器", "Name[zh_TW]": "視窗管理員" }, @@ -223,10 +223,10 @@ index ddb55b5c..8dc6b668 100644 parent); } diff --git a/kcms/memory/kcm_memory.json b/kcms/memory/kcm_memory.json -index 87ad4a4c..e3f07e81 100644 +index a0e573e1..a1acfc7e 100644 --- a/kcms/memory/kcm_memory.json +++ b/kcms/memory/kcm_memory.json -@@ -134,7 +134,7 @@ +@@ -139,7 +139,7 @@ "Name[zh_CN]": "内存", "Name[zh_TW]": "記憶體" }, @@ -236,10 +236,10 @@ index 87ad4a4c..e3f07e81 100644 "X-KDE-Keywords": "Memory,RAM,dmidecode", "X-KDE-Keywords[ar]": "Memory,RAM,dmidecode,رام,ذاكرة,ذاكرة حية", diff --git a/kcms/network/kcm_network.json b/kcms/network/kcm_network.json -index 4ab2e0f1..559baf6f 100644 +index 55df7791..f932c500 100644 --- a/kcms/network/kcm_network.json +++ b/kcms/network/kcm_network.json -@@ -146,7 +146,7 @@ +@@ -147,7 +147,7 @@ "Name[zh_CN]": "网络接口", "Name[zh_TW]": "網路介面" }, @@ -262,10 +262,10 @@ index a49284d3..77818fe2 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/opencl/kcm_opencl.json b/kcms/opencl/kcm_opencl.json -index e63b60a9..93f1f484 100644 +index 73d1e8c9..5688b964 100644 --- a/kcms/opencl/kcm_opencl.json +++ b/kcms/opencl/kcm_opencl.json -@@ -92,7 +92,7 @@ +@@ -96,7 +96,7 @@ "Name[zh_CN]": "OpenCL", "Name[zh_TW]": "OpenCL" }, @@ -301,10 +301,10 @@ index 36d82ef8..16ce2703 100644 endif() diff --git a/kcms/sensors/kcm_sensors.json b/kcms/sensors/kcm_sensors.json -index 4f9959dc..1cba9e5f 100644 +index d67d8435..96f04ace 100644 --- a/kcms/sensors/kcm_sensors.json +++ b/kcms/sensors/kcm_sensors.json -@@ -66,7 +66,7 @@ +@@ -76,7 +76,7 @@ "Name[zh_CN]": "传感器", "Name[zh_TW]": "感測器" }, @@ -314,31 +314,34 @@ index 4f9959dc..1cba9e5f 100644 "X-KDE-Keywords": "lm_sensors,sensors,temp,temperature,volt,voltage,sensors,fan,fan speed,monitoring,amp,amps,current,power", "X-KDE-Keywords[ar]": "مستشعرات lm,مستشعرات,درجة الحرارة,درجة الحرارة,فولت,جهد,مستشعرات,مروحة,سرعة المروحة,مراقبة,أمبير,أمبير,تيار,طاقة", diff --git a/kcms/sensors/main.cpp b/kcms/sensors/main.cpp -index 8dae9f8f..ee70f381 100644 +index 276280db..aa8856b6 100644 --- a/kcms/sensors/main.cpp +++ b/kcms/sensors/main.cpp -@@ -18,7 +18,7 @@ public: - explicit KCMSensors(QObject *parent, const KPluginMetaData &data) +@@ -21,9 +21,9 @@ public: : KQuickConfigModule(parent, data) { -- m_outputContext = new CommandOutputContext(u"sensors"_s, {}, parent); -+ m_outputContext = new CommandOutputContext(u"@sensors@"_s, {}, parent); + if (QLocale().measurementSystem() == QLocale::ImperialUSSystem) { +- m_outputContext = new CommandOutputContext(u"sensors"_s, {u"-f"_s}, parent); ++ m_outputContext = new CommandOutputContext(u"@sensors@"_s, {u"-f"_s}, parent); + } else { +- m_outputContext = new CommandOutputContext(u"sensors"_s, {}, parent); ++ m_outputContext = new CommandOutputContext(u"@sensors@"_s, {}, parent); + } m_outputContext->setAutoRefreshMs(1000); } - CommandOutputContext *outputContext() const diff --git a/kcms/vulkan/kcm_vulkan.json b/kcms/vulkan/kcm_vulkan.json -index ca4cf9e0..4f6af805 100644 +index 3e6df405..ae08bc95 100644 --- a/kcms/vulkan/kcm_vulkan.json +++ b/kcms/vulkan/kcm_vulkan.json -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ "Name[zh_CN]": "Vulkan", "Name[zh_TW]": "Vulkan" }, - "TryExec": "vulkaninfo", + "TryExec": "@vulkaninfo@", "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics,dxdiag", - "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات,dxdiag", + "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics,dxdiag,vulkaninfo", + "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات,dxdiag,vulkaninfo", diff --git a/kcms/vulkan/main.cpp b/kcms/vulkan/main.cpp index 5665d9d2..008f1bf0 100644 --- a/kcms/vulkan/main.cpp @@ -353,10 +356,10 @@ index 5665d9d2..008f1bf0 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/wayland/kcm_wayland.json b/kcms/wayland/kcm_wayland.json -index 7ca1dcb7..e814570b 100644 +index 3a1a9ad1..572af87e 100644 --- a/kcms/wayland/kcm_wayland.json +++ b/kcms/wayland/kcm_wayland.json -@@ -106,7 +106,7 @@ +@@ -108,7 +108,7 @@ "Name[zh_CN]": "Wayland", "Name[zh_TW]": "Wayland" }, @@ -379,10 +382,10 @@ index 3a4825c7..4633927b 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json -index 5b12997a..9debc887 100644 +index b22ecf03..e9240ce7 100644 --- a/kcms/xserver/kcm_xserver.json +++ b/kcms/xserver/kcm_xserver.json -@@ -146,7 +146,7 @@ +@@ -147,7 +147,7 @@ "Name[zh_CN]": "X 服务器", "Name[zh_TW]": "X 伺服器" }, diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index 1f477f7f9aea..5f41a9783974 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -6,6 +6,7 @@ pam, pkg-config, qtwayland, + kirigami-addons, freerdp, }: mkKdeDerivation { @@ -21,6 +22,8 @@ mkKdeDerivation { extraBuildInputs = [ qtwayland + kirigami-addons + freerdp pam ]; diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix index 2f91e980bbfa..1d543af28794 100644 --- a/pkgs/kde/plasma/kscreen/default.nix +++ b/pkgs/kde/plasma/kscreen/default.nix @@ -3,8 +3,10 @@ pkg-config, qtsensors, qtwayland, - dbus, + kitemmodels, + plasma5support, wayland-protocols, + dbus, }: mkKdeDerivation { pname = "kscreen"; @@ -14,6 +16,10 @@ mkKdeDerivation { extraBuildInputs = [ qtsensors qtwayland + + kitemmodels + plasma5support + wayland-protocols ]; diff --git a/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch b/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch deleted file mode 100644 index e6408605aa43..000000000000 --- a/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 232e480ab1303f37d37d295b57fdcbb6b6648bca Mon Sep 17 00:00:00 2001 -From: Alois Wohlschlager -Date: Sun, 7 Aug 2022 16:12:31 +0200 -Subject: [PATCH] Lower CAP_SYS_NICE from the ambient set - -The capabilities wrapper raises CAP_SYS_NICE into the ambient set so it -is inherited by the wrapped program. However, we don't want it to leak -into the entire desktop environment. - -Lower the capability again at startup so that the kernel will clear it -on exec. ---- - src/main_wayland.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp -index 1720e14e7..f2bb446b0 100644 ---- a/src/main_wayland.cpp -+++ b/src/main_wayland.cpp -@@ -39,7 +39,9 @@ - #include - #include - -+#include - #include -+#include - #include - - #include -@@ -285,6 +287,7 @@ static QString automaticBackendSelection() - - int main(int argc, char *argv[]) - { -+ prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, CAP_SYS_NICE, 0, 0); - KWin::Application::setupMalloc(); - KWin::Application::setupLocalizedString(); - KWin::gainRealTime(); --- -2.37.1 - diff --git a/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch index d0be721b044c..845106916b76 100644 --- a/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch +++ b/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch @@ -1,26 +1,13 @@ -From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001 -From: Yaroslav Bolyukin -Date: Wed, 23 Dec 2020 18:02:14 +0300 -Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper - -Signed-off-by: Yaroslav Bolyukin ---- - src/plugins/qpa/main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/src/plugins/qpa/main.cpp b/src/plugins/qpa/main.cpp -index efd236b..a69c046 100644 +index c26092700a..2aa3e21e7d 100644 --- a/src/plugins/qpa/main.cpp +++ b/src/plugins/qpa/main.cpp @@ -23,7 +23,7 @@ public: - + QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList) { -- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { -+ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { +- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1StringView("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { ++ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1StringView("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { // Not KWin return nullptr; } --- -2.29.2 - diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index 140b98923d03..4e6e471ddc42 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -18,7 +18,6 @@ pipewire, krunner, python3, - fetchpatch, }: mkKdeDerivation { pname = "kwin"; @@ -26,7 +25,6 @@ mkKdeDerivation { patches = [ ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch - ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch ]; postPatch = '' diff --git a/pkgs/kde/plasma/plasma-bigscreen/default.nix b/pkgs/kde/plasma/plasma-bigscreen/default.nix new file mode 100644 index 000000000000..311a6e33a498 --- /dev/null +++ b/pkgs/kde/plasma/plasma-bigscreen/default.nix @@ -0,0 +1,39 @@ +{ + mkKdeDerivation, + plasma-workspace, + pkg-config, + qtwebengine, + libcec, + sdl3, +}: + +mkKdeDerivation { + pname = "plasma-bigscreen"; + + postPatch = '' + substituteInPlace bin/plasma-bigscreen-wayland.in \ + --replace-fail @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" + + substituteInPlace bin/plasma-bigscreen-wayland.desktop.cmake \ + --replace-fail @CMAKE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" + ''; + + extraCmakeFlags = [ + "-DQT_FIND_PRIVATE_MODULES=ON" + ]; + + extraNativeBuildInputs = [ + pkg-config + ]; + + extraBuildInputs = [ + qtwebengine + + libcec + sdl3 + ]; + + dontQmlLint = true; + + passthru.providedSessions = [ "plasma-bigscreen-wayland" ]; +} diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 30de7c407e2d..e9fa2ec669f4 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -6,7 +6,6 @@ glib, gsettings-desktop-schemas, replaceVars, - util-linux, pkg-config, qtsvg, qtwayland, @@ -35,13 +34,9 @@ mkKdeDerivation { pname = "plasma-desktop"; patches = [ - (replaceVars ./hwclock-path.patch { - hwclock = "${lib.getBin util-linux}/bin/hwclock"; - }) (replaceVars ./kcm-access.patch { gsettings = "${gsettings-wrapper}/bin/gsettings"; }) - ./tzdir.patch ./no-discover-shortcut.patch (replaceVars ./wallpaper-paths.patch { wallpapers = "${lib.getBin breeze}/share/wallpapers"; diff --git a/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch b/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch deleted file mode 100644 index 4c0891db97a6..000000000000 --- a/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp -+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -@@ -48,10 +48,6 @@ - #include - #endif - --// We cannot rely on the $PATH environment variable, because D-Bus activation --// clears it. So we have to use a reasonable default. --static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin"); -- - int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled) - { - int ret = 0; -@@ -227,7 +223,7 @@ int ClockHelper::tzreset() - - void ClockHelper::toHwclock() - { -- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':'))); -+ QString hwclock = QLatin1String("@hwclock@"); - if (!hwclock.isEmpty()) { - KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); - } diff --git a/pkgs/kde/plasma/plasma-desktop/tzdir.patch b/pkgs/kde/plasma/plasma-desktop/tzdir.patch deleted file mode 100644 index 97504b330fed..000000000000 --- a/pkgs/kde/plasma/plasma-desktop/tzdir.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp -+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele - - val = selectedzone; - #else -- QString tz = "/usr/share/zoneinfo/" + selectedzone; -+ QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR")); -+ QString tz = tzdir + "/" + selectedzone; -+ if (tzdir.isEmpty()) { -+ // Standard Linux path -+ tz = "/usr/share/zoneinfo/" + selectedzone; -+ } - - if (QFile::exists(tz)) { // make sure the new TZ really exists - QFile::remove(QStringLiteral("/etc/localtime")); diff --git a/pkgs/kde/plasma/plasma-keyboard/default.nix b/pkgs/kde/plasma/plasma-keyboard/default.nix index be510d3ef01d..06f738ae1074 100644 --- a/pkgs/kde/plasma/plasma-keyboard/default.nix +++ b/pkgs/kde/plasma/plasma-keyboard/default.nix @@ -2,6 +2,7 @@ mkKdeDerivation, pkg-config, qtvirtualkeyboard, + libplasma, wayland-protocols, }: mkKdeDerivation { @@ -13,6 +14,9 @@ mkKdeDerivation { extraBuildInputs = [ qtvirtualkeyboard + + libplasma + wayland-protocols ]; diff --git a/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch b/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch deleted file mode 100644 index 708a9f6c11ce..000000000000 --- a/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp -index bb44514..abbdf57 100644 ---- a/src/common/ConfigReader.cpp -+++ b/src/common/ConfigReader.cpp -@@ -184,9 +184,6 @@ void ConfigBase::load() - - files << m_path; - -- if (latestModificationTime <= m_fileModificationTime) { -- return; -- } - m_fileModificationTime = latestModificationTime; - - for (const QString &filepath : std::as_const(files)) { diff --git a/pkgs/kde/plasma/plasma-login-manager/default.nix b/pkgs/kde/plasma/plasma-login-manager/default.nix index 964c988368fd..47ebbef47cd7 100644 --- a/pkgs/kde/plasma/plasma-login-manager/default.nix +++ b/pkgs/kde/plasma/plasma-login-manager/default.nix @@ -11,7 +11,6 @@ mkKdeDerivation { pname = "plasma-login-manager"; patches = [ - ./config-mtime.patch ./config-path.patch (replaceVars ./kwin-path.patch { diff --git a/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch b/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch index bf2eb6047118..360884d1e30b 100644 --- a/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch +++ b/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch @@ -1,10 +1,11 @@ --- a/src/frontend/startkde/plasma-login-kwin_wayland.service.in +++ b/src/frontend/startkde/plasma-login-kwin_wayland.service.in -@@ -3,6 +3,6 @@ Description=KDE Window Manager (Login Manager Version) +@@ -3,7 +3,7 @@ Description=KDE Window Manager (Login Manager Version) PartOf=graphical-session.target [Service] -ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kwin_wayland --no-lockscreen --no-global-shortcuts --no-kactivities --inputmethod plasma-keyboard --locale1 -+ExecStart=@kwin_wayland@ --no-lockscreen --no-lockscreen --no-global-shortcuts --no-kactivities --inputmethod plasma-keyboard --locale1 ++ExecStart=@kwin_wayland@ --no-lockscreen --no-global-shortcuts --no-kactivities --inputmethod plasma-keyboard --locale1 + SuccessExitStatus=15 BusName=org.kde.KWin Slice=session.slice diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix index edba027fc4b0..f260e12d8087 100644 --- a/pkgs/kde/plasma/plasma-nm/default.nix +++ b/pkgs/kde/plasma/plasma-nm/default.nix @@ -3,6 +3,7 @@ mkKdeDerivation, replaceVars, pkg-config, + qtkeychain, qtwebengine, kirigami-addons, mobile-broadband-provider-info, @@ -22,6 +23,7 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ + qtkeychain qtwebengine mobile-broadband-provider-info openconnect diff --git a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch index a39328027d6d..4c64b37503fc 100644 --- a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch +++ b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch @@ -12,10 +12,10 @@ index f425eb3..5b8cd43 100644 } // namespace PlasmaVault diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp -index b992f6f..eb828dd 100644 +index 8636e4e..4f4ba0d 100644 --- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp +++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp -@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const +@@ -204,7 +204,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); KConfigGroup backendConfig(config, "GocryptfsBackend"); @@ -25,19 +25,19 @@ index b992f6f..eb828dd 100644 QString GocryptfsBackend::getConfigFilePath(const Device &device) const diff --git a/kded/engine/vault.cpp b/kded/engine/vault.cpp -index c101079..67c8a83 100644 +index f488d00..6b76565 100644 --- a/kded/engine/vault.cpp +++ b/kded/engine/vault.cpp -@@ -485,7 +485,7 @@ FutureResult<> Vault::close() +@@ -480,7 +480,7 @@ FutureResult<> Vault::close() } else { // We want to check whether there is an application // that is accessing the vault -- AsynQt::Process::getOutput(QStringLiteral("lsof"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this] { -+ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this] { - d->updateMessage(i18n("Unable to lock the vault because an application is using it")); - }) | onSuccess([this](const QString &result) { - // based on ksolidnotify.cpp -@@ -538,7 +538,7 @@ FutureResult<> Vault::forceClose() +- AsynQt::Process::getOutput(QStringLiteral("lsof"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this, result] { ++ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this, result] { + // no application seems to be accessing the vault, bubble + // through the original unmount error + d->updateMessage(result.error().message()); +@@ -534,7 +534,7 @@ FutureResult<> Vault::forceClose() using namespace AsynQt::operators; AsynQt::await( diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 0a02c8e424cd..d7a60c785318 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -2,6 +2,7 @@ lib, mkKdeDerivation, replaceVars, + flatpak, fontconfig, libxtst, libxft, @@ -82,6 +83,7 @@ mkKdeDerivation { libxtst libxft + flatpak gpsd ]; diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch index df8c5981dcfb..30c4d995220f 100644 --- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch +++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch @@ -1,8 +1,8 @@ -diff --git a/applets/devicenotifier/devicemessagemonitor_p.cpp b/applets/devicenotifier/devicemessagemonitor_p.cpp -index 173fec78c1..0519424f71 100644 ---- a/applets/devicenotifier/devicemessagemonitor_p.cpp -+++ b/applets/devicenotifier/devicemessagemonitor_p.cpp -@@ -118,7 +118,7 @@ void DeviceMessageMonitor::queryBlockingApps(const QString &devicePath) +diff --git a/applets/devicenotifier/messageinfo.cpp b/applets/devicenotifier/messageinfo.cpp +index e5c987879b..d26287a906 100644 +--- a/applets/devicenotifier/messageinfo.cpp ++++ b/applets/devicenotifier/messageinfo.cpp +@@ -64,7 +64,7 @@ void MessageInfo::queryBlockingApps(const QString &devicePath) Q_EMIT blockingAppsReady(blockApps); p->deleteLater(); }); @@ -25,10 +25,10 @@ index e27e21a7bd..abbf7f32e1 100644 p.write(input); p.closeWriteChannel(); diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp -index da28f13837..4af78b7850 100644 +index a150527de6..4798518162 100644 --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp -@@ -137,7 +137,7 @@ void KFonts::save() +@@ -151,7 +151,7 @@ void KFonts::save() if (fontsAASettings()->forceFontDPI() == 0 && forceFontDPIChanged && KWindowSystem::isPlatformX11()) { QProcess proc; proc.setProcessChannelMode(QProcess::ForwardedChannels); @@ -38,10 +38,10 @@ index da28f13837..4af78b7850 100644 proc.write("Xft.dpi\n"); proc.closeWriteChannel(); diff --git a/kcms/kfontinst/kcmfontinst/FcQuery.cpp b/kcms/kfontinst/kcmfontinst/FcQuery.cpp -index e4d1ad4311..d45bdfad98 100644 +index 32ba97a4d6..c26f45f2e0 100644 --- a/kcms/kfontinst/kcmfontinst/FcQuery.cpp +++ b/kcms/kfontinst/kcmfontinst/FcQuery.cpp -@@ -46,7 +46,7 @@ void CFcQuery::run(const QString &query) +@@ -44,7 +44,7 @@ void CFcQuery::run(const QString &query) connect(m_proc, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(procExited())); connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data); @@ -51,7 +51,7 @@ index e4d1ad4311..d45bdfad98 100644 void CFcQuery::procExited() diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp -index 53f77d0a18..680e81b6e4 100644 +index 0a3fb44698..d44b63350b 100644 --- a/kcms/krdb/krdb.cpp +++ b/kcms/krdb/krdb.cpp @@ -425,7 +425,7 @@ void runRdb(unsigned int flags) @@ -107,7 +107,7 @@ index 7218628ce9..9126475ea4 100644 +ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1 Slice=session.slice diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index b8474dd34f..7d0616e116 100644 +index f9104619bf..af9fc09a67 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber) @@ -119,7 +119,7 @@ index b8474dd34f..7d0616e116 100644 } QStringList allServices(const QLatin1String &prefix) -@@ -508,7 +508,7 @@ QProcess *setupKSplash() +@@ -552,7 +552,7 @@ QProcess *setupKSplash() if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; p->setProcessChannelMode(QProcess::ForwardedChannels); diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix index 2c12c45cddfd..ae2b56a004f2 100644 --- a/pkgs/kde/plasma/powerdevil/default.nix +++ b/pkgs/kde/plasma/powerdevil/default.nix @@ -7,10 +7,6 @@ mkKdeDerivation { pname = "powerdevil"; - patches = [ - # https://invent.kde.org/plasma/powerdevil/-/merge_requests/601 - ./rb-batterymonitor.patch - ]; extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ ddcutil diff --git a/pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch b/pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch deleted file mode 100644 index b5808138734f..000000000000 --- a/pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/applets/batterymonitor/CMakeLists.txt b/applets/batterymonitor/CMakeLists.txt -index 28e52d26..3f2bf985 100644 ---- a/applets/batterymonitor/CMakeLists.txt -+++ b/applets/batterymonitor/CMakeLists.txt -@@ -19,3 +19,5 @@ plasma_add_applet(org.kde.plasma.battery - main.xml - GENERATE_APPLET_CLASS - ) -+ -+add_dependencies(org.kde.plasma.battery batterymonitorplugin) diff --git a/pkgs/kde/plasma/print-manager/default.nix b/pkgs/kde/plasma/print-manager/default.nix index dd06f5217637..35409087d6b1 100644 --- a/pkgs/kde/plasma/print-manager/default.nix +++ b/pkgs/kde/plasma/print-manager/default.nix @@ -1,10 +1,14 @@ { mkKdeDerivation, + kdeclarative, cups, }: mkKdeDerivation { pname = "print-manager"; # FIXME: cups-smb? - extraBuildInputs = [ cups ]; + extraBuildInputs = [ + kdeclarative + cups + ]; } diff --git a/pkgs/kde/plasma/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix index 098bc2394cca..dde9c0d5433a 100644 --- a/pkgs/kde/plasma/spectacle/default.nix +++ b/pkgs/kde/plasma/spectacle/default.nix @@ -1,5 +1,4 @@ { - fetchpatch, mkKdeDerivation, pkg-config, qtwayland, @@ -11,15 +10,6 @@ mkKdeDerivation { pname = "spectacle"; - # Backport the upstream switch from runtime QLibrary loading to direct - # linking so Spectacle OCR can find Tesseract reliably on NixOS. - patches = [ - (fetchpatch { - url = "https://invent.kde.org/graphics/spectacle/-/commit/13b0be099e7abe9bbb17b90e62c2e83afb248db7.patch"; - hash = "sha256-HEgHsuajaF+WVMiRp0YKRmi+/NsIy5s8frwMJRIdDY8="; - }) - ]; - extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ diff --git a/pkgs/kde/plasma/union/default.nix b/pkgs/kde/plasma/union/default.nix new file mode 100644 index 000000000000..b9d29eb91afe --- /dev/null +++ b/pkgs/kde/plasma/union/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + kcoreaddons, +}: +mkKdeDerivation { + pname = "union"; + + extraBuildInputs = [ + kcoreaddons + ]; +} From a5c6947aeb50f4bec5ce4cc014c1c64ff1bafe6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jun 2026 12:24:48 +0000 Subject: [PATCH 73/73] git-ls: 7.0.1 -> 7.1.2 --- pkgs/by-name/gi/git-ls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-ls/package.nix b/pkgs/by-name/gi/git-ls/package.nix index 2653b1e7a374..50b39e921d7c 100644 --- a/pkgs/by-name/gi/git-ls/package.nix +++ b/pkgs/by-name/gi/git-ls/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "git-ls"; - version = "7.0.1"; + version = "7.1.2"; __structuredAttrs = true; strictDeps = true; @@ -18,7 +18,7 @@ buildGoModule (finalAttrs: { owner = "llimllib"; repo = "git-ls"; tag = "v${finalAttrs.version}"; - hash = "sha256-2D82VbOf/NPCXHNraiOfWwRthKElg1AgNr8dxY41AiA="; + hash = "sha256-g+LFQEud4nF+3hRaH8JcjQHx6Ol2LDRRP2HdQ2oLfls="; }; vendorHash = "sha256-Bk6IBG+BrqY4FNVIlbSSSnqqAeL+8SJUtRXuIp4e8f8=";