From 4179e19ecd060b1086ef97eb87fe8a98766a9df1 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 00:17:42 +0100 Subject: [PATCH 1/3] fftw: fix structuredAttrs --- pkgs/by-name/ff/fftw/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index 1e08014e8fce..3d3678210441 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -66,9 +66,15 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (precision != "double") "--enable-${precision}" # https://www.fftw.org/fftw3_doc/SIMD-alignment-and-fftw_005fmalloc.html # FFTW will try to detect at runtime whether the CPU supports these extensions - ++ lib.optional ( - stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double") - ) "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma" + ++ + lib.optionals (stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double")) + [ + "--enable-sse2" + "--enable-avx" + "--enable-avx2" + "--enable-avx512" + "--enable-avx128-fma" + ] ++ lib.optionals enableMpi [ "--enable-mpi" # link libfftw3_mpi explicitly with -lmpi @@ -92,6 +98,8 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + __structuredAttrs = true; + meta = { description = "Fastest Fourier Transform in the West library"; homepage = "https://www.fftw.org/"; From c9821405d3762a7212729241bff489e8eb99f661 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 00:18:07 +0100 Subject: [PATCH 2/3] fftw: use 'hash', fix deprecation warning --- pkgs/by-name/ff/fftw/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index 3d3678210441..1ea58f8fa362 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { "https://fftw.org/fftw-${finalAttrs.version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz" ]; - sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; + hash = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; }; patches = [ @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { # fftw builds with -mtune=native by default postPatch = '' - substituteInPlace configure --replace "-mtune=native" "-mtune=generic" + substituteInPlace configure --replace-fail "-mtune=native" "-mtune=generic" ''; enableParallelBuilding = true; From 2d9e255fd1ac41308eebc0b8272eb1bfabb85039 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 00:18:27 +0100 Subject: [PATCH 3/3] fftw: enable strictDeps --- pkgs/by-name/ff/fftw/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index 1ea58f8fa362..ae56ad4b321c 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace configure --replace-fail "-mtune=native" "-mtune=generic" ''; + strictDeps = true; enableParallelBuilding = true; nativeCheckInputs = [ perl ];