-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
{yoda,lhapdf,fastnlo-toolkit}: fix and enable strictDeps #366449
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
veprbl
approved these changes
Dec 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
FliegendeWurst
force-pushed
the
nlo-strict
branch
from
December 19, 2024 22:26
85dbd58
to
363053f
Compare
Result of 2 packages failed to build:
21 packages built:
|
Need to move around more inputs to make python bindings build: diff --git a/pkgs/by-name/fa/fastnlo-toolkit/package.nix b/pkgs/by-name/fa/fastnlo-toolkit/package.nix
index d43cc2698c1b..db79f1be9f83 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,25 +34,18 @@ stdenv.mkDerivation rec {
./yoda2_support.patch
];
- buildInputs =
- [
- boost
- gfortran
- gfortran.cc.lib
- lhapdf
- yoda
- ]
- ++ lib.optional withPython python
- ++ lib.optional (withPython && python.isPy3k) ncurses;
+ nativeBuildInputs = [
+ lhapdf
+ yoda
+ ] ++ lib.optional withPython python;
+ buildInputs = [
+ boost
+ lhapdf
+ yoda
+ ] ++ lib.optional withPython python ++ lib.optional (withPython && python.isPy3k) ncurses;
- propagatedBuildInputs =
- [
- zlib
- ]
- ++ lib.optional withPython [
- swig
- python.pkgs.distutils
- ];
+ propagatedNativeBuildInputs = lib.optional withPython [ swig ];
+ propagatedBuildInputs = [ zlib ] ++ lib.optional withPython [ python.pkgs.distutils ];
preConfigure = ''
substituteInPlace ./fastnlotoolkit/Makefile.in \
@@ -64,9 +56,7 @@ stdenv.mkDerivation rec {
chmod +x check/fnlo-tk-stattest.pl.in
'';
- configureFlags = [
- "--with-yoda=${yoda}"
- ] ++ lib.optional withPython "--enable-pyext";
+ configureFlags = [ "--with-yoda=${yoda}" ] ++ lib.optional withPython "--enable-pyext";
enableParallelBuilding = true;
@@ -84,6 +74,8 @@ stdenv.mkDerivation rec {
# Use a workaround from https://github.com/swig/swig/issues/1538
env.CXXFLAGS = "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES";
+ strictDeps = true;
+
meta = with lib; {
homepage = "http://fastnlo.hepforge.org";
description = "Fast pQCD calculations for hadron-induced processes"; |
Also remove the currently unused gfortran inputs. Co-Authored-By: veprbl <[email protected]>
FliegendeWurst
force-pushed
the
nlo-strict
branch
from
December 20, 2024 07:03
363053f
to
5b93a4e
Compare
Result of 23 packages built:
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All done in one PR because the packages look very related.
ref. #178468
Things done