From eabe3789b67700ebdf7a1fb04a4f168ed2c144f7 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 19 Dec 2024 07:21:20 +0100 Subject: [PATCH 1/3] yoda: fix and enable strictDeps --- pkgs/development/libraries/physics/yoda/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 746286254daed..581c9b4362dd1 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, autoreconfHook, + bash, python, root, makeWrapper, @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with python.pkgs; [ autoreconfHook + bash cython makeWrapper ]; @@ -43,6 +45,8 @@ stdenv.mkDerivation rec { zlib ]; + strictDeps = true; + enableParallelBuilding = true; postPatch = '' @@ -54,6 +58,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' + patchShebangs --build $out/bin/yoda-config for prog in "$out"/bin/*; do wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") done From 0852807b55d110308b16a20def524eda421148c3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 19 Dec 2024 07:22:38 +0100 Subject: [PATCH 2/3] lhapdf: fix and enable strictDeps --- pkgs/development/libraries/physics/lhapdf/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index bb2bc4e8a72e8..a8d1e5ddded26 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + bash, python, makeWrapper, }: @@ -22,7 +23,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = - [ makeWrapper ] + [ + bash + makeWrapper + ] ++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ]; @@ -34,6 +38,8 @@ stdenv.mkDerivation rec { rm wrappers/python/lhapdf.cpp ''; + strictDeps = true; + enableParallelBuilding = true; passthru = { @@ -41,6 +47,7 @@ stdenv.mkDerivation rec { }; postInstall = '' + patchShebangs --build $out/bin/lhapdf-config wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")" ''; From 5b93a4e3759db4699c15ccbd4cef636017a95840 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 19 Dec 2024 08:46:54 +0100 Subject: [PATCH 3/3] fastnlo-toolkit: fix and enable strictDeps Also remove the currently unused gfortran inputs. Co-Authored-By: veprbl --- pkgs/by-name/fa/fastnlo-toolkit/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/fastnlo-toolkit/package.nix b/pkgs/by-name/fa/fastnlo-toolkit/package.nix index d43cc2698c1bb..77c605f5d3636 100644 --- a/pkgs/by-name/fa/fastnlo-toolkit/package.nix +++ b/pkgs/by-name/fa/fastnlo-toolkit/package.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, boost, - gfortran, lhapdf, ncurses, perl, @@ -35,23 +34,26 @@ stdenv.mkDerivation rec { ./yoda2_support.patch ]; + nativeBuildInputs = [ + lhapdf # lhapdf-config + yoda # yoda-config + ] ++ lib.optional withPython python; + buildInputs = [ boost - gfortran - gfortran.cc.lib lhapdf yoda ] ++ lib.optional withPython python ++ lib.optional (withPython && python.isPy3k) ncurses; + propagatedNativeBuildInputs = lib.optional withPython [ swig ]; propagatedBuildInputs = [ zlib ] ++ lib.optional withPython [ - swig python.pkgs.distutils ]; @@ -68,6 +70,8 @@ stdenv.mkDerivation rec { "--with-yoda=${yoda}" ] ++ lib.optional withPython "--enable-pyext"; + strictDeps = true; + enableParallelBuilding = true; doCheck = true;