From d184facbd91f2c1d3f2d665975e37ab6a6786c68 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 6 Mar 2025 14:55:26 +0000 Subject: [PATCH 01/17] diesel-cli: 2.2.7 -> 2.2.8 Diff: https://github.com/diesel-rs/diesel/compare/v2.2.7...v2.2.8 Changelog: https://github.com/diesel-rs/diesel/releases/tag/v2.2.8 --- pkgs/by-name/di/diesel-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 6c15ad70cfb8..92b98816e363 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,16 +27,16 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.2.7"; + version = "2.2.8"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-0rmuOeWPczO5XRlpkeFC7FXMSnWSy5FBd9GpClA+i7c="; + hash = "sha256-+h5gLhbFxVnEHsFZqkkQe6rUiiZy6oYcF2mnb44VHDU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-waX8wkbU8rXN183j0RDfszHKsLxQdq19UMwrqI8gBOY="; + cargoHash = "sha256-vCdxtrhyIhy3VuLWl7XYysCFecHReHWhAs/BRaBTbrk="; nativeBuildInputs = [ installShellFiles From 61a805821930fccf8b1cfad7428cb369e1bb7b80 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 24 Mar 2025 00:21:47 +0000 Subject: [PATCH 02/17] lock: 1.4.2 -> 1.5.1 Diff: https://github.com/konstantintutsch/Lock/compare/v1.4.2...v1.5.1 Changelog: https://github.com/konstantintutsch/Lock/releases/tag/v1.5.1 --- pkgs/by-name/lo/lock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 0a9b46577619..5c9ea9e206be 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.4.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-wNy+tffl8WQDYVsy5Perv/bESoZ2WXWe7WUXJ+hT370="; + hash = "sha256-HXyU+b4CtTeQJrX0vVKV94twCXJRWZn/dGsjyC8fpc8="; }; strictDeps = true; From 4c2f564ef005e0d260aca6fb17f31c6216fcfb7a Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Mon, 24 Mar 2025 19:15:47 -0400 Subject: [PATCH 03/17] nixos/geoclue2: add options for static source --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/services/desktops/geoclue2.nix | 81 +++++++++++++++++-- nixos/tests/all-tests.nix | 1 + nixos/tests/geoclue2.nix | 36 +++++++++ ...d-option-for-installation-sysconfdir.patch | 17 ---- pkgs/by-name/ge/geoclue2/package.nix | 8 +- 6 files changed, 121 insertions(+), 24 deletions(-) create mode 100644 nixos/tests/geoclue2.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f9cc4337af7e..2ef9de7cb51c 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -578,6 +578,8 @@ - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details. +- [`services.geoclue2`](#opt-services.geoclue2.enable) now has an `enableStatic` option, which allows the NixOS configuration to specify a fixed location for GeoClue to use. + - [`services.mongodb`](#opt-services.mongodb.enable) is now compatible with the `mongodb-ce` binary package. To make use of it, set [`services.mongodb.package`](#opt-services.mongodb.package) to `pkgs.mongodb-ce`. - [`services.jupyter`](#opt-services.jupyter.enable) is now compatible with `Jupyter Notebook 7`. See [the migration guide](https://jupyter-notebook.readthedocs.io/en/latest/migrate_to_notebook7.html) for details. diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index 16d1cb17ca06..bc5d52f9e374 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -136,6 +136,48 @@ in ''; }; + enableStatic = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable the static source. This source defines a fixed + location using the `staticLatitude`, `staticLongitude`, + `staticAltitude`, and `staticAccuracy` options. + + Setting `enableStatic` to true will disable all other sources, to + prevent conflicts. Use `lib.mkForce true` when enabling other sources + if for some reason you want to override this. + ''; + }; + + staticLatitude = lib.mkOption { + type = lib.types.numbers.between (-90) 90; + description = '' + Latitude to use for the static source. Defaults to `location.latitude`. + ''; + }; + + staticLongitude = lib.mkOption { + type = lib.types.numbers.between (-180) 180; + description = '' + Longitude to use for the static source. Defaults to `location.longitude`. + ''; + }; + + staticAltitude = lib.mkOption { + type = lib.types.number; + description = '' + Altitude in meters to use for the static source. + ''; + }; + + staticAccuracy = lib.mkOption { + type = lib.types.numbers.positive; + description = '' + Accuracy radius in meters to use for the static source. + ''; + }; + geoProviderUrl = lib.mkOption { type = lib.types.str; default = "https://location.services.mozilla.com/v1/geolocate?key=geoclue"; @@ -224,6 +266,16 @@ in groups.geoclue = { }; }; + services.geoclue2 = { + enable3G = lib.mkIf cfg.enableStatic false; + enableCDMA = lib.mkIf cfg.enableStatic false; + enableModemGPS = lib.mkIf cfg.enableStatic false; + enableNmea = lib.mkIf cfg.enableStatic false; + enableWifi = lib.mkIf cfg.enableStatic false; + staticLatitude = lib.mkDefault config.location.latitude; + staticLongitude = lib.mkDefault config.location.longitude; + }; + systemd.services.geoclue = { wants = lib.optionals cfg.enableWifi [ "network-online.target" ]; after = lib.optionals cfg.enableWifi [ "network-online.target" ]; @@ -284,16 +336,33 @@ in modem-gps = { enable = cfg.enableModemGPS; }; - wifi = { - enable = cfg.enableWifi; - url = cfg.geoProviderUrl; - submit-data = lib.boolToString cfg.submitData; - submission-url = cfg.submissionUrl; - submission-nick = cfg.submissionNick; + wifi = + { + enable = cfg.enableWifi; + } + // lib.optionalAttrs cfg.enableWifi { + url = cfg.geoProviderUrl; + submit-data = lib.boolToString cfg.submitData; + submission-url = cfg.submissionUrl; + submission-nick = cfg.submissionNick; + }; + static-source = { + enable = cfg.enableStatic; }; } // lib.mapAttrs' appConfigToINICompatible cfg.appConfig ); + + environment.etc.geolocation = lib.mkIf cfg.enableStatic { + mode = "0440"; + group = "geoclue"; + text = '' + ${toString cfg.staticLatitude} + ${toString cfg.staticLongitude} + ${toString cfg.staticAltitude} + ${toString cfg.staticAccuracy} + ''; + }; }; meta = with lib; { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ca3b04135b4f..b70683de021e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -455,6 +455,7 @@ in { garage = handleTest ./garage {}; gatus = runTest ./gatus.nix; gemstash = handleTest ./gemstash.nix {}; + geoclue2 = runTest ./geoclue2.nix; geoserver = runTest ./geoserver.nix; gerrit = handleTest ./gerrit.nix {}; geth = handleTest ./geth.nix {}; diff --git a/nixos/tests/geoclue2.nix b/nixos/tests/geoclue2.nix new file mode 100644 index 000000000000..0a2f311c286f --- /dev/null +++ b/nixos/tests/geoclue2.nix @@ -0,0 +1,36 @@ +{ config, lib, ... }: +{ + name = "geoclue2"; + meta = { + maintainers = with lib.maintainers; [ rhendric ]; + }; + + nodes.machine = { + imports = [ common/user-account.nix ]; + + location = { + latitude = 12.345; + longitude = -67.890; + }; + + services.geoclue2 = { + enable = true; + enableDemoAgent = true; + enableStatic = true; + staticAltitude = 123.45; + staticAccuracy = 1000; + }; + }; + + testScript = + let + inherit (config.node) pkgs; + in + '' + whereAmI = machine.succeed('machinectl shell alice@.host ${pkgs.geoclue2}/libexec/geoclue-2.0/demos/where-am-i -t 5') + assert ("Latitude: 12.345000°" in whereAmI), f"Incorrect latitude in:\n{whereAmI}" + assert ("Longitude: -67.890000°" in whereAmI), f"Incorrect longitude in:\n{whereAmI}" + assert ("Altitude: 123.450000 meters" in whereAmI), f"Incorrect altitude in:\n{whereAmI}" + assert ("Accuracy: 1000.000000 meters" in whereAmI), f"Incorrect accuracy in:\n{whereAmI}" + ''; +} diff --git a/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch index 11bd6f561c8b..2d2ccbd5c4ba 100644 --- a/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch +++ b/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch @@ -2,14 +2,6 @@ diff --git a/data/meson.build b/data/meson.build index b22ff55..01c5910 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -1,6 +1,6 @@ - if get_option('enable-backend') - conf = configuration_data() -- conf.set('sysconfdir', sysconfdir) -+ conf.set('sysconfdir', sysconfdir_install) - - if get_option('demo-agent') - conf.set('demo_agent', 'geoclue-demo-agent;') @@ -14,7 +14,7 @@ if get_option('enable-backend') conf.set('default_wifi_enable', 'false') endif @@ -19,15 +11,6 @@ index b22ff55..01c5910 100644 configure_file(output: 'geoclue.conf', input: 'geoclue.conf.in', configuration: conf, -@@ -23,7 +23,7 @@ if get_option('enable-backend') - conf = configuration_data() - conf.set('libexecdir', libexecdir) - conf.set('dbus_srv_user', get_option('dbus-srv-user')) -- conf.set('sysconfdir', sysconfdir) -+ conf.set('sysconfdir', sysconfdir_install) - - confd_dir = join_paths(conf_dir, 'conf.d') - install_emptydir(confd_dir) diff --git a/demo/meson.build b/demo/meson.build index 1427fbe..2623f16 100644 --- a/demo/meson.build diff --git a/pkgs/by-name/ge/geoclue2/package.nix b/pkgs/by-name/ge/geoclue2/package.nix index cb6e524a9cb8..0abca745cb33 100644 --- a/pkgs/by-name/ge/geoclue2/package.nix +++ b/pkgs/by-name/ge/geoclue2/package.nix @@ -24,6 +24,7 @@ vala, withDemoAgent ? false, nix-update-script, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { @@ -107,7 +108,12 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs demo/install-file.py ''; - passthru.updateScript = nix-update-script { }; + passthru = { + tests = { + inherit (nixosTests) geoclue2; + }; + updateScript = nix-update-script { }; + }; meta = with lib; { broken = stdenv.hostPlatform.isDarwin && withDemoAgent; From 444bb18acba08afa0f23ff9d889bb8ba98041e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Mar 2025 16:42:44 -0700 Subject: [PATCH 04/17] python313Packages.bx-py-utils: 98 -> 108 Diff: https://github.com/boxine/bx_py_utils/compare/refs/tags/v98...v108 Changelog: https://github.com/boxine/bx_py_utils/releases/tag/v108 --- .../python-modules/bx-py-utils/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index 45ac1d45af95..7c1a7c3a848f 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -7,7 +7,10 @@ setuptools-scm, beautifulsoup4, boto3, + freezegun, lxml, + openpyxl, + parameterized, pdoc, pytestCheckHook, requests-mock, @@ -16,7 +19,7 @@ buildPythonPackage rec { pname = "bx-py-utils"; - version = "98"; + version = "108"; disabled = pythonOlder "3.10"; @@ -26,7 +29,7 @@ buildPythonPackage rec { owner = "boxine"; repo = "bx_py_utils"; tag = "v${version}"; - hash = "sha256-VJ4510HLTqdRfeUEe2srT8+W9AaRpi+Mm6srZOOp0fc="; + hash = "sha256-VMGP5yl+7kiZ3Ww4ESJPHABDCMZG1VsVDgVoLnGU5r4="; }; postPatch = '' @@ -59,7 +62,10 @@ buildPythonPackage rec { nativeCheckInputs = [ beautifulsoup4 boto3 + freezegun lxml + openpyxl + parameterized pdoc pytestCheckHook requests-mock @@ -82,9 +88,9 @@ buildPythonPackage rec { meta = { description = "Various Python utility functions"; - mainProgram = "publish"; + mainProgram = "bx_py_utils"; homepage = "https://github.com/boxine/bx_py_utils"; - changelog = "https://github.com/boxine/bx_py_utils/releases/tag/v${version}"; + changelog = "https://github.com/boxine/bx_py_utils/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; From dbd4a16a18e394f61da935b249d1503ef1be8710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Mar 2025 16:43:14 -0700 Subject: [PATCH 05/17] python313Packages.jaraco-abode: 6.2.1 -> 6.3.0 Diff: https://github.com/jaraco/jaraco.abode/compare/refs/tags/v6.2.1...v6.3.0 Changelog: https://github.com/jaraco/jaraco.abode/blob/v6.3.0/NEWS.rst --- .../python-modules/jaraco-abode/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index 3154651d486c..e5c4147dd0ac 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -9,15 +9,15 @@ jaraco-collections, jaraco-itertools, jaraco-context, + jaraco-functools, jaraco-net, keyring, lomond, more-itertools, platformdirs, + pytest-responses, pytestCheckHook, - pythonOlder, requests, - requests-mock, requests-toolbelt, setuptools, setuptools-scm, @@ -25,24 +25,22 @@ buildPythonPackage rec { pname = "jaraco-abode"; - version = "6.2.1"; + version = "6.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.abode"; tag = "v${version}"; - hash = "sha256-t5AI2wpSM6xMzULEZYkUgGvcODM8PVxdd2Vy/PV0Ga4="; + hash = "sha256-AqnyQdLkg2vobVJ84X15AB0Yyj3gZf4rP3pEdk3MqZ4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ requests lomond colorlog @@ -57,11 +55,12 @@ buildPythonPackage rec { bx-py-utils platformdirs jaraco-itertools + jaraco-functools ]; nativeCheckInputs = [ + pytest-responses pytestCheckHook - requests-mock ]; pythonImportsCheck = [ "jaraco.abode" ]; @@ -79,13 +78,12 @@ buildPythonPackage rec { "test_camera_capture_no_control_URLs" ]; - meta = with lib; { - changelog = "https://github.com/jaraco/jaraco.abode/blob/${version}/CHANGES.rst"; + meta = { + changelog = "https://github.com/jaraco/jaraco.abode/blob/${src.tag}/NEWS.rst"; homepage = "https://github.com/jaraco/jaraco.abode"; description = "Library interfacing to the Abode home security system"; - mainProgram = "abode"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jamiemagee dotlambda ]; From 3dacffa9be700d41e96421d27109b8a2e2ee1c26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Mar 2025 07:56:28 +0000 Subject: [PATCH 06/17] enlightenment.evisum: 0.6.1 -> 0.6.4 --- pkgs/desktops/enlightenment/evisum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index 63e8ab41780b..b07349da332f 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "0.6.1"; + version = "0.6.4"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "gy8guN4T4pCJCBAmfPQe2Ey7DITi4goU9ng2MmEtrbk="; + sha256 = "hlyotWUTfDKkEjAvDrlE7xYEMG7XksCg3X9Xksdca/g="; }; nativeBuildInputs = [ From f1cef62fb50aaee1aa4f1cd110d00c53cff80311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 Mar 2025 09:59:22 -0700 Subject: [PATCH 07/17] python313Packages.aiowebdav2: 0.4.2 -> 0.4.4 Diff: https://github.com/jpbede/aiowebdav2/compare/refs/tags/v0.4.2...v0.4.4 Changelog: https://github.com/jpbede/aiowebdav2/releases/tag/v0.4.3 https://github.com/jpbede/aiowebdav2/releases/tag/v0.4.4 --- pkgs/development/python-modules/aiowebdav2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowebdav2/default.nix b/pkgs/development/python-modules/aiowebdav2/default.nix index 21db3ed59cf3..76416639c8eb 100644 --- a/pkgs/development/python-modules/aiowebdav2/default.nix +++ b/pkgs/development/python-modules/aiowebdav2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiowebdav2"; - version = "0.4.2"; + version = "0.4.4"; pyproject = true; src = fetchFromGitHub { owner = "jpbede"; repo = "aiowebdav2"; tag = "v${version}"; - hash = "sha256-ftz5FYY1mTVSI0dn1Oc0GfDv7rBnsl/sIn81YG9IARE="; + hash = "sha256-5GcxOnHG0TqD5rGrekQEpr+4uTfZTSCL+JF9xEISzNM="; }; build-system = [ poetry-core ]; From 9b93f3276f576819300c0cdf6e4ecfad20c11702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 Mar 2025 10:06:29 -0700 Subject: [PATCH 08/17] python313Packages.pysmlight: 0.2.3 -> 0.2.4 Diff: https://github.com/smlight-tech/pysmlight/compare/refs/tags/v0.2.3...v0.2.4 Changelog: https://github.com/smlight-tech/pysmlight/releases/tag/v0.2.4 --- pkgs/development/python-modules/pysmlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix index cc8796ca4456..b5764abafbba 100644 --- a/pkgs/development/python-modules/pysmlight/default.nix +++ b/pkgs/development/python-modules/pysmlight/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pysmlight"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; src = fetchFromGitHub { owner = "smlight-tech"; repo = "pysmlight"; tag = "v${version}"; - hash = "sha256-9aJ69t+zuWsmU9JIYgz12DRxFkhUCrrA0lBaUFbsEVM="; + hash = "sha256-ZNqNRz7d3HZybQG778+ubxuc7Eakf/kWpd3I3cosSIU="; }; build-system = [ poetry-core ]; From 0e1ea2dc87b854f7d3af81ea35bec08d4ec984c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 Mar 2025 10:29:44 -0700 Subject: [PATCH 09/17] python313Packages.python-snoo: 0.6.4 -> 0.6.5 Diff: https://github.com/Lash-L/python-snoo/compare/refs/tags/v0.6.4...v0.6.5 Changelog: https://github.com/Lash-L/python-snoo/blob/v0.6.5/CHANGELOG.md --- pkgs/development/python-modules/python-snoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-snoo/default.nix b/pkgs/development/python-modules/python-snoo/default.nix index f50582fe90ec..4b97206e03b1 100644 --- a/pkgs/development/python-modules/python-snoo/default.nix +++ b/pkgs/development/python-modules/python-snoo/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-snoo"; - version = "0.6.4"; + version = "0.6.5"; pyproject = true; src = fetchFromGitHub { owner = "Lash-L"; repo = "python-snoo"; tag = "v${version}"; - hash = "sha256-Lzyh9DbU9opKxx/2eb2yDEmwHCHsDkbcU6Xhqj0qOaU="; + hash = "sha256-vge7tCtKigBIOyInJVVztLdbr1trXTRu3Xbcst2VZN0="; }; postPatch = '' From 0e73e1f38ecfa707ca1fcd1f7430c7ab150e2022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 Mar 2025 10:32:40 -0700 Subject: [PATCH 10/17] python313Packages.aiodukeenergy: 0.2.2 -> 0.3.0 Diff: https://github.com/hunterjm/aiodukeenergy/compare/v0.2.2...v0.3.0 Changelog: https://github.com/hunterjm/aiodukeenergy/blob/v0.3.0/CHANGELOG.md --- pkgs/development/python-modules/aiodukeenergy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiodukeenergy/default.nix b/pkgs/development/python-modules/aiodukeenergy/default.nix index 4a724b5ab183..52dbd8296db7 100644 --- a/pkgs/development/python-modules/aiodukeenergy/default.nix +++ b/pkgs/development/python-modules/aiodukeenergy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiodukeenergy"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "hunterjm"; repo = "aiodukeenergy"; tag = "v${version}"; - hash = "sha256-aDBleEp3ZlY1IfFCbsUEU+wzYgjNaJeip8crHlh5qHE="; + hash = "sha256-BYDC2j2s6gg8/owTDdijqmReUSqDYWqHXf8BUzYn+sI="; }; build-system = [ poetry-core ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/hunterjm/aiodukeenergy/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/hunterjm/aiodukeenergy/blob/${src.tag}/CHANGELOG.md"; description = "Asyncio Duke Energy"; homepage = "https://github.com/hunterjm/aiodukeenergy"; license = lib.licenses.mit; From e15c014e2057dfc80447aa6c8c7fa55db5ad0cfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Mar 2025 19:25:45 +0000 Subject: [PATCH 11/17] mdbook-mermaid: 0.14.1 -> 0.15.0 --- pkgs/by-name/md/mdbook-mermaid/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdbook-mermaid/package.nix b/pkgs/by-name/md/mdbook-mermaid/package.nix index a88716ec4fce..f3109e1ecc73 100644 --- a/pkgs/by-name/md/mdbook-mermaid/package.nix +++ b/pkgs/by-name/md/mdbook-mermaid/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "badboy"; repo = "mdbook-mermaid"; tag = "v${version}"; - hash = "sha256-hqz2zUdDZjbe3nq4YpL68XJ64qpbjANag9S2uAM5nXg="; + hash = "sha256-+Dk3wW1pLWVfJy+OC648BQ5rZrHYqPdjV2hfJSIV6m0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-yb4EWSl/mQp5q9fmYUq6UEdsknqfUx//BZ8IK/BVs7g="; + cargoHash = "sha256-LbDlxQ2sbyYlXOzvA+9tLRxqGGxtgQ9KujsD7UBzskM="; meta = { description = "Preprocessor for mdbook to add mermaid.js support"; From ec32280b4d39c089369d843bdeda9fb47e447bec Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 28 Mar 2025 22:48:26 +0100 Subject: [PATCH 12/17] python312Packages.keras: 3.9.0 -> 3.9.1 Diff: https://github.com/keras-team/keras/compare/refs/tags/v3.9.0...v3.9.1 Changelog: https://github.com/keras-team/keras/releases/tag/v3.9.1 --- pkgs/development/python-modules/keras/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 61713c18972b..9108d76138a5 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -36,14 +35,14 @@ buildPythonPackage rec { pname = "keras"; - version = "3.9.0"; + version = "3.9.1"; pyproject = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; tag = "v${version}"; - hash = "sha256-T1QY1GwE0X5ARtAueB6kF310kTaeOA+8Obdzx0NrOUs="; + hash = "sha256-e4jHa+/HAe+bKUngcdF6zpI6+l7NvnjCEtNCAA5QHCo="; }; build-system = [ From 305fbc064bd654badfb6313b8184f8d5b6266c89 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 28 Mar 2025 22:11:36 +0100 Subject: [PATCH 13/17] python312Packages.equinox: 0.11.12 -> 0.12.1 Diff: https://github.com/patrick-kidger/equinox/compare/refs/tags/v0.11.12...v0.12.1 Changelog: https://github.com/patrick-kidger/equinox/releases/tag/v0.12.1 --- pkgs/development/python-modules/equinox/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 834e6f5d732b..0b99125f4fc1 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.12"; + version = "0.12.1"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "equinox"; tag = "v${version}"; - hash = "sha256-hor2qw+aTL7yhV53E/y5DUwyDEYJA8RPRS39xxa8xcw="; + hash = "sha256-mw2fk+527b6Rx6FGe6QJf3ZbxZ3rjYFXKleX2g6AryU="; }; # Relax speed constraints on tests that can fail on busy builders @@ -56,14 +56,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - # Since jax 0.5.3: - # DeprecationWarning: shape requires ndarray or scalar arguments, got at position 0. In a future JAX release this will be an error. - # https://github.com/patrick-kidger/equinox/issues/979 - "-W" - "ignore::DeprecationWarning" - ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! "test_filter" From 518017034c0dddd679c870753fae9da5246c764b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 28 Mar 2025 22:26:05 +0100 Subject: [PATCH 14/17] python312Packages.lineax: 0.0.7 -> 0.0.8 Diff: https://github.com/patrick-kidger/lineax/compare/refs/tags/v0.0.7...v0.0.8 Changelog: https://github.com/patrick-kidger/lineax/releases/tag/v0.0.8 --- .../python-modules/lineax/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/lineax/default.nix b/pkgs/development/python-modules/lineax/default.nix index 8f6a41af46d8..3f31208364de 100644 --- a/pkgs/development/python-modules/lineax/default.nix +++ b/pkgs/development/python-modules/lineax/default.nix @@ -16,32 +16,20 @@ beartype, pytest, python, - - fetchpatch, }: buildPythonPackage rec { pname = "lineax"; - version = "0.0.7"; + version = "0.0.8"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "lineax"; tag = "v${version}"; - hash = "sha256-HcFI55Ww/y7ZaUkawj7xWSb7VDTBec3u0ulWL8kTm2c="; + hash = "sha256-VMTDCExgxfCcd/3UZAglfAxAFaSjzFJJuvSWJAx2tJs="; }; - patches = [ - (fetchpatch { - # Reported upstream: https://github.com/patrick-kidger/lineax/issues/118 - # Fixed by https://github.com/patrick-kidger/lineax/pull/119 - name = "fix-vmap-tests"; - url = "https://github.com/patrick-kidger/lineax/pull/119/commits/d21552ac4c504d7b139ad8e4f15d5f102b54d705.patch"; - hash = "sha256-pBejiqIVNjXi7dXuDBQdAy892wro1WxzwbI7v07N86c="; - }) - ]; - build-system = [ hatchling ]; dependencies = [ From e7f1d2254d595f939dfa58ed12fd88cdebede7c5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 28 Mar 2025 23:48:36 +0100 Subject: [PATCH 15/17] python312Packages.stable-baselines3: disable flaky tests --- pkgs/development/python-modules/stable-baselines3/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/stable-baselines3/default.nix b/pkgs/development/python-modules/stable-baselines3/default.nix index a5f5e6a1e5c6..37ea041b1c79 100644 --- a/pkgs/development/python-modules/stable-baselines3/default.nix +++ b/pkgs/development/python-modules/stable-baselines3/default.nix @@ -65,6 +65,9 @@ buildPythonPackage rec { ]; disabledTests = [ + # Flaky: Can fail if it takes too long, which happens when the system is under heavy load + "test_fps_logger" + # Tests that attempt to access the filesystem "test_make_atari_env" "test_vec_env_monitor_kwargs" From 180241ac26698795560c9d59e2bd5c2033b14a51 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 29 Mar 2025 01:12:47 +0100 Subject: [PATCH 16/17] python312Packages.finetuning-scheduler: 2.5.0 -> 2.5.1 Diff: https://github.com/speediedan/finetuning-scheduler/compare/refs/tags/v2.5.0...v2.5.1 Changelog: https://github.com/speediedan/finetuning-scheduler/blob/v2.5.1/CHANGELOG.md --- .../python-modules/finetuning-scheduler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index c0993799ae9d..ce1d1f858a30 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "finetuning-scheduler"; - version = "2.5.0"; + version = "2.5.1"; pyproject = true; src = fetchFromGitHub { owner = "speediedan"; repo = "finetuning-scheduler"; tag = "v${version}"; - hash = "sha256-neeSATQwAaYN1QGBUXphqqJp9lP3HG2OH4aLdt1cOho="; + hash = "sha256-+jt+if9aAbEd2XDMC7RpZmJpm4VUEZMt5xoLOP/esMg="; }; build-system = [ setuptools ]; @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = { description = "PyTorch Lightning extension for foundation model experimentation with flexible fine-tuning schedules"; homepage = "https://finetuning-scheduler.readthedocs.io"; - changelog = "https://github.com/speediedan/finetuning-scheduler/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/speediedan/finetuning-scheduler/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; badPlatforms = [ From 8917a8a855ace3ce10d4ee086f6793ffd1f09c36 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Fri, 28 Mar 2025 22:14:08 -0700 Subject: [PATCH 17/17] vscode-extensions.databricks.databricks: 2.6.0 -> 2.9.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 7749e9cb7001..376724be47c6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1255,8 +1255,8 @@ let mktplcRef = { name = "databricks"; publisher = "databricks"; - version = "2.6.0"; - hash = "sha256-nPDElLHZUeGNqE3QcO5GIj6AN1rNPk3RYQjFCUSuCdM="; + version = "2.9.1"; + hash = "sha256-wbq7XtINlPVUqBdmbl/O3P8f7Y/KqGSR+vbtEUofKk4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";