tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #307968 from SFrijters/zia-updates

authored by Sandro and committed by GitHub da515e5d ec5423c5

+17 -16
unified split
+8 -6
pkgs/development/python-modules/schemdraw/default.nix
··· 14 15 buildPythonPackage rec { 16 pname = "schemdraw"; 17 - version = "0.18"; 18 - format = "pyproject"; 19 20 disabled = pythonOlder "3.8"; 21 ··· 23 owner = "cdelker"; 24 repo = pname; 25 rev = version; 26 - hash = "sha256-JJc3LA+fqB+2g7pPIZ8YMV921EyYpLZrHSJCYyYThZg="; 27 }; 28 29 - nativeBuildInputs = [ 30 setuptools 31 ]; 32 33 - propagatedBuildInputs = [ 34 pyparsing 35 ]; 36 37 - passthru.optional-dependencies = { 38 matplotlib = [ 39 matplotlib 40 ]; ··· 58 postPatch = '' 59 substituteInPlace test/test_styles.ipynb --replace "font='Times', " "" 60 ''; 61 62 pytestFlagsArray = [ "--nbval-lax" ]; 63
··· 14 15 buildPythonPackage rec { 16 pname = "schemdraw"; 17 + version = "0.19"; 18 + pyproject = true; 19 20 disabled = pythonOlder "3.8"; 21 ··· 23 owner = "cdelker"; 24 repo = pname; 25 rev = version; 26 + hash = "sha256-vqEHcazE5DNHr0FceOWLqq+RZmMK5ovHDVjy/2wbTJU="; 27 }; 28 29 + build-system = [ 30 setuptools 31 ]; 32 33 + dependencies = [ 34 pyparsing 35 ]; 36 37 + optional-dependencies = { 38 matplotlib = [ 39 matplotlib 40 ]; ··· 58 postPatch = '' 59 substituteInPlace test/test_styles.ipynb --replace "font='Times', " "" 60 ''; 61 + 62 + preCheck = "rm test/test_pictorial.ipynb"; # Tries to download files 63 64 pytestFlagsArray = [ "--nbval-lax" ]; 65
+4 -5
pkgs/development/python-modules/ziafont/default.nix
··· 9 10 buildPythonPackage rec { 11 pname = "ziafont"; 12 - version = "0.7"; 13 - 14 - format = "pyproject"; 15 16 disabled = pythonOlder "3.8"; 17 ··· 19 owner = "cdelker"; 20 repo = pname; 21 rev = version; 22 - hash = "sha256-DQEVWYOgiGSP3WlmZzEweyRa0UY7fxjjpbued+5EH5I="; 23 }; 24 25 - nativeBuildInputs = [ 26 setuptools 27 ]; 28
··· 9 10 buildPythonPackage rec { 11 pname = "ziafont"; 12 + version = "0.8"; 13 + pyproject = true; 14 15 disabled = pythonOlder "3.8"; 16 ··· 18 owner = "cdelker"; 19 repo = pname; 20 rev = version; 21 + hash = "sha256-C+dC+mNquDuj6RfJpiEbeuGZOIXcgSrTB4XM21reBPs="; 22 }; 23 24 + build-system = [ 25 setuptools 26 ]; 27
+5 -5
pkgs/development/python-modules/ziamath/default.nix
··· 11 12 buildPythonPackage rec { 13 pname = "ziamath"; 14 - version = "0.9"; 15 - format = "pyproject"; 16 17 disabled = pythonOlder "3.8"; 18 ··· 20 owner = "cdelker"; 21 repo = pname; 22 rev = version; 23 - hash = "sha256-ISd+J7R8qZ0NXdlyHMj+torzr+541UAhNCSaUH8ytSQ="; 24 }; 25 26 - nativeBuildInputs = [ 27 setuptools 28 ]; 29 30 - propagatedBuildInputs = [ 31 ziafont 32 ]; 33
··· 11 12 buildPythonPackage rec { 13 pname = "ziamath"; 14 + version = "0.10"; 15 + pyproject = true; 16 17 disabled = pythonOlder "3.8"; 18 ··· 20 owner = "cdelker"; 21 repo = pname; 22 rev = version; 23 + hash = "sha256-Drssi+YySh4OhVYAOvgIwzeeu5dQbUUXuhwTedhUUt8="; 24 }; 25 26 + build-system = [ 27 setuptools 28 ]; 29 30 + dependencies = [ 31 ziafont 32 ]; 33