diff --git a/maintainers/README.md b/maintainers/README.md index 6dd4062e93b6..922cf55826de 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -34,6 +34,13 @@ In order to do so, add yourself to the [`maintainer-list.nix`](./maintainer-list If you're adding yourself as a maintainer as part of another PR (in which you become a maintainer of a package, for example), make your change to `maintainer-list.nix` in a separate commit titled `maintainers: add `. +Once the PR is merged you will automatically get invited to join the [NixOS/nixpkgs-maintainers](https://github.com/orgs/NixOS/teams/nixpkgs-maintainers) GitHub team. +By joining, we will be able to ping you for review, and you will get some triaging rights in the nixpkgs repository, like the ability to close and reopen issues made by others and managing labels, as well as invoke the merge bot on eligible PRs. + +> [!NOTE] +> The automatic GitHub team invite is usually only sent by email, and is only valid for one week! +> Should it expire, please request a new one by following the instructions [here](https://github.com/NixOS/rfc39-record/blob/main/README.md#requesting-a-new-invitation). + ### Losing maintainer status Maintainers who have become inactive can be removed. @@ -54,11 +61,6 @@ This process is subject to error however, so we encourage PR authors to notify t Maintainers can also invoke the [nixpkgs-merge-bot](../ci/README.md#nixpkgs-merge-bot) to merge pull requests targeting packages they are the maintainer of, which satisfy the current security [constraints](../ci/README.md#merge-bot-constraints). Examples: [#397273](https://github.com/NixOS/nixpkgs/pull/397273#issuecomment-2789382120) and [#377027](https://github.com/NixOS/nixpkgs/pull/377027#issuecomment-2614510869) -New maintainers will automatically get invited to join the [NixOS/nixpkgs-maintainers](https://github.com/orgs/NixOS/teams/nixpkgs-maintainers) GitHub team. -By joining, you will get some triaging rights in the nixpkgs repository, like the ability to close and reopen issues made by others, and managing labels. -However, the GitHub team invite is usually only sent by email, and is only valid for one week! -Should it expire, please request a new one by following the instructions [here](https://github.com/NixOS/rfc39-record/blob/main/README.md). - ### Unofficial maintainer tooling [zh.fail](https://zh.fail/failed/overview.html) tracks all package build failures on `master` grouped by maintainer. diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 248f45584e9b..68ed2cb3a3fb 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -225,7 +225,7 @@ in Example usage: `nvidia-offload sauerbraten_client` - This script can be renamed with {option}`hardware.nvidia.prime.offload.enableOffloadCmd`. + This script can be renamed with {option}`hardware.nvidia.prime.offload.offloadCmdMainProgram`. ''; prime.offload.offloadCmdMainProgram = lib.mkOption { type = lib.types.str; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a99dd8f2ec5e..e1ea79fbf61d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -788,7 +788,7 @@ in ]; in if cfg.graphics then consoles else reverseList consoles; - example = [ "console=tty1" ]; + example = [ "tty1" ]; description = '' The output console devices to pass to the kernel command line via the `console` parameter, the primary console is the last diff --git a/nixos/tests/web-apps/dawarich.nix b/nixos/tests/web-apps/dawarich.nix index 37451a87913b..628fd9e06319 100644 --- a/nixos/tests/web-apps/dawarich.nix +++ b/nixos/tests/web-apps/dawarich.nix @@ -5,6 +5,8 @@ nodes.machine = { lib, pkgs, ... }: { + virtualisation.memorySize = 1536; + services.dawarich = { enable = true; localDomain = "localhost"; diff --git a/nixos/tests/web-apps/linkwarden.nix b/nixos/tests/web-apps/linkwarden.nix index 573b5de1b360..332833c43be5 100644 --- a/nixos/tests/web-apps/linkwarden.nix +++ b/nixos/tests/web-apps/linkwarden.nix @@ -55,7 +55,7 @@ machine.succeed(curlCmd + "-X GET http://localhost:3000/api/v1/links") - machine.wait_for_file("/var/lib/linkwarden/archives/1/1.html") + machine.wait_for_file("/var/lib/linkwarden/archives/1/1.html", 10) machine.succeed("grep -q '

HELLO LINKWARDEN

' -Date: Mon, 10 Feb 2025 23:31:47 +0400 -Subject: [PATCH] cmake: fix pkg-config path for libdir - -on systems that prefer absolute paths there is a mixing and matching of -the relative and absolute paths that can result in the below creation of -libdir having the prefix and the full path appended to it. - -** added to highlight - -``prefix=/nix/store/3npvhj5wfwhc0q42qwiinj64bzfb1vvz-snort-3.6.3.0 -exec_prefix=${prefix} -bindir=${exec_prefix}/bin -**libdir=${prefix}//nix/store/3npvhj5wfwhc0q42qwiinj64bzfb1vvz-snort-3.6.3.0/lib** -includedir=${prefix}/include -datarootdir=${prefix}/share -datadir=${datarootdir} -mandir=${datarootdir}/man -infodir=${datarootdir}/info -`` - -In order to preserve backwards compatibility we will use the cmake -fullpath option ${CMAKE_INSTALL_FULL_LIBDIR} in place of -${prefix}/${CMAKE_INSTALL_LIBDIR} which will support both contexts. - -Signed-off-by: Brian McGillion ---- - cmake/create_pkg_config.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/create_pkg_config.cmake b/cmake/create_pkg_config.cmake -index 300350cbd..4ce8b16e6 100644 ---- a/cmake/create_pkg_config.cmake -+++ b/cmake/create_pkg_config.cmake -@@ -5,7 +5,7 @@ - set(prefix "${CMAKE_INSTALL_PREFIX}") - set(exec_prefix "\${prefix}") - set(bindir "\${exec_prefix}/bin") --set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") -+set(libdir "\${CMAKE_INSTALL_FULL_LIBDIR}") - set(includedir "\${prefix}/include") - set(datarootdir "\${prefix}/share") - set(datadir "\${datarootdir}") --- -2.47.2 - diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix index 0306750bd294..00443e0cc83f 100644 --- a/pkgs/by-name/sn/snort/package.nix +++ b/pkgs/by-name/sn/snort/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snort"; - version = "3.10.0.0"; + version = "3.12.2.0"; src = fetchFromGitHub { owner = "snort3"; repo = "snort3"; tag = finalAttrs.version; - hash = "sha256-vxiZeJByZGS7rXtvPMgNjb94E/oju+mmEuzJ7tA+hE4="; + hash = "sha256-YxWIWR8E1bf8+xRFFasZqe284ecd0R922OXDJ2IclDA="; }; nativeBuildInputs = [ @@ -49,9 +49,6 @@ stdenv.mkDerivation (finalAttrs: { xz ]; - # Patch that is tracking upstream PR https://github.com/snort3/snort3/pull/399 - patches = [ ./0001-cmake-fix-pkg-config-path-for-libdir.patch ]; - enableParallelBuilding = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/st/stoolap/package.nix b/pkgs/by-name/st/stoolap/package.nix index 989d7c33dc1a..e3c228326316 100644 --- a/pkgs/by-name/st/stoolap/package.nix +++ b/pkgs/by-name/st/stoolap/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stoolap"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "stoolap"; repo = "stoolap"; tag = "v${finalAttrs.version}"; - hash = "sha256-TE16vsLzhwmqZRZrmWx8ikv2HJbB4sAXaKSPPNsMeLw="; + hash = "sha256-xL0MFxtIqSsQh5SDEvIsJgBi/o/To0oht8ZjdEFJX7Q="; }; - cargoHash = "sha256-ZWu1uu607n3wl3k7xcpS7cHbX7mifAX9gvo8KQmCB/E="; + cargoHash = "sha256-edWMWY0gBjDNroJ9qm6u7krTy1lskD4s9aSS8jEN/MM="; # On aarch64-darwin, dev target needs to set panic strategy to abort # However this must be set while the flag `-Zpanic_abort_tests` is also set, diff --git a/pkgs/by-name/ta/tautulli/package.nix b/pkgs/by-name/ta/tautulli/package.nix index 3b2d48192f67..c7adb555f56b 100644 --- a/pkgs/by-name/ta/tautulli/package.nix +++ b/pkgs/by-name/ta/tautulli/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "tautulli"; - version = "2.17.2"; + version = "2.18.1"; pyproject = false; pythonPath = [ python3Packages.setuptools ]; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "Tautulli"; repo = "Tautulli"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-BtKVGXJijxGK3CH0J49WKxBFG0pAp+zAw7YIJ4w5PCk="; + sha256 = "sha256-Fs1Zih7Hx7tu+/EKwkeQUC35iTiJBkv12jZns8NyL6Q="; }; postPatch = '' diff --git a/pkgs/by-name/ti/tiled/package.nix b/pkgs/by-name/ti/tiled/package.nix index 2eb9fd58db59..61b832216370 100644 --- a/pkgs/by-name/ti/tiled/package.nix +++ b/pkgs/by-name/ti/tiled/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, pkg-config, + qaseprite, qbs, libsForQt5, zlib, @@ -12,6 +13,7 @@ let qtEnv = libsForQt5.env "tiled-qt-env" [ + qaseprite libsForQt5.qtbase libsForQt5.qtdeclarative libsForQt5.qtsvg diff --git a/pkgs/by-name/to/tomlplusplus/package.nix b/pkgs/by-name/to/tomlplusplus/package.nix index 7d8286454fad..61f2adad6191 100644 --- a/pkgs/by-name/to/tomlplusplus/package.nix +++ b/pkgs/by-name/to/tomlplusplus/package.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "tomlplusplus"; version = "3.4.0"; + strictDeps = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; @@ -40,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - checkInputs = [ + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isGnu [ glibcLocales ]; @@ -49,9 +52,10 @@ stdenv.mkDerivation (finalAttrs: { "-Dbuild_examples=true" ]; - # almost all tests fail on Darwin with the following exception: + # locale tests seem to only work with glibc + # darwin also fails the following: # libc++abi: terminating due to uncaught exception of type std::runtime_error: collate_byname::collate_byname failed to construct for - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = stdenv.hostPlatform.isGnu; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index c00a352c115d..57c98e27fb6e 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.55"; + version = "0.1.56"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-VcYBzaldmnFb5Y3O+wWapEs7pkBI/n4N6FEM8fBhYZs="; + hash = "sha256-FZoqYacc6ZkVtcN5lStEXEJxEicXXo1tnpYCBPAFzQQ="; }; - cargoHash = "sha256-JV0LDkJvdM1zZbYDXGcEZPbwbm7vV9+K5WjQxZX0au4="; + cargoHash = "sha256-zXafwVK9RgUbH8iJ8kR3+AWoH7WM1TrCe1jaXhiCWHA="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/by-name/we/wealthfolio-server/package.nix b/pkgs/by-name/we/wealthfolio-server/package.nix index 247a80356d05..919513cfb6d6 100644 --- a/pkgs/by-name/we/wealthfolio-server/package.nix +++ b/pkgs/by-name/we/wealthfolio-server/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage ( pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-D83YrsSVNUfiyX4CTV9BOlQhP3tCvQsubaJecXCP/5Q="; + hash = "sha256-P7N2Y41W467PxEcg6EGBuEB1s6n7wfQh4Rg2Mv8z8bs="; }; nativeBuildInputs = [ @@ -54,18 +54,18 @@ rustPlatform.buildRustPackage ( __structuredAttrs = true; pname = "wealthfolio-server"; - version = "3.6.3"; + version = "3.7.0"; src = fetchFromGitHub { owner = "wealthfolio"; repo = "wealthfolio"; tag = "v${finalAttrs.version}"; - hash = "sha256-QUie1MpYOY9B50vcL8GanPgQpj4jMh9yzmDxjcY5dW4="; + hash = "sha256-GsI2TrPXEiHKUnUxNNmYf2EveWlg5PJBGh5TYILK0yc="; }; cargoRoot = "."; buildAndTestSubdir = "apps/server"; - cargoHash = "sha256-UC+NhMuDisVjdZ8n25oKixosS6NLU7w9VVl7e2LtjK0="; + cargoHash = "sha256-vnmhaAoF3O5N+y3HpYZz+2j/WU1HAA5uyKtxLCJBqA4="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix index 03b9366974b8..9c63ca5dc915 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -3,6 +3,7 @@ stdenv, unzip, fetchurl, + installFonts, }: let @@ -14,6 +15,7 @@ let pname, hash, desc, + suffix, }: stdenv.mkDerivation rec { inherit pname; @@ -26,12 +28,15 @@ let # Work around the "unpacker appears to have produced no directories" # case that happens when the archive doesn't have a subdirectory. sourceRoot = "."; - nativeBuildInputs = [ unzip ]; - installPhase = '' - find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; - find . -name '*.otf' -exec install -Dt $out/share/fonts/opentype {} \; - find . -name '*.woff2' -exec install -Dt $out/share/fonts/woff2 {} \; - ''; + nativeBuildInputs = [ + installFonts + unzip + ]; + + # installFonts checks if "$webfont" exists and copies any woff files there, + # this is typically done with a second "webfont" output, resulting in a second derivation + # we set this to `placeholder "out"` to keep webfonts in the same derivation instead + webfont = lib.optionalString (suffix == "Woff2") (placeholder "out"); meta = { homepage = "https://github.com/subframe7536/Maple-font"; @@ -129,6 +134,7 @@ let inherit pname; desc = "${ligVariant.desc} ${typeVariant.desc}"; hash = hashes.${pname}; + inherit (typeVariant) suffix; }; } ) typeVariants @@ -142,6 +148,7 @@ let inherit pname; inherit (value) desc; hash = hashes.${pname}; + inherit (value) suffix; } ) typeVariants; in diff --git a/pkgs/desktops/lomiri/applications/morph-browser/1501-Re-enable-Suru-style-in-Qt6.patch b/pkgs/desktops/lomiri/applications/morph-browser/1501-Re-enable-Suru-style-in-Qt6.patch deleted file mode 100644 index 967680104f23..000000000000 --- a/pkgs/desktops/lomiri/applications/morph-browser/1501-Re-enable-Suru-style-in-Qt6.patch +++ /dev/null @@ -1,73 +0,0 @@ -From babdb3f2eabd0bb9a713817bd8cec6320160a53f Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Wed, 29 Apr 2026 15:37:31 +0200 -Subject: [PATCH 1/2] src/app: Re-enable Suru style in Qt6 - ---- - src/app/browserapplication.cpp | 12 +++--------- - src/app/qml-qt6/ContentExportDialog.qml | 8 -------- - 2 files changed, 3 insertions(+), 17 deletions(-) - -diff --git a/src/app/browserapplication.cpp b/src/app/browserapplication.cpp -index 0bd70309..98a50bac 100644 ---- a/src/app/browserapplication.cpp -+++ b/src/app/browserapplication.cpp -@@ -193,21 +193,15 @@ bool BrowserApplication::initialize(const QString& qmlFileSubPath - qputenv("UBUNTU_WEBVIEW_DEVTOOLS_PORT", devtoolsPort.toUtf8()); - } - -- // FIXME re-enable Suru theme once it is available for Qt 6 --#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - // set suru style - if (qgetenv("QT_QUICK_CONTROLS_STYLE") == QString()) - { -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - qputenv("QT_QUICK_CONTROLS_STYLE", "Suru"); -- } - #else -- // This is a bit of a hack, as we don't seem to have a way to set QQC2 style -- // per-Qt-version... -- if (qgetenv("QT_QUICK_CONTROLS_STYLE") == "Suru") -- { -- qunsetenv("QT_QUICK_CONTROLS_STYLE"); -- } -+ qputenv("QT_QUICK_CONTROLS_STYLE", "QtQuick.Controls.Suru"); - #endif -+ } - - const char* uri = "webbrowsercommon.private"; - qmlRegisterSingletonType(uri, 0, 1, "BrowserUtils", BrowserUtils_singleton_factory); -diff --git a/src/app/qml-qt6/ContentExportDialog.qml b/src/app/qml-qt6/ContentExportDialog.qml -index 08aac589..c90b4880 100644 ---- a/src/app/qml-qt6/ContentExportDialog.qml -+++ b/src/app/qml-qt6/ContentExportDialog.qml -@@ -21,9 +21,7 @@ import Lomiri.Components - import Lomiri.Components.Popups - import Lomiri.Content 2.0 - import QtQuick.Controls 2.5 as QQC2 --/* FIXME: re-enable once Suru has been ported to Qt 6 - import QtQuick.Controls.Suru 2.2 --*/ - - import webbrowsercommon.private 0.1 - -@@ -57,16 +55,10 @@ QQC2.Dialog { - closePolicy: QQC2.Popup.CloseOnEscape | QQC2.Popup.CloseOnPressOutside - modal: true - -- /* FIXME: re-enable once Suru has been ported to Qt 6 - QQC2.Overlay.modal: Rectangle { - color: Suru.overlayColor - Behavior on opacity { NumberAnimation { duration: Suru.animations.FastDuration } } - } -- */ -- QQC2.Overlay.modal: Rectangle { -- color: Qt.rgba(0, 0, 0, 0.85) -- Behavior on opacity { NumberAnimation { duration: 165 } } -- } - - function openDialog(_downloadPath, _contentType, _mimeType, _downloadURL, _fileName){ - path = _downloadPath --- -2.51.2 - diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index bb06ca3adc4c..1dc3f7fe49d4 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "morph-browser"; - version = "1.99.4"; + version = "1.99.6"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/morph-browser"; tag = finalAttrs.version; - hash = "sha256-gVRaM4pnQlfwRKYVsXk4wO79FgNJ60QBn0X2QZE+8a4="; + hash = "sha256-VvkIVODMV9iQiYlMxgUS/Q3xhQ5TMwU5GkuiI09xG+Y="; }; outputs = [ @@ -51,11 +51,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/626 - ./1501-Re-enable-Suru-style-in-Qt6.patch - ]; - postPatch = '' substituteInPlace src/Morph/CMakeLists.txt \ --replace-fail '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt''${QT_VERSION_MAJOR}/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 3ddc9423d52d..fdf3effd4bd8 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -115,6 +115,11 @@ stdenv.mkDerivation ( } // (args.env or { }); + preConfigure = '' + export CRYSTAL_WORKERS="''${CRYSTAL_WORKERS:-$NIX_BUILD_CORES}" + '' + + (args.preConfigure or ""); + inherit enableParallelBuilding; strictDeps = true; buildInputs = diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index a32782b11c40..fdd4fca4e7a1 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -131,7 +131,7 @@ let makeShellWrapper "$out/bin/dart" "$out/bin/flutter" \ --set-default FLUTTER_ROOT "$out" \ --set FLUTTER_ALREADY_LOCKED true \ - --set NIX_AAPT2_BINARY_PATH "${lib.getExe aapt}" \ + ${lib.optionalString aapt.meta.available "--set NIX_AAPT2_BINARY_PATH ${lib.getExe aapt}"} \ --add-flags "--disable-dart-dev --packages='${flutterTools.pubcache}/package_config.json' \$NIX_FLUTTER_TOOLS_VM_OPTIONS $out/bin/cache/flutter_tools.snapshot" runHook postInstall diff --git a/pkgs/development/libraries/nettle/4.nix b/pkgs/development/libraries/nettle/4.nix new file mode 100644 index 000000000000..ec8d44b3d75e --- /dev/null +++ b/pkgs/development/libraries/nettle/4.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl }: + +callPackage ./generic.nix rec { + version = "4.0"; + + src = fetchurl { + url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; + hash = "sha256-Ot28ANoBhGsjL7O8RTU46lRo2kMDPyG7NFyx6Qc/UJQ="; + }; +} diff --git a/pkgs/development/python-modules/ddgs/default.nix b/pkgs/development/python-modules/ddgs/default.nix index 9317f9572a17..7c4bf2c96042 100644 --- a/pkgs/development/python-modules/ddgs/default.nix +++ b/pkgs/development/python-modules/ddgs/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "ddgs"; - version = "9.14.2"; + version = "9.16.0"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "ddgs"; tag = "v${finalAttrs.version}"; - hash = "sha256-4kTGiEVsmjlPH8pAbAoeTrC6a/ZshsPSErmPkLRwR9A="; + hash = "sha256-r65Ak4J6W47sQrDfo1KVcBjgavXjvcprggrA0BoEMA0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mediawiki-langcodes/default.nix b/pkgs/development/python-modules/mediawiki-langcodes/default.nix index cd5a977361e4..e21c5f9ad295 100644 --- a/pkgs/development/python-modules/mediawiki-langcodes/default.nix +++ b/pkgs/development/python-modules/mediawiki-langcodes/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "mediawiki-langcodes"; - version = "0.2.27"; + version = "0.2.28"; pyproject = true; # Using fetchPypi instead of fetching from source for technical reason. @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "mediawiki_langcodes"; inherit (finalAttrs) version; - hash = "sha256-aHaD4v7Qr5ABvbKymuF9G3O+0XEfT73U4l2XU7wz9/I="; + hash = "sha256-ZugyKir6QeFDHghTzCurK1wWV2m+p67EqI2/yAPe0NI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix index dc852ae74eca..dc848df50355 100644 --- a/pkgs/development/python-modules/rucio/default.nix +++ b/pkgs/development/python-modules/rucio/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, # build-system packaging, @@ -54,9 +53,6 @@ buildPythonPackage { inherit version src; pyproject = true; - # future-1.0.0 not supported for interpreter python3.13 - disabled = pythonAtLeast "3.13"; - pythonRelaxDeps = true; pythonRemoveDeps = [ "boto" ]; diff --git a/pkgs/development/rocm-modules/llvm/default.nix b/pkgs/development/rocm-modules/llvm/default.nix index 99f358656679..1ff69dea9692 100644 --- a/pkgs/development/rocm-modules/llvm/default.nix +++ b/pkgs/development/rocm-modules/llvm/default.nix @@ -180,10 +180,10 @@ let pname = name; # If this is erroring, try why-depends --precise on the symlinkJoin of inputs to look for the problem # nix why-depends --precise .#rocmPackages.llvm.rocm-toolchain.linked /store/path/its/not/allowed - disallowedRequisites = disallowedRefsForToolchain; + outputChecks.out.disallowedRequisites = disallowedRefsForToolchain; passthru.linked = linked; - linkPaths = linkPaths; - passAsFile = [ "linkPaths" ]; + inherit linkPaths; + __structuredAttrs = true; # TODO(@LunNova): Try to use --sysroot with clang in its original location instead of # relying on copying the binary? # $clang/bin/clang++ --sysroot=$rocm-toolchain is not equivalent @@ -221,7 +221,7 @@ let builtins.concatStringsSep " " (map (x: "${x}/lib") paths) } $out/ # create links *within* the sysroot to save space - for i in $(cat $linkPathsPath); do + for i in "''${linkPaths[@]}"; do ${lib.getExe lndir} -silent $i $out done diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 84c349595f0a..42f187174d44 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": "7.3-rc1", - "hash": "sha256:1wwg9m0fg3pibm3fvsf6jc31c4xd5wpisxpr0ycxn2sfizql94ff", + "version": "7.3-rc2", + "hash": "sha256:1ysspc93ggydcic9dsg6ibkr1xcfakqjfp9xymma9pwq6wybpwnb", "lts": false }, "6.1": { diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 0d8d5919790a..351eb6d8235c 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -18,7 +18,7 @@ in buildLinux ( args // rec { - version = "7.1.10"; + version = "7.2.3"; pname = "linux-zen"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; @@ -27,7 +27,7 @@ buildLinux ( owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0c01cnamvl3mdc1rm7pjpcy5s6s9yamfkg413zn7k2xwkjig8b08"; + sha256 = "033njpi0wrgq1619xncsz5ixzy1m2arqwdfnq11hng0j2qnxiw4h"; }; # This is based on the following source: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e658552d652d..c993a8426386 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6233,6 +6233,7 @@ with pkgs; }; nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; + nettle_4 = import ../development/libraries/nettle/4.nix { inherit callPackage fetchurl; }; libnghttp2 = nghttp2.lib;