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

Merge pull request #142796 from veprbl/pr/yoda_1_9_1

Browse Source 
yoda: 1.9.0 -> 1.9.1
This commit is contained in:
Dmitry Kalinkin 2021-10-25 14:10:30 -04:00 committed by GitHub
commit f827b90439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,39 +1,14 @@
{ lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }:
{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:
stdenv.mkDerivation rec {
pname = "yoda";
version = "1.9.0";
version = "1.9.1";
src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
sha256 = "1x7xi6w7lb92x8202kbaxgqg1sly534wana4f38l3gpbzw9dwmcs";
sha256 = "sha256-xhagWmVlvlsayL0oWTihoxhq0ejejEACCsdQqFN1HUw=";
};
patches = [
# fix a minor bug
# https://gitlab.com/hepcedar/yoda/-/merge_requests/38
(fetchpatch {
name = "yoda-fix-fuzzy-compare-bin2d.patch";
url = "https://gitlab.com/hepcedar/yoda/-/commit/a2999d78cb3d9ed874f367bad375dc39a1a11148.diff";
sha256 = "sha256-BsaVm+4VtCvRoEuN4r6A4bj9XwgMe75UesKzN+b56Qw=";
})
# fix a regression
# https://gitlab.com/hepcedar/yoda/-/merge_requests/40
(fetchpatch {
name = "yoda-fix-for-yodagz.patch";
url = "https://gitlab.com/hepcedar/yoda/-/commit/3338ba5a7466599ac6969e4ae462f133d6cf4fd8.diff";
sha256 = "sha256-MZTOIt468bdPCS7UVfr5hQZUsVy3TpY/TjRrNySIL70=";
excludes = [ "ChangeLog" ];
})
# fix a minor bug
# https://gitlab.com/hepcedar/yoda/-/merge_requests/45
(fetchpatch {
name = "yoda-fix-yodascale-for-gz.patch";
url = "https://gitlab.com/hepcedar/yoda/-/commit/b03162aeaa2c99e38512ba6e4818d2e0a825b757.diff";
sha256 = "sha256-IMuPalQ/GKcdJOKAlwE/IRWtxDdu0inoj+A9nbRl6Gs=";
})
];
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
buildInputs = [ python ]
++ (with python.pkgs; [ numpy matplotlib ])
@ -58,6 +33,12 @@ stdenv.mkDerivation rec {
doInstallCheck = true;
installCheckTarget = "check";
# Workaround for https://gitlab.com/hepcedar/yoda/-/merge_requests/49
preInstallCheck = ''
cp tests/test{1,}.yoda
gzip -c tests/test.yoda > tests/test.yoda.gz
'';
meta = {
description = "Provides small set of data analysis (specifically histogramming) classes";
license = lib.licenses.gpl3;