From 1eac6104b79f8cf3bda1dd42dc7204671076b715 Mon Sep 17 00:00:00 2001 From: Charlotte Hartmann Paludo Date: Wed, 17 Sep 2025 08:03:18 +0200 Subject: [PATCH 01/18] nixos/services.ddclient: remove nsupdate assertion --- nixos/modules/services/networking/ddclient.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index fed65ee8ec16..54e488db9856 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -268,8 +268,8 @@ in message = "You cannot use both services.ddclient.passwordFile and services.ddclient.secretsFile at the same time."; } { - assertion = !(cfg.protocol == "nsupdate") || (cfg.passwordFile == null && cfg.secretsFile == null); - message = "You cannot use services.ddclient.passwordFile and or services.ddclient.secretsFile when services.ddclient.protocol is \"nsupdate\"."; + assertion = (cfg.protocol != "nsupdate") || (cfg.secretsFile == null); + message = "You cannot use services.ddclient.secretsFile when services.ddclient.protocol is \"nsupdate\". Use services.ddclient.passwordFile instead."; } ]; From d787612f6f1b6d719843cfde4523b8629913429a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Sep 2025 19:01:21 +0000 Subject: [PATCH 02/18] talosctl: 1.11.1 -> 1.11.2 --- pkgs/by-name/ta/talosctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix index e13e9fb5f564..f43b941547e4 100644 --- a/pkgs/by-name/ta/talosctl/package.nix +++ b/pkgs/by-name/ta/talosctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; tag = "v${version}"; - hash = "sha256-G+su1Udkp/IqsU9/TWcEQO4MY8iGC+QM39eMeBUSaDs="; + hash = "sha256-r78O/FdsfD29wM6fcbuwYea/b7J60iAdtrw4CEBM/mo="; }; - vendorHash = "sha256-x9In+TaEuYMB0swuMzyXQRRnWgP1Krg7vKQH4lqDf+c="; + vendorHash = "sha256-T8lJjJfCLpQIsmCW/FQk/CJstyH6u/gNZ6R+COH909M="; ldflags = [ "-s" From 7524bb2331740d30c1379ca21cdecfcdac901405 Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 26 Sep 2025 14:33:46 +0800 Subject: [PATCH 03/18] skippy-xd: 0.8.0 -> 2025.09.07 --- pkgs/by-name/sk/skippy-xd/package.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sk/skippy-xd/package.nix b/pkgs/by-name/sk/skippy-xd/package.nix index 8f5fa8f1e789..09b6c5a4d129 100644 --- a/pkgs/by-name/sk/skippy-xd/package.nix +++ b/pkgs/by-name/sk/skippy-xd/package.nix @@ -13,16 +13,20 @@ giflib, pkg-config, }: -stdenv.mkDerivation { + +stdenv.mkDerivation (finalAttrs: { pname = "skippy-xd"; - version = "0.8.0"; + version = "2025.09.07"; + src = fetchFromGitHub { owner = "felixfung"; repo = "skippy-xd"; - rev = "30da57cb59ccf77f766718f7d533ddbe533ba241"; - hash = "sha256-YBUDbI1SHsBI/fA3f3W1sPu3wXSodMbTGvAMqOz7RCM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-PxVU0atl5OLINFTM1n3REVA/M9iozkHOW9kPgTU/+qI="; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 @@ -34,15 +38,18 @@ stdenv.mkDerivation { libjpeg giflib ]; + makeFlags = [ "PREFIX=$(out)" ]; + preInstall = '' sed -e "s@/etc/xdg@$out&@" -i Makefile ''; - meta = with lib; { + + meta = { description = "Expose-style compositing-based standalone window switcher"; homepage = "https://github.com/felixfung/skippy-xd"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; }; -} +}) From bf105ba1f030e249dfc8cb7562f279135dbe096a Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Mon, 29 Sep 2025 20:40:17 +0800 Subject: [PATCH 04/18] mtxclient: mark as unbroken on darwin --- pkgs/by-name/mt/mtxclient/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/mt/mtxclient/package.nix b/pkgs/by-name/mt/mtxclient/package.nix index 1ce611fc08ca..3d95f6f04bc3 100644 --- a/pkgs/by-name/mt/mtxclient/package.nix +++ b/pkgs/by-name/mt/mtxclient/package.nix @@ -63,8 +63,5 @@ stdenv.mkDerivation rec { rnhmjoj ]; platforms = platforms.all; - # Should be fixable if a higher clang version is used, see: - # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.hostPlatform.isDarwin; }; } From e4abb3f95cf3a021e2ffc5a8787a6d7fb2aabdb1 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Mon, 29 Sep 2025 21:18:37 +0800 Subject: [PATCH 05/18] mtxclient: enable tests --- pkgs/by-name/mt/mtxclient/package.nix | 24 +++--- .../mt/mtxclient/remove-network-tests.patch | 77 +++++++++++++++++++ 2 files changed, 90 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/mt/mtxclient/remove-network-tests.patch diff --git a/pkgs/by-name/mt/mtxclient/package.nix b/pkgs/by-name/mt/mtxclient/package.nix index 3d95f6f04bc3..d52a70e75f33 100644 --- a/pkgs/by-name/mt/mtxclient/package.nix +++ b/pkgs/by-name/mt/mtxclient/package.nix @@ -12,29 +12,27 @@ openssl, re2, spdlog, + gtest, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mtxclient"; version = "0.10.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Y0FMCq4crSbm0tJtYq04ZFwWw+vlfxXKXBo0XUgf7hw="; }; - postPatch = '' - # See https://github.com/gabime/spdlog/issues/1897 - sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt - ''; + patches = [ + ./remove-network-tests.patch + ]; cmakeFlags = [ - # Network requiring tests can't be disabled individually: - # https://github.com/Nheko-Reborn/mtxclient/issues/22 - "-DBUILD_LIB_TESTS=OFF" - "-DBUILD_LIB_EXAMPLES=OFF" + (lib.cmakeBool "BUILD_LIB_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "BUILD_LIB_EXAMPLES" false) ]; nativeBuildInputs = [ @@ -53,6 +51,10 @@ stdenv.mkDerivation rec { spdlog ]; + checkInputs = [ gtest ]; + + doCheck = true; + meta = with lib; { description = "Client API library for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; @@ -64,4 +66,4 @@ stdenv.mkDerivation rec { ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/mt/mtxclient/remove-network-tests.patch b/pkgs/by-name/mt/mtxclient/remove-network-tests.patch new file mode 100644 index 000000000000..166370bd6a2a --- /dev/null +++ b/pkgs/by-name/mt/mtxclient/remove-network-tests.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d9f92932246ebec8ab5d1cc462366a17818d014..ce27390bd754a33986188dd2bf29cd0c818c2d58 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,36 +398,6 @@ if(BUILD_LIB_TESTS) + + file(COPY tests/fixtures DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +- add_executable(client_api tests/client_api.cpp) +- target_link_libraries(client_api +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(client_api PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(media_api tests/media_api.cpp) +- target_link_libraries(media_api +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(media_api PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(e2ee tests/e2ee.cpp) +- target_link_libraries(e2ee +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(e2ee PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(device tests/device.cpp) +- target_link_libraries(device +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(device PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- + add_executable(utils tests/utils.cpp) + target_link_libraries(utils + MatrixClient::MatrixClient +@@ -435,21 +405,6 @@ if(BUILD_LIB_TESTS) + GTest::Main) + target_include_directories(utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) + +- add_executable(pushrules tests/pushrules.cpp) +- target_link_libraries(pushrules +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(pushrules PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(connection tests/connection.cpp) +- target_link_libraries(connection +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(connection PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- + add_executable(identifiers tests/identifiers.cpp) + target_link_libraries(identifiers + MatrixClient::MatrixClient +@@ -498,13 +453,7 @@ if(BUILD_LIB_TESTS) + GTest::GTest + GTest::Main) + +- add_test(BasicConnectivity connection) +- add_test(ClientAPI client_api) +- add_test(MediaAPI media_api) +- add_test(Encryption e2ee) +- add_test(Devices device) + add_test(Utilities utils) +- add_test(Pushrules pushrules) + add_test(Identifiers identifiers) + add_test(Errors errors) + add_test(CryptoStructs crypto) From c8c747413345fc81644bd97d0740398e07b869a7 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Mon, 29 Sep 2025 22:54:38 +0800 Subject: [PATCH 06/18] nheko: fix build on darwin --- pkgs/by-name/nh/nheko/fix-darwin-build.patch | 22 ++++++++++ pkgs/by-name/nh/nheko/package.nix | 43 ++++++++++---------- 2 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 pkgs/by-name/nh/nheko/fix-darwin-build.patch diff --git a/pkgs/by-name/nh/nheko/fix-darwin-build.patch b/pkgs/by-name/nh/nheko/fix-darwin-build.patch new file mode 100644 index 000000000000..6fb5c4138807 --- /dev/null +++ b/pkgs/by-name/nh/nheko/fix-darwin-build.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4ff134c53877d5aa2e00e3c344eb5c6783cccb2f..164553d34152639c6a2c5319c2a03d7a25c33ba3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -974,16 +974,11 @@ endif() + + # potential workaround for macdeployqt issues + if(APPLE) ++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") + install(TARGETS nheko + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) +- qt_generate_deploy_qml_app_script( +- TARGET nheko +- OUTPUT_SCRIPT deploy_script +- NO_UNSUPPORTED_PLATFORM_ERROR +- ) +- install(SCRIPT ${deploy_script}) + endif() + + if(UNIX AND NOT APPLE) diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix index d54028a3df54..105644a2b429 100644 --- a/pkgs/by-name/nh/nheko/package.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -5,7 +5,6 @@ cmake, asciidoc, pkg-config, - boost, cmark, coeurl, curl, @@ -23,16 +22,17 @@ libnice, qt6Packages, fetchpatch, + withVoipSupport ? stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nheko"; version = "0.12.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-WlWxe4utRSc9Tt2FsnhBwxzQsoDML2hvm3g5zRnDEiU="; }; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { url = "https://github.com/Nheko-Reborn/nheko/commit/2769642d3c7bd3c0d830b2f18ef6b3bf6a710bf4.patch"; hash = "sha256-y8aiS6h5CSJYBdsAH4jYhAyrFug7aH2H8L6rBfULnQQ="; }) + ./fix-darwin-build.patch ]; nativeBuildInputs = [ @@ -53,7 +54,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost cmark coeurl curl @@ -65,35 +65,39 @@ stdenv.mkDerivation rec { nlohmann_json olm qt6Packages.qtbase + qt6Packages.qtdeclarative qt6Packages.qtimageformats qt6Packages.qtkeychain qt6Packages.qtmultimedia + qt6Packages.qtsvg qt6Packages.qttools - qt6Packages.qtwayland qt6Packages.qt-jdenticon re2 spdlog ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - (gst-plugins-good.override { qt6Support = true; }) - gst-plugins-bad + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qt6Packages.qtwayland + ] + ++ lib.optionals withVoipSupport [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + (gst_all_1.gst-plugins-good.override { qt6Support = true; }) + gst_all_1.gst-plugins-bad libnice - ]); + ]; cmakeFlags = [ - "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 + (lib.cmakeBool "VOIP" withVoipSupport) ]; preFixup = '' - # add gstreamer plugins path to the wrapper # unset QT_STYLE_OVERRIDE to avoid showing a blank window when started # https://github.com/NixOS/nixpkgs/issues/333009 - qtWrapperArgs+=( - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - --unset QT_STYLE_OVERRIDE - ) + qtWrapperArgs+=(--unset QT_STYLE_OVERRIDE) + '' + + lib.optionalString withVoipSupport '' + # add gstreamer plugins path to the wrapper + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; meta = with lib; { @@ -107,8 +111,5 @@ stdenv.mkDerivation rec { rnhmjoj ]; platforms = platforms.all; - # Should be fixable if a higher clang version is used, see: - # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.hostPlatform.isDarwin; }; -} +}) From 7cc3406497de62c64ca54cbb72844608dc3470c6 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Mon, 29 Sep 2025 23:22:11 +0800 Subject: [PATCH 07/18] maintainers: add rebmit --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ad373cd39fc5..7e9ff268bb4f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21577,6 +21577,12 @@ github = "i-am-logger"; githubId = 1440852; }; + rebmit = { + name = "Lu Wang"; + email = "rebmit@rebmit.moe"; + github = "rebmit"; + githubId = 188659765; + }; reckenrode = { name = "Randy Eckenrode"; email = "randy@largeandhighquality.com"; From 618883d36d9cc17ba26fadd33b0188309398fce0 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Mon, 29 Sep 2025 23:24:51 +0800 Subject: [PATCH 08/18] mtxclient: add rebmit to maintainers --- pkgs/by-name/mt/mtxclient/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/mt/mtxclient/package.nix b/pkgs/by-name/mt/mtxclient/package.nix index d52a70e75f33..dba49625017a 100644 --- a/pkgs/by-name/mt/mtxclient/package.nix +++ b/pkgs/by-name/mt/mtxclient/package.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fpletz pstn + rebmit rnhmjoj ]; platforms = platforms.all; From 158dc4d7a33b0a6bfa44bf339e6ae766d09a0684 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Mon, 29 Sep 2025 23:25:10 +0800 Subject: [PATCH 09/18] nheko: add rebmit to maintainers --- pkgs/by-name/nh/nheko/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix index 105644a2b429..c48c23697788 100644 --- a/pkgs/by-name/nh/nheko/package.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -108,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ ekleog fpletz + rebmit rnhmjoj ]; platforms = platforms.all; From 1cb891a66e6fa01f01904164fc6270730f8f3d07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Sep 2025 17:09:10 +0000 Subject: [PATCH 10/18] python3Packages.weaviate-client: 4.16.10 -> 4.17.0 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index e9dd929cb33c..e2d344c14f66 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.16.10"; + version = "4.17.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-wI/lbMFxxh5Kl30hf42o5FnFiXmANl69/ll9d3ZQC70="; + hash = "sha256-4/8HDxS6PKnYt1LaMuXQtMeb4HNFjaagLfQ8xuyLXLo="; }; pythonRelaxDeps = [ From 436d2122acffdef90fe4f9733257a06982f7c014 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 26 Sep 2025 12:34:11 +0000 Subject: [PATCH 11/18] python3Packages.rdkit: 2024.09.1 -> 2025.03.1 --- .../python-modules/rdkit/default.nix | 92 +++++++++++++++---- .../rdkit/dont-fetch-better-enums.patch | 14 +++ 2 files changed, 87 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/rdkit/dont-fetch-better-enums.patch diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 77cd25503084..55d548fbdfab 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -1,13 +1,14 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, + fetchzip, + applyPatches, + replaceVars, cmake, comic-neue, boost, catch2_3, - inchi, cairo, eigen, python, @@ -26,11 +27,27 @@ let rev = "AvalonToolkit_2.0.5-pre.3"; hash = "sha256-2MuFZgRIHXnkV7Nc1da4fa7wDx57VHUtwLthrmjk+5o="; }; - yaehmop = fetchFromGitHub { - owner = "greglandrum"; - repo = "yaehmop"; - rev = "v2024.03.1"; - hash = "sha256-rhR7Ev+9Fk/Ks7R2x2SjWu1L/48a4zHDHUBohx1Dw/M="; + chemdraw = fetchFromGitHub { + owner = "Glysade"; + repo = "chemdraw"; + tag = "v1.0.10"; + hash = "sha256-ee2Oxvo2d7Yb59lN0zkrbFqy/3rOvVLo6qdS+f23wVQ="; + }; + yaehmop = applyPatches { + src = fetchFromGitHub { + owner = "greglandrum"; + repo = "yaehmop"; + rev = "v2025.03.1"; + hash = "sha256-rhR7Ev+9Fk/Ks7R2x2SjWu1L/48a4zHDHUBohx1Dw/M="; + }; + + # Compatibility with CMake < 3.5 has been removed from CMake. + postPatch = '' + substituteInPlace tightbind/CMakeLists.txt \ + --replace-fail \ + "cmake_minimum_required(VERSION 3.0)" \ + "cmake_minimum_required(VERSION 3.5)" + ''; }; freesasa = fetchFromGitHub { owner = "mittinatten"; @@ -44,12 +61,23 @@ let rev = "daefab3dd0c90ca56da9d3d5e375fe4d651e6be3"; hash = "sha256-tQB4wqza9rlSoy4Uj9bA99ddawjxGyN9G7DYbcv/Qdo="; }; + better_enums = fetchFromGitHub { + owner = "aantron"; + repo = "better-enums"; + tag = "0.11.3"; + hash = "sha256-UYldCOkRTySc78oEOJzgoY9h2lB386W/D5Rz3KjVCO8="; + }; + # We cannot use the inchi from nixpkgs as the version is too old + inchi = fetchzip { + url = "https://github.com/IUPAC-InChI/InChI/releases/download/v1.07.3/INCHI-1-SRC.zip"; + hash = "sha256-TUC2175HifB63EfSsg/ixA3wYzAxsvUnY6ZyNjVR/Fc="; + }; }; boost' = boost.override { enableNumpy = true; }; in buildPythonPackage rec { pname = "rdkit"; - version = "2024.09.1"; + version = "2025.03.6"; pyproject = false; src = @@ -59,8 +87,8 @@ buildPythonPackage rec { fetchFromGitHub { owner = "rdkit"; repo = "rdkit"; - rev = "Release_${versionTag}"; - hash = "sha256-UsyPlAJ8FISblF8szEmRqWansunIhW/gbEBZx13YM+A="; + tag = "Release_${versionTag}"; + hash = "sha256-DqnwfT+lX7OnArIcFlCBrDl+QDmNpbPO9u7OGwu8fJo="; }; unpackPhase = '' @@ -72,19 +100,46 @@ buildPythonPackage rec { # see https://github.com/rdkit/rdkit/pull/5928 cp -r ${external.avalon}/* External/AvalonTools/avalon + mkdir External/ChemDraw/chemdraw + cp -r ${external.chemdraw}/* External/ChemDraw/chemdraw/ + chmod -R +w External/ChemDraw/chemdraw + mkdir External/YAeHMOP/yaehmop ln -s ${external.yaehmop}/* External/YAeHMOP/yaehmop - mkdir -p External/FreeSASA/freesasa + mkdir External/FreeSASA/freesasa cp -r ${external.freesasa}/* External/FreeSASA/freesasa chmod +w External/FreeSASA/freesasa/src cp External/FreeSASA/freesasa2.c External/FreeSASA/freesasa/src - ln -s ${external.pubchem-align3d} External/pubchem_shape/pubchem-align3d + mkdir External/pubchem_shape/pubchem-align3d + cp -r ${external.pubchem-align3d}/* External/pubchem_shape/pubchem-align3d + + mkdir External/INCHI-API/src + ln -s ${external.inchi}/* External/INCHI-API/src + ln -s ${rapidjson} External/rapidjson-1.1.0 ln -s ${comic-neue}/share/fonts/truetype/ComicNeue-Regular.ttf Data/Fonts/ ''; + patches = [ + (replaceVars ./dont-fetch-better-enums.patch { + inherit (external) better_enums; + }) + ]; + + # Prevent linking to libpython which fails on darwin with: + # Undefined symbols for architecture arm64 + # Reverts https://github.com/rdkit/rdkit/commit/470df8cd2fab78d64ef1dd254576097b651c3dd9 + postPatch = '' + substituteInPlace \ + CMakeLists.txt \ + External/pubchem_shape/Wrap/CMakeLists.txt \ + --replace-fail \ + "find_package(Python3 COMPONENTS Interpreter Development.Module NumPy" \ + "find_package(Python3 COMPONENTS Interpreter Development NumPy" \ + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -93,7 +148,6 @@ buildPythonPackage rec { catch2_3 coordgenlibs eigen - inchi maeparser ]; @@ -126,8 +180,8 @@ buildPythonPackage rec { (lib.cmakeBool "RDK_USE_URF" false) (lib.cmakeFeature "AVALONTOOLS_DIR" "avalon") (lib.cmakeFeature "FREESASA_SRC_DIR" "freesasa") - (lib.cmakeFeature "INCHI_INCLUDE_DIR" "${inchi}/include/inchi") - (lib.cmakeFeature "PUBCHEMSHAPE_DIR" "External/pubchem_shape/pubchem-align3d") + (lib.cmakeFeature "maeparser_DIR" "${maeparser}/lib/cmake") + (lib.cmakeFeature "coordgen_DIR" "${coordgenlibs}/lib/cmake") ]; checkPhase = '' @@ -144,14 +198,14 @@ buildPythonPackage rec { "rdkit.Chem.rdDetermineBonds" ]; - meta = with lib; { + meta = { description = "Open source toolkit for cheminformatics"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ rmcgibbo natsukium ]; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://www.rdkit.org"; - changelog = "https://github.com/rdkit/rdkit/releases/tag/${src.rev}"; + changelog = "https://github.com/rdkit/rdkit/releases/tag/${src.tag}"; }; } diff --git a/pkgs/development/python-modules/rdkit/dont-fetch-better-enums.patch b/pkgs/development/python-modules/rdkit/dont-fetch-better-enums.patch new file mode 100644 index 000000000000..c52f30a2c20f --- /dev/null +++ b/pkgs/development/python-modules/rdkit/dont-fetch-better-enums.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77939f452..9cace7fe1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,8 +184,7 @@ Include(FetchContent) + + FetchContent_Declare( + better_enums +- GIT_REPOSITORY https://github.com/aantron/better-enums.git +- GIT_TAG c35576bed0295689540b39873126129adfa0b4c8 # 0.11.3 ++ URL @better_enums@ + ) + + if(RDK_INSTALL_INTREE) From fb89da422c9648051aee0532be1d404581874e2a Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Mon, 29 Sep 2025 19:29:23 -0400 Subject: [PATCH 12/18] norouter: drop Has been marked broken for a full release cycle. Dropping per RFC 180. --- pkgs/by-name/no/norouter/package.nix | 40 ---------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/by-name/no/norouter/package.nix diff --git a/pkgs/by-name/no/norouter/package.nix b/pkgs/by-name/no/norouter/package.nix deleted file mode 100644 index 12ad91496a84..000000000000 --- a/pkgs/by-name/no/norouter/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "norouter"; - version = "0.6.5"; - - src = fetchFromGitHub { - owner = "norouter"; - repo = "norouter"; - rev = "v${version}"; - sha256 = "sha256-EY/Yfyaz2DeQKHJ4awpQDbrVkse9crIZlLzfviPy3Tk="; - }; - - vendorHash = "sha256-RxrmYfEm1Maq8byoLXUr5RfXcwgqpCcAq5enMnl9V9E="; - - subPackages = [ "cmd/norouter" ]; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/norouter --version | grep ${version} > /dev/null - - runHook postInstallCheck - ''; - - meta = with lib; { - # Doesn't build with Go >=1.21 - # https://github.com/norouter/norouter/issues/165 - broken = true; - description = "Tool to handle unprivileged networking by using multiple loopback addresses"; - homepage = "https://github.com/norouter/norouter"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - mainProgram = "norouter"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b72e42479277..b85d3d9134c9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1882,6 +1882,7 @@ mapAliases { nomad_1_6 = throw "nomad_1_6 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 nomad_1_7 = throw "nomad_1_7 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27 nomad_1_8 = throw "nomad_1_8 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27 + norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29 noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 From ec1d9408594e5923f7ffee02e22ff2b949f3c8fd Mon Sep 17 00:00:00 2001 From: Danny Breyfogle <27653146+dbreyfogle@users.noreply.github.com> Date: Sun, 28 Sep 2025 01:31:21 -0700 Subject: [PATCH 13/18] github-copilot-cli: init at 0.0.328 --- .../gi/github-copilot-cli/package-lock.json | 58 +++++++++++++++++++ .../by-name/gi/github-copilot-cli/package.nix | 38 ++++++++++++ pkgs/development/node-packages/aliases.nix | 1 - pkgs/top-level/aliases.nix | 1 - 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/gi/github-copilot-cli/package-lock.json create mode 100644 pkgs/by-name/gi/github-copilot-cli/package.nix diff --git a/pkgs/by-name/gi/github-copilot-cli/package-lock.json b/pkgs/by-name/gi/github-copilot-cli/package-lock.json new file mode 100644 index 000000000000..2d53b9d57986 --- /dev/null +++ b/pkgs/by-name/gi/github-copilot-cli/package-lock.json @@ -0,0 +1,58 @@ +{ + "name": "@github/copilot", + "version": "0.0.328", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@github/copilot", + "version": "0.0.328", + "dependencies": { + "keytar-forked-forked": "^7.10.2", + "node-pty": "npm:@devm33/node-pty@^1.0.8" + }, + "bin": { + "copilot": "index.js" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/keytar-forked-forked": { + "version": "7.10.3", + "resolved": "https://registry.npmjs.org/keytar-forked-forked/-/keytar-forked-forked-7.10.3.tgz", + "integrity": "sha512-ipErTUO1NPXmngYhnMrda0yOIOPSNbVJ2BRjk3kNozLx3UmGICnzCfEDemuLY6HgP+rV0c9F+Opt+89+Ydbw6w==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.3.0" + } + }, + "node_modules/node-addon-api": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz", + "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==", + "license": "MIT", + "engines": { + "node": "^18 || ^20 || >= 21" + } + }, + "node_modules/node-pty": { + "name": "@devm33/node-pty", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@devm33/node-pty/-/node-pty-1.0.9.tgz", + "integrity": "sha512-5yzbTTywkaFk1iRwte2aWEpyDfcpDjCofVD1BiOUQI+fsCvp/+RdJnB4jgnULrdlWOEWuBf+bg4/NZKVApPhoQ==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^7.1.0" + } + }, + "node_modules/node-pty/node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "license": "MIT" + } + } +} diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix new file mode 100644 index 000000000000..2006f6db64d3 --- /dev/null +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildNpmPackage, + fetchzip, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "github-copilot-cli"; + version = "0.0.328"; + + src = fetchzip { + url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz"; + hash = "sha256-9oTaVjvwyS8KY8N5kUEiAs+l6vEd/BZ0AGJI0p9Jie0="; + }; + + npmDepsHash = "sha256-WK6t3IW4uF+MDu7Y5GRinbm8iDcYB8RhJ15GE9VBcjQ="; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; + + meta = { + description = "GitHub Copilot CLI brings the power of Copilot coding agent directly to your terminal"; + homepage = "https://github.com/github/copilot-cli"; + changelog = "https://github.com/github/copilot-cli/releases/tag/v${finalAttrs.version}"; + downloadPage = "https://www.npmjs.com/package/@github/copilot"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + dbreyfogle + ]; + mainProgram = "copilot"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 523735e7c897..596cecd17165 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -40,7 +40,6 @@ mapAliases { throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20 - "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 "@maizzle/cli" = pkgs.maizzle; # added 2023-08-17 "@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f15badd0e3a6..ab5e5938e8aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1038,7 +1038,6 @@ mapAliases { svn_all_fast_export = svn-all-fast-export; # Added 2021-01-14 topGit = top-git; # Added 2021-01-14 }; - github-copilot-cli = throw "'github-copilot-cli' has been removed because GitHub has replaced it with 'gh-copilot'."; # Added 2025-06-01 gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30 givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07 givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07 From b80c916da4b8bb5653d9a9691fbcbcbd1ef6fe5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Sep 2025 01:18:14 +0000 Subject: [PATCH 14/18] python3Packages.petsc4py: 3.23.6 -> 3.23.7 --- pkgs/by-name/pe/petsc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index ed989be6f710..cdf5ddee537b 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -109,11 +109,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "petsc"; - version = "3.23.6"; + version = "3.23.7"; src = fetchzip { url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz"; - hash = "sha256-sKXLYtOw6xom7c7ARpOY4dcsV5zR5KgbYrt1bnHF/Io="; + hash = "sha256-6jP1EEYGMkttmEh0Fvtm0Fgp0NwHQlG21fY7cnLmXTI="; }; strictDeps = true; From dffd1e8f3f5796e1cba80515b4a13c73e6ac9bc2 Mon Sep 17 00:00:00 2001 From: Multipixelone Date: Mon, 29 Sep 2025 21:46:07 -0400 Subject: [PATCH 15/18] snapcast: add pipewireSupport the most recent release 0.33 adds a cmake flag to build the application with pipewire support. Standard convention builds the package with pipewire support if the hostPlatform isLinux. --- pkgs/applications/audio/snapcast/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 1ad175bb0376..cf40ea7d9552 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -17,7 +17,9 @@ aixlog, popl, pulseaudioSupport ? false, + pipewireSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, + pipewire, nixosTests, openssl, }: @@ -54,11 +56,15 @@ stdenv.mkDerivation rec { openssl ] ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional pipewireSupport pipewire ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; - cmakeFlags = [ (lib.cmakeBool "BUILD_WITH_PULSE" pulseaudioSupport) ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_WITH_PULSE" pulseaudioSupport) + (lib.cmakeBool "BUILD_WITH_PIPEWIRE" pipewireSupport) + ]; # Upstream systemd unit files are pretty awful, so we provide our own in a # NixOS module. It might make sense to get that upstreamed... From 6e331d90bd42d472888b6823ba466034e3a2eb40 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 27 Sep 2025 04:02:16 -0400 Subject: [PATCH 16/18] bcachefs-kernel-module: Nest within bcachefs-tools When you set the bcachefs userspace tools with: ```nix boot.bcachefs.package = /* custom pacakge */; ``` This now also changes the kernel package. The NixOS module now calls on the nested `cfg.package.kernelModule` expression with `kernelPackages.callPackage`. This will enable overriding both userspace and kernel space from e.g. upstream git. --- nixos/modules/tasks/filesystems/bcachefs.nix | 20 +++++++++++++++---- .../bc/bcachefs-tools/kernel-module.nix} | 2 +- pkgs/by-name/bc/bcachefs-tools/package.nix | 3 +++ pkgs/top-level/linux-kernels.nix | 6 +++++- 4 files changed, 25 insertions(+), 6 deletions(-) rename pkgs/{os-specific/linux/bcachefs-kernel-module/default.nix => by-name/bc/bcachefs-tools/kernel-module.nix} (98%) diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 6ac728bfaeba..f223bd80dbe8 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -178,8 +178,20 @@ let in { - options.boot.bcachefs.package = lib.mkPackageOption pkgs "bcachefs-tools" { } // { - description = "Configured Bcachefs userspace package."; + options.boot.bcachefs = { + package = lib.mkPackageOption pkgs "bcachefs-tools" { + extraDescription = '' + This package should also provide a passthru 'kernelModule' + attribute to build the out-of-tree kernel module. + ''; + }; + + modulePackage = lib.mkOption { + type = lib.types.package; + # See NOTE in linux-kernels.nix + default = config.boot.kernelPackages.callPackage cfg.package.kernelModule { }; + internal = true; + }; }; options.services.bcachefs.autoScrub = { @@ -245,8 +257,8 @@ in system.fsPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; - boot.extraModulePackages = lib.optionals (!config.boot.kernelPackages.bcachefs.meta.broken) [ - config.boot.kernelPackages.bcachefs + boot.extraModulePackages = lib.optionals (!cfg.modulePackage.meta.broken) [ + cfg.modulePackage ]; systemd = { diff --git a/pkgs/os-specific/linux/bcachefs-kernel-module/default.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix similarity index 98% rename from pkgs/os-specific/linux/bcachefs-kernel-module/default.nix rename to pkgs/by-name/bc/bcachefs-tools/kernel-module.nix index a43e55225681..e2eab3c2b944 100644 --- a/pkgs/os-specific/linux/bcachefs-kernel-module/default.nix +++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix @@ -1,7 +1,7 @@ +bcachefs-tools: { lib, stdenv, - bcachefs-tools, kernelModuleMakeFlags, kernel, }: diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 4314f299e0b2..05075a603f1a 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -118,6 +118,9 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + # See NOTE in linux-kernels.nix + kernelModule = import ./kernel-module.nix finalAttrs.finalPackage; + tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 0369355da714..1faba9a7f1b5 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -375,7 +375,11 @@ in bbswitch = callPackage ../os-specific/linux/bbswitch { }; - bcachefs = callPackage ../os-specific/linux/bcachefs-kernel-module { }; + # NOTE: The bcachefs module is called this way to facilitate + # easy overriding, as it is expected many users will want to + # pull from the upstream git repo, which may include + # unreleased changes to the module build process. + bcachefs = callPackage pkgs.bcachefs-tools.kernelModule { }; ch9344 = callPackage ../os-specific/linux/ch9344 { }; From cf58f5db61f3912aeac5a1932c12bce016d0f6ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 30 Sep 2025 07:51:24 +0200 Subject: [PATCH 17/18] inetutils: avoid a non-deterministic part of test https://hydra.nixos.org/build/307976056/nixlog/3 /cc issue #423347 --- pkgs/by-name/in/inetutils/package.nix | 4 ++++ pkgs/by-name/in/inetutils/tests-libls.sh.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/by-name/in/inetutils/tests-libls.sh.patch diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix index 20f5519a6d7d..655d43a187d3 100644 --- a/pkgs/by-name/in/inetutils/package.nix +++ b/pkgs/by-name/in/inetutils/package.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + ] + # FIXME: apply unconditionally + ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ./tests-libls.sh.patch ]; strictDeps = true; diff --git a/pkgs/by-name/in/inetutils/tests-libls.sh.patch b/pkgs/by-name/in/inetutils/tests-libls.sh.patch new file mode 100644 index 000000000000..d3fc7c68fae5 --- /dev/null +++ b/pkgs/by-name/in/inetutils/tests-libls.sh.patch @@ -0,0 +1,12 @@ +tests: Remove bogus test for unsorted file listing + +Minimized from what Debian applies: +https://git.hadrons.org/cgit/debian/pkgs/inetutils.git/tree/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch?id=8ab7f49fe5cf194e989ae6ae6a78eb65397c5778 +--- a/tests/libls.sh ++++ b/tests/libls.sh +@@ -91,1 +91,0 @@ +-REPLY_Cf=`$LS -Cf $LSDIR` +@@ -130,3 +129,0 @@ +-test x"$REPLY_C" != x"$REPLY_Cf" || +- { errno=1; echo >&2 'Failed to disable sorting with "-f".'; } +- From 4840c65f1dfd264e44b7681a1c5505b9a30bcc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 30 Sep 2025 08:04:23 +0200 Subject: [PATCH 18/18] html-tidy: fixup build with cmake 4 --- pkgs/by-name/ht/html-tidy/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ht/html-tidy/package.nix b/pkgs/by-name/ht/html-tidy/package.nix index c75bfdbb1f7e..fa5c7f20a965 100644 --- a/pkgs/by-name/ht/html-tidy/package.nix +++ b/pkgs/by-name/ht/html-tidy/package.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-Q2GjinNBWLL+HXUtslzDJ7CJSTflckbjweiSMCnIVwg="; } ); + # https://github.com/htacg/tidy-html5/issues/1139 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'cmake_minimum_required (VERSION 2.8.12)' 'cmake_minimum_required(VERSION 3.5)' + ''; nativeBuildInputs = [ cmake