xfitter: runtime fixes #48675

veprbl · 2018-10-18T18:09:26Z

Motivation for this change

Fixes xfitter. It is a UB in C++ for function to declare a return value and not provide any, a patch was added to fix that. Also qcdnum 17-01-14 deprecates some of the functions used by xfitter, so downgrade it for now.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Determined the impact on package closure size (by running nix path-info -S before and after)
Fits CONTRIBUTING.md.

17-01-14 is not compatible with xfitter. It fails with: PDFEXT obsolete, please use EXTPDF instead

Mic92 · 2018-10-18T18:21:28Z

pkgs/applications/science/physics/xfitter/undefined_behavior.patch

@@ -1,5 +1,4 @@
 diff --git a/DY/src/finterface.cc b/DY/src/finterface.cc
-index 0405786..eb171d0 100644
 --- a/DY/src/finterface.cc


Have you also send this patch upstream?

Not yet. I'm working on preparing a version of this patch that would apply to upstream's master.

Did you had a chance to submit the patch?

@Mic92 I did. Fingers crossed, will see how it goes.

GrahamcOfBorg · 2018-10-18T18:28:04Z

Failure on x86_64-linux (full log)

Attempted: qcdnum, xfitter

Partial log (click to expand)

[ 16%] Building C object core/utils/CMakeFiles/rootcint.dir/__/clib/src/strlcpy.c.o
[ 16%] Building C object core/utils/CMakeFiles/rootcint.dir/__/clib/src/strlcat.c.o
[ 16%] Linking CXX executable ../../bin/rootcint
[ 16%] Built target rootcint
make: *** [Makefile:152: all] Error 2
builder for '/nix/store/rc2469ifapcyqh45pw9axq4l62rxz0a0-root-5.34.36.drv' failed with exit code 2
cannot build derivation '/nix/store/2d6h2l6rq20ajpa14cmyijrz334w84px-applgrid-1.4.70.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/k2i4blnm1xg9mnyjpbiqgcqdximf97cr-apfelgrid-1.0.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/8zag1a09zydp5iv0wsz50rlibwirwmxw-xfitter-2.0.0.drv': 3 dependencies couldn't be built
error: build of '/nix/store/8zag1a09zydp5iv0wsz50rlibwirwmxw-xfitter-2.0.0.drv' failed

GrahamcOfBorg · 2018-10-18T18:41:05Z

Failure on aarch64-linux (full log)

Attempted: qcdnum, xfitter

Partial log (click to expand)

/nix/store/3g9yrjv8h592nbry3xp3rjhdc6nfp79x-root-6.12.06/etc/vmc/g4_makedist.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/3g9yrjv8h592nbry3xp3rjhdc6nfp79x-root-6.12.06/etc/vmc/makedist.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/3g9yrjv8h592nbry3xp3rjhdc6nfp79x-root-6.12.06/etc/daemons/proofd.rc.d: interpreter directive changed from " /bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/3g9yrjv8h592nbry3xp3rjhdc6nfp79x-root-6.12.06/etc/daemons/rootd.rc.d: interpreter directive changed from " /bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/3g9yrjv8h592nbry3xp3rjhdc6nfp79x-root-6.12.06/etc/dictpch/makepch.py: interpreter directive changed from " /usr/bin/env python" to "/nix/store/74b1xd5srd6ja54xwznvbrd5hcfl6k1n-python-2.7.15/bin/python"
/nix/store/3g9yrjv8h592nbry3xp3rjhdc6nfp79x-root-6.12.06/etc/dictpch/makepch.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/3g9yrjv8h592nbry3xp3rjhdc6nfp79x-root-6.12.06...
cannot build derivation '/nix/store/1npqm2jzza2kc6cbcf2dci1w1ncfqfcr-apfelgrid-1.0.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/sxp2rlc3wl0y7qnzzhc6qjdicklf0sip-xfitter-2.0.0.drv': 3 dependencies couldn't be built
error: build of '/nix/store/sxp2rlc3wl0y7qnzzhc6qjdicklf0sip-xfitter-2.0.0.drv' failed

GrahamcOfBorg · 2018-10-18T19:22:44Z

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: qcdnum, xfitter

Partial log (click to expand)

[ 53%] Building CXX object interpreter/llvm/src/lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CallingConvLower.cpp.o
[ 53%] Building CXX object interpreter/llvm/src/lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CodeGen.cpp.o
[ 53%] Building CXX object interpreter/llvm/src/lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CodeGenPrepare.cpp.o
[ 53%] Building CXX object interpreter/llvm/src/lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CountingFunctionInserter.cpp.o
[ 53%] Building CXX object interpreter/llvm/src/lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CriticalAntiDepBreaker.cpp.o
[ 53%] Building CXX object interpreter/llvm/src/lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/DeadMachineInstructionElim.cpp.o
building of '/nix/store/s99pnhs8f32r4c2a0426dvkgcysd1k7v-root-6.12.06.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/4h0l75cs4i5ishra4m2fn9kbkq0qj2gc-apfelgrid-1.0.1.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/ddd9qxhqlmaw296vg5125zpnvknr5xc9-xfitter-2.0.0.drv': 9 dependencies couldn't be built
error: build of '/nix/store/d3gv26dggr21qyk7p5sjks091ppapz3v-QCDNUM-17-01-13.drv', '/nix/store/ddd9qxhqlmaw296vg5125zpnvknr5xc9-xfitter-2.0.0.drv' failed

GrahamcOfBorg · 2018-10-18T19:41:19Z

Success on x86_64-linux (full log)

Attempted: qcdnum

The following builds were skipped because they don't evaluate on x86_64-linux: apfelgrid, root5, xfitter

Partial log (click to expand)

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.


/nix/store/7w2pj3gv2dzyfpdghc7wbs0c14gnm58x-QCDNUM-17-01-13

GrahamcOfBorg · 2018-10-18T19:41:30Z

Success on aarch64-linux (full log)

Attempted: qcdnum

The following builds were skipped because they don't evaluate on aarch64-linux: apfelgrid, root5, xfitter

Partial log (click to expand)

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.


/nix/store/qa3ym9038804p2frkibfpbqpp0h5ndi0-QCDNUM-17-01-13

GrahamcOfBorg · 2018-10-18T20:41:30Z

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: apfelgrid, qcdnum, root5, xfitter

Partial log (click to expand)

cannot build derivation '/nix/store/50frjbc552mn40nfcgy6588jaqadj55p-apple-framework-Carbon.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/8d0p9adx6y99fk1hm8y583cff378c06b-apple-framework-AudioUnit.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/37hdm9vrqjnsikdavzkx0rk3sfngsdsv-apple-framework-AudioToolbox.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/0qiqpkngnvz9lcqbjwjx64flw2insldk-apple-framework-AppKit.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/n6pg2kh8mnnc986r7p42f93gl1qnxbzx-apple-framework-Cocoa.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/47wjdkz71lbrcagmmlr5ik3zdj1pngj7-root-5.34.36.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/np1qr0vw2l5fccd72w8mlp8cydv7q4dw-applgrid-1.4.70.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/6pphvi4br8s1f4v97fdagwzghas8mx5a-apfelgrid-1.0.1.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/1sb53da7png6jc6ikwx3lhwxr1j3zdwh-xfitter-2.0.0.drv': 13 dependencies couldn't be built
error: build of '/nix/store/1sb53da7png6jc6ikwx3lhwxr1j3zdwh-xfitter-2.0.0.drv', '/nix/store/47wjdkz71lbrcagmmlr5ik3zdj1pngj7-root-5.34.36.drv', '/nix/store/6pphvi4br8s1f4v97fdagwzghas8mx5a-apfelgrid-1.0.1.drv', '/nix/store/d3gv26dggr21qyk7p5sjks091ppapz3v-QCDNUM-17-01-13.drv' failed

veprbl · 2019-01-11T23:33:19Z

@GrahamcOfBorg build apfelgrid qcdnum

veprbl · 2019-01-12T01:47:43Z

@GrahamcOfBorg build apfelgrid qcdnum

veprbl added 2 commits October 8, 2018 10:59

xfitter: extend UB patch to fix all -Wreturn-type issues

5828821

qcdnum: downgrade 17-01-14 -> 17-01-13

ad6b9e4

17-01-14 is not compatible with xfitter. It fails with: PDFEXT obsolete, please use EXTPDF instead

Mic92 reviewed Oct 18, 2018

View reviewed changes

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 18, 2018

apfelgrid: use root5 (same as xfitter)

3dd924b

veprbl force-pushed the pr/xfitter_fix branch from ffc1b2b to 778901a Compare January 11, 2019 23:32

veprbl force-pushed the pr/xfitter_fix branch from 778901a to 3dd924b Compare January 12, 2019 01:47

veprbl merged commit 958201a into NixOS:master Jan 21, 2019

veprbl deleted the pr/xfitter_fix branch December 1, 2020 17:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

xfitter: runtime fixes #48675

xfitter: runtime fixes #48675

veprbl commented Oct 18, 2018

Mic92 Oct 18, 2018

veprbl Oct 18, 2018

Mic92 Jan 21, 2019

veprbl Jan 21, 2019

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

veprbl commented Jan 11, 2019

veprbl commented Jan 12, 2019

xfitter: runtime fixes #48675

xfitter: runtime fixes #48675

Conversation

veprbl commented Oct 18, 2018

Motivation for this change

Things done

Mic92 Oct 18, 2018

Choose a reason for hiding this comment

veprbl Oct 18, 2018

Choose a reason for hiding this comment

Mic92 Jan 21, 2019

Choose a reason for hiding this comment

veprbl Jan 21, 2019

Choose a reason for hiding this comment

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

GrahamcOfBorg commented Oct 18, 2018

veprbl commented Jan 11, 2019

veprbl commented Jan 12, 2019