diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/development/python-modules/librosa/default.nix | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/librosa/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/librosa/default.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/nixpkgs/pkgs/development/python-modules/librosa/default.nix index 03cdeea14e51..a93b6b0d99cb 100644 --- a/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { @@ -41,22 +41,23 @@ buildPythonPackage rec { repo = "librosa"; rev = "refs/tags/${version}"; fetchSubmodules = true; # for test data - hash = "sha256-MXzPIcbG8b1JwhEyAZG4DRObGaHq+ipVHMrZCzaxLdE="; + hash = "sha256-zbmU87hI9A1CVcBZ/5FU8z0t6SS4jfJk9bj9kLe/EHI="; }; + nativeBuildInputs = [ + setuptools + ]; + patches = [ - # https://github.com/librosa/librosa/pull/1731 (fetchpatch { - name = "support-scipy-1.11.patch"; - url = "https://github.com/librosa/librosa/commit/12dee8eabed7df14c5622b52c05393ddfeb11f4b.patch"; - hash = "sha256-JxTXU0Mc+QYpsafjoGLaIccD7EdCYJvIVianeosYpw4="; + # https://github.com/librosa/librosa/issues/1754 + # https://github.com/librosa/librosa/pull/1755 + name = "matplotlib-3.8-compat.patch"; + url = "https://github.com/librosa/librosa/commit/beef47885ce1255b43b65e48ea2054ddace37c6c.patch"; + hash = "sha256-rrnlUHXHY2me4BWGs3wFq8WJmz75CbXTWKFp3VdJKzE="; }) ]; - nativeBuildInputs = [ - setuptools - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--cov-report term-missing --cov librosa --cov-report=xml " "" |