From bb24041a1c09fc77ba869c08c0142ca94e33b6e1 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Sun, 17 Aug 2025 13:57:47 +0800 Subject: [PATCH 1/8] grpc: drop patch to fix build for 1.74 on darwin --- pkgs/by-name/gr/grpc/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index f863c0b3f77b..34c33d2b8f52 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/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 = [ From f6187b425f27a5af53668c927b24c614685cc975 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 17 Aug 2025 06:33:01 -0600 Subject: [PATCH 2/8] jansson: fix cmake import prefix --- pkgs/by-name/ja/jansson/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix index bb0035b97669..c949486def69 100644 --- a/pkgs/by-name/ja/jansson/package.nix +++ b/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}" "$out" + ''; + passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; updateScript = nix-update-script { }; From 294574264e32d3129e178703912a2c8d5e0fcfe3 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 17 Aug 2025 19:01:11 -0700 Subject: [PATCH 3/8] linux: remove unused argument --- pkgs/os-specific/linux/kernel/manual-config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 9ec9720863ec..4456a3e0d5c6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPackages, - runCommand, bc, bison, flex, From 35956ce40e13ad8aa297f0c6ec1de4132807efdf Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 17 Aug 2025 19:01:27 -0700 Subject: [PATCH 4/8] linux: parse configfile at eval-time if possible Users might call `manualConfig` with a path presented at evaluation time, in which case they shouldn't need to set `allowImportFromDerivation` to true, since IFD wouldn't be needed. --- .../linux/kernel/manual-config.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4456a3e0d5c6..200969bc8af2 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -32,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 ( { @@ -64,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 ? "", From b5bd89906b29056b93ea93ef01e76197a953e62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Aug 2025 09:25:33 +0200 Subject: [PATCH 5/8] thunderbird-latest: pull a patch to fix build with rustc 1.89 Upstream hasn't fully resolved this, and I'm not sure how thunderbird-esr 140 will be around this, so let's go simple for now. No firefox version seems affected. --- .../networking/mailreaders/thunderbird/packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 466cb3f2e694..0193bbd99af8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/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 From b90a8d5d1d2f73d29100a5f95a9e8b100ee7db72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Aug 2025 10:39:10 +0200 Subject: [PATCH 6/8] jansson: nit - more precision when replacing in .cmake --- pkgs/by-name/ja/jansson/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix index c949486def69..1478f46feae7 100644 --- a/pkgs/by-name/ja/jansson/package.nix +++ b/pkgs/by-name/ja/jansson/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' # Incorrectly references the dev output, libjansson.so is in out substituteInPlace $dev/lib/cmake/jansson/janssonTargets-release.cmake \ - --replace-fail "\''${_IMPORT_PREFIX}" "$out" + --replace-fail "\''${_IMPORT_PREFIX}/lib" "$out/lib" ''; passthru = { From a04bd81e706addca7ed3711f5910922852203291 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 18 Aug 2025 11:40:48 +0200 Subject: [PATCH 7/8] electron: fix update script (#434548) --- pkgs/development/tools/electron/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index 6baf1135a796..94ba8eca4fa7 100755 --- a/pkgs/development/tools/electron/update.py +++ b/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}" From db168f1f1bb05c655f93828a72417f31ea504bca Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Mon, 18 Aug 2025 11:56:13 +0200 Subject: [PATCH 8/8] qt-material: modernize, fix - pypi as source failed to fetch, so use github fetcher - pypi links to https://github.com/dunderlab/qt-material as the package homepage - qt-material switched to a pyproject build - adjust dependencies/build-system to accomodate --- .../python-modules/qt-material/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/qt-material/default.nix b/pkgs/development/python-modules/qt-material/default.nix index 24c279dc3e89..3f3bb9e07284 100644 --- a/pkgs/development/python-modules/qt-material/default.nix +++ b/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 ]; }; }