From 5781ef6de9ff4d3ed6b8ce2f8526825878a850aa Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Mon, 28 Apr 2025 10:41:52 -0700 Subject: [PATCH 01/55] nixos/systemd/networkd: allow passing flow control fields to link --- nixos/modules/system/boot/networkd.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 89d967ccc0bf..8ac3df70df97 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -100,6 +100,9 @@ let "ReceiveQueues" "TransmitQueues" "TransmitQueueLength" + "RxFlowControl" + "TxFlowControl" + "AutoNegotiationFlowControl" ]) (assertValueOneOf "MACAddressPolicy" [ "persistent" @@ -137,6 +140,9 @@ let (assertValueOneOf "GenericSegmentationOffload" boolValues) (assertValueOneOf "GenericReceiveOffload" boolValues) (assertValueOneOf "LargeReceiveOffload" boolValues) + (assertValueOneOf "RxFlowControl" boolValues) + (assertValueOneOf "TxFlowControl" boolValues) + (assertValueOneOf "AutoNegotiationFlowControl" boolValues) (assertInt "RxChannels") (assertRange "RxChannels" 1 4294967295) (assertInt "TxChannels") From d76207806846212bf50c8f87c7969f4c296e2900 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 04:48:42 +0000 Subject: [PATCH 02/55] octavePackages.mapping: 1.4.2 -> 1.4.3 --- pkgs/development/octave-modules/mapping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/mapping/default.nix b/pkgs/development/octave-modules/mapping/default.nix index 679712503304..0e80cd89eb02 100644 --- a/pkgs/development/octave-modules/mapping/default.nix +++ b/pkgs/development/octave-modules/mapping/default.nix @@ -9,11 +9,11 @@ buildOctavePackage rec { pname = "mapping"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-mrUQWqC15Ul5AHDvhMlNStqIMG2Zxa+hB2vDyeizLaI="; + sha256 = "sha256-IYiyRjnHCHhAFy5gR/dcuKWY11gSCubggQzmMAqGmhs="; }; buildInputs = [ From b04406805ef6fa3894ede8cc7e0ba8c0223032b1 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Sat, 10 May 2025 16:04:41 -0500 Subject: [PATCH 03/55] octavePackages.mapping: Propagate gdal input to runtime --- pkgs/development/octave-modules/mapping/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/octave-modules/mapping/default.nix b/pkgs/development/octave-modules/mapping/default.nix index 0e80cd89eb02..490841816bc2 100644 --- a/pkgs/development/octave-modules/mapping/default.nix +++ b/pkgs/development/octave-modules/mapping/default.nix @@ -16,7 +16,7 @@ buildOctavePackage rec { sha256 = "sha256-IYiyRjnHCHhAFy5gR/dcuKWY11gSCubggQzmMAqGmhs="; }; - buildInputs = [ + propagatedBuildInputs = [ gdal ]; From d51ffda5bc89e9f9bb9cc93566243f675ac302cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 May 2025 14:29:18 +0000 Subject: [PATCH 04/55] x42-plugins: 20240611 -> 20250512 --- pkgs/by-name/x4/x42-plugins/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/x4/x42-plugins/package.nix b/pkgs/by-name/x4/x42-plugins/package.nix index d327058c33d1..f235f1babda8 100644 --- a/pkgs/by-name/x4/x42-plugins/package.nix +++ b/pkgs/by-name/x4/x42-plugins/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "x42-plugins"; - version = "20240611"; + version = "20250512"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - hash = "sha256-lO6Y1zEGGhv6HIrHmq9b0LA37K3ZzBtC/ERzBsGUZiw="; + hash = "sha256-HBENTb1BGxBDIOWtswCe6t0mEzVNZf65NhLjsfE4KYk="; }; nativeBuildInputs = [ pkg-config ]; From ff6695751e914745ee89c18f464bbd1f7d6822e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 20:42:57 +0000 Subject: [PATCH 05/55] keystore-explorer: 5.5.3 -> 5.6.0 --- pkgs/applications/misc/keystore-explorer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index aa37f5cfe689..7aa4aa62910f 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { - version = "5.5.3"; + version = "5.6.0"; pname = "keystore-explorer"; src = fetchzip { url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-${ lib.replaceStrings [ "." ] [ "" ] version }.zip"; - sha256 = "sha256-oShVfmien4HMpAfSa9rPr18wLu7RN8ZWEZEUtiBHyBs="; + sha256 = "sha256-+ZgALJaZodLmAtdCIE1SG6D0lzlETg4mMPXheXmGhPc="; }; # glib is necessary so file dialogs don't hang. From f8f7a8c7698535e83e9667e1b8dd489096310186 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 May 2025 02:49:54 +0000 Subject: [PATCH 06/55] wasm-tools: 1.230.0 -> 1.231.0 --- pkgs/by-name/wa/wasm-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index 028613edbf86..4998d4bd24c2 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.230.0"; + version = "1.231.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; rev = "v${version}"; - hash = "sha256-xtGPZXb/tgReshmpW5zzG0EOVYPMoXU+avnO5uLKJnI="; + hash = "sha256-6SpkiaCBzCSHC+KesExNP7V7g8qYF2UR5UAxilxUK9c="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; useFetchCargoVendor = true; - cargoHash = "sha256-P+5g1ynZVFIU2bgait+2rwJoVYClF7lyq4j2roV/w2o="; + cargoHash = "sha256-zyYyIjzMxe74h94Sm3iMBWW7sy94dVrcVr5/0aDrtJU="; cargoBuildFlags = [ "--package" "wasm-tools" From 2f4719cdd6de46c75ceacbc69d39d798ecdbb502 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 May 2025 18:29:14 +0000 Subject: [PATCH 07/55] seagoat: 0.54.17 -> 0.54.18 --- pkgs/by-name/se/seagoat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index 1efa4851ec4c..771f5ca58bb7 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "seagoat"; - version = "0.54.17"; + version = "0.54.18"; pyproject = true; src = fetchFromGitHub { owner = "kantord"; repo = "SeaGOAT"; tag = "v${version}"; - hash = "sha256-8pLBZXj9p+nO+deozo57H/FlxDKd9KSQHZ8qkGsNzhA="; + hash = "sha256-vRaC6YrqejtRs8NHoTj6DB0CAYMSygRMDOTaJyk1BZc="; }; build-system = [ python3Packages.poetry-core ]; From fb2803a6422b607f6926cf1a3e0a2dedcffaea83 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 26 May 2025 14:58:00 +0200 Subject: [PATCH 08/55] prrte: 3.0.10 -> 3.0.11 --- pkgs/by-name/pr/prrte/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index 075e86594fb3..7e9b68ddceb8 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "prrte"; - version = "3.0.10"; + version = "3.0.11"; src = fetchFromGitHub { owner = "openpmix"; repo = "prrte"; rev = "v${version}"; - hash = "sha256-Pnm0t7dJhT0MEYEKBHh6l16V5b/zOSxsd5OWda5SIzI="; + hash = "sha256-4JEh4N/38k0Xgp0CqnFipaEZlJBQr8nyxoncyz0/7yo="; fetchSubmodules = true; }; From 28d4ec20364c5cfdaac6f79abc14f2a03ed84dd5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 27 May 2025 06:06:26 +0100 Subject: [PATCH 09/55] strace: 6.14 -> 6.15 Changes: https://github.com/strace/strace/releases/tag/v6.15 --- pkgs/by-name/st/strace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix index 68930c92d64d..f8b521af0d57 100644 --- a/pkgs/by-name/st/strace/package.nix +++ b/pkgs/by-name/st/strace/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.14"; + version = "6.15"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-JE87XCCjKFTKm3yno+4JHdPUvSCTOhcezujbSGx308k="; + hash = "sha256-hVLfqwirwioPIEjJj9lUH9TXG2iCUHlSeA2rfHxRL1E="; }; separateDebugInfo = true; From c68492604906ba8b8b3f89ac916c8a03a7263102 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 15:21:29 +0200 Subject: [PATCH 10/55] python312Packages.llama-index-llms-ollama: 0.5.4 -> 0.5.6 --- .../python-modules/llama-index-llms-ollama/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 3409c2ce7da4..afd8c6e45f44 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -2,15 +2,15 @@ lib, buildPythonPackage, fetchPypi, + hatchling, llama-index-core, ollama, - poetry-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.5.4"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,10 +18,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-5efnpOZUeMdikG0I9ZRkfYFI/9wyrpCNVrc8DfjqBPI="; + hash = "sha256-RDiMv6riuVcvbqZzTAcBXHcoI/vm0ssmx9/jT65R3cU="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core From 29f056aa00f9336812f093ce443641a1109bcba2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 15:31:05 +0200 Subject: [PATCH 11/55] python312Packages.losant-rest: 1.20.1 -> 1.22.0 Diff: https://github.com/Losant/losant-rest-python/compare/refs/tags/v1.20.1...refs/tags/v1.22.0 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 385e5832d218..7453a9b7dc63 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.20.1"; + version = "1.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; tag = "v${version}"; - hash = "sha256-1CxcA9/FvKP3P0Q02by0hBHQTAcbfLCp3AualHhZyvY="; + hash = "sha256-8h8EGG13C3zSB/KBdk6Oa5dKHTIftO7mCYay/wAe9Y4="; }; build-system = [ setuptools ]; From 9c8749a77c3f1e42cd5c3c85876439331e94adac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 16:03:45 +0200 Subject: [PATCH 12/55] python312Packages.azure-mgmt-appcontainers: 3.1.0 -> 3.2.0 --- .../azure-mgmt-appcontainers/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index 0be4aa8e3c01..9020c2924ed0 100644 --- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -6,22 +6,26 @@ azure-common, azure-mgmt-core, isodate, + setuptools, typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-appcontainers"; - version = "3.1.0"; - format = "setuptools"; + version = "3.2.0"; + pyroject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-PHlDnxK8788UCvjG572LUWJOlx/ZH1rOmKzAc8Lm+uw="; + pname = "azure_mgmt_appcontainers"; + inherit version; + hash = "sha256-bp7WPCwssPZD+tZ52BMIxKomFWztQfwDPl9MBJghjz4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core isodate From e4b9c5ccfa729c17cfbd8c27a96f265b675ab473 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 16:07:51 +0200 Subject: [PATCH 13/55] python312Packages.azure-mgmt-apimanagement: 4.0.1 -> 5.0.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-apimanagement_5.0.0/sdk/apimanagement/azure-mgmt-apimanagement/CHANGELOG.md --- .../azure-mgmt-apimanagement/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 5262587ba133..27687e4340d2 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -11,19 +11,20 @@ buildPythonPackage rec { pname = "azure-mgmt-apimanagement"; - version = "4.0.1"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-XPUJzALti7QXTmgtuwVDhCA2luWz7zfykWEsJmpHzA4="; + pname = "azure_mgmt_apimanagement"; + inherit version; + hash = "sha256-Crf+F+cP4xVM2ED/R9GdekYQIXAD6qfCGs81EableZk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate From fc898084500abe0d3f6a990e1e488eacceacedfb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 16:17:14 +0200 Subject: [PATCH 14/55] python312Packages.canmatrix: 1.0 -> 1.2 Changelog: https://github.com/ebroecker/canmatrix/releases/tag/1.2 --- .../python-modules/canmatrix/default.nix | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 372a8ed685fb..511afe5f353a 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -4,50 +4,39 @@ buildPythonPackage, click, fetchFromGitHub, - future, - importlib-metadata, ldfparser, lxml, openpyxl, + pytest-cov-stub, + pytest-timeout, pytestCheckHook, pythonOlder, pyyaml, setuptools, - six, - versioneer, xlrd, xlwt, }: buildPythonPackage rec { pname = "canmatrix"; - version = "1.0"; + version = "1.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ebroecker"; repo = "canmatrix"; tag = version; - hash = "sha256-UUJnLVt+uOj8Eav162btprkUeTemItGrSnBBB9UhJJI="; + hash = "sha256-PfegsFha7ernSqnMeaDoLf1jLx1CiOoiYi34dESEgBY="; }; - postPatch = '' - # Remove vendorized versioneer.py - rm versioneer.py - ''; - build-system = [ setuptools ]; - nativeBuildInputs = [ versioneer ]; - dependencies = [ attrs click - future - six - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; optional-dependencies = { arxml = [ lxml ]; @@ -64,12 +53,15 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + pytest-cov-stub + pytest-timeout pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ # long_envvar_name_imports requires stable key value pair ordering "-s src/canmatrix" + "tests/" ]; disabledTests = [ "long_envvar_name_imports" ]; From 75798f94fae4566dceb3170d84bd49ae8f2a6f9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 14:27:28 +0000 Subject: [PATCH 15/55] cargo-careful: 0.4.5 -> 0.4.6 --- pkgs/by-name/ca/cargo-careful/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix index 8d168b4f9961..5cd6a3c6d920 100644 --- a/pkgs/by-name/ca/cargo-careful/package.nix +++ b/pkgs/by-name/ca/cargo-careful/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-dalsBILFZzVHBIhGGIOUMSCWuM7xE46w91MbzCYa1Io="; + hash = "sha256-aKmaNDk9yZ/1MS3vQ9c1rCySfxiNv8PRwnIjT5bdhMg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Es5BT0jfyJXuw7TTtGRhI4PeplZgTYm6JhSxQiZ+6NE="; + cargoHash = "sha256-KtTTpYwhNYvghb8k2NXyCRV5NGn07d7iaW+5uTI6qJ4="; meta = with lib; { description = "Tool to execute Rust code carefully, with extra checking along the way"; From 1e2b75e63493404631d3ecd80a5699aef508047b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 16:34:56 +0200 Subject: [PATCH 16/55] python312Packages.google-cloud-dns: 0.35.0 -> 0.35.1 Changelog: https://github.com/googleapis/python-dns/blob/v0.35.1/CHANGELOG.md --- .../python-modules/google-cloud-dns/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 0bc3237aad09..5e1eae819e12 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -12,14 +12,15 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.35.0"; + version = "0.35.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-CsRNqesPoLEilRPNiIB0q9AhGZLEBCMAr9HBbUFHRVM="; + pname = "google_cloud_dns"; + inherit version; + hash = "sha256-lU9EYV16tv/NBjJOL552D5awffH83bAkuaEJ0LMwqR8="; }; build-system = [ setuptools ]; From 7bcba6a26f6da65c36a441ea205d3e92e072c8ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 16:36:34 +0200 Subject: [PATCH 17/55] python312Packages.google-cloud-container: 2.56.1 -> 2.57.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-container-v2.57.0/packages/google-cloud-container/CHANGELOG.md --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 6a2d0c0fb325..9370066bdc27 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.56.1"; + version = "2.57.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-QADuXKwndJvGDEWTftNIGRX7vwmJJdkoUjcC1w8vT6E="; + hash = "sha256-+n5vWT9YNIuYvW3Vk0TJpgOOn7psC5hY4j2dJ4NG8Sk="; }; build-system = [ setuptools ]; From ad3a4c4bd386979f7a6a5d6ad463033c1342f95d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 16:41:30 +0200 Subject: [PATCH 18/55] python312Packages.json-repair: 0.44.1 -> 0.46.0 Changelog: https://github.com/mangiucugna/json_repair/releases/tag/v0.46.0 --- pkgs/development/python-modules/json-repair/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix index 34a28f5ba76c..04d252c45e4b 100644 --- a/pkgs/development/python-modules/json-repair/default.nix +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json-repair"; - version = "0.44.1"; + version = "0.46.0"; pyproject = true; src = fetchFromGitHub { owner = "mangiucugna"; repo = "json_repair"; tag = "v${version}"; - hash = "sha256-S3hSbvNyvCx4qia9PRgUy+UugURjtA4hV5kuJIuLafw="; + hash = "sha256-MfjWZYDYiFBTy0Tsm0OKY/89ziSTXNB5m99VkpS0Mco="; }; build-system = [ setuptools ]; @@ -24,7 +24,6 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_performance.py" - "tests/test_coverage.py" ]; pythonImportsCheck = [ "json_repair" ]; From b8bde38176840b09906b681a6577a93918025fd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 16:51:25 +0200 Subject: [PATCH 19/55] python312Packages.vispy: 0.14.3 -> 0.15.2 Changelog: https://github.com/vispy/vispy/blob/v0.15.2/CHANGELOG.md --- pkgs/development/python-modules/vispy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 875c06b5fe71..0d77d9c77373 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.14.3"; + version = "0.15.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-77u4R6kIuvfnFpq5vylhOKOTZPNn5ssKjsA61xaZ0x0="; + hash = "sha256-1S0QwGl/SJkFVc6iorrT+fWncjkYVv2jZOpLvGn9B1w="; }; patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ From 2a9fdee37113cf1c87680a220c9c949b99cc8f6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 May 2025 16:51:51 +0200 Subject: [PATCH 20/55] python312Packages.napari: 0.6.1 -> 0.6.1 Changelog: https://github.com/napari/napari/releases/tag/v0.6.1 --- pkgs/development/python-modules/napari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index ed7736c072b7..4e3a41bc999f 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -45,14 +45,14 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "napari"; repo = "napari"; tag = "v${version}"; - hash = "sha256-OGEnB+GVqBwtYQegPuR7MOYFxmc4aNHCQt2+OKHLZ5M="; + hash = "sha256-qgyhoxXROlm+DASJV2QOA1IqpHxPhsIEv+TGU2mhiuc="; }; postPatch = '' From a3598eb3a417b501b61639e07f7520161554f937 Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Tue, 27 May 2025 11:51:48 -0400 Subject: [PATCH 21/55] pythonPackages.yara-x: 0.14.0 -> 0.15.0 --- pkgs/development/python-modules/yara-x/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix index 3e1eae5394ce..6d5be2c0fda7 100644 --- a/pkgs/development/python-modules/yara-x/default.nix +++ b/pkgs/development/python-modules/yara-x/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "yara-x"; - version = "0.14.0"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-x"; tag = "v${version}"; - hash = "sha256-C8wBGmilouNcNN3HkwvSTWcZY1fe0jVc2TeWDN4w5xA="; + hash = "sha256-fbuh/SMfOygnuvG9zTZqem4oLaS+5uXScXPhU3aVDjM="; }; buildAndTestSubdir = "py"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-afCBuWr12trjEIDvE0qnGFxTXU7LKZCzZB8RqgqperY="; + hash = "sha256-+dPIujaxDJ7JrtNvX4VjGHFmgtCb1BJpFQL4c3E1/GY="; }; nativeBuildInputs = [ From 7c8abc7f4572c39f25bb43f26ed225657b5ec01b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 17:46:53 +0000 Subject: [PATCH 22/55] skopeo: 1.18.0 -> 1.19.0 --- pkgs/by-name/sk/skopeo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix index abdc1c4ebd31..9e8eeff9ad1d 100644 --- a/pkgs/by-name/sk/skopeo/package.nix +++ b/pkgs/by-name/sk/skopeo/package.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-Ws01dYx2Jq/zB8rWiWSnV4ZgcxyBWHWvE3DfG7gvFOc="; + hash = "sha256-Xi3M8M8UukxwWXNTnbFLA8RIWa6CHs84PjrOvtJEl78="; }; outputs = [ From 842fa7428c9f8475a1972c92abf12370e3ca6eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Tue, 27 May 2025 19:47:25 +0200 Subject: [PATCH 23/55] vmTools: Use nixfmt-rfc-style from buildPackages set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `pkgs` might not contain the correct derivations if cross-compiling. Using `buildPackages` ensures that the executables come from the correct set. Signed-off-by: Marcel Müller --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index fe2e42855e0e..95bb2d6ea3c4 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -909,7 +909,7 @@ rec { nativeBuildInputs = [ buildPackages.perl buildPackages.dpkg - pkgs.nixfmt-rfc-style + buildPackages.nixfmt-rfc-style ]; } '' From 0808f06443b288979d0bba8cfbe5df210cca1956 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 19:30:29 +0000 Subject: [PATCH 24/55] fabric-ai: 1.4.187 -> 1.4.195 --- pkgs/by-name/fa/fabric-ai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 2f2a6ffc4cd6..14b0745c8bd7 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.187"; + version = "1.4.195"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${version}"; - hash = "sha256-5vUtw8ttNB2gjVgASfgWke5tCZGzEiSvk+c4K9555ck="; + hash = "sha256-83LlJ697CyW8Hmp6cB3RqeVk1OGuF6TUHcfKLqjgLPk="; }; - vendorHash = "sha256-ZrIzCKhEa00KOS8tauYEGLR4o7gGVVZ9pdfEQbAGDkI="; + vendorHash = "sha256-xfNvmhHNYpanhZKT9o8kImzw4gzigpgc8ri9O1iOqwc="; # Fabric introduced plugin tests that fail in the nix build sandbox. doCheck = false; From 4f081b542669e986df05cf7006a701de736200ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 19:50:42 +0000 Subject: [PATCH 25/55] zed-editor: 0.187.6 -> 0.187.9 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 71171c8a6106..c38458f5b57a 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.187.6"; + version = "0.187.9"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-aib6RJPkNQQmK+zVfNvf/LwfKuloj6xHN4tT8p0yPZo="; + hash = "sha256-BWn36z6EoyYRGtYZjWmTbu77M2wYNNBQ76u6MhKlkY4="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-fIOgakr2Wni8BJB7VD63worcHEwnL0WKI88kjJ4YTMg="; + cargoHash = "sha256-kXE+brvG8Z70Bla5SXGwRVX+fP8PtIPOkYXLhyJa4l8="; nativeBuildInputs = [ From 28131135b0dae49556ddc0d03718352631c91fcd Mon Sep 17 00:00:00 2001 From: Wolfgang Meier Date: Tue, 27 May 2025 22:54:18 +0200 Subject: [PATCH 26/55] add myself to maintainers file --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e700fe1e9e3..5c284998b6bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -26711,6 +26711,12 @@ githubId = 9132420; keys = [ { fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; } ]; }; + womeier = { + name = "Wolfgang Meier"; + email = "womeier@posteo.de"; + github = "womeier"; + githubId = 55190123; + }; womfoo = { email = "kranium@gikos.net"; github = "womfoo"; From 2ed3d938545b303348c8818f4ead3de453737e73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 22:16:42 +0000 Subject: [PATCH 27/55] postgresqlPackages.timescaledb-apache: 2.20.0 -> 2.20.1 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 09001e5d212c..d98e997ffbd2 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,13 +13,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.20.0"; + version = "2.20.1"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = finalAttrs.version; - hash = "sha256-CdunXknZoOnxYK3i37TMSR+ma2JAXLsRVSVaa0giJMA="; + hash = "sha256-eB88YPoK3uUhvbKP1mob5L+pyemxvGVuGGcJAXDDets="; }; nativeBuildInputs = [ cmake ]; From 28a9a44f7f845756867b64e67eb6b0c41f634031 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 22:22:33 +0000 Subject: [PATCH 28/55] nom: 2.8.0 -> 2.8.1 --- pkgs/by-name/no/nom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 59b38088fe9c..58fd59144f78 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; tag = "v${version}"; - hash = "sha256-2YXecurdmlho5LvkkMc97GiyrSy/kTZINTPtC+J+eL0="; + hash = "sha256-PqoTpy+Pz5OS+7pzzdxNKeqIZRipOvHKMs9o67XzdqY="; }; vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw="; From 22e89e88fe2bf78544351db3c898610fc6408e29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 22:24:20 +0000 Subject: [PATCH 29/55] mympd: 21.0.0 -> 21.0.1 --- pkgs/by-name/my/mympd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index d04843e56c44..faeafc52ac60 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "21.0.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-K86kOCJ9Fnf/ZvS11Tyf81mdKA9R5pgBz1XzDY4N/8E="; + sha256 = "sha256-A4wjnITpI9Cy5kIVljXvmnunsqJXFSi4CqBmlqVcqZM="; }; nativeBuildInputs = [ From c1c5d998c075b0d6d244319afa6958fe8000f54a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 23:18:54 +0000 Subject: [PATCH 30/55] cdncheck: 1.1.19 -> 1.1.20 --- pkgs/by-name/cd/cdncheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 4c74cb1c8f05..e913134cfa21 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.19"; + version = "1.1.20"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-Zp3ObJkK60g4VgH8e1aghHjCbueu/9FNru9RUx6uIuE="; + hash = "sha256-qL2SNVHsAH+Z0A5Vv+kBa1O9VgdR7eZ29Z19s5GuTXA="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; From 2bfb071649168502ea9c07799ffc24fdd848c145 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 23:27:34 +0000 Subject: [PATCH 31/55] cargo-edit: 0.13.4 -> 0.13.6 --- pkgs/by-name/ca/cargo-edit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix index 93b405e1c825..784aaf80976e 100644 --- a/pkgs/by-name/ca/cargo-edit/package.nix +++ b/pkgs/by-name/ca/cargo-edit/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.13.4"; + version = "0.13.6"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-gs7+OuW0av7p45+wgXVVS17YKTwIqDFQWc3kKE7y/Yw="; + hash = "sha256-z+LTgCeTUr3D0LEbw0yHlk1di2W95XewbYlgusD2TLg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JafagbF+JCp3ATtGjlExLDUehYqO9DhI39uD4fLafsQ="; + cargoHash = "sha256-/+DDA64kemZKzKdaKnXK+R4e8FV59qT5HCGcwyOz7R8="; nativeBuildInputs = [ pkg-config ]; From f0dbe45b28e3997c4cd36c49f81d9d60ad5e4af1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 23:53:49 +0000 Subject: [PATCH 32/55] python3Packages.databricks-sdk: 0.53.0 -> 0.55.0 --- pkgs/development/python-modules/databricks-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 61210550ece6..b8647c483e2e 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.53.0"; + version = "0.55.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-QuPoez1F9v87LGM0Ov6Wg2f5pLAr0uDqZ0b08Xda5+k="; + hash = "sha256-H/LtuqVRW3Ii/z/AU4d/PLxywG41G4aZH3xz+nOM0FY="; }; build-system = [ @@ -82,7 +82,7 @@ buildPythonPackage rec { meta = { description = "Databricks SDK for Python"; homepage = "https://github.com/databricks/databricks-sdk-py"; - changelog = "https://github.com/databricks/databricks-sdk-py/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/databricks/databricks-sdk-py/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; From aa01286569e779f544a68ea40127b8ac69c175b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 01:00:53 +0000 Subject: [PATCH 33/55] wgpu-native: 24.0.3.1 -> 25.0.2.1 --- pkgs/by-name/wg/wgpu-native/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix index 95988dddf8f3..9af1f9616686 100644 --- a/pkgs/by-name/wg/wgpu-native/package.nix +++ b/pkgs/by-name/wg/wgpu-native/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "wgpu-native"; - version = "24.0.3.1"; + version = "25.0.2.1"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu-native"; tag = "v${version}"; - hash = "sha256-0GPwTm23i/UMoGQ71qybQS9sHN7XTtiPAZWG229Tn2k="; + hash = "sha256-w0qzJxdJioiQAmsh56vLaR34TjaUK/qqHhWcvO93IQ8="; fetchSubmodules = true; }; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-sYwDbSglOS8h8XG5sC6yX5JfRmmmc8v8mxPBicoKxEU="; + cargoHash = "sha256-iOnz//eHQ6WRPWOGcKOXyuwZS9WcbJWslRAz8yDamn8="; nativeBuildInputs = [ rustPlatform.bindgenHook From c689a968aee514f8e9eafa3b6e2c40191f693ea6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 01:19:00 +0000 Subject: [PATCH 34/55] e1s: 1.0.47 -> 1.0.48 --- pkgs/by-name/e1/e1s/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix index adf6a1742977..aacc410d5a07 100644 --- a/pkgs/by-name/e1/e1s/package.nix +++ b/pkgs/by-name/e1/e1s/package.nix @@ -5,7 +5,7 @@ }: let pname = "e1s"; - version = "1.0.47"; + version = "1.0.48"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "keidarcy"; repo = "e1s"; tag = "v${version}"; - hash = "sha256-5lb2j3cfQ2W+r+3UOdxXt15PQNWIMRM+pwChdzL+HUQ="; + hash = "sha256-pURUTWlj0iOfHpc4BheprfgAuK05sZDGLbCF/T3LN9w="; }; vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY="; From 5de973ef09ab899254e6178ee582d940db044d74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 02:00:57 +0000 Subject: [PATCH 35/55] lint-staged: 16.0.0 -> 16.1.0 --- pkgs/by-name/li/lint-staged/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 68e16790e4bc..a4c7b302b818 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "16.0.0"; + version = "16.1.0"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-vMk8KrWkrMETEGUev0C5ZaMFZH95/VaASr9v5nI2JGo="; + hash = "sha256-dR0z/60CHDqCl9pEc9KQww1S5aSZ4XGsfNqxBSZe0Ig="; }; - npmDepsHash = "sha256-lj1+a/+X/0Qj41S+C50Z5cQfu/5KUgXgls+tYbN16OU="; + npmDepsHash = "sha256-MznWvv61Z+8t+Nicj6yWlQqUHVx7AAtkDXu2L2E5dw8="; dontNpmBuild = true; From c65eab4d427f73c9a227f6e72fdec01af19d3558 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 02:04:06 +0000 Subject: [PATCH 36/55] cargo-shear: 1.2.7 -> 1.3.0 --- pkgs/by-name/ca/cargo-shear/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 96815b728efd..e10c1d9c5237 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.2.7"; + version = "1.3.0"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-IOTlDLHSFH93tgCaF8ZOboIRkGImcT+oDfbmKKjNDlM="; + hash = "sha256-OOjN6JI5RWo2J2awX3ts4wlVptQ1mhQEk8acNOVjFz0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6Pu7qFOT9fPjtgjNqZ4mF37xNLuCIl1U3a23vGpRs4k="; + cargoHash = "sha256-ha/soHq6lEZUQ/gfk4zQkRBGN3S6npJ2CHI2oyjDsXA="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; From 9d64a0b45266133d8f6b394e116f8f59c11dc098 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 24 May 2025 22:15:55 +0900 Subject: [PATCH 37/55] cryptpad: fix broken symlink that renders cryptpad unusable This fixes a broken symlink after install; there probably is a better way to do it but that'll work and ideally new test will catch this breaking again. Fixes: #404114 --- pkgs/by-name/cr/cryptpad/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix index 804ff3c72a29..ffb27ee1bb8a 100644 --- a/pkgs/by-name/cr/cryptpad/package.nix +++ b/pkgs/by-name/cr/cryptpad/package.nix @@ -120,6 +120,8 @@ buildNpmPackage { # Move to install directory manually. npm run install:components mv www/components "$out_cryptpad/www/" + # and fix absolute symlink to /build... + ln -Tfs ../../src/tweetnacl "$out_cryptpad/www/components/tweetnacl" # install OnlyOffice (install-onlyoffice.sh without network) mkdir -p "$out_cryptpad/www/common/onlyoffice/dist" From 18ca00d03e1b1ff8a3d7f2536e369dac14221500 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 24 May 2025 22:15:11 +0900 Subject: [PATCH 38/55] nixos/cryptpad: add selenium test This catches more errors than just the curl test we had previously, e.g. it catches 404 on tweetnacl fixed by the following commit Link: https://github.com/NixOS/nixpkgs/issues/404114#issuecomment-2906588917 --- nixos/tests/cryptpad.nix | 50 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/nixos/tests/cryptpad.nix b/nixos/tests/cryptpad.nix index 9d6af15f5f86..f18649dd4af7 100644 --- a/nixos/tests/cryptpad.nix +++ b/nixos/tests/cryptpad.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ lib, pkgs, ... }: let certs = pkgs.runCommand "cryptpadSelfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' mkdir -p $out @@ -12,6 +12,48 @@ let test_write_data = pkgs.writeText "cryptpadTestData" '' {"command":"WRITE_BLOCK","content":{"publicKey":"O2onvM62pC1io6jQKm8Nc2UyFXcd4kOmOsBIoYtZ2ik=","signature":"aXcM9SMO59lwA7q7HbYB+AnzymmxSyy/KhkG/cXIBVzl8v+kkPWXmFuWhcuKfRF8yt3Zc3ktIsHoFyuyDSAwAA==","ciphertext":"AFwCIfBHKdFzDKjMg4cu66qlJLpP+6Yxogbl3o9neiQou5P8h8yJB8qgnQ=="},"publicKey":"O2onvM62pC1io6jQKm8Nc2UyFXcd4kOmOsBIoYtZ2ik=","nonce":"bitSbJMNSzOsg98nEzN80a231PCkBQeH"} ''; + seleniumScript = + pkgs.writers.writePython3Bin "selenium-script" + { + libraries = with pkgs.python3Packages; [ selenium ]; + } + '' + from sys import stderr + from time import time + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC + + options = Options() + options.add_argument("--headless") + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 + + driver = webdriver.Firefox(options=options, service=service) + driver.implicitly_wait(10) + driver.get("https://cryptpad.localhost") + + WebDriverWait(driver, 10).until( + EC.text_to_be_present_in_element( + (By.TAG_NAME, "body"), "CryptPad") + ) + + driver.find_element(By.PARTIAL_LINK_TEXT, "Sheet").click() + + # Title changes once the sheet is rendered, which can take + # a lot of time on first run (browser generates keypair etc) + start = time() + WebDriverWait(driver, 60).until( + EC.title_contains('Sheet') + ) + print(f"Sheets done loading in {time() - start}", file=stderr) + + # check screen looks sane... + # driver.print_page() and dump pdf somewhere through pdftotext? OCR? + + driver.close() + ''; in { name = "cryptpad"; @@ -20,6 +62,9 @@ in }; nodes.machine = { + environment.systemPackages = [ + pkgs.firefox-unwrapped + ]; services.cryptpad = { enable = true; configureNginx = true; @@ -62,6 +107,9 @@ in # test some API (e.g. check cryptpad main process) machine.succeed("curl --fail -d @${test_write_data} -H 'Content-Type: application/json' https://cryptpad.localhost/api/auth") + # page loads + machine.succeed("${lib.getExe seleniumScript}") + # test telemetry has been disabled machine.fail("journalctl -u cryptpad | grep TELEMETRY"); From 5aba71fa5ff6d2692954b0b34dc76acd423a6d72 Mon Sep 17 00:00:00 2001 From: Christopher Schnick Date: Wed, 28 May 2025 06:14:54 +0200 Subject: [PATCH 39/55] xpipe: 14.2 -> 16.4.1 --- pkgs/by-name/xp/xpipe/package.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 073fda85e381..67c153fb2983 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-u2T2pKO+rOs29Un8dKc+sUqBJiruu6GS6wzrJhKKW9Y="; + x86_64-linux = "sha256-Ma2WWknZ0rF9NZNqOaPyQ2eil34HWmgSIHMnfaSaFjs="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "14.2"; + version = "16.4.1"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; @@ -90,7 +90,7 @@ stdenvNoCC.mkDerivation rec { categories = [ "Network" ]; comment = "Your entire server infrastructure at your fingertips"; desktopName = displayname; - exec = "/opt/${pname}/cli/bin/xpipe open %U"; + exec = "/opt/${pname}/bin/xpipe open %U"; genericName = "Shell connection hub"; icon = "/opt/${pname}/logo.png"; name = displayname; @@ -104,22 +104,19 @@ stdenvNoCC.mkDerivation rec { cp -r ./ $out/opt/$pkg mkdir -p "$out/bin" - ln -s "$out/opt/$pkg/cli/bin/xpipe" "$out/bin/$pkg" + ln -s "$out/opt/$pkg/bin/xpipe" "$out/bin/$pkg" mkdir -p "$out/share/applications" cp -r "${desktopItem}/share/applications/" "$out/share/" - mkdir -p "$out/etc/bash_completion.d" - ln -s "$out/opt/$pkg/cli/xpipe_completion" "$out/etc/bash_completion.d/$pkg" - substituteInPlace "$out/share/applications/${displayname}.desktop" --replace "Exec=" "Exec=$out" substituteInPlace "$out/share/applications/${displayname}.desktop" --replace "Icon=" "Icon=$out" - mv "$out/opt/$pkg/app/bin/xpiped" "$out/opt/$pkg/app/bin/xpiped_raw" - mv "$out/opt/$pkg/app/lib/app/xpiped.cfg" "$out/opt/$pkg/app/lib/app/xpiped_raw.cfg" - mv "$out/opt/$pkg/app/scripts/xpiped_debug.sh" "$out/opt/$pkg/app/scripts/xpiped_debug_raw.sh" + mv "$out/opt/$pkg/bin/xpiped" "$out/opt/$pkg/bin/xpiped_raw" + mv "$out/opt/$pkg/lib/app/xpiped.cfg" "$out/opt/$pkg/lib/app/xpiped_raw.cfg" + mv "$out/opt/$pkg/scripts/xpiped_debug.sh" "$out/opt/$pkg/scripts/xpiped_debug_raw.sh" - makeShellWrapper "$out/opt/$pkg/app/bin/xpiped_raw" "$out/opt/$pkg/app/bin/xpiped" \ + makeShellWrapper "$out/opt/$pkg/bin/xpiped_raw" "$out/opt/$pkg/bin/xpiped" \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ fontconfig @@ -129,7 +126,8 @@ stdenvNoCC.mkDerivation rec { socat ] }" - makeShellWrapper "$out/opt/$pkg/app/scripts/xpiped_debug_raw.sh" "$out/opt/$pkg/app/scripts/xpiped_debug.sh" \ + + makeShellWrapper "$out/opt/$pkg/scripts/xpiped_debug_raw.sh" "$out/opt/$pkg/scripts/xpiped_debug.sh" \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ fontconfig From 230ca6f245d37eb979832ed28dc9a91c1cda31cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 05:07:06 +0000 Subject: [PATCH 40/55] libretro.pcsx-rearmed: 0-unstable-2025-04-13 -> 0-unstable-2025-05-23 --- pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix index 7dc31a0a0e86..ec7e3909c091 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "pcsx-rearmed"; - version = "0-unstable-2025-04-13"; + version = "0-unstable-2025-05-23"; src = fetchFromGitHub { owner = "libretro"; repo = "pcsx_rearmed"; - rev = "febf2246848efb8937ab24c562bba20107bb46f0"; - hash = "sha256-1mnPYr5A6KmZXXbvkE9XkZiCjx/y0Y9/Ed34LQHDbvE="; + rev = "6365a756c02d25c76bf90c78e42316b46f876c49"; + hash = "sha256-7bL+3+AfbN9FBhMaF8FzZhGZ0OgKGCT+M/5KVYd9Tt0="; }; dontConfigure = true; From 9cd1c58ae8f781aabecb9b3e4e8ece8a2aa21f7b Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Fri, 23 May 2025 07:20:10 +0200 Subject: [PATCH 41/55] amp-cli: 0.0.1748347293-g7a57b5 -> 0.0.1748404992-ga3f78f Main reason for this update is to update the description which shouldn't end in a period. --- pkgs/by-name/am/amp-cli/package-lock.json | 8 ++++---- pkgs/by-name/am/amp-cli/package.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 13a4e829e76e..28c2a16ea664 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1748347293-g7a57b5" + "@sourcegraph/amp": "^0.0.1748404992-ga3f78f" } }, "node_modules/@colors/colors": { @@ -29,9 +29,9 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1748347293-g7a57b5", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748347293-g7a57b5.tgz", - "integrity": "sha512-gftyQ7jHEo1AmyP8khbTYfkGWlAzfk6TyVw11WdO3bsjVT16yWnp0nWqW1W1X0BCbDiKdyRNasR1JadZH4+gGQ==", + "version": "0.0.1748404992-ga3f78f", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748404992-ga3f78f.tgz", + "integrity": "sha512-+BvCW8zrbO7ENRzMg0LdAeKigjzL+ASIDBjJ/m2uL2CVT8WPk1h34FTNCbvnO6kssimEtdP8FcxR/2O4AHwUbA==", "dependencies": { "@types/runes": "^0.4.3", "@vscode/ripgrep": "1.15.11", diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index ba3834819581..f62ec5f897ea 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -8,11 +8,11 @@ buildNpmPackage rec { pname = "amp-cli"; - version = "0.0.1748347293-g7a57b5"; + version = "0.0.1748404992-ga3f78f"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${version}.tgz"; - hash = "sha256-15R7RojQgF9B5voQfsB0aLNIBR2M7qqLNpMa950pAKM="; + hash = "sha256-axd5VP7afa4ptAl/y8CEVguqoRKVRhWfRDSI0sgyXqA="; }; postPatch = '' @@ -44,7 +44,7 @@ buildNpmPackage rec { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-4CSXRNCKgRunMZvFM2w6wrAcTb03iPjPprTm67fHZ9Q="; + npmDepsHash = "sha256-05+hBr+eX3I92U9TsqPQrYcJCmKXTvz3n6ZTxR1XvC8="; propagatedBuildInputs = [ ripgrep @@ -71,7 +71,7 @@ buildNpmPackage rec { passthru.updateScript = ./update.sh; meta = { - description = "Amp is an AI coding agent, in research preview from Sourcegraph. This is the CLI for Amp."; + description = "CLI for Amp, an agentic coding agent in research preview from Sourcegraph"; homepage = "https://ampcode.com/"; downloadPage = "https://www.npmjs.com/package/@sourcegraph/amp"; license = lib.licenses.unfree; From 20b87a2b145996abee2a8a40c60a5f8ab7c2f08e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 05:27:19 +0000 Subject: [PATCH 42/55] polarity: latest-unstable-2025-05-14 -> latest-unstable-2025-05-19 --- pkgs/by-name/po/polarity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index 0e3d35aae305..3d65af77c032 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2025-05-14"; + version = "latest-unstable-2025-05-19"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "6c0370011b827886e87b7afec644788a1a54f6f7"; - hash = "sha256-RKuL0gn734eqNQHIsSA0kLF1qUNtyEUpYf8Zv359GAs="; + rev = "b715e6529210242d79f304d34170eba8473174b2"; + hash = "sha256-/yq6fqjkZoEw4MhsOWlRdQciA/Wqds9TgCczcVQV8Rw="; }; useFetchCargoVendor = true; From 25c2b295bf5041ae0585bd978194b411c5b08b5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 06:40:54 +0000 Subject: [PATCH 43/55] python3Packages.elevenlabs: 2.0.0 -> 2.2.0 --- pkgs/development/python-modules/elevenlabs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index 970f98c7cbed..a74a12f99d77 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.0.0"; + version = "2.2.0"; tag = "v${version}"; in buildPythonPackage { @@ -25,7 +25,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-QiV/B0ikXxEGs9UQUeqkPqdgxPwQi6UQ+tj6KT30Rv8="; + hash = "sha256-XZld32WJlZKnVQAUQV9FfJZgNOlW4JKVCqVdb8xCO7I="; }; build-system = [ poetry-core ]; From 9e287e88e85887cd7c7dc3c4514d249171ae0838 Mon Sep 17 00:00:00 2001 From: Wolfgang Meier Date: Tue, 27 May 2025 22:42:23 +0200 Subject: [PATCH 44/55] initial coq package parseque version 0.2.2 --- .../coq-modules/parseque/default.nix | 37 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/coq-modules/parseque/default.nix diff --git a/pkgs/development/coq-modules/parseque/default.nix b/pkgs/development/coq-modules/parseque/default.nix new file mode 100644 index 000000000000..def3689a3911 --- /dev/null +++ b/pkgs/development/coq-modules/parseque/default.nix @@ -0,0 +1,37 @@ +{ + lib, + mkCoqDerivation, + which, + coq, + version ? null, +}: + +with lib; +mkCoqDerivation { + pname = "parseque"; + repo = "parseque"; + owner = "rocq-community"; + + inherit version; + defaultVersion = + with versions; + switch + [ coq.coq-version ] + [ + { + cases = [ (range "8.16" "8.20") ]; + out = "0.2.2"; + } + ] + null; + + release."0.2.2".sha256 = "sha256-O50Rs7Yf1H4wgwb7ltRxW+7IF0b04zpfs+mR83rxT+E="; + + releaseRev = v: "v${v}"; + + meta = { + description = "Total parser combinators in Rocq"; + maintainers = with maintainers; [ womeier ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 81c9423e6b21..83cc3bde1585 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -187,6 +187,7 @@ let paco = callPackage ../development/coq-modules/paco { }; paramcoq = callPackage ../development/coq-modules/paramcoq { }; parsec = callPackage ../development/coq-modules/parsec { }; + parseque = callPackage ../development/coq-modules/parseque { }; pocklington = callPackage ../development/coq-modules/pocklington { }; QuickChick = callPackage ../development/coq-modules/QuickChick { }; reglang = callPackage ../development/coq-modules/reglang { }; From 7c7d6c432113bca02ca6bbd6a2390272ecde8956 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 06:46:51 +0000 Subject: [PATCH 45/55] libretro.stella: 0-unstable-2025-05-17 -> 0-unstable-2025-05-21 --- pkgs/applications/emulators/libretro/cores/stella.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index 485f488307a5..96e5b6afdad9 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2025-05-17"; + version = "0-unstable-2025-05-21"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "8421af89314bbdcf118d4b3884a9f566e4b1020e"; - hash = "sha256-uffcz8TXb0vEivOEcnL288YT8rspSOGcNdXtGijXX1g="; + rev = "3d3f223a17fe065c7dee1ff440f0309eb8583009"; + hash = "sha256-RR6/zRqFUctWc+Rrbm+4Twk6GZwpPgYHgFP65sL6UN8="; }; makefile = "Makefile"; From b0e6c71f954eddb8822d031f33ab773bcfbde908 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 28 May 2025 08:49:01 +0200 Subject: [PATCH 46/55] python312Packages.pymc: 5.22.0 -> 5.23.0 Diff: https://github.com/pymc-devs/pymc/compare/refs/tags/v5.22.0...refs/tags/v5.23.0 Changelog: https://github.com/pymc-devs/pymc/releases/tag/v5.23.0 --- pkgs/development/python-modules/pymc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 8f2ea6ee717a..d6a478165ea5 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.22.0"; + version = "5.23.0"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; tag = "v${version}"; - hash = "sha256-NQYvtt/cjssJ7Lv3RyDeBMQByKMmt1p0X9F+LqhtTV4="; + hash = "sha256-Hlj5kOSMz8uoqeBkLiq9kT6CZrb2XJW9mas45G2EZB4="; }; build-system = [ From 547b2b43756b4b5c3313a3e1f528113603a77f19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 22:17:29 +0000 Subject: [PATCH 47/55] ocamlPackages.containers: 3.15 -> 3.16 --- pkgs/development/ocaml-modules/containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 804cea216a4b..c5888c737a5a 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -14,7 +14,7 @@ }: buildDunePackage rec { - version = "3.15"; + version = "3.16"; pname = "containers"; minimalOCamlVersion = "4.08"; @@ -23,7 +23,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - hash = "sha256-PMtyJOuw+9u6rF5EGif/66ZSbkTu1Msgke9JVpDWC1c="; + hash = "sha256-WaHAZRLjaEJUba/I2r3Yof/iUqA3PFUuVbzm88izG1k="; }; buildInputs = [ dune-configurator ]; From af0cee180a0126056cf5f50c03e1846778bd8456 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 07:49:04 +0000 Subject: [PATCH 48/55] vscode-extensions.svelte.svelte-vscode: 109.8.0 -> 109.8.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9448bc408906..ee70a4a68dcd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4669,8 +4669,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "109.8.0"; - hash = "sha256-T0pNjjeKKX/T1Oc+zvOHu74H4r4F9Ogk5gDV7z0+D9I="; + version = "109.8.1"; + hash = "sha256-ILZ7YA7LngwpU3U+qsgHPd+oxyqLNGRiKUCFC/OMBAo="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; From 57e45731129ea83f281301b4e6ab52917f616c1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 07:58:49 +0000 Subject: [PATCH 49/55] openstack-rs: 0.12.0 -> 0.12.1 --- pkgs/by-name/op/openstack-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix index 836eac472b81..a865f74b9e2a 100644 --- a/pkgs/by-name/op/openstack-rs/package.nix +++ b/pkgs/by-name/op/openstack-rs/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "openstack-rs"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "gtema"; repo = "openstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-n3tVkEDn5giAYxcFWI/sc0yCjK1A80L7+dp44QXoCc4="; + hash = "sha256-jJNEZF0aGD4pdKWdWOa64nIr/CKJlBL7Vo9MFiQ54xo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lu3OeBP2fHGX1SV1LnDv/RCAVhoEVZIRiMoXWJ3H4IQ="; + cargoHash = "sha256-edKIJM4FQ/SmR7IU/7WxNm+hHouXMWUV8n3rbKzvV0A="; nativeBuildInputs = [ installShellFiles From 8eee3798969670e8c3850e1eb05a5018f7064e94 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 28 May 2025 10:16:23 +0200 Subject: [PATCH 50/55] python312Packages.nutpie: 0.14.3 -> 0.15.0 Diff: https://github.com/pymc-devs/nutpie/compare/refs/tags/v0.14.3...refs/tags/v0.15.0 Changelog: https://github.com/pymc-devs/nutpie/blob/v0.15.0/CHANGELOG.md --- pkgs/development/python-modules/nutpie/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix index e627c3d23fe0..1543a38f9e93 100644 --- a/pkgs/development/python-modules/nutpie/default.nix +++ b/pkgs/development/python-modules/nutpie/default.nix @@ -31,20 +31,20 @@ buildPythonPackage rec { pname = "nutpie"; - version = "0.14.3"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "nutpie"; tag = "v${version}"; - hash = "sha256-l2TEGa9VVJmU4mKZwfUdhiloW6Bh41OqIQzTRvYK3eg="; + hash = "sha256-451dkBysxPAhG71Z4Wnx8pQ0jV3vqmJYiNzWP9ylMM0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-hPKT+YM9s7XZhI3sfnLBfokbGQhwDa9y5Fgg1TItO4M="; + hash = "sha256-k17M2YhhNQWfxJCI0LX7FuwSgbpv2WtJw8X2+PF/g4M="; }; build-system = [ @@ -82,6 +82,10 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; + pytestFlagsArray = [ + "-v" + ]; + disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # flaky (assert np.float64(0.0017554642626285276) > 0.01) "test_normalizing_flow" From 07a2ef8a4aedf3cb67b444455a5e7815fcce7946 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 05:10:37 +0000 Subject: [PATCH 51/55] dotnet-repl: 0.3.239 -> 0.3.247 --- pkgs/by-name/do/dotnet-repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dotnet-repl/package.nix b/pkgs/by-name/do/dotnet-repl/package.nix index 3941b45926fa..eb9cda528b7d 100644 --- a/pkgs/by-name/do/dotnet-repl/package.nix +++ b/pkgs/by-name/do/dotnet-repl/package.nix @@ -6,15 +6,15 @@ buildDotnetGlobalTool { pname = "dotnet-repl"; - version = "0.3.239"; + version = "0.3.247"; dotnet-sdk = dotnetCorePackages.sdk_9_0; dotnet-runtime = dotnetCorePackages.runtime_9_0; - nugetHash = "sha256-wn4i0zC56gxnjsgjdiMxLinmUsSROhmimu0lmBZo1hA="; + nugetHash = "sha256-nD5GqLG+3VAWMy/8E9XviwJq2wKBg+BISlcB4xWtrx4="; meta = { - description = "A polyglot REPL built on .NET Interactive"; + description = "Polyglot REPL built on .NET Interactive"; homepage = "https://github.com/jonsequitur/dotnet-repl"; license = lib.licenses.mit; mainProgram = "dotnet-repl"; From 99c53376ed0273ef8200f3c27157b4199e9e38e9 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 28 May 2025 11:47:19 +0100 Subject: [PATCH 52/55] google-chrome: 136.0.7103.113->137.0.7151.55 --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index a9dc1a5ce219..e14866776f08 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -171,11 +171,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "136.0.7103.113"; + version = "137.0.7151.55"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-BnKKu7X34g+zg4rDqjVXT3Kx2E8Gn5ELqs3LQS3GCkg="; + hash = "sha256-Q4zf60OQN/2NRozssVrnmbYWGRm05Mt2/6LozfENzgM="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -276,11 +276,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "137.0.7151.41"; + version = "137.0.7151.56"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acracoudzvaateoc4hi5umv6pobq_137.0.7151.41/GoogleChrome-137.0.7151.41.dmg"; - hash = "sha256-egOl4mjsIxjWxYTLI38U2LqrIs85+cmZG9oEXe/bF7Q="; + url = "http://dl.google.com/release2/chrome/acps6il5fco5kfidgoaidec3sdha_137.0.7151.56/GoogleChrome-137.0.7151.56.dmg"; + hash = "sha256-nFk2qg8+9gipnG+4u1sRO4Uq5Iv4TVvxaTETHzF+huw="; }; dontPatch = true; From 226d943beb25844ab3bdef026d97da2f493438be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 10:56:08 +0000 Subject: [PATCH 53/55] tbls: 1.85.3 -> 1.85.4 --- pkgs/by-name/tb/tbls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index c2b38588ce33..4d5b68871deb 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.85.3"; + version = "1.85.4"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-07Xx/BoBXCQuZHveH00Wn65POnTpfDx8rfIcbqSoQLg="; + hash = "sha256-K+GIETe/SpBCgJS7KD8Rw8z1zrmnXdYjjTyl36pUzmg="; }; vendorHash = "sha256-Sqr5UiT4NNiFKNEqZRDbS92AYa9SKWqYTYl4Ljx/raY="; From 54a8cac5ca672001c4cae44aebdb40cdbbca9ed0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 May 2025 22:15:28 +0200 Subject: [PATCH 54/55] python313Packages.python-bsblan: 1.2.1 -> 1.2.2 Diff: https://github.com/liudger/python-bsblan/compare/refs/tags/v1.2.1...refs/tags/v1.2.2 Changelog: https://github.com/liudger/python-bsblan/releases/tag/v1.2.2 --- pkgs/development/python-modules/python-bsblan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index bd508b0307f9..53967ac7a55d 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "liudger"; repo = "python-bsblan"; tag = "v${version}"; - hash = "sha256-b+/Cy8F2xUsYOr8PGQxkdXD07pAECNmbeWbuysSAT2I="; + hash = "sha256-qzQP77bfV21g7DIdZfJCyv9FN/U6aQk9wWV9xPZFolk="; }; postPatch = '' From c464c44a42739a53a019e616055cbf4b8357871b Mon Sep 17 00:00:00 2001 From: hand7s <117505144+s0me1newithhand7s@users.noreply.github.com> Date: Wed, 28 May 2025 14:27:36 +0300 Subject: [PATCH 55/55] nixos/gnome & nixos/gdm: move out of x11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since DEs like KDE Plasma 6, GNOME and COSMIC are not designed to be X11-exclusive, putting them under `services.xserver` is misleading. In particular, GNOME defaults to Wayland these days and X11 support is going to be dropped in near future. Let’s follow Plasma and move GNOME NixOS options out of `xserver` attribute. This patch does not include any changes to X11 support itself. Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- .github/labeler.yml | 2 +- .../manual/configuration/x-windows.chapter.md | 4 +- .../manual/release-notes/rl-2505.section.md | 2 +- ...tallation-cd-graphical-calamares-gnome.nix | 4 +- .../installation-cd-graphical-gnome.nix | 4 +- nixos/modules/module-list.nix | 2 +- nixos/modules/programs/gpaste.nix | 2 +- .../programs/nautilus-open-any-terminal.nix | 2 +- nixos/modules/programs/zoom-us.nix | 2 +- .../{x11 => }/desktop-managers/gnome.md | 16 ++--- .../{x11 => }/desktop-managers/gnome.nix | 44 +++++++++++-- .../services/display-managers/default.nix | 2 +- .../{x11 => }/display-managers/gdm.nix | 64 ++++++++++++++----- .../services/x11/desktop-managers/default.nix | 2 +- .../modules/services/x11/terminal-server.nix | 2 +- nixos/modules/services/x11/xserver.nix | 2 +- nixos/release.nix | 4 +- nixos/tests/gnome-extensions.nix | 4 +- nixos/tests/gnome-flashback.nix | 12 ++-- nixos/tests/gnome-xorg.nix | 10 +-- nixos/tests/gnome.nix | 10 +-- nixos/tests/nixos-generate-config.nix | 6 +- pkgs/by-name/gd/gdm/package.nix | 2 +- pkgs/by-name/ne/nemo-seahorse/package.nix | 2 +- 24 files changed, 134 insertions(+), 72 deletions(-) rename nixos/modules/services/{x11 => }/desktop-managers/gnome.md (92%) rename nixos/modules/services/{x11 => }/desktop-managers/gnome.nix (91%) rename nixos/modules/services/{x11 => }/display-managers/gdm.nix (86%) diff --git a/.github/labeler.yml b/.github/labeler.yml index 7f1ac6d2ea32..f97045795fdd 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -162,7 +162,7 @@ - any-glob-to-any-file: - doc/languages-frameworks/gnome.section.md - nixos/modules/services/desktops/gnome/**/* - - nixos/modules/services/x11/desktop-managers/gnome.nix + - nixos/modules/services/desktop-managers/gnome.nix - nixos/tests/gnome-xorg.nix - nixos/tests/gnome.nix - pkgs/desktops/gnome/**/* diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index ec07e146de93..5569f9d123ed 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -29,7 +29,7 @@ Thus you should pick one or more of the following lines: { services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.xfce.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.desktopManager.gnome.enable = true; services.xserver.desktopManager.mate.enable = true; services.xserver.windowManager.xmonad.enable = true; services.xserver.windowManager.twm.enable = true; @@ -46,7 +46,7 @@ alternative one by picking one of the following lines: ```nix { services.displayManager.sddm.enable = true; - services.xserver.displayManager.gdm.enable = true; + services.displayManager.gdm.enable = true; } ``` diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 883ccb4e7abb..7a3982c95795 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -20,7 +20,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th - GNOME has been updated to version 48. - `decibels` music player is now installed by default. You can disable it using [](#opt-environment.gnome.excludePackages). - - `gnome-shell-extensions` extension collection (which included GNOME Classic extensions, Apps Menu, and User Themes, among others) are no longer installed by default. You can install them again with [](#opt-services.xserver.desktopManager.gnome.sessionPath). + - `gnome-shell-extensions` extension collection (which included GNOME Classic extensions, Apps Menu, and User Themes, among others) are no longer installed by default. You can install them again with {option}`services.xserver.desktopManager.gnome.sessionPath`. - Option [](#opt-services.gnome.core-developer-tools.enable) now also installs `sysprof` and `d-spy`. - Option `services.gnome.core-utilities.enable` has been renamed to [](#opt-services.gnome.core-apps.enable). - `cantarell-fonts`, `source-code-pro` and `source-sans` fonts are no longer installed by default. They have been replaced by `adwaita-fonts`. diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix index eda704381db0..1a5e741c4597 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix @@ -7,7 +7,7 @@ isoImage.edition = lib.mkDefault "gnome"; - services.xserver.desktopManager.gnome = { + services.desktopManager.gnome = { # Add Firefox and other tools useful for installation to the launcher favoriteAppsOverride = '' [org.gnome.shell] @@ -35,7 +35,7 @@ QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")"; }; - services.xserver.displayManager.gdm = { + services.displayManager.gdm = { enable = true; # autoSuspend makes the machine automatically suspend after inactivity. # It's possible someone could/try to ssh'd into the machine and obviously diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 7b355b191455..afee096d8579 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -7,7 +7,7 @@ isoImage.edition = lib.mkDefault "gnome"; - services.xserver.desktopManager.gnome = { + services.desktopManager.gnome = { # Add Firefox and other tools useful for installation to the launcher favoriteAppsOverride = '' [org.gnome.shell] @@ -16,7 +16,7 @@ enable = true; }; - services.xserver.displayManager.gdm = { + services.displayManager.gdm = { enable = true; # autoSuspend makes the machine automatically suspend after inactivity. # It's possible someone could/try to ssh'd into the machine and obviously diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f864dbf613b2..caa775b7a11e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -589,6 +589,7 @@ ./services/development/zammad.nix ./services/display-managers/cosmic-greeter.nix ./services/display-managers/default.nix + ./services/display-managers/gdm.nix ./services/display-managers/greetd.nix ./services/display-managers/ly.nix ./services/display-managers/sddm.nix @@ -1706,7 +1707,6 @@ ./services/x11/colord.nix ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/default.nix - ./services/x11/display-managers/gdm.nix ./services/x11/display-managers/lightdm.nix ./services/x11/display-managers/slim.nix ./services/x11/display-managers/startx.nix diff --git a/nixos/modules/programs/gpaste.nix b/nixos/modules/programs/gpaste.nix index 042bd812cca7..4918edc95bfa 100644 --- a/nixos/modules/programs/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -27,7 +27,7 @@ services.dbus.packages = [ pkgs.gpaste ]; systemd.packages = [ pkgs.gpaste ]; # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. - services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gpaste ]; + services.desktopManager.gnome.sessionPath = [ pkgs.gpaste ]; # gpaste-reloaded applet doesn't work without the typelib services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ]; }; diff --git a/nixos/modules/programs/nautilus-open-any-terminal.nix b/nixos/modules/programs/nautilus-open-any-terminal.nix index 41f26e03d312..1293f6892375 100644 --- a/nixos/modules/programs/nautilus-open-any-terminal.nix +++ b/nixos/modules/programs/nautilus-open-any-terminal.nix @@ -28,7 +28,7 @@ in nautilus-open-any-terminal ]; - environment.sessionVariables = lib.mkIf (!config.services.xserver.desktopManager.gnome.enable) { + environment.sessionVariables = lib.mkIf (!config.services.desktopManager.gnome.enable) { NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4"; }; diff --git a/nixos/modules/programs/zoom-us.nix b/nixos/modules/programs/zoom-us.nix index 22c6e3f8eedd..b5b6c8acf7b6 100644 --- a/nixos/modules/programs/zoom-us.nix +++ b/nixos/modules/programs/zoom-us.nix @@ -33,7 +33,7 @@ # Support GNOME desktop environment if it's enabled on the system. gnomeXdgDesktopPortalSupport = - prev.gnomeXdgDesktopPortalSupport or config.services.xserver.desktopManager.gnome.enable; + prev.gnomeXdgDesktopPortalSupport or config.services.desktopManager.gnome.enable; # Support Hyprland desktop for Wayland if it's enabled on the system. hyprlandXdgDesktopPortalSupport = diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/desktop-managers/gnome.md similarity index 92% rename from nixos/modules/services/x11/desktop-managers/gnome.md rename to nixos/modules/services/desktop-managers/gnome.md index 7f7801305e23..4b45b0872aa7 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.md +++ b/nixos/modules/services/desktop-managers/gnome.md @@ -10,8 +10,8 @@ To enable the GNOME desktop use: ```nix { - services.xserver.desktopManager.gnome.enable = true; - services.xserver.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; } ``` @@ -76,17 +76,17 @@ GNOME Flashback provides a desktop environment based on the classic GNOME 2 arch ```nix { - services.xserver.desktopManager.gnome.flashback.enableMetacity = true; + services.desktopManager.gnome.flashback.enableMetacity = true; } ``` -It is also possible to create custom sessions that replace Metacity with a different window manager using [](#opt-services.xserver.desktopManager.gnome.flashback.customSessions). +It is also possible to create custom sessions that replace Metacity with a different window manager using [](#opt-services.desktopManager.gnome.flashback.customSessions). The following example uses `xmonad` window manager: ```nix { - services.xserver.desktopManager.gnome.flashback.customSessions = [ + services.desktopManager.gnome.flashback.customSessions = [ { wmName = "xmonad"; wmLabel = "XMonad"; @@ -143,10 +143,10 @@ Overrides really only change the default values for GSettings keys so if you or ::: You can override the default GSettings values using the -[](#opt-services.xserver.desktopManager.gnome.extraGSettingsOverrides) option. +[](#opt-services.desktopManager.gnome.extraGSettingsOverrides) option. Take note that whatever packages you want to override GSettings for, you need to add them to -[](#opt-services.xserver.desktopManager.gnome.extraGSettingsOverridePackages). +[](#opt-services.desktopManager.gnome.extraGSettingsOverridePackages). You can use `dconf-editor` tool to explore which GSettings you can set. @@ -154,7 +154,7 @@ You can use `dconf-editor` tool to explore which GSettings you can set. ```nix { - services.xserver.desktopManager.gnome = { + services.desktopManager.gnome = { extraGSettingsOverrides = '' # Change default background [org.gnome.desktop.background] diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix similarity index 91% rename from nixos/modules/services/x11/desktop-managers/gnome.nix rename to nixos/modules/services/desktop-managers/gnome.nix index 1f980444e644..aa86bc81f70e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -15,7 +15,7 @@ let literalExpression ; - cfg = config.services.xserver.desktopManager.gnome; + cfg = config.services.desktopManager.gnome; serviceCfg = config.services.gnome; # Prioritize nautilus by default when opening directories @@ -78,13 +78,45 @@ let in { - meta = { doc = ./gnome.md; maintainers = lib.teams.gnome.members; }; imports = [ + (lib.mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome" "enable" ] + [ "services" "desktopManager" "gnome" "enable" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverrides" ] + [ "services" "desktopManager" "gnome" "extraGSettingsOverrides" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverridePackages" ] + [ "services" "desktopManager" "gnome" "extraGSettingsOverridePackages" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome" "debug" ] + [ "services" "desktopManager" "gnome" "debug" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome" "sessionPath" ] + [ "services" "desktopManager" "gnome" "sessionPath" ] + ) + # flashback options + (lib.mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome" "flashback" "customSessions" ] + [ "services" "desktopManager" "gnome" "flashback" "customSessions" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome" "flashback" "enableMetacity" ] + [ "services" "desktopManager" "gnome" "flashback" "enableMetacity" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome" "flashback" "panelModulePackages" ] + [ "services" "desktopManager" "gnome" "flashback" "panelModulePackages" ] + ) (lib.mkRenamedOptionModule [ "services" "gnome" "core-utilities" "enable" ] [ "services" "gnome" "core-apps" "enable" ] @@ -101,7 +133,7 @@ in games.enable = mkEnableOption "GNOME games"; }; - services.xserver.desktopManager.gnome = { + services.desktopManager.gnome = { enable = mkOption { type = types.bool; default = false; @@ -213,8 +245,8 @@ in system.nixos-generate-config.desktopConfiguration = [ '' # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; '' ]; @@ -333,7 +365,7 @@ in }) (lib.mkIf serviceCfg.core-shell.enable { - services.xserver.desktopManager.gnome.sessionPath = [ + services.desktopManager.gnome.sessionPath = [ pkgs.gnome-shell ]; diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index 2bcef6106cc0..50afbd9f6ffb 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -257,7 +257,7 @@ in dmConf = config.services.xserver.displayManager; noDmUsed = !( - dmConf.gdm.enable || cfg.sddm.enable || dmConf.xpra.enable || dmConf.lightdm.enable || cfg.ly.enable + cfg.gdm.enable || cfg.sddm.enable || dmConf.xpra.enable || dmConf.lightdm.enable || cfg.ly.enable ); in lib.mkIf noDmUsed (lib.mkDefault false); diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix similarity index 86% rename from nixos/modules/services/x11/display-managers/gdm.nix rename to nixos/modules/services/display-managers/gdm.nix index 5973191d6c7c..960684809711 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -7,19 +7,20 @@ let - cfg = config.services.xserver.displayManager; + cfg = config.services.displayManager.gdm; gdm = pkgs.gdm; + xdmcfg = config.services.xserver.displayManager; pamLogin = config.security.pam.services.login; settingsFormat = pkgs.formats.ini { }; - configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings; + configFile = settingsFormat.generate "custom.conf" cfg.settings; xSessionWrapper = - if (cfg.setupCommands == "") then + if (xdmcfg.setupCommands == "") then null else pkgs.writeScript "gdm-x-session-wrapper" '' #!${pkgs.bash}/bin/bash - ${cfg.setupCommands} + ${xdmcfg.setupCommands} exec "$@" ''; @@ -41,7 +42,7 @@ let defaultSessionName = config.services.displayManager.defaultSession; - setSessionScript = pkgs.callPackage ./account-service-util.nix { }; + setSessionScript = pkgs.callPackage ../x11/display-managers/account-service-util.nix { }; in { @@ -72,6 +73,35 @@ in "gdm" "nvidiaWayland" ] "We defer to GDM whether Wayland should be enabled.") + + (lib.mkRenamedOptionModule + [ "services" "xserver" "displayManager" "gdm" "enable" ] + [ "services" "displayManager" "gdm" "enable" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "displayManager" "gdm" "debug" ] + [ "services" "displayManager" "gdm" "debug" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "displayManager" "gdm" "banner" ] + [ "services" "displayManager" "gdm" "banner" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "displayManager" "gdm" "settings" ] + [ "services" "displayManager" "gdm" "settings" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "displayManager" "gdm" "wayland" ] + [ "services" "displayManager" "gdm" "wayland" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "displayManager" "gdm" "autoSuspend" ] + [ "services" "displayManager" "gdm" "autoSuspend" ] + ) + (lib.mkRenamedOptionModule + [ "services" "xserver" "displayManager" "gdm" "autoLogin" "delay" ] + [ "services" "displayManager" "gdm" "autoLogin" "delay" ] + ) ]; meta = { @@ -82,7 +112,7 @@ in options = { - services.xserver.displayManager.gdm = { + services.displayManager.gdm = { enable = lib.mkEnableOption "GDM, the GNOME Display Manager"; @@ -145,7 +175,7 @@ in ###### implementation - config = lib.mkIf cfg.gdm.enable { + config = lib.mkIf cfg.enable { services.xserver.displayManager.lightdm.enable = false; @@ -170,7 +200,7 @@ in environment = { - GDM_X_SERVER_EXTRA_ARGS = toString (lib.filter (arg: arg != "-terminate") cfg.xserverArgs); + GDM_X_SERVER_EXTRA_ARGS = toString (lib.filter (arg: arg != "-terminate") xdmcfg.xserverArgs); XDG_DATA_DIRS = lib.makeSearchPath "share" [ gdm # for gnome-login.session config.services.displayManager.sessionData.desktops @@ -274,7 +304,7 @@ in systemd.user.services.dbus.wantedBy = [ "default.target" ]; programs.dconf.profiles.gdm.databases = - lib.optionals (!cfg.gdm.autoSuspend) [ + lib.optionals (!cfg.autoSuspend) [ { settings."org/gnome/settings-daemon/plugins/power" = { sleep-inactive-ac-type = "nothing"; @@ -284,11 +314,11 @@ in }; } ] - ++ lib.optionals (cfg.gdm.banner != null) [ + ++ lib.optionals (cfg.banner != null) [ { settings."org/gnome/login-screen" = { banner-message-enable = true; - banner-message-text = cfg.gdm.banner; + banner-message-text = cfg.banner; }; } ] @@ -297,21 +327,21 @@ in # Use AutomaticLogin if delay is zero, because it's immediate. # Otherwise with TimedLogin with zero seconds the prompt is still # presented and there's a little delay. - services.xserver.displayManager.gdm.settings = { + services.displayManager.gdm.settings = { daemon = lib.mkMerge [ - { WaylandEnable = cfg.gdm.wayland; } + { WaylandEnable = cfg.wayland; } # nested if else didn't work - (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay != 0) { + (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.autoLogin.delay != 0) { TimedLoginEnable = true; TimedLogin = config.services.displayManager.autoLogin.user; - TimedLoginDelay = cfg.gdm.autoLogin.delay; + TimedLoginDelay = cfg.autoLogin.delay; }) - (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay == 0) { + (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.autoLogin.delay == 0) { AutomaticLoginEnable = true; AutomaticLogin = config.services.displayManager.autoLogin.user; }) ]; - debug = lib.mkIf cfg.gdm.debug { + debug = lib.mkIf cfg.debug { Enable = true; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 747f838e90ee..9dbb9a42d4fa 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -31,7 +31,6 @@ in ./lumina.nix ./lxqt.nix ./enlightenment.nix - ./gnome.nix ./retroarch.nix ./kodi.nix ./mate.nix @@ -43,6 +42,7 @@ in ./deepin.nix ../../desktop-managers/lomiri.nix ../../desktop-managers/cosmic.nix + ../../desktop-managers/gnome.nix ]; options = { diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 165cbea6574a..c8fa744d8869 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -17,7 +17,7 @@ with lib; services.xserver.videoDrivers = [ ]; # Enable GDM. Any display manager will do as long as it supports XDMCP. - services.xserver.displayManager.gdm.enable = true; + services.displayManager.gdm.enable = true; systemd.sockets.terminal-server = { description = "Terminal Server Socket"; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 7c0de46a8cd2..206e25355d34 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -761,7 +761,7 @@ in dmConf = cfg.displayManager; default = !( - dmConf.gdm.enable + config.services.displayManager.gdm.enable || config.services.displayManager.sddm.enable || dmConf.xpra.enable || dmConf.sx.enable diff --git a/nixos/release.nix b/nixos/release.nix index b7b550fb4721..3bcacf1e471c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -610,8 +610,8 @@ rec { { ... }: { services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; } ); diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index fa20d5e7e840..7836b92b8d7f 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -34,8 +34,8 @@ }; # Configure Gnome - services.xserver.desktopManager.gnome.enable = true; - services.xserver.desktopManager.gnome.debug = true; + services.desktopManager.gnome.enable = true; + services.desktopManager.gnome.debug = true; systemd.user.services = { "org.gnome.Shell@wayland" = { diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix index ceb420adaa54..6df6e621995e 100644 --- a/nixos/tests/gnome-flashback.nix +++ b/nixos/tests/gnome-flashback.nix @@ -14,9 +14,9 @@ services.xserver.enable = true; - services.xserver.displayManager = { - gdm.enable = true; - gdm.debug = true; + services.displayManager.gdm = { + enable = true; + debug = true; }; services.displayManager.autoLogin = { @@ -24,9 +24,9 @@ user = user.name; }; - services.xserver.desktopManager.gnome.enable = true; - services.xserver.desktopManager.gnome.debug = true; - services.xserver.desktopManager.gnome.flashback.enableMetacity = true; + services.desktopManager.gnome.enable = true; + services.desktopManager.gnome.debug = true; + services.desktopManager.gnome.flashback.enableMetacity = true; services.displayManager.defaultSession = "gnome-flashback-metacity"; }; diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index 318d206d07ac..82d3bf3e08ce 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -16,9 +16,9 @@ services.xserver.enable = true; - services.xserver.displayManager = { - gdm.enable = true; - gdm.debug = true; + services.displayManager.gdm = { + enable = true; + debug = true; }; services.displayManager.autoLogin = { @@ -26,8 +26,8 @@ user = user.name; }; - services.xserver.desktopManager.gnome.enable = true; - services.xserver.desktopManager.gnome.debug = true; + services.desktopManager.gnome.enable = true; + services.desktopManager.gnome.debug = true; services.displayManager.defaultSession = "gnome-xorg"; systemd.user.services = { diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 17fdcf550ca3..4d1b4c71ecd2 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -11,9 +11,9 @@ services.xserver.enable = true; - services.xserver.displayManager = { - gdm.enable = true; - gdm.debug = true; + services.displayManager.gdm = { + enable = true; + debug = true; }; services.displayManager.autoLogin = { @@ -21,8 +21,8 @@ user = "alice"; }; - services.xserver.desktopManager.gnome.enable = true; - services.xserver.desktopManager.gnome.debug = true; + services.desktopManager.gnome.enable = true; + services.desktopManager.gnome.debug = true; systemd.user.services = { "org.gnome.Shell@wayland" = { diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix index 6579b3646e21..c887403bbda3 100644 --- a/nixos/tests/nixos-generate-config.nix +++ b/nixos/tests/nixos-generate-config.nix @@ -15,8 +15,8 @@ system.nixos-generate-config.desktopConfiguration = [ '' # DESKTOP - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; '' ]; }; @@ -40,7 +40,7 @@ # Test if the Perl variable $desktopConfiguration is spliced correctly machine.succeed( - "grep 'services\\.xserver\\.desktopManager\\.gnome\\.enable = true;' /etc/nixos/configuration.nix" + "grep 'services\\.desktopManager\\.gnome\\.enable = true;' /etc/nixos/configuration.nix" ) machine.succeed("rm -rf /etc/nixos") diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 99967c83fd4d..e8ec15980c3e 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { }) # The following patches implement certain environment variables in GDM which are set by - # the gdm configuration module (nixos/modules/services/x11/display-managers/gdm.nix). + # the gdm configuration module (gdm.nix). ./gdm-x-session_extra_args.patch diff --git a/pkgs/by-name/ne/nemo-seahorse/package.nix b/pkgs/by-name/ne/nemo-seahorse/package.nix index 8c8bd4396d72..6c829fadc151 100644 --- a/pkgs/by-name/ne/nemo-seahorse/package.nix +++ b/pkgs/by-name/ne/nemo-seahorse/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { libcryptui ]; - services.xserver.desktopManager.gnome.extraGSettingsOverridePackages = with pkgs; [ + services.desktopManager.gnome.extraGSettingsOverridePackages = with pkgs; [ nemo gcr libcryptui