From 7b9deaba8161703ddf960f6ea80f140a5f24a289 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 18 Sep 2016 04:45:10 -0400 Subject: [PATCH 1/2] root: add setup-hook --- pkgs/applications/science/misc/root/default.nix | 2 ++ pkgs/applications/science/misc/root/setup-hook.sh | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/applications/science/misc/root/setup-hook.sh diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index a736bdad2ea..808af776e28 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -63,6 +63,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + setupHook = ./setup-hook.sh; + meta = { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh new file mode 100644 index 00000000000..197dc78c3c2 --- /dev/null +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -0,0 +1,9 @@ +thisroot () { + # Workaround thisroot.sh dependency on man + if [ -z "${MANPATH}" ]; then + MANPATH=: + fi + source @out@/bin/thisroot.sh +} + +envHooks+=(thisroot) From 6f4718bb324494c95cbe9dc8151962e1b0c4abb9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2016 22:01:19 -0400 Subject: [PATCH 2/2] rootpy: init at 0.8.3 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3bbf8a0e0e0..c4c641d000d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21325,6 +21325,25 @@ in modules // { }; }; + rootpy = buildPythonPackage rec { + version = "0.8.3"; + name = "rootpy-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/d5/40/feddb2c9d1cadfe05d1d9aea1a71be093dc700879c9f6af40a10b1330f34/rootpy-0.8.3.tar.gz"; + sha256 = "14q9bhs2a53598571x8yikj68x2iyl6090wbvdrpbwr238799b0z"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = with self; [ pkgs.root readline numpy matplotlib ]; + + meta = { + homepage = "http://www.rootpy.org"; + license = licenses.gpl3; + description = "Pythonic interface to the ROOT framework"; + }; + }; rope = buildPythonPackage rec { version = "0.10.2";