mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge pull request #122261 from veprbl/pr/yoda_1_9_0_bugfix
yoda: fix a functionality regression in 1.9.0
This commit is contained in:
commit
ca4001870b
1 changed files with 19 additions and 1 deletions
|
@ -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 ])
|
||||
|
|
Loading…
Reference in a new issue