Merge staging-next into staging

pkgs/by-name/fi/firebase-tools/package.nix

···
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "14.5.1";
+  version = "14.6.0";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-dcpGdFbXyVmCKBdh7u25skWgpbTRaE6gbUqAVWpkNFo=";
+    hash = "sha256-gMVP55hhgAWsI+NJ0au2/E955sa3uAJ/s+0OqMuvrG0=";
   };
 
-  npmDepsHash = "sha256-fYmIu4ZctRT982Q1/gdr1QxgHiymmydrNuMMCsS2r3E=";
+  npmDepsHash = "sha256-YqRfxd3vSrZcQ7/9d2kNe3B/0ZDjcDUxr5CDthdD/tg=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

pkgs/by-name/vi/victoriametrics/package.nix

···
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.118.0";
+  version = "1.119.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a84n9fuGdiG0o/1/9q3etTwoFbOL01y88ubTI/yIIBA=";
+    hash = "sha256-Gc3B3JmTbINdPJ8PIhcuQhFD+FoxNOskoBEcDoMAUUk=";
   };
 
   vendorHash = null;

pkgs/development/androidndk-pkgs/default.nix

···
   "24" = makeNdkPkgs "24.0.8215888" pkgs.llvmPackages_14;
   "25" = makeNdkPkgs "25.2.9519653" pkgs.llvmPackages_14;
   "26" = makeNdkPkgs "26.3.11579264" pkgs.llvmPackages_17;
+  "27" = makeNdkPkgs "27.0.12077973" pkgs.llvmPackages_18;
+  "28" = makeNdkPkgs "28.0.13004108" pkgs.llvmPackages_19;
 }

pkgs/development/libraries/opencv/4.x.nix

···
       mkdir -p "$cxxdev/nix-support"
       echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
     ''
+    # hard-wire CUDA_TOOLKIT_ROOT_DIR so FindCUDA sees the toolkit
     # remove the requirement that the exact same version of CUDA is used in packages
-    # consuming OpenCV's CMakes files
+    #   consuming OpenCV's CMakes files
     + optionalString enableCuda ''
+      sed -i '1s;^;set(CUDA_TOOLKIT_ROOT_DIR ${cudaPackages.cudatoolkit})\n;' \
+        "$out/lib/cmake/opencv4/OpenCVConfig.cmake"
+
       substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
         --replace-fail \
           'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \

pkgs/development/ocaml-modules/caqti/default.nix

···
   mtime,
   ptime,
   uri,
+  stdenv,
+  darwin,
 }:
 
 buildDunePackage rec {
···
     ptime
     uri
   ];
+
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
 
   # Checks depend on caqti-driver-sqlite3 (circural dependency)
   doCheck = false;

pkgs/development/ocaml-modules/dream/default.nix

···
 {
-  lib,
   buildDunePackage,
   dream-pure,
   lwt_ppx,
···
   markup,
   mirage-clock,
   mirage-crypto-rng,
-  mirage-crypto-rng-lwt,
   multipart_form-lwt,
   ssl,
   unstrctrd,
   uri,
   yojson,
+  # for mirage-crypro-rng-lwt 1.2.0
+  # It is removed from mirage-crypto 2.1.0 now.
+  fetchurl,
+  duration,
+  logs,
+  mtime,
+  lwt,
 }:
+
+let
+  mirage-crypto-rng-lwt = buildDunePackage rec {
+    pname = "mirage-crypto-rng-lwt";
+    version = "1.2.0";
+    src = fetchurl {
+      url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz";
+      hash = "sha256-CVQrzZbB02j/m6iFMQX0wXgdjJTCQA3586wGEO4H5n4=";
+    };
+    doCheck = true;
+    propagatedBuildInputs = [
+      mirage-crypto-rng
+      duration
+      logs
+      mtime
+      lwt
+    ];
+  };
+in
 
 buildDunePackage {
   pname = "dream";

pkgs/development/ocaml-modules/dream/httpaf.nix

···
 {
-  lib,
   buildDunePackage,
   dream-pure,
   lwt_ppx,

pkgs/development/ocaml-modules/mirage-crypto/default.nix

···
   minimalOCamlVersion = "4.13";
 
   pname = "mirage-crypto";
-  version = "1.2.0";
+  version = "2.0.1";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz";
-    hash = "sha256-CVQrzZbB02j/m6iFMQX0wXgdjJTCQA3586wGEO4H5n4=";
+    hash = "sha256-VDDOPD5AYn0tZ6jez1ZaH2EtOb2zP5t2fDvbYB/1oZY=";
   };
 
   doCheck = true;
···
       ocaml-freestanding
     ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/mirage/mirage-crypto";
     description = "Simple symmetric cryptography for the modern age";
-    license = [
-      licenses.isc # default license
-      licenses.bsd2 # mirage-crypto-rng-mirage
-      licenses.mit # mirage-crypto-ec
+    changelog = "https://raw.githubusercontent.com/mirage/mirage-crypto/refs/tags/v${version}/CHANGES.md";
+    license = with lib.licenses; [
+      isc # default license
+      bsd2 # mirage-crypto-rng-mirage
+      mit # mirage-crypto-ec
     ];
-    maintainers = with maintainers; [ sternenseemann ];
+    maintainers = with lib.maintainers; [
+      sternenseemann
+      momeemt
+    ];
   };
 }

pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix

···
-{
-  buildDunePackage,
-  mirage-crypto,
-  mirage-crypto-rng,
-  dune-configurator,
-  async,
-  logs,
-  ohex,
-}:
-
-buildDunePackage {
-  pname = "mirage-crypto-rng-async";
-
-  inherit (mirage-crypto) version src;
-
-  buildInputs = [
-    dune-configurator
-  ];
-
-  propagatedBuildInputs = [
-    async
-    logs
-    mirage-crypto
-    mirage-crypto-rng
-  ];
-
-  doCheck = true;
-  checkInputs = [ ohex ];
-
-  meta = mirage-crypto.meta // {
-    description = "Feed the entropy source in an Async-friendly way";
-  };
-}

pkgs/development/ocaml-modules/mirage-crypto/rng-eio.nix

···
-{
-  buildDunePackage,
-  mirage-crypto-rng,
-  eio,
-  eio_main,
-  ohex,
-}:
-
-buildDunePackage {
-  pname = "mirage-crypto-rng-eio";
-
-  inherit (mirage-crypto-rng) version src;
-
-  doCheck = true;
-  checkInputs = [
-    eio_main
-    ohex
-  ];
-
-  propagatedBuildInputs = [
-    mirage-crypto-rng
-    eio
-  ];
-
-  meta = mirage-crypto-rng.meta;
-}

pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix

···
-{
-  buildDunePackage,
-  mirage-crypto-rng,
-  duration,
-  logs,
-  mtime,
-  lwt,
-}:
-
-buildDunePackage {
-  pname = "mirage-crypto-rng-lwt";
-
-  inherit (mirage-crypto-rng) version src;
-
-  doCheck = true;
-
-  propagatedBuildInputs = [
-    mirage-crypto-rng
-    duration
-    logs
-    mtime
-    lwt
-  ];
-
-  meta = mirage-crypto-rng.meta;
-}

pkgs/development/ocaml-modules/mirage-crypto/rng-miou-unix.nix

···
+{
+  buildDunePackage,
+  mirage-crypto-rng,
+  miou,
+  logs,
+  duration,
+  mtime,
+  digestif,
+  ohex,
+}:
+
+buildDunePackage {
+  pname = "mirage-crypto-rng-miou-unix";
+
+  inherit (mirage-crypto-rng) version src;
+
+  doCheck = true;
+  checkInputs = [
+
+  ];
+
+  propagatedBuildInputs = [
+    miou
+    logs
+    mirage-crypto-rng
+    duration
+    mtime
+    digestif
+    ohex
+  ];
+
+  meta = mirage-crypto-rng.meta // {
+    description = "Feed the entropy source in an miou.unix-friendly way";
+    longDescription = ''
+      Mirage-crypto-rng-miou-unix feeds the entropy source for Mirage_crypto_rng-based
+      random number generator implementations, in an miou.unix-friendly way.
+    '';
+  };
+}

pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix

···
   mirage-crypto-rng,
   duration,
   mirage-runtime,
-  mirage-time,
-  mirage-clock,
+  mirage-mtime,
+  mirage-sleep,
   mirage-unix,
   mirage-time-unix,
   mirage-clock-unix,
···
     duration
     mirage-crypto-rng
     mirage-runtime
-    mirage-time
-    mirage-clock
+    mirage-mtime
+    mirage-sleep
     logs
     lwt
   ];

pkgs/development/python-modules/jq/default.nix

···
 
 buildPythonPackage rec {
   pname = "jq";
-  version = "1.6.0";
+  version = "1.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "mwilliamson";
     repo = "jq.py";
     tag = version;
-    hash = "sha256-c6tJI/mPlBGIYTk5ObIQ1CUTq73HouQ2quMZVWG8FFg=";
+    hash = "sha256-rPc4qIs1lGfbv0ShxJ+uUfbTGchJ+Q0qWWRZVuABlU4=";
   };
 
   env.JQPY_USE_SYSTEM_LIBS = 1;
···
   nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
-    # intentional behavior change in jq 1.7.1 not reflected upstream
-    "test_given_json_text_then_strings_containing_null_characters_are_preserved"
+    # tries to match exact error text, fails with jq 1.8
+    "test_value_error_is_raised_if_program_is_invalid"
   ];
 
   pythonImportsCheck = [ "jq" ];

pkgs/development/tools/minizinc/ide.nix

···
   makeWrapper,
   copyDesktopItems,
   makeDesktopItem,
+  imagemagick,
 }:
 
 let
···
     qmake
     makeWrapper
     copyDesktopItems
+    imagemagick
   ];
   buildInputs = [
     qtbase
···
 
   desktopItems = [
     (makeDesktopItem {
-      name = "minizinc";
+      name = "MiniZincIDE";
       desktopName = "MiniZincIDE";
       icon = "minizinc";
       comment = meta.description;
···
       wrapProgram ${executableLoc} \
         --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} \
         --set QT_QPA_PLATFORM_PLUGIN_PATH "${qtbase}/lib/qt-6/plugins/platforms"
+
+      for size in 16 24 32 48 64 128 256 512; do
+        mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+        magick -background none ${src}/MiniZincIDE/images/mznicon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/minizinc.png
+      done
     '';
 
   meta = with lib; {

pkgs/development/web/nodejs/v24.nix

···
 in
 buildNodejs {
   inherit enableNpm;
-  version = "24.1.0";
-  sha256 = "c8171b2aeccb28c8c5347f273a25adae172fb2a65bc8c975bc22ec58949d0eaf";
+  version = "24.2.0";
+  sha256 = "40143d43efbdeeb9537995f532126c494d63a31da332acb5022f76f00afc62ab";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
···
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
-
-      # Can be removed after https://github.com/NixOS/nixpkgs/pull/403958.
-      (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/9aa57bf8dab2dbfb8b6974fe71d5dbe6daf66244.patch?full_index=1";
-        hash = "sha256-k3h8mPgvaIYGAkGmaL+ix7kUnyLw4/PF7wXMAWrPMXo=";
-        revert = true;
-      })
     ]
     ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [
       # test-icu-env is failing without the reverts

pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix

···
   cargoHash = "sha256-kyUpfNEXJ732VO6JDxU+dIoL57uWzG4Ff03/GnvsxLE=";
   buildAndTestSubdir = "extension";
 
+  postInstall = ''
+    cargo run --manifest-path ./tools/post-install/Cargo.toml -- --dir "$out"
+  '';
+
   passthru = {
     updateScript = nix-update-script { };
     tests = postgresql.pkgs.timescaledb.tests;

pkgs/top-level/all-packages.nix

···
   androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs { })."24";
   androidndkPkgs_25 = (callPackage ../development/androidndk-pkgs { })."25";
   androidndkPkgs_26 = (callPackage ../development/androidndk-pkgs { })."26";
+  androidndkPkgs_27 = (callPackage ../development/androidndk-pkgs { })."27";
+  androidndkPkgs_28 = (callPackage ../development/androidndk-pkgs { })."28";
 
   androidsdk = androidenv.androidPkgs.androidsdk;
 

pkgs/top-level/ocaml-packages.nix

···
 
         mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { };
 
-        mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { };
-
-        mirage-crypto-rng-eio = callPackage ../development/ocaml-modules/mirage-crypto/rng-eio.nix { };
-
-        mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { };
-
         mirage-crypto-rng-mirage =
           callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix
+            { };
+
+        mirage-crypto-rng-miou-unix =
+          callPackage ../development/ocaml-modules/mirage-crypto/rng-miou-unix.nix
             { };
 
         mirage-device = callPackage ../development/ocaml-modules/mirage-device { };