From 48a6c137f1efdee81d963010147f99f8012a3cfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 13:09:09 +0000 Subject: [PATCH 1/2] python310Packages.pyosmium: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/pyosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index dbfe8dd4ecd0..d46919fd59b2 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.5.0"; + version = "3.6.0"; disabled = pythonOlder "3.4" || isPyPy; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-dumTyca1nLPa6B3p5fmUGWa6jReHOeFPc9heTz/2zao="; + sha256 = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk="; }; nativeBuildInputs = [ cmake ]; From 1755fd89d4ce523d0871a0589c6beb8181ee82ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 17:07:32 +0100 Subject: [PATCH 2/2] python310Packages.pyosmium: update disabled --- .../python-modules/pyosmium/default.nix | 47 +++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index d46919fd59b2..289f4d1c048e 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,24 +1,55 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cmake, python -, libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, shapely, pythonOlder, isPyPy, lz4, requests, pytestCheckHook +{ lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, python +, libosmium +, protozero +, boost +, expat +, bzip2 +, zlib +, pybind11 +, shapely +, pythonOlder +, isPyPy +, lz4 +, requests +, pytestCheckHook }: buildPythonPackage rec { pname = "pyosmium"; version = "3.6.0"; + format = "setuptools"; - disabled = pythonOlder "3.4" || isPyPy; + disabled = pythonOlder "3.6" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk="; + hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ]; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libosmium + protozero + boost + expat + bzip2 + zlib + pybind11 + lz4 + ]; + + propagatedBuildInputs = [ + requests + ]; preBuild = "cd ..";