Merge staging-next into staging

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

@@ -48,6 +48,13 @@ let
         # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
         (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
       ]
+      ++ lib.optional (lib.versionAtLeast version "140") (fetchpatch2 {
+        # https://bugzilla.mozilla.org/show_bug.cgi?id=1982003
+        name = "rustc-1.89.patch";
+        url = "https://raw.githubusercontent.com/openbsd/ports/3ef8a2538893109bea8211ef13a870822264e096/mail/mozilla-thunderbird/patches/patch-third_party_rust_allocator-api2_src_stable_vec_mod_rs";
+        extraPrefix = "";
+        hash = "sha256-eL+RNVLMkj8x/8qQJVUFHDdDpS0ahV1XEN1L0reaYG4=";
+      })
       ++ lib.optionals (lib.versionOlder version "139") [
         # clang-19 fixes for char_traits build issue
         # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac

pkgs/by-name/gr/grpc/package.nix

@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  fetchurl,
   buildPackages,
   cmake,
   zlib,
@@ -54,11 +53,6 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654
     ./dynamic-lookup-darwin.patch
-    # https://github.com/grpc/grpc/issues/39170
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/rdhafidh/vcpkg/0ae97b7b81562bd66ab99d022551db1449c079f9/ports/grpc/00017-add-src-upb.patch";
-      hash = "sha256-0zaJqeCM90DTtUR6xCUorahUpiJF3D/KODYkUXQh2ok=";
-    })
   ];
 
   nativeBuildInputs = [

pkgs/by-name/ja/jansson/package.nix

@@ -35,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
     "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
   ];
 
+  postFixup = ''
+    # Incorrectly references the dev output, libjansson.so is in out
+    substituteInPlace $dev/lib/cmake/jansson/janssonTargets-release.cmake \
+      --replace-fail "\''${_IMPORT_PREFIX}/lib" "$out/lib"
+  '';
+
   passthru = {
     tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
     updateScript = nix-update-script { };

pkgs/development/python-modules/qt-material/default.nix

@@ -1,28 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   jinja2,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "qt-material";
   version = "2.17";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-tQCgwfXvj0aozwN9GqW9+epOthgYC2MyU5373QZHrQ0=";
+  src = fetchFromGitHub {
+    owner = "dunderlab";
+    repo = "qt-material";
+    tag = "v${version}";
+    hash = "sha256-ilrPA8SoVCo6FgwxWQ4sOjqURCFDQJLlTTkCZzTZQKI=";
   };
 
-  propagatedBuildInputs = [ jinja2 ];
+  build-system = [ setuptools ];
+
+  dependencies = [ jinja2 ];
 
   pythonImportsCheck = [ "qt_material" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/dunderlab/qt-material/releases/tag/${src.tag}";
     description = "Material inspired stylesheet for PySide2, PySide6, PyQt5 and PyQt6";
-    homepage = "https://github.com/UN-GCPDS/qt-material";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ _999eagle ];
+    homepage = "https://github.com/dunderlab/qt-material";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ _999eagle ];
   };
 }

pkgs/development/tools/electron/update.py

@@ -100,7 +100,7 @@ def get_chromium_gn_source(chromium_tag: str) -> dict:
         .split(")]}'\n")[1]
     )
 
-    gn_commit_date = datetime.strptime(gn_commit_info["commiter"]["time"], "%a %b %d %H:%M:%S %Y %z")
+    gn_commit_date = datetime.strptime(gn_commit_info["committer"]["time"], "%a %b %d %H:%M:%S %Y %z")
     gn_date = gn_commit_date.astimezone(UTC).date().isoformat()
     gn_version = f"0-unstable-{gn_date}"
 

pkgs/os-specific/linux/kernel/manual-config.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPackages,
-  runCommand,
   bc,
   bison,
   flex,
@@ -33,16 +32,24 @@ let
 
   readConfig =
     configfile:
-    import
-      (runCommand "config.nix" { } ''
-        echo "{" > "$out"
-        while IFS='=' read key val; do
-          [ "x''${key#CONFIG_}" != "x$key" ] || continue
-          no_firstquote="''${val#\"}";
-          echo '  "'"$key"'" = "'"''${no_firstquote%\"}"'";' >> "$out"
-        done < "${configfile}"
-        echo "}" >> $out
-      '').outPath;
+    lib.listToAttrs (
+      map
+        (
+          line:
+          let
+            match = lib.match "(.*)=\"?(.*)\"?" line;
+          in
+          {
+            name = lib.elemAt match 0;
+            value = lib.elemAt match 1;
+          }
+        )
+        (
+          lib.filter (line: !(lib.hasPrefix "#" line || line == "")) (
+            lib.splitString "\n" (builtins.readFile configfile)
+          )
+        )
+    );
 in
 lib.makeOverridable (
   {
@@ -65,7 +72,9 @@ lib.makeOverridable (
     configfile,
     # Manually specified nixexpr representing the config
     # If unspecified, this will be autodetected from the .config
-    config ? lib.optionalAttrs allowImportFromDerivation (readConfig configfile),
+    config ? lib.optionalAttrs (builtins.isPath configfile || allowImportFromDerivation) (
+      readConfig configfile
+    ),
     # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is
     # automatically extended with extra per-version and per-config values.
     randstructSeed ? "",