git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #117887 from sikmir/pyosmium

python3Packages.pyosmium: 3.1.0 → 3.1.3

commit36a4bbd3b981b25bfd3f130ee69f7fc76d4cdfcf authorSandro <sandro.jaeckel@gmail.com> dateTue 30 Mar 2021, 17:18 (6 years ago) parent498cb76f525c90
2 files changed+8−5
pkgs/development/python-modules/pyosmium/default.nix+5−4 pkgs/top-level/python-packages.nix+3−1
pkgs/development/python-modules/pyosmium/default.nix+5−4
@@ -1,10 +1,10 @@
11{ lib, buildPythonPackage, fetchFromGitHub, cmake, python
22, libosmium, protozero, boost, expat, bzip2, zlib, pybind11
3−, nose, shapely, pythonOlder, isPyPy }:
3+, nose, shapely, pythonOlder, isPyPy, lz4 }:
44
55buildPythonPackage rec {
66 pname = "pyosmium";
7− version = "3.1.0";
7+ version = "3.1.3";
88
99 disabled = pythonOlder "3.4" || isPyPy;
1010
@@ -12,11 +12,11 @@ buildPythonPackage rec {
1212 owner = "osmcode";
1313 repo = pname;
1414 rev = "v${version}";
15− sha256 = "0m11hdgiysdhyi5yn6nj8a8ycjzx5hpjy7n1c4j6q5caifj7rf7h";
15+ sha256 = "11ma8nr7k2ixwwb55fiqvrj5qbmpgkyfk0canz4l0m8b7rcw3qsc";
1616 };
1717
1818 nativeBuildInputs = [ cmake ];
19− buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 ];
19+ buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ];
2020
2121 preBuild = "cd ..";
2222
@@ -27,6 +27,7 @@ buildPythonPackage rec {
2727 meta = with lib; {
2828 description = "Python bindings for libosmium";
2929 homepage = "https://osmcode.org/pyosmium";
30+ changelog = "https://github.com/osmcode/pyosmium/blob/v${version}/CHANGELOG.md";
3031 license = licenses.bsd2;
3132 maintainers = with maintainers; [ sikmir ];
3233 };
pkgs/top-level/python-packages.nix+3−1
@@ -6057,7 +6057,9 @@ in {
60576057
60586058 pyosf = callPackage ../development/python-modules/pyosf { };
60596059
6060− pyosmium = callPackage ../development/python-modules/pyosmium { };
6060+ pyosmium = callPackage ../development/python-modules/pyosmium {
6061+ inherit (pkgs) lz4;
6062+ };
60616063
60626064 pyotp = callPackage ../development/python-modules/pyotp { };
60636065