geant4: v10.0.2 -> v10.4.1, define datasets seperately, add dependencies for enableInventor #39514

tmplt · 2018-04-26T00:14:32Z

Motivation for this change

Add another version of geant4 sources and define all related datasets in a seperate set of derivations.
Dependencies for geant4's enableInventor flag has been added (soxt).

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
Fits CONTRIBUTING.md.

tmplt · 2018-05-08T05:53:32Z

I've never seen the usage of dependency ? null before. I left them in because I was unsure: since most of them hint at libraries with the same name, shouldn't the ? null just be omitted? After all, libraries can be overridden, right?

veprbl · 2018-05-08T15:33:42Z

pkgs/development/libraries/soxt/default.nix

+  meta = {
+    homepage = http://www.coin3d.org/;
+    license = stdenv.lib.licenses.bsd3;
+    description = "High-level, retained-mode toolkit for effective 3D graphics development";


Perhaps "A GUI binding for using Open Inventor with Xt/Motif"

That sounds good to me.

veprbl · 2018-05-08T15:57:32Z

This is coming together well. Could you please squash the geant4 changes after you are done with it?

veprbl · 2018-05-08T16:01:39Z

pkgs/development/libraries/physics/geant4/datasets.nix

+      '';
+
+      inherit envvar;
+      setupHook = writeTextFile {


I have my doubts about this. I see that writeTextFile is not used for static files in pkgs/, I wonder if it would be better to stick with regular file here as well.

I figured since the setup hooks were to small they could just be inlined. Is writeTextFile meant to be used in another way?

I would not be surprised if there is some nasty corner case with it. I suppose I know one relatively harmless side-effect: if I'm not mistaken, the writeTextFile is a derivation and will "build" a new file for each architecture.

Well, it does make sense to store the hook within the actual derivation. I'll revert back to regular files.

I kind of agree with you, but that discussion goes beyond the scope of this PR.

veprbl · 2018-05-08T16:02:10Z

pkgs/development/libraries/physics/geant4/default.nix


-      setupHook = ./setup-hook.sh;
+      setupHook = writeTextFile {


tmplt · 2018-05-08T16:08:54Z

I'll squash the geant4 changes when I figure out how to do it around the merges with master.

tmplt · 2018-05-09T12:52:46Z

That should do it.

veprbl · 2018-05-09T14:16:22Z

pkgs/development/libraries/physics/geant4/datasets.nix

@@ -0,0 +1,103 @@
+{ stdenv, fetchurl, writeTextFile }:


don't need writeTextFile

veprbl · 2018-05-09T14:16:34Z

pkgs/development/libraries/physics/geant4/default.nix

@@ -8,7 +8,7 @@
 , enableRaytracerX11   ? false

 # Standard build environment with cmake.
-, stdenv, fetchurl, cmake
+, stdenv, fetchurl, writeTextFile, cmake


veprbl · 2018-05-09T14:16:44Z

pkgs/development/libraries/physics/geant4/default.nix

+      setupHook = ./geant4-hook.sh;
+
+      passthru = {
+        data = import ./datasets.nix { inherit stdenv fetchurl writeTextFile; };


tmplt · 2018-05-09T14:18:58Z

Thanks; fixed.

veprbl · 2018-05-09T18:10:00Z

@GrahamcOfBorg build geant4.v10_0_2 geant4.v10_4_1

GrahamcOfBorg · 2018-05-09T18:12:16Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: geant4.v10_0_2, geant4.v10_4_1

Partial log (click to expand)


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

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

GrahamcOfBorg · 2018-05-09T18:30:06Z

Success on x86_64-linux (full log)

Attempted: geant4.v10_0_2, geant4.v10_4_1

Partial log (click to expand)

shrinking /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/lib/libG4vis_management.so
shrinking /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/lib/libG4modeling.so
shrinking /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/lib/libG4OpenGL.so
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/lib  /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/bin
patching script interpreter paths in /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1
/nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/share/Geant4-10.4.1/geant4make/geant4make.sh: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/bin/geant4.sh: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/bin/geant4-config: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1...

GrahamcOfBorg · 2018-05-09T19:07:45Z

Success on aarch64-linux (full log)

Attempted: geant4.v10_0_2, geant4.v10_4_1

Partial log (click to expand)

shrinking /nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/lib/libG4analysis.so
strip is /nix/store/gp7fylxwn18b7pl2c18ks89hsiaxyfvf-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/lib  /nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/bin
patching script interpreter paths in /nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1
/nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/bin/geant4-config: interpreter directive changed from "/bin/sh" to "/nix/store/a4qslf0yfs44mhnbagarn232sjnckhy0-bash-4.4-p19/bin/sh"
/nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/bin/geant4.sh: interpreter directive changed from "/bin/sh" to "/nix/store/a4qslf0yfs44mhnbagarn232sjnckhy0-bash-4.4-p19/bin/sh"
/nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/share/Geant4-10.4.1/geant4make/geant4make.sh: interpreter directive changed from "/bin/sh" to "/nix/store/a4qslf0yfs44mhnbagarn232sjnckhy0-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1...
/nix/store/6aba07kryfcwk0pz3m2yv5fr0is998df-geant4-10.0.2
/nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1

veprbl

Checked against examples/basic/B1, was able to simulate events using data files. X11/OpenGl visual would not work for me, but thats probably due to my setup.

I will address some remaining issues with geant4 in a separate PR after this gets merged.

xeji · 2018-05-12T19:16:12Z

pkgs/development/libraries/soxt/default.nix

+    homepage = http://www.coin3d.org/;
+    license = stdenv.lib.licenses.bsd3;
+    description = "A GUI binding for using Open Inventor with Xt/Motif";
+    maintainers = [];


Would you like to add yourself as a maintainer here as well?

Might as well.

…enableInventor By seperating the datasets, geant4 now builds in a sandbox. Resolves NixOS#39766

xeji · 2018-05-12T20:14:08Z

@GrahamcOfBorg build geant4.v10_0_2 geant4.v10_4_1 soxt

GrahamcOfBorg · 2018-05-12T20:14:19Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: geant4.v10_0_2, geant4.v10_4_1, soxt

Partial log (click to expand)


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

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

GrahamcOfBorg · 2018-05-12T20:35:32Z

Success on x86_64-linux (full log)

Attempted: geant4.v10_0_2, geant4.v10_4_1, soxt

Partial log (click to expand)

shrinking /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/lib/libG4vis_management.so
shrinking /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/lib/libG4modeling.so
shrinking /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/lib/libG4OpenGL.so
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/lib  /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/bin
patching script interpreter paths in /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1
/nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/share/Geant4-10.4.1/geant4make/geant4make.sh: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/bin/geant4.sh: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1/bin/geant4-config: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/ddihxip4cpjkacn5cdpfd89s6plfrmai-geant4-10.4.1...

GrahamcOfBorg · 2018-05-12T21:08:06Z

Success on aarch64-linux (full log)

Attempted: geant4.v10_0_2, geant4.v10_4_1, soxt

Partial log (click to expand)

strip is /nix/store/gp7fylxwn18b7pl2c18ks89hsiaxyfvf-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/lib  /nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/bin
patching script interpreter paths in /nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1
/nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/bin/geant4-config: interpreter directive changed from "/bin/sh" to "/nix/store/a4qslf0yfs44mhnbagarn232sjnckhy0-bash-4.4-p19/bin/sh"
/nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/bin/geant4.sh: interpreter directive changed from "/bin/sh" to "/nix/store/a4qslf0yfs44mhnbagarn232sjnckhy0-bash-4.4-p19/bin/sh"
/nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1/share/Geant4-10.4.1/geant4make/geant4make.sh: interpreter directive changed from "/bin/sh" to "/nix/store/a4qslf0yfs44mhnbagarn232sjnckhy0-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1...
/nix/store/6aba07kryfcwk0pz3m2yv5fr0is998df-geant4-10.0.2
/nix/store/jwzialwhz8yxnm9123psrzk0ynyd6kyg-geant4-10.4.1
/nix/store/wdjhfxqhg5hs5g24p8vg99a1qvs7sx0g-soxt-1.3.0

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Apr 26, 2018

tmplt mentioned this pull request Apr 30, 2018

geant4 derivations cannot be built in a sandbox #39766

Closed

tmplt changed the title ~~geant4: v10.0.2 -> v10.4.1, download all non-optional data files~~ geant4: v10.0.2 -> v10.4.1, define datasets seperately, add dependencies for enableInventor May 8, 2018

GrahamcOfBorg added 8.has: package (new) 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 0 labels May 8, 2018

veprbl reviewed May 8, 2018

View reviewed changes

pkgs/development/libraries/physics/geant4/default.nix Outdated

setupHook = ./setup-hook.sh;

setupHook = writeTextFile {

Copy link

Member

veprbl May 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

tmplt force-pushed the update-geant4 branch from 5bc03d7 to c3f3716 Compare May 9, 2018 12:50

tmplt force-pushed the update-geant4 branch from c3f3716 to 7f4b921 Compare May 9, 2018 13:12

veprbl reviewed May 9, 2018

View reviewed changes

tmplt force-pushed the update-geant4 branch from 7f4b921 to 5712b9a Compare May 9, 2018 14:18

veprbl approved these changes May 9, 2018

View reviewed changes

xeji reviewed May 12, 2018

View reviewed changes

tmplt added 2 commits May 12, 2018 21:58

soxt: init at 1.3.0

3eabf15

geant4: v10.0.2 -> v10.4.1, define datasets seperately, add deps for …

024efc9

…enableInventor By seperating the datasets, geant4 now builds in a sandbox. Resolves NixOS#39766

tmplt force-pushed the update-geant4 branch from 5712b9a to 024efc9 Compare May 12, 2018 19:59

xeji merged commit ef102bd into NixOS:master May 12, 2018

tmplt deleted the update-geant4 branch August 16, 2018 02:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

geant4: v10.0.2 -> v10.4.1, define datasets seperately, add dependencies for enableInventor #39514

geant4: v10.0.2 -> v10.4.1, define datasets seperately, add dependencies for enableInventor #39514

tmplt commented Apr 26, 2018 •

edited

tmplt commented May 8, 2018

veprbl May 8, 2018

tmplt May 8, 2018

veprbl commented May 8, 2018

veprbl May 8, 2018

tmplt May 8, 2018

veprbl May 8, 2018

tmplt May 8, 2018

veprbl May 8, 2018

veprbl May 8, 2018

tmplt commented May 8, 2018

tmplt commented May 9, 2018

veprbl May 9, 2018

veprbl May 9, 2018

veprbl May 9, 2018

tmplt commented May 9, 2018

veprbl commented May 9, 2018

GrahamcOfBorg commented May 9, 2018

GrahamcOfBorg commented May 9, 2018

GrahamcOfBorg commented May 9, 2018

veprbl left a comment

xeji May 12, 2018

tmplt May 12, 2018

xeji commented May 12, 2018

GrahamcOfBorg commented May 12, 2018

GrahamcOfBorg commented May 12, 2018

GrahamcOfBorg commented May 12, 2018

geant4: v10.0.2 -> v10.4.1, define datasets seperately, add dependencies for enableInventor #39514

geant4: v10.0.2 -> v10.4.1, define datasets seperately, add dependencies for enableInventor #39514

Conversation

tmplt commented Apr 26, 2018 • edited

Motivation for this change

Things done

tmplt commented May 8, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

veprbl commented May 8, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tmplt commented May 8, 2018

tmplt commented May 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tmplt commented May 9, 2018

veprbl commented May 9, 2018

GrahamcOfBorg commented May 9, 2018

GrahamcOfBorg commented May 9, 2018

GrahamcOfBorg commented May 9, 2018

veprbl left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xeji commented May 12, 2018

GrahamcOfBorg commented May 12, 2018

GrahamcOfBorg commented May 12, 2018

GrahamcOfBorg commented May 12, 2018

tmplt commented Apr 26, 2018 •

edited