gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-30 06:05:59 +00:00
committed by GitHub
parent 4840c65f1d aec87d52f4
commit 3dddb78e5b
22 changed files with 383 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -21571,6 +21571,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";
nixos/modules/services/networking/ddclient.nix
+2 -2
View File
@@ -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.";
}
];
nixos/modules/tasks/filesystems/bcachefs.nix
+16 -4
View File
@@ -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 = {
pkgs/applications/audio/snapcast/default.nix
+7 -1
View File
@@ -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...
pkgs/os-specific/linux/bcachefs-kernel-module/default.nix → pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
+1 -1
View File
@@ -1,7 +1,7 @@
bcachefs-tools:
{
lib,
stdenv,
bcachefs-tools,
kernelModuleMakeFlags,
kernel,
}:
pkgs/by-name/bc/bcachefs-tools/package.nix
+3
View File
@@ -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;
pkgs/by-name/gi/github-copilot-cli/package-lock.json
Generated
+58
View File
@@ -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"
}
}
}
pkgs/by-name/gi/github-copilot-cli/package.nix
+38
View File
@@ -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";
};
})
pkgs/by-name/mt/mtxclient/package.nix
+14 -14
View File
@@ -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";
@@ -60,11 +62,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [
fpletz
pstn
rebmit
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;
};
}
})
pkgs/by-name/mt/mtxclient/remove-network-tests.patch
+77
View File
@@ -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)
pkgs/by-name/nh/nheko/fix-darwin-build.patch
+22
View File
@@ -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)
pkgs/by-name/nh/nheko/package.nix
+23 -21
View File
@@ -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; {
@@ -104,11 +108,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [
ekleog
fpletz
rebmit
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;
};
}
})
pkgs/by-name/no/norouter/package.nix
-40
View File
@@ -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";
};
}
pkgs/by-name/pe/petsc/package.nix
+2 -2
View File
@@ -110,11 +110,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;
pkgs/by-name/sk/skippy-xd/package.nix
+16 -9
View File
@@ -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;
};
}
})
pkgs/by-name/ta/talosctl/package.nix
+3 -3
View File
@@ -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"
pkgs/development/node-packages/aliases.nix
-1
View File
@@ -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
pkgs/development/python-modules/rdkit/default.nix
+73 -19
View File
@@ -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}";
};
}
pkgs/development/python-modules/rdkit/dont-fetch-better-enums.patch
+14
View File
@@ -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)
pkgs/development/python-modules/weaviate-client/default.nix
+2 -2
View File
@@ -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 = [
pkgs/top-level/aliases.nix
+1 -1
View File
@@ -1051,7 +1051,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
@@ -1890,6 +1889,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
pkgs/top-level/linux-kernels.nix
+5 -1
View File
@@ -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 { };