gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-03-29 06:04:39 +00:00
committed by GitHub
parent 614804be60 2a6f5e8209
commit 57b819e8b1
22 changed files with 176 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/release-notes/rl-2505.section.md
+2
View File
@@ -591,6 +591,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.
nixos/modules/services/desktops/geoclue2.nix
+75 -6
View File
@@ -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; {
nixos/tests/all-tests.nix
+1
View File
@@ -463,6 +463,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 {};
nixos/tests/geoclue2.nix
+36
View File
@@ -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}"
'';
}
pkgs/applications/editors/vscode/extensions/default.nix
+2 -2
View File
@@ -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";
pkgs/by-name/di/diesel-cli/package.nix
+3 -3
View File
@@ -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
pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch
-17
View File
@@ -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
pkgs/by-name/ge/geoclue2/package.nix
+7 -1
View File
@@ -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;
pkgs/by-name/lo/lock/package.nix
+2 -2
View File
@@ -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;
pkgs/by-name/md/mdbook-mermaid/package.nix
+3 -3
View File
@@ -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";
pkgs/desktops/enlightenment/evisum/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/aiodukeenergy/default.nix
+3 -3
View File
@@ -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;
pkgs/development/python-modules/aiowebdav2/default.nix
+2 -2
View File
@@ -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 ];
pkgs/development/python-modules/bx-py-utils/default.nix
+10 -4
View File
@@ -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 ];
};
pkgs/development/python-modules/equinox/default.nix
+2 -10
View File
@@ -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 <class 'jax._src.api.ShapeDtypeStruct'> 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"
pkgs/development/python-modules/finetuning-scheduler/default.nix
+3 -3
View File
@@ -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 = [
pkgs/development/python-modules/jaraco-abode/default.nix
+12 -14
View File
@@ -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
];
pkgs/development/python-modules/keras/default.nix
+2 -3
View File
@@ -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 = [
pkgs/development/python-modules/lineax/default.nix
+2 -14
View File
@@ -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 = [
pkgs/development/python-modules/pysmlight/default.nix
+2 -2
View File
@@ -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 ];
pkgs/development/python-modules/python-snoo/default.nix
+2 -2
View File
@@ -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 = ''
pkgs/development/python-modules/stable-baselines3/default.nix
+3
View File
@@ -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"