diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 6c1c5197e480..159862ce26ce 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -450,6 +450,8 @@ - Overriding Wayland compositor is possible using `waylandSessionCompositor` option, but you might need to take care [`xfce4-session`](https://gitlab.xfce.org/xfce/xfce4-session/-/merge_requests/49), [`dbus-update-activation-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L234) and [`systemctl --user import-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L239) on startup. - For new Xfce installations, default panel layout has [changed](https://gitlab.xfce.org/xfce/xfce4-panel/-/merge_requests/158/diffs) to not include external panel plugins by default. You can still add them yourself using the "Panel Preferences" dialog. +- PAM services for `i3lock`/`i3lock-color`, `vlock`, `xlock`, and `xscreensaver` now default to disabled unless other corresponding NixOS options are set (`programs.i3lock.enable`, `console.enable`, `services.xserver.enable`, and `services.xscreensaver.enable`, respectively). If for some reason you want one of them back without setting the corresponding option, set, e.g., `security.pam.services.xlock.enable = true`. + - [`system.stateVersion`](#opt-system.stateVersion) is now validated and must be in the `"YY.MM"` format, ideally corresponding to a prior NixOS release. - `services.mysql` now supports easy cluster setup via [`services.mysql.galeraCluster`](#opt-services.mysql.galeraCluster.enable) option. diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index de74e5cda3c5..ad4e32e82561 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -145,6 +145,11 @@ let description = "Name of the PAM service."; }; + enable = lib.mkEnableOption "this PAM service" // { + default = true; + example = false; + }; + rules = lib.mkOption { # This option is experimental and subject to breaking changes without notice. visible = false; @@ -1566,6 +1571,8 @@ let Defaults env_keep+=SSH_AUTH_SOCK ''; + enabledServices = lib.filterAttrs (name: svc: svc.enable) config.security.pam.services; + in { @@ -2282,7 +2289,7 @@ in }; }; - environment.etc = lib.mapAttrs' makePAMService config.security.pam.services; + environment.etc = lib.mapAttrs' makePAMService enabledServices; security.pam.services = { @@ -2298,11 +2305,11 @@ in ''; # Most of these should be moved to specific modules. - i3lock = { }; - i3lock-color = { }; - vlock = { }; - xlock = { }; - xscreensaver = { }; + i3lock.enable = lib.mkDefault config.programs.i3lock.enable; + i3lock-color.enable = lib.mkDefault config.programs.i3lock.enable; + vlock.enable = lib.mkDefault config.console.enable; + xlock.enable = lib.mkDefault config.services.xserver.enable; + xscreensaver.enable = lib.mkDefault config.services.xscreensaver.enable; runuser = { rootOK = true; @@ -2327,11 +2334,11 @@ in security.apparmor.includes."abstractions/pam" = lib.concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") ( - lib.attrNames config.security.pam.services + lib.attrNames enabledServices ) + ( with lib; - pipe config.security.pam.services [ + pipe enabledServices [ lib.attrValues (catAttrs "rules") (lib.concatMap lib.attrValues) diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index d47f2ec05521..fbc5fe1ed2b3 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -15,7 +15,7 @@ let ${pkgs.lsof}/bin/lsof | ${pkgs.gnugrep}/bin/grep $MNTPT | ${pkgs.gawk}/bin/awk '{print $2}' | ${pkgs.findutils}/bin/xargs ${pkgs.util-linux}/bin/kill -$SIGNAL ''; - anyPamMount = lib.any (lib.attrByPath [ "pamMount" ] false) ( + anyPamMount = lib.any (svc: svc.enable && svc.pamMount) ( lib.attrValues config.security.pam.services ); in diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index d5bad47e52a4..3ee04d328c87 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -9,7 +9,7 @@ let cfg = config.services.xserver.displayManager; gdm = pkgs.gdm; - pamCfg = config.security.pam.services; + pamLogin = config.security.pam.services.login; settingsFormat = pkgs.formats.ini { }; configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings; @@ -345,7 +345,7 @@ in gdm-autologin.text = '' auth requisite pam_nologin.so auth required pam_succeed_if.so uid >= 1000 quiet - ${lib.optionalString pamCfg.login.enableGnomeKeyring '' + ${lib.optionalString (pamLogin.enable && pamLogin.enableGnomeKeyring) '' auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} @@ -369,7 +369,7 @@ in auth requisite pam_faillock.so preauth auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so auth required pam_env.so - ${lib.optionalString pamCfg.login.enableGnomeKeyring '' + ${lib.optionalString (pamLogin.enable && pamLogin.enableGnomeKeyring) '' auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix deleted file mode 100644 index d560f537b499..000000000000 --- a/pkgs/applications/radio/qlog/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - fetchFromGitHub, - qtbase, - stdenv, - lib, - wrapQtAppsHook, - qmake, - qtcharts, - qtwebengine, - qtserialport, - qtwebchannel, - hamlib, - qtkeychain, - pkg-config, - cups, -}: - -stdenv.mkDerivation rec { - pname = "qlog"; - version = "0.43.0"; - - src = fetchFromGitHub { - owner = "foldynl"; - repo = "QLog"; - rev = "v${version}"; - hash = "sha256-gCXLZ00klyjisLxSvs4wKD0Sg8CFvF0xR+eHpc1D0Jc="; - fetchSubmodules = true; - }; - - env.NIX_LDFLAGS = "-lhamlib"; - - buildInputs = - [ - qtbase - qtcharts - qtwebengine - qtserialport - qtwebchannel - hamlib - qtkeychain - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cups - ]; - - nativeBuildInputs = [ - wrapQtAppsHook - qmake - pkg-config - ]; - - meta = with lib; { - description = "Amateur radio logbook software"; - mainProgram = "qlog"; - license = with licenses; [ gpl3Only ]; - homepage = "https://github.com/foldynl/QLog"; - maintainers = with maintainers; [ - oliver-koss - mkg20001 - ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/by-name/ig/igvm-tooling/package.nix b/pkgs/by-name/ig/igvm-tooling/package.nix index 557bcee8aa0d..05629f538466 100644 --- a/pkgs/by-name/ig/igvm-tooling/package.nix +++ b/pkgs/by-name/ig/igvm-tooling/package.nix @@ -5,7 +5,7 @@ fetchpatch, which, acpica-tools, - nix-update-script, + unstableGitUpdater, }: python3.pkgs.buildPythonApplication rec { @@ -62,7 +62,9 @@ python3.pkgs.buildPythonApplication rec { find $out/share/igvm-tooling/acpi -name "*.dsl" -exec iasl -f {} \; ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "igvm-"; + }; meta = { description = "IGVM Image Generator"; diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 393045e5ff2b..716c85a71644 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.13.1"; + version = "3.14.0"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-jZvF0vagzQRhw2vPhY61/ayki/gneG66e2MPBaqwlyk="; + hash = "sha256-kQ8VwUYfNnnBPJTLsN2/VZyHZ4KReD7yJiL3ukA96o0="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix index 88d348e32f1a..ae866f2ed639 100644 --- a/pkgs/by-name/op/opkssh/package.nix +++ b/pkgs/by-name/op/opkssh/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "opkssh"; - version = "0.3.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "openpubkey"; repo = "opkssh"; tag = "v${finalAttrs.version}"; - hash = "sha256-RtTo/wj4v+jtJ4xZJD0YunKtxT7zZ1esgJOSEtxnLOg="; + hash = "sha256-93GtevOnJD7CJlKTR9IMlrausBA0ipveunOUZbowRDQ="; }; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-MK7lEBKMVZv4jbYY2Vf0zYjw7YV+13tB0HkO3tCqzEI="; + vendorHash = "sha256-CQYeRN//mEA5vUj9rtIxZQSE3t3sl/kY6F3ICEIrZao="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix new file mode 100644 index 000000000000..9a6121bdb15f --- /dev/null +++ b/pkgs/by-name/ql/qlog/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + stdenv, + lib, + cups, + hamlib, + pkg-config, + qt6, + qt6Packages, +}: + +stdenv.mkDerivation rec { + pname = "qlog"; + version = "0.43.1"; + + src = fetchFromGitHub { + owner = "foldynl"; + repo = "QLog"; + tag = "v${version}"; + hash = "sha256-D3WtvSHDauo/9py9To2Kn+20vrSvgw+b1+H0inNnRJI="; + fetchSubmodules = true; + }; + + env.NIX_LDFLAGS = "-lhamlib"; + + buildInputs = + [ + hamlib + qt6.qtbase + qt6.qtcharts + qt6.qtserialport + qt6.qtwebchannel + qt6.qtwebengine + qt6Packages.qtkeychain + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cups + ]; + + nativeBuildInputs = [ + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/{qlog.app,Applications} + ln -s $out/Applications/qlog.app/Contents/MacOS/qlog $out/bin/qlog + ''; + + meta = { + description = "Amateur radio logbook software"; + mainProgram = "qlog"; + license = with lib.licenses; [ gpl3Only ]; + homepage = "https://github.com/foldynl/QLog"; + maintainers = with lib.maintainers; [ + oliver-koss + mkg20001 + ]; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 8a4b957c48ec..48f7c810724e 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -199,15 +199,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "9.0.0-beta.25161.4", - "hash": "sha256-NrQSPWnG7RlhNMyrqcz4sR0+WWpJpoTrrRtVLkIGFms=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25161.4/microsoft.dotnet.arcade.sdk.9.0.0-beta.25161.4.nupkg" + "version": "9.0.0-beta.25164.2", + "hash": "sha256-NZ3Isdg/TWeD5oqBtzwZ+k4ouuVAbSevKR1AbFXzxR8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25164.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.25164.2.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "9.0.0-beta.25161.4", - "hash": "sha256-l4CTmNsxuFP3Bjs2mS1/zdmsb/ZvyHpddTX2HT+MVu4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25161.4/microsoft.dotnet.xlifftasks.9.0.0-beta.25161.4.nupkg" + "version": "9.0.0-beta.25164.2", + "hash": "sha256-1wCqxMI/Xn7HgxyaYP5LcLoXh8GGCM8aj6s8EQJzIyQ=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25164.2/microsoft.dotnet.xlifftasks.9.0.0-beta.25164.2.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", @@ -415,9 +415,9 @@ }, { "pname": "Microsoft.VisualStudio.Telemetry", - "version": "17.14.2", - "hash": "sha256-MqIrtr0I5uC64ww7v7xD2nTOqsdAqX7C1nPNzfhTkWA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.14.2/microsoft.visualstudio.telemetry.17.14.2.nupkg" + "version": "17.14.8", + "hash": "sha256-DBqhTILQhgFqeVVr1/ktcIAlM8KgdUuaKomONSwzQ1I=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.14.8/microsoft.visualstudio.telemetry.17.14.8.nupkg" }, { "pname": "Microsoft.VisualStudio.Threading", @@ -545,12 +545,6 @@ "hash": "sha256-ioasr71UIhDmeZ2Etw52lQ7QsioEd1pnbpVlEeCyUI4=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg" }, - { - "pname": "RichCodeNav.EnvVarDump", - "version": "0.1.1643-alpha", - "hash": "sha256-bwND+Na9iEnkEdeL1elY34+m4/F4BYATBHv/2BEw4d4=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg" - }, { "pname": "Roslyn.Diagnostics.Analyzers", "version": "3.11.0-beta1.24081.1", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index ce314ce8ea8e..790be6a3697b 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.70.15"; + vsVersion = "2.74.24"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-vXRt/scWxekd8U04MGfD4W8aj05H0CqkbIYZy8+0OdU="; + hash = "sha256-Q5yt8eMUuLx+X7sNlc6uTlMsC20G0SXcn3RdsrSDapg="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.14.0-3.25164.3"; + version = "5.0.0-1.25204.1"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; diff --git a/pkgs/development/php-packages/excimer/default.nix b/pkgs/development/php-packages/excimer/default.nix new file mode 100644 index 000000000000..18d74e90e8ef --- /dev/null +++ b/pkgs/development/php-packages/excimer/default.nix @@ -0,0 +1,28 @@ +{ + buildPecl, + lib, + fetchFromGitHub, +}: + +let + version = "1.2.3"; +in +buildPecl { + inherit version; + pname = "excimer"; + + src = fetchFromGitHub { + owner = "wikimedia"; + repo = "mediawiki-php-excimer"; + tag = version; + hash = "sha256-p1tnrrSiTtoin/QSQFeeiX0Di1wFD8CMTdLazOfjWKU="; + }; + + meta = { + changelog = "https://pecl.php.net/package-changelog.php?package=excimer&release=${version}"; + description = "PHP extension that provides an interrupting timer and a low-overhead sampling profiler"; + license = lib.licenses.asl20; + homepage = "https://mediawiki.org/wiki/Excimer"; + maintainers = lib.teams.php.members; + }; +} diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix index 6c9d585a09f5..014167bf2aea 100644 --- a/pkgs/development/python-modules/distrax/default.nix +++ b/pkgs/development/python-modules/distrax/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, chex, jaxlib, numpy, @@ -23,6 +24,15 @@ buildPythonPackage rec { hash = "sha256-A1aCL/I89Blg9sNmIWQru4QJteUTN6+bhgrEJPmCrM0="; }; + patches = [ + # TODO: remove at the next release (already on master) + (fetchpatch { + name = "fix-jax-0.6.0-compat"; + url = "https://github.com/google-deepmind/distrax/commit/c02708ac46518fac00ab2945311e0f2ee32c672c.patch"; + hash = "sha256-hFNXKoA1b5I6dzhwTRXp/SnkHv89GI6tYwlnBBHwG78="; + }) + ]; + dependencies = [ chex jaxlib @@ -71,6 +81,10 @@ buildPythonPackage rec { ]; disabledTestPaths = [ + # Since jax 0.6.0: + # TypeError: () got an unexpected keyword argument 'accuracy' + "distrax/_src/bijectors/lambda_bijector_test.py" + # TypeErrors "distrax/_src/bijectors/tfp_compatible_bijector_test.py" "distrax/_src/distributions/distribution_from_tfp_test.py" diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 31ed846da855..df171f75d234 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "django-cacheops"; - version = "7.1"; + version = "7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_cacheops"; inherit version; - hash = "sha256-7Aeau5aFVzIe4gjGJ0ggIxgg+YymN33alx8EmBvCq1I="; + hash = "sha256-y8EcwDISlaNkTie8smlA8Iy5wucdPuUGy8/wvdoanzM="; }; pythonRelaxDeps = [ "funcy" ]; diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 5ea929f8570e..0a818b0b8f36 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -58,6 +58,17 @@ let }) ]; + # AttributeError: jax.core.Var was removed in JAX v0.6.0. Use jax.extend.core.Var instead, and + # see https://docs.jax.dev/en/latest/jax.extend.html for details. + # Alrady on master: https://github.com/google-deepmind/dm-haiku/commit/cfe8480d253a93100bf5e2d24c40435a95399c96 + # TODO: remove at the next release + postPatch = '' + substituteInPlace haiku/_src/jaxpr_info.py \ + --replace-fail "jax.core.JaxprEqn" "jax.extend.core.JaxprEqn" \ + --replace-fail "jax.core.Var" "jax.extend.core.Var" \ + --replace-fail "jax.core.Jaxpr" "jax.extend.core.Jaxpr" + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix index a87833f8bb63..c98c3d7cb119 100644 --- a/pkgs/development/python-modules/gymnasium/default.nix +++ b/pkgs/development/python-modules/gymnasium/default.nix @@ -90,6 +90,15 @@ buildPythonPackage rec { ]; disabledTests = [ + # Fails since jax 0.6.0 + # Fixed on master https://github.com/Farama-Foundation/Gymnasium/commit/94019feee1a0f945b9569cddf62780f4e1a224a5 + # TODO: un-skip at the next release + "test_all_env_api" + "test_env_determinism_rollout" + "test_jax_to_numpy_wrapper" + "test_pickle_env" + "test_roundtripping" + # Succeeds for most environments but `test_render_modes[Reacher-v4]` fails because it requires # OpenGL access which is not possible inside the sandbox. "test_render_mode" diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix index 14c59787f06a..160158d0ed39 100644 --- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - fetchurl, + fetchPypi, addDriverRunpath, autoPatchelfHook, pypaInstallHook, @@ -31,30 +31,31 @@ let ] ); - # Find new releases at https://storage.googleapis.com/jax-releases - # When upgrading, you can get these hashes from jaxlib/prefetch.sh. See - # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. - - # upstream does not distribute jax-cuda12-pjrt binaries for aarch64-linux - srcs = { - "x86_64-linux" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_x86_64.whl"; - hash = "sha256-xTeDBlaLoMgbIwp3ndMZTJ3RAzmrY2CugJKBCNN+f3U="; - }; - # "aarch64-linux" = fetchurl { - # url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_aarch64.whl"; - # hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - # }; - }; in -buildPythonPackage { +buildPythonPackage rec { pname = "jax-cuda12-pjrt"; inherit version; pyproject = false; - src = - srcs.${stdenv.hostPlatform.system} - or (throw "jax-cuda12-pjrt: No src for ${stdenv.hostPlatform.system}"); + src = fetchPypi { + pname = "jax_cuda12_pjrt"; + inherit version; + format = "wheel"; + python = "py3"; + dist = "py3"; + platform = + { + x86_64-linux = "manylinux2014_x86_64"; + aarch64-linux = "manylinux2014_aarch64"; + } + .${stdenv.hostPlatform.system}; + hash = + { + x86_64-linux = "sha256-aDcb2cE1JEuJZjA5viCCVWmKdb7JhU1BnqPD+VfKRkY= "; + aarch64-linux = "sha256-m/67BqOWFMtomfdzDqhWHxEVasgcuz7GiEpir7OxX/M="; + } + .${stdenv.hostPlatform.system}; + }; nativeBuildInputs = [ autoPatchelfHook @@ -97,7 +98,7 @@ buildPythonPackage { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ natsukium ]; - platforms = lib.attrNames srcs; + platforms = lib.platforms.linux; # see CUDA compatibility matrix # https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder broken = diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix index a1bcf01218da..3103feb271e4 100644 --- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix @@ -40,42 +40,42 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-uiVVln+bbDgci075+wPQW8Vewl7P7lz+RcWs4099QVI="; + hash = "sha256-pwDhcYI84lUQIALkDJR4j6ho8hYle30/BWjQn+dcEHs="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp310"; - hash = "sha256-YXGu0vSzvdX8E3gt4QcsamNPzhNzG3XQywpquPTm5lA="; + hash = "sha256-UwrYUcpGKZHOgtsmrUfwKwjOvkg8nI0MADfp4np7Up8="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-qqcEpe9UdZXQItscHkh4oGdxFkEqk2DBFdZ/9LZOFZY="; + hash = "sha256-DZ7O3mbEAlhwKkImHoaM21ahA1UafDyISzX1Mcms1I4="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-KY0tdo8QKbdKCx0BJw5Uk0nSw33Adlh5ZULNqWfre9M="; + hash = "sha256-fNG0iKVKMInolYjMr2dwiZUsglKefQQD4LBQGZ5SVBg="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-IDDPEgjOTqcO5WysYd3SOfl5hpX8Obt3OcUKJdbp2kQ="; + hash = "sha256-5w608IRpbD474StekJ7xIFyfVu/j3OzyYhvZtatZVNU="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-wlF6fCGG+HCIlGluJs+W69YLeHnOyjmLLEarso0slsg="; + hash = "sha256-oqOvX5iIDYb40kartGpVLlou9J12e/xKdMjDV3UgB8Y="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-GGJZWyttgVZ50R4OiJ5SMYXuVKRtRuAiaJ9w/EVU3ZE="; + hash = "sha256-6W891KlCUWroeMn2l+au/teOFI8JAYynPuKLI0JqfYo="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-If7BtWyYeD6gVpt0elZ1Hx+f8hh7SKzBHHANO/xeGjE="; + hash = "sha256-o0LyznxLH1nUA/Zlo1qGuGUCU7sl3jRkf7IlxFzrCgQ="; }; }; in diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 30b6789692a9..b8168916df8d 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.5.3"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { @@ -48,7 +48,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! tag = "jax-v${version}"; - hash = "sha256-t4LHwpCz08zrQGWBehyPs2JnxsOvtV3L14MCdTqMeEI="; + hash = "sha256-leadxLK21JF/cF/hMveUPgrwyumjR+zMm9Wsn7bWNLQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 4a8bfb8d31af..8c934c4af977 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,7 +18,7 @@ }: let - version = "0.5.3"; + version = "0.6.0"; inherit (python) pythonVersion; # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the @@ -49,65 +49,65 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-Ur5sl3Wv9zimEXDYwEdQXHW7eZpFUY5mp6CQgSexF4U="; + hash = "sha256-pNQlTHEziIh6MhN508WxogITqNzckD+vFRObqB4+zWE="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp310"; - hash = "sha256-lyQA20r26FJw2B215uYg0xOV8EcuUQxQ381Ms/crciA="; + hash = "sha256-VBpBi5iyjfW9Oh6TxistP2TUSwxwt7YI9/4rSqRSsq8="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-SP9cifuKD+BNR16d3AdLSHmpHXq2ilHOxc0eh/gebEc="; + hash = "sha256-ZKgvjrQP23uh1G75BzANQuT5jL2pYCou2OcNsamsSmA="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-KeFTD8gYMyFvHii1eNDFlpdlT3LuMcekTtd1O69axGY="; + hash = "sha256-vtRVJeO7XsCGML/SB8Ca+dYun/E/XwfC7iz9jthBG6E="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-pGZvgdcsBg7T5YHe0RapyqmwpwoUilTLEqHTr8o2JLU="; + hash = "sha256-wK6VmJmALhMpzI7ForTUvpoHa1vrIFLrSbo3UU5iPrw="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-tivYsp5aT5v6pXyNr24EggssmU9Ejz3sYC1kJVVF6fI="; + hash = "sha256-7xY88H3gC8VpAWnpf6+q3DePHDgfAofopHPnirW6sbU="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-Wl6IqxzW/feNaavjVE6PCcziAN0zm7hfvjwupn8qXmg="; + hash = "sha256-tthbjR/XkkiwRQNRcgHnL8vNOYDPeR036BRwnqUKPII="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-vd9jYDd6oceS5H/YfzB8NC4zHl/zWC+UCxvKAPa0vHM="; + hash = "sha256-JTb6k+wUjVAW2osgd7pmMlsNhqriKJphwSaHfwQrPRw="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-05Tb3koca9Z1Ac+ynTgZoQuQDLU0zA/GAzGfcJLyTPo="; + hash = "sha256-fjzi7w7cm0izbicEw2GB8eznoSrBFN91PbQobqLG6Lg="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-u3WTy3//yxOWPyL6UintlguPtK5ew7CCAEjL1n8ejjE="; + hash = "sha256-0PsSLceDDKKlyjyHSghzY6AFMrZEUJwhnDv9HVRRXo0="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-6QS5Le37x+VFclqNdnaYcDCunAaQAdlHAbwQnG2rQQA="; + hash = "sha256-GJcpY5diBQwXgLBQ6Y/2IEgLHqMr8WdTPgAKXPTFc44="; }; "3.13-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp313"; - hash = "sha256-MTIcJSgqBqbfyUBQe8FNCgrIONjO1sB6oAp/rjTOez8="; + hash = "sha256-xOl5NMuvUXI0OqWujvDFhGLOJhVN/adUICswNBYMrHs="; }; }; in diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 58b92815d1c7..2a2a49fd9b91 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -48,7 +48,11 @@ buildPythonPackage rec { hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak="; }; - build-system = [ hatchling ]; + build-system = [ + hatchling + # babel, setuptools required as "build hooks" + babel + ] ++ lib.optionals (pythonAtLeast "3.12") [ setuptools ]; dependencies = [ click @@ -67,7 +71,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; optional-dependencies = { - i18n = [ babel ] ++ lib.optionals (pythonAtLeast "3.12") [ setuptools ]; + i18n = [ babel ]; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index c74c35c76ed9..7d800cc5e62f 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { hash = "sha256-v2Lbzya+E9d7tlUVlQQa4fuPp2q3E309Qvyt70mcdb0="; }; + # TODO: remove these patches at the next release (already on master) patches = [ (fetchpatch { # Follow chex API change (https://github.com/google-deepmind/chex/pull/52) @@ -43,6 +44,22 @@ buildPythonPackage rec { url = "https://github.com/google-deepmind/rlax/commit/30e7913a1102667137654d6e652a6c4b9e9ba1f4.patch"; hash = "sha256-OPnuTKEtwZ28hzR1660v3DcktxTYjhR1xYvFbQvOhgs="; }) + (fetchpatch { + name = "remove-deprecation-warning"; + url = "https://github.com/google-deepmind/rlax/commit/dea6eb479ffc32156aefe73015387a762c6b4562.patch"; + hash = "sha256-htDyDRJW0eQx7AmrS3Fl7Lbh2VAmoYiDgHSePsQUaWs="; + }) + (fetchpatch { + name = "fix-deprecation-warnings"; + url = "https://github.com/google-deepmind/rlax/commit/605e0ef8ad8f9a06e88d4aabbb7d50e086d0cf3a.patch"; + hash = "sha256-GZ/nGMXne6Lv6yDm/29NVTWxLBVSzaPYKAfQOLHY4UI="; + }) + # https://github.com/google-deepmind/rlax/pull/135 + (fetchpatch { + name = "fix-jax-0.6.0-compat"; + url = "https://github.com/google-deepmind/rlax/commit/461b4cf9b4239d6b1b83aad6e5946f68d8402b93.patch"; + hash = "sha256-uPMpm4IcoBWJwnyuIRjQEfo0F9HIW/lrwecxGW/Yw38="; + }) ]; build-system = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 36bdeab9fe76..5577c6104813 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -49,6 +49,10 @@ buildPythonPackage rec { ]; versionCheckProgramArg = "--version"; + preCheck = '' + export PATH=$out/bin:$PATH + ''; + __darwinAllowLocalNetworking = true; disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/waymax/default.nix b/pkgs/development/python-modules/waymax/default.nix index 1e499b92f03a..6fb36ddcf8b8 100644 --- a/pkgs/development/python-modules/waymax/default.nix +++ b/pkgs/development/python-modules/waymax/default.nix @@ -19,9 +19,9 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage { pname = "waymax"; - version = "0-unstable-2025-03-25"; + version = "0-unstable-2024-03-23"; pyproject = true; src = fetchFromGitHub { @@ -31,6 +31,21 @@ buildPythonPackage rec { hash = "sha256-B1Rp5MATbEelp6G6K2wwV83QpINhOHgvAxb3mBN52Eg="; }; + # AttributeError: jax.tree_map was removed in JAX v0.6.0: use jax.tree.map (jax v0.4.25 or newer) or jax.tree_util.tree_map (any JAX version). + # https://github.com/waymo-research/waymax/pull/77 + postPatch = '' + substituteInPlace \ + waymax/agents/expert.py \ + waymax/agents/waypoint_following_agent.py \ + waymax/agents/waypoint_following_agent_test.py \ + waymax/dynamics/abstract_dynamics_test.py \ + waymax/dynamics/state_dynamics_test.py \ + waymax/env/base_environment_test.py \ + waymax/env/rollout_test.py \ + waymax/env/wrappers/brax_wrapper_test.py \ + --replace-fail "jax.tree_map" "jax.tree_util.tree_map" + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5aee6d9bad4f..b584538eb42e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.15-rc1", - "hash": "sha256:0kp35q86jihknj5y6f1zspfkhqx0c0npkk3is8p0gf2r3y302cp9" + "version": "6.15-rc2", + "hash": "sha256:0ldqjmafisf8dx5xhak9y7glwlrk07hppfpi27w2nb5845bqdwfz" }, "6.1": { "version": "6.1.134", @@ -24,15 +24,15 @@ "hash": "sha256:1iks6msk4cajyy0khyhrwsdl123hr81n67xzdnhlgg6dvb1famw9" }, "6.12": { - "version": "6.12.23", - "hash": "sha256:0jbps9sr4bpg4ym6vjib33lfjqjh09azh39ck7v7zsyyz0259nfq" + "version": "6.12.24", + "hash": "sha256:078c2gs7f4gzxhc1jr42bfwrfi4yq5f84l7r2bfn05crnp0l4cb4" }, "6.13": { - "version": "6.13.11", - "hash": "sha256:08gcms4gvh8i30wj9vk27rb7d4yrndprxk1m72dhr1f7lywz2azn" + "version": "6.13.12", + "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1" }, "6.14": { - "version": "6.14.2", - "hash": "sha256:06rfg9bnn48his9km0nf38i3fp4ylws7v9apjc9r0cgaajiq5in5" + "version": "6.14.3", + "hash": "sha256:0ak5av0ykf8m65dmbihlcx9ahb1p8rgx6bm04acz0s15qcic7ili" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf4fdd586dde..707126c1a872 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4640,8 +4640,6 @@ with pkgs; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; - qlog = qt6Packages.callPackage ../applications/radio/qlog { }; - quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 008f239bf8ec..1f84875d55d5 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -296,6 +296,8 @@ lib.makeScope pkgs.newScope ( event = callPackage ../development/php-packages/event { }; + excimer = callPackage ../development/php-packages/excimer { }; + gnupg = callPackage ../development/php-packages/gnupg { }; grpc = callPackage ../development/php-packages/grpc { };