From 23f7087dc55a446898825131c714e231a3da3adb Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 2 Apr 2017 23:26:05 -0400 Subject: [PATCH 1/4] yoda: 1.6.5 -> 1.6.6, provide version with ROOT --- pkgs/development/libraries/physics/yoda/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index c1f0d3a29304..d398080a360c 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, python2Packages, makeWrapper }: +{ stdenv, fetchurl, python2Packages, root, makeWrapper }: stdenv.mkDerivation rec { name = "yoda-${version}"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "1i8lmj63cd3qnxl9k2cb1abap2pirhx7ffinm834wbpy9iszwxql"; + sha256 = "088xx4q6b03bnj6xg5189m8wsznhal8aj3jk40sbj24idm4jl5yg"; }; pythonPath = []; # python wrapper support - buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ]; + buildInputs = with python2Packages; [ python numpy matplotlib root makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e089956fdbf..94475d06e0be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17698,7 +17698,10 @@ with pkgs; thepeg = callPackage ../development/libraries/physics/thepeg { }; - yoda = callPackage ../development/libraries/physics/yoda { }; + yoda = callPackage ../development/libraries/physics/yoda { + root = null; + }; + yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda { }); ### MISC From a07d334bf42feb9a41858852d8300ee6ce28d38d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 3 Apr 2017 03:48:22 -0400 Subject: [PATCH 2/4] yoda: refactor root support to be more explicit --- pkgs/development/libraries/physics/yoda/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index d398080a360c..46e2580bd0c3 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, root, makeWrapper }: +{ stdenv, fetchurl, python2Packages, root, makeWrapper, withRootSupport ? false }: stdenv.mkDerivation rec { name = "yoda-${version}"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { pythonPath = []; # python wrapper support - buildInputs = with python2Packages; [ python numpy matplotlib root makeWrapper ]; + buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ] + ++ stdenv.lib.optional withRootSupport root; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94475d06e0be..79af89983ce4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17698,10 +17698,10 @@ with pkgs; thepeg = callPackage ../development/libraries/physics/thepeg { }; - yoda = callPackage ../development/libraries/physics/yoda { - root = null; - }; - yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda { }); + yoda = callPackage ../development/libraries/physics/yoda { }; + yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda { + withRootSupport = true; + }); ### MISC From 61ae20e08516e31126f5c69b3250f474c53e3ce0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 4 Apr 2017 22:37:35 -0400 Subject: [PATCH 3/4] rivet: move ghostscript to propagatedBuildInputs (fixes runtime) --- pkgs/development/libraries/physics/rivet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index a82c14fee773..f68c2ea877d5 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { xcolor xkeyval ;}; - buildInputs = [ ghostscript hepmc imagemagick python2 latex makeWrapper ]; - propagatedBuildInputs = [ fastjet gsl yoda ]; + buildInputs = [ hepmc imagemagick python2 latex makeWrapper ]; + propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; preInstall = '' substituteInPlace bin/make-plots \ From 31a0f937839893562111fbf0dde09425bce589ac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 4 Apr 2017 22:47:26 -0400 Subject: [PATCH 4/4] yoda: apply patches from tip --- pkgs/development/libraries/physics/yoda/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 46e2580bd0c3..e6d0f3c500ea 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, root, makeWrapper, withRootSupport ? false }: +{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, withRootSupport ? false }: stdenv.mkDerivation rec { name = "yoda-${version}"; @@ -11,6 +11,17 @@ stdenv.mkDerivation rec { pythonPath = []; # python wrapper support + patches = [ + (fetchpatch { + url = "https://yoda.hepforge.org/hg/yoda/rev/3dbc8927e715?style=raw"; + sha256 = "02rm34z9lbab66p7gpij12qwdph5fddpksg80qz0m537wjwy2ddy"; + }) + (fetchpatch { + url = "https://yoda.hepforge.org/hg/yoda/rev/669c2be582ef?style=raw"; + sha256 = "0s705cl3bazpvpvy46vv1k223knwxq2yy5na1c6lv217sq9w86wj"; + }) + ]; + buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ] ++ stdenv.lib.optional withRootSupport root;