diff options
author | Robert Scott <code@humanleg.org.uk> | 2023-11-17 22:53:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-17 22:53:09 +0000 |
commit | 605b6f5e24ea3cbcec3be57853d27b721a6f3ec1 (patch) | |
tree | a6d5cc4b141ab7ed41acbd0225de8dab9a1a9dcb | |
parent | c3094f371b98163abeba48e1acc5f32155ba1f61 (diff) | |
parent | e7e7df50fbbd28adcd5f2a04bc0d90b4380ffa71 (diff) | |
download | nixpkgs-605b6f5e24ea3cbcec3be57853d27b721a6f3ec1.tar nixpkgs-605b6f5e24ea3cbcec3be57853d27b721a6f3ec1.tar.gz nixpkgs-605b6f5e24ea3cbcec3be57853d27b721a6f3ec1.tar.bz2 nixpkgs-605b6f5e24ea3cbcec3be57853d27b721a6f3ec1.tar.lz nixpkgs-605b6f5e24ea3cbcec3be57853d27b721a6f3ec1.tar.xz nixpkgs-605b6f5e24ea3cbcec3be57853d27b721a6f3ec1.tar.zst nixpkgs-605b6f5e24ea3cbcec3be57853d27b721a6f3ec1.zip |
Merge pull request #268053 from a-n-n-a-l-e-e/msprime-fix-build
python311Packages.msprime: apply upstream patch; fix build
-rw-r--r-- | pkgs/development/python-modules/msprime/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix index 008ce7f2711..2ec32c255df 100644 --- a/pkgs/development/python-modules/msprime/default.nix +++ b/pkgs/development/python-modules/msprime/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , oldest-supported-numpy , setuptools-scm , wheel @@ -26,6 +27,16 @@ buildPythonPackage rec { hash = "sha256-YAJa2f0w2CenKubnYLbP8HodDhabLB2hAkyw/CPkp6o="; }; + patches = [ + # upstream patch fixes 2 failing unittests. remove on update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/tskit-dev/msprime/commit/639125ec942cb898cf4a80638f229e11ce393fbc.patch"; + hash = "sha256-peli4tdu8Bv21xIa5H8SRdfjQnTMO72IPFqybmSBSO8="; + includes = [ "tests/test_ancestry.py" ]; + }) + ]; + nativeBuildInputs = [ gsl oldest-supported-numpy |