public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yoda: 1.7.7 -> 1.8.2, enable tests

Browse Source
This commit is contained in:
Dmitry Kalinkin 2020-05-20 15:29:34 -04:00
parent 9f1c07af20
commit 167e5cc9d7
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/physics/yoda/default.nix
View File

@ -1,22 +1,14 @@
{ stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }: { stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yoda"; pname = "yoda";
version = "1.7.7"; version = "1.8.2";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
sha256 = "1ki88rscnym0vjxpfgql8m1lrc7vm1jb9w4jhw9lvv3rk84lpdng"; sha256 = "1nqbv334iwdvbsc5bw8g936cxzc1hyzv9r8kjy4v124vrw8qqmc9";
}; };
patches = [
# fixes "TypeError: expected bytes, str found" in writeYODA()
(fetchpatch {
url = "https://gitlab.com/hepcedar/yoda/commit/d2bbbe92912457f8a29b440cbfa0b39daf28ec34.diff";
sha256 = "1x60piswpxwak61r2sdclsc8pzi1fshpkjnxlyflsa1iap77vkq8";
})
];
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
buildInputs = [ python ] buildInputs = [ python ]
++ (with python.pkgs; [ numpy matplotlib ]) ++ (with python.pkgs; [ numpy matplotlib ])
@ -27,6 +19,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
touch pyext/yoda/*.{pyx,pxd} touch pyext/yoda/*.{pyx,pxd}
patchShebangs .
''; '';
postInstall = '' postInstall = ''
@ -37,6 +30,9 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
doInstallCheck = true;
installCheckTarget = "check";
meta = { meta = {
description = "Provides small set of data analysis (specifically histogramming) classes"; description = "Provides small set of data analysis (specifically histogramming) classes";
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;

2
pkgs/top-level/all-packages.nix
View File

@ -25230,7 +25230,7 @@ in
thepeg = callPackage ../development/libraries/physics/thepeg { }; thepeg = callPackage ../development/libraries/physics/thepeg { };
yoda = callPackage ../development/libraries/physics/yoda { yoda = callPackage ../development/libraries/physics/yoda {
python = python2; python = python3;
}; };
yoda-with-root = lowPrio (yoda.override { yoda-with-root = lowPrio (yoda.override {
withRootSupport = true; withRootSupport = true;