From 23f7087dc55a446898825131c714e231a3da3adb Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 2 Apr 2017 23:26:05 -0400 Subject: [PATCH] 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 c1f0d3a2930..d398080a360 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 1e089956fdb..94475d06e0b 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