From 4e3d543f4dd36b7573b1f5ce344d89e519839fac Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 17 Jun 2025 11:03:29 +0800 Subject: [PATCH 1/3] netgen: move pythonImportsCheckHook to nativeBuildInputs --- pkgs/by-name/ne/netgen/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index c12f445798ec..2d277ca556d8 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { imagemagick cmake python3Packages.pybind11-stubgen + python3Packages.pythonImportsCheckHook ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ @@ -194,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.pytest python3Packages.pytest-check python3Packages.pytest-mpi - python3Packages.pythonImportsCheckHook mpiCheckPhaseHook ]; From d79bf12714703a6f316360b9361baeea43c4639b Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 18 Jun 2025 00:19:42 +0800 Subject: [PATCH 2/3] netgen: typo fixup --- pkgs/by-name/ne/netgen/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index 2d277ca556d8..0fed04a8f5b7 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/Applications/netgen.app/Contents/{MacOS,Resouces} substituteInPlace $out/Info.plist --replace-fail "Netgen1" "netgen" mv $out/Info.plist $out/Applications/netgen.app/Contents - mv $out/Netgen.icns $out/Applications/netgen.app/Contents/Resouces + mv $out/Netgen.icns $out/Applications/netgen.app/Contents/Resources ln -s $out/bin/netgen $out/Applications/netgen.app/Contents/MacOS/netgen '' + lib.optionalString stdenv.hostPlatform.isLinux '' From ed83268acabc365dd8de9c63f1e883518c83fc97 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 17 Jun 2025 11:25:30 +0800 Subject: [PATCH 3/3] netgen: 6.2.2501 -> 6.2.2504 Diff: https://github.com/NGSolve/netgen/compare/v6.2.2501...v6.2.2504 --- pkgs/by-name/ne/netgen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index 0fed04a8f5b7..99882939612c 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "netgen"; - version = "6.2.2501"; + version = "6.2.2504"; src = fetchFromGitHub { owner = "ngsolve"; repo = "netgen"; tag = "v${finalAttrs.version}"; - hash = "sha256-IzYulT3bo7XZiEEy8vNCct0zqHCnbQaH+y4fHMorzZw="; + hash = "sha256-N4mmh2H2qvc+3Pa9CHm38arViI76Qvwp8fOVGZbMv1M="; }; patches = [