Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -450,6 +450,8 @@
|
||||
- Overriding Wayland compositor is possible using `enableWaylandSession` 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.
|
||||
|
||||
- [`system.stateVersion`](#opt-system.stateVersion) is now validated and must be in the `"YY.MM"` format, ideally corresponding to a prior NixOS release.
|
||||
|
||||
- GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details.
|
||||
|
||||
- [`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`.
|
||||
|
||||
@@ -16,6 +16,7 @@ let
|
||||
toLower
|
||||
optionalString
|
||||
literalExpression
|
||||
match
|
||||
mkRenamedOptionModule
|
||||
mkDefault
|
||||
mkOption
|
||||
@@ -263,6 +264,27 @@ in
|
||||
|
||||
config = {
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion = match "[0-9]{2}\\.[0-9]{2}" config.system.stateVersion != null;
|
||||
message = ''
|
||||
${config.system.stateVersion} is an invalid value for 'system.stateVersion'; it must be in the format "YY.MM",
|
||||
which corresponds to a prior release of NixOS.
|
||||
|
||||
If you want to switch releases or switch to unstable, you should change your channel and/or flake input URLs only.
|
||||
*DO NOT* touch the 'system.stateVersion' option, as it will not help you upgrade.
|
||||
Leave it exactly on the previous value, which is likely the value you had for it when you installed your system.
|
||||
|
||||
If you're unsure which value to set it to, use "${
|
||||
if match "[0-9]{2}\\.[0-9]{2}" options.system.stateVersion.default != null then
|
||||
options.system.stateVersion.default
|
||||
else
|
||||
options.system.nixos.release.default
|
||||
}" as a default.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
system.nixos = {
|
||||
# These defaults are set here rather than up there so that
|
||||
# changing them would not rebuild the manual
|
||||
|
||||
+3
-3
@@ -32,13 +32,13 @@ let
|
||||
in
|
||||
melpaBuild {
|
||||
pname = "lsp-bridge";
|
||||
version = "0-unstable-2025-01-22";
|
||||
version = "0-unstable-2025-02-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manateelazycat";
|
||||
repo = "lsp-bridge";
|
||||
rev = "c87e6ac6d452b3bd94583a5c5edb16f37edadb94";
|
||||
hash = "sha256-+6qU8KGdti/pji1d+024bnT7+oFP5Ve3jToURautKzE=";
|
||||
rev = "16c9054be6e40a254e096715b1acf80ca36918aa";
|
||||
hash = "sha256-u1NWrSLsc+SRiK9BZwAujrzYb7vU+lEqyT+wozbXaiY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -171,6 +171,10 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace ./modules/cs_user.py --replace-fail "/usr/bin/passwd" "/run/wrappers/bin/passwd"
|
||||
popd
|
||||
|
||||
# In preFixup we make these executable.
|
||||
substituteInPlace ./files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js \
|
||||
--replace-fail "Util.spawn_async(['python3'," "Util.spawn_async(["
|
||||
|
||||
substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \
|
||||
--replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session"
|
||||
|
||||
@@ -198,6 +202,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Called as `pkexec cinnamon-settings-users.py`.
|
||||
wrapGApp $out/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
|
||||
|
||||
# postPatch touches both but we mainly want to wrap cancel-print-dialog.
|
||||
chmod +x $out/share/cinnamon/applets/printers@cinnamon.org/{cancel-print-dialog,lpstat-a}.py
|
||||
wrapGApp $out/share/cinnamon/applets/printers@cinnamon.org/cancel-print-dialog.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -37,7 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "USE_SYSTEM_LIBS" true)
|
||||
];
|
||||
|
||||
doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
|
||||
# The tests check what CPU the host has and makes sure it can query information.
|
||||
# not all build environments may have this information availaible. And, cpuinfo may
|
||||
# not understand all CPUs (causing test failures such as https://github.com/pytorch/cpuinfo/issues/132)
|
||||
# Instead, allow building in any environment.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Tools and library to detect essential for performance optimization information about host CPU";
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2025-01-27";
|
||||
version = "0-unstable-2025-02-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "e1ae908bcc30af792b0bb0a52e53b03d2577255e";
|
||||
hash = "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=";
|
||||
rev = "5af1b9a0f193ab6138b89a8e0af8763c21bbf491";
|
||||
hash = "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -35,13 +35,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nemo";
|
||||
version = "6.4.3";
|
||||
version = "6.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-3FALXfW0PzWuirX7bxP8BFkIRyQzvg3xBQCdddSpmOg=";
|
||||
hash = "sha256-6U7SeqgWKFb6l5u/fHqv+gzIh+MsJurKuWpHDNGRTsg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simdutf";
|
||||
version = "6.1.1";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdutf";
|
||||
repo = "simdutf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VAIxoTXOcWA2V+vx+AsCArkjprFiZun5BJoP1l3FGk0=";
|
||||
hash = "sha256-kjKwJKAmzHwna5T/8tYp3kddHa4r1y+0wVJmotvg0OQ=";
|
||||
};
|
||||
|
||||
# Fix build on darwin
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-OxBFw18XHLbR7HoJHYxVQVwkO14HvJjpjrWt8nQ+FDQ=",
|
||||
"version": "0.2025.01.22.08.02.stable_05"
|
||||
"hash": "sha256-Z5NCTgOs49Pld1jRyUngbSgkxuH4LPROx06bf7H0cuE=",
|
||||
"version": "0.2025.02.05.08.02.stable_03"
|
||||
},
|
||||
"linux_x86_64": {
|
||||
"hash": "sha256-5Ro7nLGzmAWQGG0e2797LvvBW5nkB+OHSiw5hXw75wM=",
|
||||
"version": "0.2025.01.22.08.02.stable_05"
|
||||
"hash": "sha256-xvckfFXl/ECP5YS/+NZv1UJFkVpIMQ7qnbzM3ffVrmw=",
|
||||
"version": "0.2025.02.05.08.02.stable_03"
|
||||
},
|
||||
"linux_aarch64": {
|
||||
"hash": "sha256-C00/LQc4AmB+8UcNENrt1Qrk6nZmPwQtHHa7SEvQ+GY=",
|
||||
"version": "0.2025.01.22.08.02.stable_05"
|
||||
"hash": "sha256-x1U8EyZ+AoLdmF1LdXHEWz28+El/aBhD7JOG/XNaBJY=",
|
||||
"version": "0.2025.02.05.08.02.stable_03"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-config";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-zAJD1p0iJUEN+pOW1nyVKrCBfew/uqVNqw9aCFq+JY4=";
|
||||
hash = "sha256-Vzf+Olaxl6tn3ETEQseFIPstjo+pfdzZUgyVFqk6p3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docling-core";
|
||||
version = "2.16.1";
|
||||
version = "2.17.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DS4SD";
|
||||
repo = "docling-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oW/jX9IHCpztc0FDm8/3OzDmOxM92jrkFq/JeAcI9ZA=";
|
||||
hash = "sha256-JO6WI2juehO825QOO0FkD58OigEoLGOZAnPBOD4b1tI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docling-parse";
|
||||
version = "3.1.2";
|
||||
version = "3.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DS4SD";
|
||||
repo = "docling-parse";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SgVLk1kruUSjtzuo/5YFY4Keha8zMzovm/UeCtfGaNY=";
|
||||
hash = "sha256-huJOH/5SQoJiJp1wmJV5n07KHDZseM9XI26bfPQAxrA=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@@ -44,14 +44,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docling";
|
||||
version = "2.17.0";
|
||||
version = "2.20.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DS4SD";
|
||||
repo = "docling";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OtUFQRNqyTGT1Z41tHziwM5hqbk+tg/97bxhtPVtmN0=";
|
||||
hash = "sha256-6p6/UwbI4ZB6ro1O5ELg8fENEnpH4ycpCyOk7QPX7cY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
@@ -17,12 +16,13 @@
|
||||
numpy,
|
||||
pyyaml,
|
||||
|
||||
# checks
|
||||
# tests
|
||||
# brax, (unpackaged)
|
||||
# gymnax, (unpackaged)
|
||||
pytestCheckHook,
|
||||
torch,
|
||||
torchvision,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -30,8 +30,6 @@ buildPythonPackage rec {
|
||||
version = "0.1.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RobertTLange";
|
||||
repo = "evosax";
|
||||
@@ -54,16 +52,13 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "evosax" ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
# brax
|
||||
# gymnax
|
||||
pytestCheckHook
|
||||
torch
|
||||
torchvision
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@@ -77,7 +72,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Evolution Strategies in JAX";
|
||||
homepage = "https://github.com/RobertTLange/evosax";
|
||||
changelog = "https://github.com/RobertTLange/evosax/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/RobertTLange/evosax/releases/tag/v.${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "materialx";
|
||||
version = "1.39.1";
|
||||
version = "1.38.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "MaterialX";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WzzsY1hOWwJEqT/ZRLIoZDfKNvx1Yf6aFhA3ZcSPx+s=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@@ -64,8 +64,14 @@ buildPythonPackage rec {
|
||||
ln -s $out/python $target_dir
|
||||
'';
|
||||
|
||||
# Update to 1.39 has major API changes and downstream software
|
||||
# needs to adapt, first. So, do not include in mass updates. For reference, see
|
||||
# https://github.com/NixOS/nixpkgs/pull/326466#issuecomment-2293029160
|
||||
# and https://github.com/NixOS/nixpkgs/issues/380230
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Open standard for representing rich material and look-development content in computer graphics";
|
||||
homepage = "https://materialx.org";
|
||||
maintainers = [ lib.maintainers.gador ];
|
||||
|
||||
@@ -32,12 +32,11 @@
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
respx,
|
||||
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "1.59.9";
|
||||
version = "1.61.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -46,7 +45,7 @@ buildPythonPackage rec {
|
||||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-khdrpiurp/PigM5+0LJpXfSbG22e2I+2Jwsxo6MJKhQ=";
|
||||
hash = "sha256-7dDsfEHHYJv6hbDPryhzZwCtdIzYUOABLOSXXQ1vau8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -59,14 +59,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "4.48.2";
|
||||
version = "4.48.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "transformers";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jW/yhzmxQd/5BgbDImUaJSF0oMKIpIGhFoJuMZu0tv0=";
|
||||
hash = "sha256-gDPJx/kgFa8KCoX8XCMtFrSY/z2as22yDSNEW3UDm/0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell_plugin_formats";
|
||||
inherit (nushell) version src;
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk=";
|
||||
cargoHash = "sha256-3cmNlCTawMUpr6kSyT/YZzC717FoXkF0uTeE/D8BSFM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
|
||||
Reference in New Issue
Block a user