Merge pull request #117887 from sikmir/pyosmium

python3Packages.pyosmium: 3.1.0 → 3.1.3

authored by Sandro and committed by GitHub 36a4bbd3 498cb76b

+8 -5
+5 -4
pkgs/development/python-modules/pyosmium/default.nix
··· 1 { lib, buildPythonPackage, fetchFromGitHub, cmake, python 2 , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 3 - , nose, shapely, pythonOlder, isPyPy }: 4 5 buildPythonPackage rec { 6 pname = "pyosmium"; 7 - version = "3.1.0"; 8 9 disabled = pythonOlder "3.4" || isPyPy; 10 ··· 12 owner = "osmcode"; 13 repo = pname; 14 rev = "v${version}"; 15 - sha256 = "0m11hdgiysdhyi5yn6nj8a8ycjzx5hpjy7n1c4j6q5caifj7rf7h"; 16 }; 17 18 nativeBuildInputs = [ cmake ]; 19 - buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 ]; 20 21 preBuild = "cd .."; 22 ··· 27 meta = with lib; { 28 description = "Python bindings for libosmium"; 29 homepage = "https://osmcode.org/pyosmium"; 30 license = licenses.bsd2; 31 maintainers = with maintainers; [ sikmir ]; 32 };
··· 1 { lib, buildPythonPackage, fetchFromGitHub, cmake, python 2 , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 3 + , nose, shapely, pythonOlder, isPyPy, lz4 }: 4 5 buildPythonPackage rec { 6 pname = "pyosmium"; 7 + version = "3.1.3"; 8 9 disabled = pythonOlder "3.4" || isPyPy; 10 ··· 12 owner = "osmcode"; 13 repo = pname; 14 rev = "v${version}"; 15 + sha256 = "11ma8nr7k2ixwwb55fiqvrj5qbmpgkyfk0canz4l0m8b7rcw3qsc"; 16 }; 17 18 nativeBuildInputs = [ cmake ]; 19 + buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ]; 20 21 preBuild = "cd .."; 22 ··· 27 meta = with lib; { 28 description = "Python bindings for libosmium"; 29 homepage = "https://osmcode.org/pyosmium"; 30 + changelog = "https://github.com/osmcode/pyosmium/blob/v${version}/CHANGELOG.md"; 31 license = licenses.bsd2; 32 maintainers = with maintainers; [ sikmir ]; 33 };
+3 -1
pkgs/top-level/python-packages.nix
··· 6057 6058 pyosf = callPackage ../development/python-modules/pyosf { }; 6059 6060 - pyosmium = callPackage ../development/python-modules/pyosmium { }; 6061 6062 pyotp = callPackage ../development/python-modules/pyotp { }; 6063
··· 6057 6058 pyosf = callPackage ../development/python-modules/pyosf { }; 6059 6060 + pyosmium = callPackage ../development/python-modules/pyosmium { 6061 + inherit (pkgs) lz4; 6062 + }; 6063 6064 pyotp = callPackage ../development/python-modules/pyotp { }; 6065