cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #122261 from veprbl/pr/yoda_1_9_0_bugfix

Browse source 
yoda: fix a functionality regression in 1.9.0
This commit is contained in:
Dmitry Kalinkin 2021-05-10 15:47:49 -04:00 committed by GitHub
commit ca4001870b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/libraries/physics/yoda/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:
{ lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }:
stdenv.mkDerivation rec {
pname = "yoda";
@ -9,6 +9,24 @@ stdenv.mkDerivation rec {
sha256 = "1x7xi6w7lb92x8202kbaxgqg1sly534wana4f38l3gpbzw9dwmcs";
};
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" ];
})
];
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
buildInputs = [ python ]
++ (with python.pkgs; [ numpy matplotlib ])