diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a4806d70c6c3..ac1b3af8b281 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -30006,12 +30006,6 @@ githubId = 26011724; name = "Burim Augustin Berisa"; }; - ymarkus = { - name = "Yannick Markus"; - email = "nixpkgs@ymarkus.dev"; - github = "ymarkus"; - githubId = 62380378; - }; ymatsiuk = { name = "Yurii Matsiuk"; github = "ymatsiuk"; diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix index 8ccec7997f82..9903308d619c 100644 --- a/nixos/modules/services/networking/mullvad-vpn.nix +++ b/nixos/modules/services/networking/mullvad-vpn.nix @@ -103,6 +103,5 @@ with lib; meta.maintainers = with maintainers; [ arcuru - ymarkus ]; } diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix index 7a59859c5e4c..ff913c306640 100644 --- a/nixos/modules/services/web-apps/bookstack.nix +++ b/nixos/modules/services/web-apps/bookstack.nix @@ -485,7 +485,6 @@ in }; meta.maintainers = with lib.maintainers; [ - ymarkus savyajha ]; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4ef844f5e344..606fd6ae44ff 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1058,11 +1058,11 @@ "vendorHash": null }, "ovh_ovh": { - "hash": "sha256-OoyQtdl/42/S7Q392N8ez3qrdTZcjxFbLuLXi1QMgcw=", + "hash": "sha256-OYzMG/F4wnsB10WPwNRcRKjbdT469nLMeFusHQfsdm8=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v2.12.0", + "rev": "v2.13.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/by-name/bo/bookstack/package.nix b/pkgs/by-name/bo/bookstack/package.nix index 5ba4ed54b7b4..d931def734b4 100644 --- a/pkgs/by-name/bo/bookstack/package.nix +++ b/pkgs/by-name/bo/bookstack/package.nix @@ -43,7 +43,6 @@ php83.buildComposerProject2 (finalAttrs: { homepage = "https://www.bookstackapp.com/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - ymarkus savyajha ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix index 571d09ae2d3d..01d4d82258ec 100644 --- a/pkgs/by-name/ck/ckan/package.nix +++ b/pkgs/by-name/ck/ckan/package.nix @@ -85,7 +85,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ Baughn - ymarkus nullcube ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index d69950dcf3fc..8f470f5f72c8 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,6 +14,7 @@ librusty_v8 ? callPackage ./librusty_v8.nix { inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8; }, + livekit-libwebrtc, makeBinaryWrapper, nix-update-script, pkg-config, @@ -24,18 +25,27 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.118.0"; + version = "0.121.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-FdtV+CIqTInnegcXrXBxw4aE0JnNDh4GdYKwUDjSk9Y="; + hash = "sha256-wjiUMox9V5tFggNgaFyHXWhRlpPerK7W+U/eR2Ddbbc="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-7rexlmc79eUkwcqTa8rN3GFDy1dWs+0h/SUllZqAcpM="; + cargoHash = "sha256-zpQ0vg9XuarLfdZYiRIhcwLHUOdunNbOb5xLW3MPzp8="; + + postPatch = '' + # webrtc-sys asks rustc to link libwebrtc statically by default, + # but nixpkgs provides libwebrtc as a shared library. + # use LK_CUSTOM_WEBRTC to point to the packaged library and adjust linking + # to use the shared library instead + substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \ + --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" + ''; nativeBuildInputs = [ clang @@ -60,6 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # character-conversion warning-as-error disabled. env = { LIBCLANG_PATH = "${lib.getLib libclang}/lib"; + LK_CUSTOM_WEBRTC = lib.getDev livekit-libwebrtc; NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix index df2115272e86..579f0b279f6b 100644 --- a/pkgs/by-name/gp/gpxsee/package.nix +++ b/pkgs/by-name/gp/gpxsee/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "16.2"; + version = "16.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; tag = finalAttrs.version; - hash = "sha256-7zEk8cFYgDNlRpXkgGVBj9XMmvOWDS++C8vCSP4DL1Q="; + hash = "sha256-24kfNtjD4zV2eTufDErPDt2O9ON1hvhWOPRaPBCxxEI="; }; buildInputs = [ diff --git a/pkgs/by-name/kd/kde-gruvbox/package.nix b/pkgs/by-name/kd/kde-gruvbox/package.nix index f1cb4139b7be..45bbacc72ce3 100644 --- a/pkgs/by-name/kd/kde-gruvbox/package.nix +++ b/pkgs/by-name/kd/kde-gruvbox/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { description = "Suite of themes for KDE applications that match the retro gruvbox colorscheme"; homepage = "https://github.com/printesoi/kde-gruvbox"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.ymarkus ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index 0f129ae4e6cb..09bb995a5d21 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -172,8 +172,7 @@ stdenv.mkDerivation { mainProgram = "mullvad-vpn"; platforms = lib.platforms.unix; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; - maintainers = with lib.maintainers; [ - ymarkus + maintainers = [ ]; }; } diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 98615b7abdb8..a1c8dd6f6d8d 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.4.6"; + version = "1.4.10"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-rVbWlVY4ujNVaE1o3SJmD0NrfWDtAfH+8MhOzmGgnhM="; + hash = "sha256-L2oiB7YwAaB07ZSEjxOUobX3fZW4noluUbo/FFPDYl4="; }; node_modules = stdenvNoCC.mkDerivation { @@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-0vIkCiVnyy3FwXWI3ZooskJGMhEI75BP9Xc/ZLWaTbk="; + outputHash = "sha256-rF+l0Hho0QEvMS5jaImhMlhKjjf1R66X20R6lEZcZeg="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix index e6370f11f40f..144c470270ff 100644 --- a/pkgs/by-name/pg/pgdog/package.nix +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "pgdog"; - version = "0.1.36"; + version = "0.1.37"; src = fetchFromGitHub { owner = "pgdogdev"; repo = "pgdog"; tag = "v${finalAttrs.version}"; - hash = "sha256-3ESeZA+824abvTMp7Vge4ldqqQ6qSF/dkDgGaY6h4mM="; + hash = "sha256-wJUJI5ogK8JLMqyEqU2dyySy5o0mA/xy4pYRntszdB0="; }; - cargoHash = "sha256-PNqUYP3lUXuQLosrDvoIMofWglJQjD9I/k6u/M3qfZ0="; + cargoHash = "sha256-wE8YFekvNPmwaoPm2DSa0gAGh5TqkDn3CSvLHdPwXW0="; # Hardcoded paths for C compiler and linker postPatch = '' diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index c15867c1ca82..9c934bb5a4e7 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -2,38 +2,27 @@ lib, buildNpmPackage, gettext, - python3, + python314, fetchFromGitHub, plugins ? [ ], nixosTests, }: let - python = python3.override { + python = python314.override { self = python; packageOverrides = final: prev: { - django = prev.django_5; - - django-countries = prev.django-countries.overridePythonAttrs (oldAttrs: rec { - version = "8.1.0"; - src = fetchFromGitHub { - owner = "SmileyChris"; - repo = "django-countries"; - tag = "v${version}"; - hash = "sha256-KtBFSkYNKwivCFlqlWm4idiMybqsqiV0SNZx3egLl6c="; - }; - build-system = with final; [ uv-build ]; - }); + django = prev.django_6; }; }; - version = "2025.2.2"; + version = "2026.1.0"; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx"; tag = "v${version}"; - hash = "sha256-2qru52/ZALBAdRh0I+3VimVsiRl71YZgbSUD/LdoA/0="; + hash = "sha256-oSqeqVQ/L6DBI2ZP0h+qz2QBB4evt7V99tLMTkXvAic="; }; meta = { @@ -55,7 +44,7 @@ let sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor"; - npmDepsHash = "sha256-voHiml0nFWZIST39D5ErB0xTiWAOHN9OZinYutuQcdg="; + npmDepsHash = "sha256-66PA2COL3lqMspYGoF/bOJje5URRu1voQbZspM7DTxs="; npmBuildScript = "build"; @@ -131,10 +120,8 @@ python.pkgs.buildPythonApplication rec { diff-match-patch django django-context-decorator - django-countries django-csp django-filter - django-formset-js-improved django-formtools django-hierarkey django-i18nfield @@ -159,6 +146,7 @@ python.pkgs.buildPythonApplication rec { ] ++ beautifulsoup4.optional-dependencies.lxml ++ django.optional-dependencies.argon2 + ++ whitenoise.optional-dependencies.brotli ++ plugins; optional-dependencies = { @@ -194,15 +182,16 @@ python.pkgs.buildPythonApplication rec { preCheck = '' export PRETALX_CONFIG_FILE="$src/src/tests/ci_sqlite.cfg" - cd src ''; nativeCheckInputs = with python.pkgs; [ faker + factory-boy freezegun jsonschema + polib pytest-cov-stub pytest-django pytest-mock @@ -213,21 +202,8 @@ python.pkgs.buildPythonApplication rec { ++ lib.concatAttrValues optional-dependencies; disabledTests = [ - # tries to run npm run i18n:extract - "test_common_custom_makemessages_does_not_blow_up" - # Expected to perform X queries or less but Y were done - "test_can_see_schedule" - "test_schedule_export_public" - "test_schedule_frab_json_export" - "test_schedule_frab_xcal_export" - "test_schedule_frab_xml_export" - "test_schedule_frab_xml_export_control_char" - "test_schedule_page_text_list" - "test_schedule_page_text_table" - "test_schedule_page_text_wrong_format" - "test_versioned_schedule_page" - # Test is racy - "test_can_reset_password_by_email" + # assert 'tests.dummy_app' in ['pretalx_pages'] + "test_event_wizard_plugin_form_init_creates_field_for_installed_plugins" ]; passthru = { diff --git a/pkgs/by-name/pr/pretalx/plugins/downstream.nix b/pkgs/by-name/pr/pretalx/plugins/downstream.nix index dd1465777ac2..dede0f649861 100644 --- a/pkgs/by-name/pr/pretalx/plugins/downstream.nix +++ b/pkgs/by-name/pr/pretalx/plugins/downstream.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-downstream"; - version = "1.3.1"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-downstream"; rev = "v${version}"; - hash = "sha256-Q9519jNKQUeNCHg3ivjYyQm1ePMxp/bhtcJAselQiiM="; + hash = "sha256-sYdaG1F2jprSnzvVgxRyDrKzeQh9H7IKS/T3lObdvzc="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix index 1a3fd290702c..f50cd7304d2a 100644 --- a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix +++ b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-media-ccc-de"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-media-ccc-de"; rev = "v${version}"; - hash = "sha256-QyX/hmDom2QHiaTH0EFg2jxzochQaFQ4AOQ2vM6yofU="; + hash = "sha256-2a8AHP7G30K7Y8skmKnyoy/I9bpwgsUChf7s7G2nBZE="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/pages.nix b/pkgs/by-name/pr/pretalx/plugins/pages.nix index 39df7b787153..ae076d654b04 100644 --- a/pkgs/by-name/pr/pretalx/plugins/pages.nix +++ b/pkgs/by-name/pr/pretalx/plugins/pages.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-pages"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-pages"; tag = "v${version}"; - hash = "sha256-iRmDYjq08UkA/2pyUUK/DUuNbLNn/KSNQGiU1o1gTWw="; + hash = "sha256-2xrkUxOXLR8ccdpkTpDQOV75vkPzkKqodTGf9aqVU0Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix index eed5f89b46f0..8583c672e462 100644 --- a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix +++ b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-public-voting"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-public-voting"; rev = "v${version}"; - hash = "sha256-VslvZkmRy7f+rBd9re46WlmASyk01//N9+jajaSfKG4="; + hash = "sha256-nvMDOvxVJ97JBAQFi4BuMkdtWLODnopfFCoPzExbu00="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/venueless.nix b/pkgs/by-name/pr/pretalx/plugins/venueless.nix index 65e8ab7d00b6..f1deca7b8ac1 100644 --- a/pkgs/by-name/pr/pretalx/plugins/venueless.nix +++ b/pkgs/by-name/pr/pretalx/plugins/venueless.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pretalx-venueless"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-venueless"; rev = "v${version}"; - hash = "sha256-oV7J5ndhrhrI5UXTDexLMRo7Gud4SyppCKhoUtom54E="; + hash = "sha256-DgS10Pc08CVzbNUSwJpNee+/2THgt3zQsBlBk+mla6M="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix index fed9fd0da260..1948a19fb243 100644 --- a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix +++ b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-vimeo"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-vimeo"; rev = "v${version}"; - hash = "sha256-qj0z6sLIJz0Ug+MN7wGTDZli0CdArhdeGSpp4n/EaHk="; + hash = "sha256-ZohT6RLnvGINBkNuCBGonffzW2GdjYsYYy6B3di1bdo="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/youtube.nix b/pkgs/by-name/pr/pretalx/plugins/youtube.nix index 2620c5e80a4b..dd8a4f13adc1 100644 --- a/pkgs/by-name/pr/pretalx/plugins/youtube.nix +++ b/pkgs/by-name/pr/pretalx/plugins/youtube.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-youtube"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-youtube"; rev = "v${version}"; - hash = "sha256-vOgzYxF3MHzzcUb8TMLRSyuRc6RHcxvCWxAFRFAf1Cs="; + hash = "sha256-mudTB2qyCUkLwQsbbPiQuBeEscJQROdPWdjWmfOY7Vw="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/pr/pretalx/rebuild-no-npm.patch b/pkgs/by-name/pr/pretalx/rebuild-no-npm.patch index 579a630cda5f..0ca15e4fbd7c 100644 --- a/pkgs/by-name/pr/pretalx/rebuild-no-npm.patch +++ b/pkgs/by-name/pr/pretalx/rebuild-no-npm.patch @@ -1,8 +1,8 @@ diff --git a/src/pretalx/common/management/commands/rebuild.py b/src/pretalx/common/management/commands/rebuild.py -index 45c83aab3..8c8c1e590 100644 +index b7412498f..f9e2e24c3 100644 --- a/src/pretalx/common/management/commands/rebuild.py +++ b/src/pretalx/common/management/commands/rebuild.py -@@ -45,16 +45,6 @@ def handle(self, *args, **options): +@@ -57,16 +57,6 @@ def handle(self, *args, **options): call_command( "collectstatic", verbosity=silent, interactive=False, clear=options["clear"] ) @@ -14,8 +14,8 @@ index 45c83aab3..8c8c1e590 100644 - env["OUT_DIR"] = str(settings.STATIC_ROOT) - env["BASE_URL"] = settings.STATIC_URL - if options["npm_install"] or not (frontend_dir / "node_modules").exists(): -- subprocess.check_call(["npm", "ci"], cwd=frontend_dir) -- subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env) +- subprocess.check_call(["npm", "ci"], cwd=frontend_dir) # noqa: S607 -- npm is commonly installed in user paths +- subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env) # noqa: S607 -- npm is commonly installed in user paths # This fails if we don't have db access, which is fine with suppress(Exception): diff --git a/pkgs/by-name/rp/rpi-imager/package.nix b/pkgs/by-name/rp/rpi-imager/package.nix index 465297fbc350..4e470cece0c4 100644 --- a/pkgs/by-name/rp/rpi-imager/package.nix +++ b/pkgs/by-name/rp/rpi-imager/package.nix @@ -123,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; mainProgram = "rpi-imager"; maintainers = with lib.maintainers; [ - ymarkus anthonyroussel ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/wo/wofi-emoji/package.nix b/pkgs/by-name/wo/wofi-emoji/package.nix index 718caa04f6f2..ffe293c1cb9c 100644 --- a/pkgs/by-name/wo/wofi-emoji/package.nix +++ b/pkgs/by-name/wo/wofi-emoji/package.nix @@ -66,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ johnrtitor - ymarkus ]; platforms = lib.platforms.all; mainProgram = "wofi-emoji"; diff --git a/pkgs/by-name/zf/zfs-prune-snapshots/package.nix b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix index bd93010cbe31..755723afeecc 100644 --- a/pkgs/by-name/zf/zfs-prune-snapshots/package.nix +++ b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "zfs-prune-snapshots"; homepage = "https://github.com/bahamas10/zfs-prune-snapshots"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.ymarkus ]; + maintainers = [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 2d76c8c237c3..bb9aae785f0e 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -197,6 +197,10 @@ buildPythonPackage (finalAttrs: { # Flaky: Unclosed temporary file handle under heavy load (as in nixpkgs-review) "test_check_privileges_without_c_force_root_and_no_group_entry" ] + ++ lib.optionals (lib.versionAtLeast django.version "6.0") [ + "test_is_pickled" + "test_cleanup" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Too many open files on hydra "test_cleanup" diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index ff05d3f18d16..64a110368d99 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -6,36 +6,27 @@ djangorestframework, djangorestframework-simplejwt, fetchFromGitHub, - fetchpatch, python, responses, setuptools, unittest-xml-reporting, + pyotp, pytestCheckHook, pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dj-rest-auth"; - version = "7.0.2"; + version = "7.2.0"; pyproject = true; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; - tag = version; - hash = "sha256-tgcEnB9n9pq+TBde8udsr8osdAAJqmXaaU1Wt2psPIw="; + tag = finalAttrs.version; + hash = "sha256-eUcve2KPcLjKKWU7AxQEZ0mokP185E43Xjm4b+4hQzA="; }; - patches = [ - # See https://github.com/iMerica/dj-rest-auth/pull/683 - (fetchpatch { - name = "djangorestframework-simplejwt_5.5_compatibility.patch"; - url = "https://github.com/iMerica/dj-rest-auth/commit/cc5587e4e3f327697709f3f0d491650bff5464e7.diff"; - hash = "sha256-2LahibxuNECAfjqsbNs2ezaWt1VH0ZBNwSNWCZwIe8I="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace-fail "==" ">=" @@ -47,22 +38,24 @@ buildPythonPackage rec { dependencies = [ djangorestframework ]; - optional-dependencies.with_social = [ - django-allauth - ] - ++ django-allauth.optional-dependencies.socialaccount; + optional-dependencies = { + with_social = [ + django-allauth + ] + ++ django-allauth.optional-dependencies.socialaccount; + with_mfa = [ + pyotp + ]; + }; nativeCheckInputs = [ djangorestframework-simplejwt + pytestCheckHook + pytest-django responses unittest-xml-reporting ] - ++ optional-dependencies.with_social; - - checkInputs = [ - pytestCheckHook - pytest-django - ]; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; env.DJANGO_SETTINGS_MODULE = "dj_rest_auth.tests.settings"; @@ -74,15 +67,6 @@ buildPythonPackage rec { disabledTests = [ # Test connects to graph.facebook.com "TestSocialLoginSerializer" - # claim[user_id] is "1" (str) vs 1 (int) - "test_custom_jwt_claims" - "test_custom_jwt_claims_cookie_w_authentication" - ]; - - disabledTestPaths = [ - # Test fails with > django-allauth 65.4 - # See: https://github.com/iMerica/dj-rest-auth/pull/681#issuecomment-3034953311 - "dj_rest_auth/tests/test_social.py" ]; pythonImportsCheck = [ "dj_rest_auth" ]; @@ -90,8 +74,8 @@ buildPythonPackage rec { meta = { description = "Authentication for Django Rest Framework"; homepage = "https://github.com/iMerica/dj-rest-auth"; - changelog = "https://github.com/iMerica/dj-rest-auth/releases/tag/${src.tag}"; + changelog = "https://github.com/iMerica/dj-rest-auth/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/development/python-modules/django-tables2/default.nix b/pkgs/development/python-modules/django-tables2/default.nix index 84be33edda64..b27bbfee4923 100644 --- a/pkgs/development/python-modules/django-tables2/default.nix +++ b/pkgs/development/python-modules/django-tables2/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "django-tables2"; - version = "2.8.0"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "jieter"; repo = "django-tables2"; tag = "v${version}"; - hash = "sha256-gEURC3LUBdqebd4+TAJcbgn4SpY1oTI+tg9p2GGKClE="; + hash = "sha256-hy1eh+cSYK7TPgenCEo8J7msKgvk7i69PUb6m9NuCIA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index af0d378ac86a..3a17e86a80a9 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -58,17 +58,15 @@ buildPythonPackage rec { pytest7CheckHook ]; - disabledTests = [ - # https://github.com/graphql-python/graphene-django/issues/1510 - "test_should_filepath_convert_string" - "test_should_choice_convert_enum" - "test_should_multiplechoicefield_convert_to_list_of_enum" - "test_perform_mutate_success_with_enum_choice_field" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # this test touches files in the "/" directory and fails in darwin sandbox - "test_should_filepath_convert_string" - ]; + disabledTests = + lib.optionals (lib.versionAtLeast django.version "6.0") [ + "test_global_id_field_explicit" + "test_global_id_field_implicit" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # this test touches files in the "/" directory and fails in darwin sandbox + "test_should_filepath_convert_string" + ]; meta = { description = "Integrate GraphQL into your Django project"; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index dcb2be8baf26..a31cc9615899 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -16,16 +16,16 @@ uv-dynamic-versioning, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylitterbot"; - version = "2025.3.0"; + version = "2025.3.2"; pyproject = true; src = fetchFromGitHub { owner = "natekspencer"; repo = "pylitterbot"; - tag = version; - hash = "sha256-EK2QiQMHhA69p7xnyeYE+kru0k7eL9EilkAUAN6LukU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-bFJ6v27yfzMPqZijWCOlgdVS19IKIMqZcq2FjAyMnqo="; }; build-system = [ @@ -54,8 +54,8 @@ buildPythonPackage rec { meta = { description = "Modulefor controlling a Litter-Robot"; homepage = "https://github.com/natekspencer/pylitterbot"; - changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${src.tag}"; + changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index b2f3830d0b40..9ef49807e44d 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -5,16 +5,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyroute2"; - version = "0.9.5"; + version = "0.9.6"; pyproject = true; src = fetchFromGitHub { owner = "svinota"; repo = "pyroute2"; - tag = version; - hash = "sha256-KPXDXRQWonuTyy1SsvgO7jXjawiRj1XJ3zte5ZHanRw="; + tag = finalAttrs.version; + hash = "sha256-ZseZQFiR+btDsR+ozcd8DBp0vsNTb6tIzaArQfOk7CI="; }; build-system = [ setuptools ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; - changelog = "https://github.com/svinota/pyroute2/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/svinota/pyroute2/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = with lib.licenses; [ asl20 # or gpl2Plus @@ -54,4 +54,4 @@ buildPythonPackage rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index acf17ce538c5..fd3a2929a44d 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "pyswitchbot"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; tag = finalAttrs.version; - hash = "sha256-1DJ7mo1L75PPoVivngJPdbEWFTF36KLShkr3V1/rLDY="; + hash = "sha256-vVFCzbp7DMhyPlUXrw3fXwyKybf3nXyTH9zCTz6uh5E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index eb6672f51bbe..ddc9904d6c37 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -27,14 +27,14 @@ buildPythonPackage (finalAttrs: { pname = "rio-tiler"; - version = "9.0.4"; + version = "9.0.6"; pyproject = true; src = fetchFromGitHub { owner = "cogeotiff"; repo = "rio-tiler"; tag = finalAttrs.version; - hash = "sha256-R8vmb33ZfKGqRLkJ55npL031Gnc7HTUDeWiCvtaLsiM="; + hash = "sha256-oLMWrf3udqlf4SlQnBU7Stm6MzXS7EN6xWiTNtOOm4g="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 19e1a705fc1c..7c308bd2a216 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.15"; + version = "0.31.0"; pyproject = true; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; tag = "v${version}"; - hash = "sha256-wnfqxFKDSO7gcIc5UGJs/v3VxttlQPrRWYeZc5IlriU="; + hash = "sha256-Tuh+ycH2czTZHNw5p02NtCfBDuqshMiJAuzPAfcCaTE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tinytuya/default.nix b/pkgs/development/python-modules/tinytuya/default.nix index 646511d9e981..62af65c94588 100644 --- a/pkgs/development/python-modules/tinytuya/default.nix +++ b/pkgs/development/python-modules/tinytuya/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "tinytuya"; - version = "1.17.6"; + version = "1.18.0"; pyproject = true; src = fetchFromGitHub { owner = "jasonacox"; repo = "tinytuya"; tag = "v${version}"; - hash = "sha256-iX16Hqlvp0YIlhSFLa3MYAKOr+Z2ubPBPwI1883m5p4="; + hash = "sha256-0tY2O8OQ6hYZKF/2I6DehYygtNfZCJKIZiyW0iI8VQc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 2e8b496ce514..eb7145814487 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whitenoise"; version = "6.12.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "evansd"; repo = "whitenoise"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qNya/3oI9413VUGaLPq4vtuLvq9mIGhaYBt+4OhrkOw="; }; @@ -25,13 +25,14 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ brotli ]; + optional-dependencies.brotli = [ brotli ]; nativeCheckInputs = [ django pytestCheckHook requests - ]; + ] + ++ finalAttrs.passthru.optional-dependencies.brotli; disabledTests = [ # Test fails with AssertionError @@ -43,8 +44,8 @@ buildPythonPackage rec { meta = { description = "Library to serve static file for WSGI applications"; homepage = "https://whitenoise.readthedocs.io/"; - changelog = "https://github.com/evansd/whitenoise/blob/${version}/docs/changelog.rst"; + changelog = "https://github.com/evansd/whitenoise/blob/${finalAttrs.src.tag}/docs/changelog.rst"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index c7bd79345811..f66abe0c8582 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -9,8 +9,8 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "6.12.62"; - hash = "sha256-jcSzPoCCnmZU1GDBUWAljIUjZRzbfdh2aQB9/GOc5mQ="; + modDirVersion = "6.12.75"; + hash = "sha256-qrljd20n4tj/7C7gzNnxw7JIyEF2Ppf1PWm2a7vxh1w="; in lib.overrideDerivation (buildLinux ( @@ -23,8 +23,8 @@ lib.overrideDerivation src = fetchFromGitHub { owner = "raspberrypi"; repo = "linux"; - # https://github.com/RPi-Distro/linux-packaging/raw/refs/tags/pios/1%256.12.62-1+rpt1/debian/changelog - rev = "a1073743767f9e7fdc7017ababd2a07ea0c97c1c"; + # https://github.com/RPi-Distro/linux-packaging/raw/refs/tags/pios/1%256.12.75-1+rpt1/debian/changelog + rev = "89050b1059997d38d55462b323b099a6436dc10d"; inherit hash; }; diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix index 52b11e4b0b67..f55ad96d6971 100644 --- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "make-all"; domain = "tuya_local"; - version = "2026.4.0"; + version = "2026.4.2"; src = fetchFromGitHub { inherit owner; repo = "tuya-local"; tag = version; - hash = "sha256-7Q7bkyWLIv6m8d3XaKaoiBIXcOeb/1YcL4kfl0HfUZY="; + hash = "sha256-yxnWiAsI3nJrugnxI6XE4s2AIK/YvUIDfLY7BINzup4="; }; dependencies = [