diff --git a/ci/README.md b/ci/README.md index 389ef59f57b9..df0b9a12384a 100644 --- a/ci/README.md +++ b/ci/README.md @@ -18,6 +18,41 @@ The goal is to eventually have all GitHub specific code in `ci/github-script` an A lot of code has already been migrated, but some Bash code still remains. New CI features need to be introduced in JavaScript, not Bash. +## Nixpkgs merge bot + +The Nixpkgs merge bot empowers package maintainers by enabling them to merge PRs related to their own packages. +It serves as a bridge for maintainers to quickly respond to user feedback, facilitating a more self-reliant approach. +Especially when considering there are roughly 20 maintainers for every committer, this bot is a game-changer. + +Following [RFC 172] the merge bot was originally implemented as a [python webapp](https://github.com/NixOS/nixpkgs-merge-bot), which has now been integrated into [`ci/github-script/bot.js`](./github-script/bot.js) and [`ci/github-script/merge.js`](./github-script/merge.js). + +### Using the merge bot + +To merge a PR, maintainers can simply comment: +```gfm +@NixOS/nixpkgs-merge-bot merge +``` + +The next time the bot runs it will verify the below constraints, then (if satisfied) merge the PR. + +The merge bot will reference [#306934](https://github.com/NixOS/nixpkgs/issues/306934) on PRs it merges successfully, [#305350](https://github.com/NixOS/nixpkgs/issues/305350) for unsuccessful attempts, or [#371492](https://github.com/NixOS/nixpkgs/issues/371492) if an error occurs. +These issues effectively list PRs the merge bot has interacted with. + +### Merge bot constraints + +To ensure security and a focused utility, the bot adheres to specific limitations: + +- The PR targets `master`, `staging`, or `staging-next`. +- The PR only touches files located under `pkgs/by-name/*`. +- The PR is authored by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/) or a [committer][@NixOS/nixpkgs-committers]. +- The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers]. +- The user attempting to merge is a maintainer of all packages touched by the PR. + +### Approving merge bot changes + +Changes to the bot can usually be approved by the [@NixOS/nixpkgs-ci] team, as with other CI changes. +However, additional acknowledgement from the [@NixOS/nixpkgs-core] team is required for changes to what the merge bot will merge, who is eligible to use the merge bot, or similar changes in scope. + ## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]` Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does. @@ -58,3 +93,10 @@ Some branches also have a version component, which is either `unstable` or `YY.M `ci/supportedBranches.js` is a script imported by CI to classify the base and head branches of a Pull Request. This classification will then be used to skip certain jobs. This script can also be run locally to print basic test cases. + + +[@NixOS/nixpkgs-maintainers]: https://github.com/orgs/NixOS/teams/nixpkgs-maintainers +[@NixOS/nixpkgs-committers]: https://github.com/orgs/NixOS/teams/nixpkgs-committers +[@NixOS/nixpkgs-ci]: https://github.com/orgs/NixOS/teams/nixpkgs-ci +[@NixOS/nixpkgs-core]: https://github.com/orgs/NixOS/teams/nixpkgs-core +[RFC 172]: https://github.com/NixOS/rfcs/pull/172 diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ce0b1159470a..37e15130b8cd 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -54,6 +54,7 @@ let cups-filters pkgs.ghostscript ] + ++ lib.optional cfg.browsed.enable cfg.browsed.package ++ cfg.drivers; pathsToLink = [ "/lib" diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 454bd58c5177..01159d75be44 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -148,6 +148,8 @@ python3.pkgs.buildPythonApplication rec { "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station" # upstream does actually not enforce source code linting "--ignore=tests/quality" + # marked as flaky, breaks in sandbox + "--deselect=tests/test_library_file.py::TWatchedFileLibrary::test_watched_adding" ] ++ lib.optionals (withXineBackend || !withGstPlugins) [ "--ignore=tests/plugin/test_replaygain.py" diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 10388a6d822d..216f21518538 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY="; }; + patches = [ + # Check if the patch can be removed next release + ./fix-build-with-qt-6-10.patch + ]; + buildInputs = [ poppler qtbase diff --git a/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch b/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch new file mode 100644 index 000000000000..4de5263f6922 --- /dev/null +++ b/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ef6a4e6..b564be8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -386,7 +386,7 @@ set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_AUTORCC ON) + +-find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools) ++find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core CorePrivate Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools) + + qt_standard_project_setup() + diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 1be8ef9daca7..2b1207a94c8f 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-Sm2Ij1yHMQzPM9lKtiejHRrdCot/DRzgnxznwlZyyro="; + hash = "sha256-803feSIFyuBTyGGDH4zZ4hRGXRNN+J2y1p0C9I9qMro="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index c14fb2a67ed0..e14bb5b95d0b 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -72,9 +72,9 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.2.2"; + virtualboxVersion = "7.2.4"; virtualboxSubVersion = ""; - virtualboxSha256 = "sha256-sOY7+4VTJ67PESLNozOQwzc05f/tcvEj9e33hqjOE5M="; + virtualboxSha256 = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd"; kvmPatchVboxVersion = "7.2.0"; kvmPatchVersion = "20250903"; @@ -425,5 +425,7 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = [ "x86_64-linux" ]; mainProgram = "VirtualBox"; + # Patch is not compatible with the current version of Virtualbox + broken = enableKvm; }; }) diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 42701f6efead..cb3a6cea45db 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -4,7 +4,7 @@ virtualbox, }: let - virtualboxExtPackVersion = "7.2.2"; + virtualboxExtPackVersion = "7.2.4"; in fetchurl rec { name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack"; @@ -14,7 +14,7 @@ fetchurl rec { # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://download.virtualbox.org/virtualbox/${version}/SHA256SUMS let - value = "a7f5904e35b3c34c000f74e0364f1d1c0efdb126a4d3c4a264244959711c7f42"; + value = "b80ee54252442ec025d6a7b2b9c3f32526ab5c2d91a0ffa2385be3ed83bcff0b"; in assert (builtins.stringLength value) == 64; value; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 654e9a78a867..61862a140ae3 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -5,7 +5,7 @@ }: fetchurl { url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso"; - sha256 = "sha256-QkV0h/tfEXJl/kG/iypSFEnCz/dclQKdj2Z/fataRAk="; + sha256 = "66fa60b041fcda5d8b2ed22ba91bfafafaa3a5ff05c7d8ba01fbbe639669e153"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 741aa1295a64..3f9c665fd945 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -13,9 +13,9 @@ libX11, }: let - virtualboxVersion = "7.2.2"; + virtualboxVersion = "7.2.4"; virtualboxSubVersion = ""; - virtualboxSha256 = "sha256-sOY7+4VTJ67PESLNozOQwzc05f/tcvEj9e33hqjOE5M="; + virtualboxSha256 = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd"; platform = if stdenv.hostPlatform.isAarch64 then diff --git a/pkgs/by-name/ba/batticonplus/package.nix b/pkgs/by-name/ba/batticonplus/package.nix new file mode 100644 index 000000000000..d83eacc1dacb --- /dev/null +++ b/pkgs/by-name/ba/batticonplus/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + gettext, + glib, + gtk3, + libnotify, + wrapGAppsHook3, + libayatana-appindicator, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "batticonplus"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "artist4xlibre"; + repo = "batticonplus"; + tag = "v${version}"; + hash = "sha256-H9ZoiQ5zWMIoWWol2a6f9Z8g4o9DIHYdF+/nEsBfuzc="; + }; + + nativeBuildInputs = [ + pkg-config + gettext + wrapGAppsHook3 + ]; + + buildInputs = [ + glib + gtk3 + libnotify + libayatana-appindicator + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "WITH_APPINDICATOR=1" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Lightweight battery status icon for the system tray and notifier (based on cbatticon)"; + mainProgram = "batticonplus"; + homepage = "https://github.com/artist4xlibre/batticonplus"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ yechielw ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 119d6352fdfa..3fa44d6fe442 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-MOhcTG8r7kDVTg5PY1rmrkd8U94CqT7RdPSfaakqf2M="; + hash = "sha256-kkCeNQL5NR7DGKa3rbPx3NRQv1vAOHw741icHmzj5v8="; }; - cargoHash = "sha256-lWBCMS7xFEqXPpMpBzfZmdwQOq8Yaux83FGFaRyaBNg="; + cargoHash = "sha256-oTL/kwvuFio7RTnpVqeEXNsWCsNUKY8GlNlh+59LVxg="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index bc35fe20a220..45d274a0adec 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "codebook"; - version = "0.3.15"; + version = "0.3.16"; src = fetchFromGitHub { owner = "blopker"; repo = "codebook"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sv1rB6Jvg+FX5NuWr4jwCwLdVPuub8OK1+Nin2D4XVY="; + hash = "sha256-kunYcWwb4b8ryQYZpG623RcyZaiWTGTKCXjfUq8iz+o="; }; buildAndTestSubdir = "crates/codebook-lsp"; - cargoHash = "sha256-DRXTCquhGhNIby+HMQZGF8NWAbto5Egaij6jDVwnSHQ="; + cargoHash = "sha256-cHcSmTEW4xpZkrv4a2lgTlK2VU7+kOvZiEo//jrnd8E="; # Integration tests require internet access for dictionaries doCheck = false; diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index 0d01d8291ccb..4b82ac879d6d 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-10-27"; + version = "0-unstable-2025-10-30"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "4630761f03d5a389d36c22bf685df107b43083a7"; - hash = "sha256-hp90A/uSXS/RNn1HCCWF4Sv3X8AOtcCOk9DRv95epVc="; + rev = "7f9512777db72a1e89ba0880af7bc5467ee461bf"; + hash = "sha256-ptx9JA/uyH05r/NvgtK4ppifOiW/zjl7Bsy7vgBYkjI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 44dd61e2a17e..12b14072c299 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "datafusion-cli"; - version = "50.1.0"; + version = "50.3.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "arrow-datafusion"; tag = finalAttrs.version; - hash = "sha256-SYvdz/rGs8bZHKuM5ws2c+pSdYx7mVfQ69dliCDp8ec="; + hash = "sha256-Zv3XW1BbqOHrhnPa47YoS67v/INJBgXyitvU6/wQVSM="; }; - cargoHash = "sha256-WHmNbmP8rqP0W+5PvV9Qi5szdWIwLsZuNqDVnV6JL9o="; + cargoHash = "sha256-VjDcqoI5KKIGqXMhvxkWan6jP1/0H/fkbl78C2WPhQI="; buildAndTestSubdir = "datafusion-cli"; diff --git a/pkgs/by-name/dr/driftnet/package.nix b/pkgs/by-name/dr/driftnet/package.nix index 5d5d3c54c250..7c7fdb19d060 100644 --- a/pkgs/by-name/dr/driftnet/package.nix +++ b/pkgs/by-name/dr/driftnet/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, giflib, glib, - gtk2-x11, + gtk3, libjpeg, libpcap, libpng, @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "driftnet"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "deiv"; repo = "driftnet"; tag = "v${version}"; - hash = "sha256-lMn60vtOMPs1Tr+SnAOUZDrNIO7gEXdHpizjXiEkkoM="; + hash = "sha256-f7EPC/n3CyxVOXC6j43Nnwkgu/aDVst8lQpzfgegDsI="; }; enableParallelBuilding = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { cairo giflib glib - gtk2-x11 + gtk3 libjpeg libpcap libpng diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 73ab3651c4c3..69f71b3a40ff 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -151,6 +151,31 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace doc/meson.build \ --replace-fail '$MESON_INSTALL_DESTDIR_PREFIX/@1@/@2@' '@1@/@2@' + + substituteInPlace triggers/gtk-icon-cache.trigger \ + --replace-fail '/usr/share/icons/hicolor/index.theme' '/run/current-system/sw/share/icons/hicolor/index.theme' + ''; + + # Fixup PATHs in trigger scripts + postInstall = '' + wrapProgram $out/share/flatpak/triggers/desktop-database.trigger --prefix PATH : ${ + lib.makeBinPath [ + desktop-file-utils + ] + } + + wrapProgram $out/share/flatpak/triggers/gtk-icon-cache.trigger --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gtk3 + ] + } + + wrapProgram $out/share/flatpak/triggers/mime-database.trigger --prefix PATH : ${ + lib.makeBinPath [ + shared-mime-info + ] + } ''; strictDeps = true; diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index c30591f70b7a..868e15d61d4c 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -8,10 +8,10 @@ }: let - version = "2.7.2"; - srcHash = "sha256-a6qWGkhtslwvb4fW+K5Q0GP58wecOs2RRrMuJUX8wLs="; - vendorHash = "sha256-GRn+2VX7UsqlVyIrTwRFeJiBFcZpxBNkw4FW2efsCK4="; - manifestsHash = "sha256-cNJrx+4/dR48uYmA7HpLZlnpzF1pgWRerg2dpiXJA+U="; + version = "2.7.3"; + srcHash = "sha256-nyMKlcJcDa532NqiT16eQJH0Z4dAO1MHkIzsrWlJS7Q="; + vendorHash = "sha256-0aQYOmH9CFv0gQ3PIEWr3OhC1jyQOIkNMp9lb7GQ40I="; + manifestsHash = "sha256-SQkMqcJY3FHLx6aAwWL0Nuz3fzPTevod4paz2H2srcI="; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; diff --git a/pkgs/by-name/je/jellyflix/package.nix b/pkgs/by-name/je/jellyflix/package.nix index 15a20de0fa00..d68c7cb0503c 100644 --- a/pkgs/by-name/je/jellyflix/package.nix +++ b/pkgs/by-name/je/jellyflix/package.nix @@ -25,6 +25,9 @@ flutter332.buildFlutterApplication rec { --replace-fail "} on DioException catch (_) { return _.response!.statusCode ?? 400;" "} on DioException catch (e) { return e.response!.statusCode ?? 400;" + + substituteInPlace linux/CMakeLists.txt \ + --replace-fail "-Werror" "" ''; postInstall = '' diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix index 5e5b1d3dda89..3c6a144f0b40 100644 --- a/pkgs/by-name/li/libwebsockets/package.nix +++ b/pkgs/by-name/li/libwebsockets/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, openssl, zlib, @@ -21,6 +22,19 @@ stdenv.mkDerivation rec { hash = "sha256-KOAhIVn4G5u0A1TE75Xv7iYO3/i8foqWYecH0kJHdBM="; }; + patches = [ + (fetchpatch { + name = "CVE-2025-11677.patch"; + url = "https://libwebsockets.org/git/libwebsockets/patch?id=2f082ec31261f556969160143ba94875d783971a"; + hash = "sha256-FeiZAbr1kpt+YNjhi2gfG2A6nXKiSssMFRmlALaneu4="; + }) + (fetchpatch { + name = "CVE-2025-11678.patch"; + url = "https://libwebsockets.org/git/libwebsockets/patch?id=2bb9598562b37c942ba5b04bcde3f7fdf66a9d3a"; + hash = "sha256-1uQUkoMbK+3E/QYMIBLlBZypwHBIrWBtm+KIW07WRj8="; + }) + ]; + # Updating to 4.4.1 would bring some errors, and the patch doesn't apply cleanly # https://github.com/warmcat/libwebsockets/commit/47efb8c1c2371fa309f85a32984e99b2cc1d614a postPatch = '' diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix index 18a6ca071b44..7c9776d635e6 100644 --- a/pkgs/by-name/pr/prefect/package.nix +++ b/pkgs/by-name/pr/prefect/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "prefect"; - version = "3.4.24"; + version = "3.5.0"; pyproject = true; # Trying to install from source is challenging @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { # Source will be missing sdist, uv.lock, ui artefacts ... src = fetchPypi { inherit pname version; - hash = "sha256-jBDHgGNZRl1nr5qpj/5r5+D7o1skFFPcd6yTe60uMlE="; + hash = "sha256-BazzO+gR/mLcx+tlysPMJzcqmctUU0LSYL0YMZMyVrg="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index f92687dd7227..c9d79e5e2280 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "41.149.2"; + version = "41.166.0"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-mYBOcVUH6LvSBmPrUu+JxAu70qFYjGaYuuSh5iiXp0I="; + hash = "sha256-nwGV9Ut0WhrBw/n+BaKFrYMNCCu+HuWJ5Fj3W28/yf4="; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-ouqy34xMhHvNilEPjmcFfpFRvrFrM3IBBT5nNvyW1r8="; + hash = "sha256-nsr3TEbOdCrI1czWYQhjLSl/S+9ZgcezNKWppjleRBk="; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 58f497322ad3..3538af9a24db 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.13.30"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-7SUr23m+zUHsSmSZGlmKnwI5VUPh53Rxiw2Wx8yy+5k="; + hash = "sha256-0b9gB7vHvw1wjoTxWcQOcshpuIKfcaQJeI8GCo+rvF4="; }; - cargoHash = "sha256-Qvj4xdbKI8PEbJ+N8Ba+sE5hDDHMegzU18gFtx/q/W8="; + cargoHash = "sha256-ctyb/llOYBiyBwKylacpXrEp3hXix64zwHxv/E54rrM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json index ab37d28ec1be..04380496e601 100644 --- a/pkgs/development/compilers/openjdk/11/source.json +++ b/pkgs/development/compilers/openjdk/11/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-u8SWC0T4rmQVV3TKfEW1/rCT8KWNsL5hZtUW3pXBIfA=", + "hash": "sha256-nFRxcL9fkh9NhDVTUwwOXhmFRBVPTq79zeUsWBdmIfk=", "owner": "openjdk", "repo": "jdk11u", - "rev": "refs/tags/jdk-11.0.29+5" + "rev": "refs/tags/jdk-11.0.29+7" } diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 87784a47966a..bc43493b9d1a 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.13"; - hash = "sha256-hRgd3Kez4D8UhSGwQ71iQRlQ1GjGZ9tkAEefGxCBIZQ="; + version = "8.4.14"; + hash = "sha256-8hOc5Mt6bFZD7pjKo05cMrqEHCuik+NKPQNX+qhLs+c="; } ); in diff --git a/pkgs/development/python-modules/textual-serve/default.nix b/pkgs/development/python-modules/textual-serve/default.nix index 947bb63bdb26..87de708b2192 100644 --- a/pkgs/development/python-modules/textual-serve/default.nix +++ b/pkgs/development/python-modules/textual-serve/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "textual-serve"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "textual_serve"; inherit version; - hash = "sha256-DMr5ud+cCNSy16CIfK0yciQ7qH9oGSw2T0vtW2g+S9Q="; + hash = "sha256-+PY2ri9f1lG3nZZUc8PpOD01Ic34lvm8KJcJGF2j9oM="; }; build-system = [ diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix index ff311a5b988c..c01efb0342a7 100644 --- a/pkgs/development/python-modules/textual-textarea/default.nix +++ b/pkgs/development/python-modules/textual-textarea/default.nix @@ -46,6 +46,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # AssertionError: assert None == 'word' + # https://github.com/tconbeer/textual-textarea/issues/312 + "test_autocomplete" + "test_autocomplete_with_types" + ]; + pythonImportsCheck = [ "textual_textarea" ]; meta = { diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 68eee933c737..76856cedeb58 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "textual"; - version = "6.4.0"; + version = "6.5.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-lwtgPJK62SntL0ThoIpmEq0Ngjf8wl73Q8PXjvut3ps="; + hash = "sha256-Z9KevcicU+mt1XglYOdGWnMbRa1zpbts+0D2nwtgAac="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 082b55c4c698..c18b542fa7b4 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -342,6 +342,9 @@ rec { version = "7.6.6"; hash = "sha256-Zz2XdvMDvHBI/DMp0jLW6/EFGweJO9nRFhb62ahnO+A="; defaultJava = jdk17; + meta.knownVulnerabilities = [ + "Gradle 7 no longer receives security updates with the release of Gradle 9 on 31 July 2025. https://endoflife.date/gradle" + ]; }; # Default version of Gradle in nixpkgs. diff --git a/pkgs/os-specific/linux/kernel/build.nix b/pkgs/os-specific/linux/kernel/build.nix index da50861fb459..4ec0c63cb761 100644 --- a/pkgs/os-specific/linux/kernel/build.nix +++ b/pkgs/os-specific/linux/kernel/build.nix @@ -51,6 +51,8 @@ lib.makeOverridable ( version, # The kernel pname (should be set for variants) pname ? "linux", + # Position of the Linux build expression + pos ? null, # Additional kernel make flags extraMakeFlags ? [ ], # The name of the kernel module directory @@ -551,6 +553,8 @@ lib.makeOverridable ( karch = stdenv.hostPlatform.linuxArch; + pos = lib.optionalDrvAttr (pos != null) pos; + meta = { # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381 broken = withRust && lib.versionOlder version "6.12"; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 8eecd334df70..456e9052d5c2 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -293,6 +293,7 @@ let configfile modDirVersion ; + pos = builtins.unsafeGetAttrPos "version" args; config = { CONFIG_MODULES = "y"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index fd753977bf87..5a2781659262 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -447,25 +447,16 @@ lib.makeScope pkgs.newScope ( configureFlags = [ "--enable-dom" ]; - patches = - lib.optionals (lib.versionAtLeast php.version "8.4") [ - # Fix build of ext-dom. - # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14) - (fetchpatch { - url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch"; - hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA="; - }) - ] - ++ lib.optionals (lib.versionOlder php.version "8.3") [ - # Fix gh10234 test with libxml 2.15.0 - (fetchpatch { - url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch"; - hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic="; - includes = [ - "ext/dom/tests/gh10234.phpt" - ]; - }) - ]; + patches = lib.optionals (lib.versionOlder php.version "8.3") [ + # Fix gh10234 test with libxml 2.15.0 + (fetchpatch { + url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch"; + hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic="; + includes = [ + "ext/dom/tests/gh10234.phpt" + ]; + }) + ]; } { name = "enchant";