From 5929ce550c80c947820835faa4d31137b70ca39d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Mar 2025 11:18:06 +0000 Subject: [PATCH] mapproxy: 3.1.3 -> 4.0.1 * drop python 3.8 support * drop Riak warnings (support dropped by upstream) * avoid usage of top level `with` --- pkgs/by-name/ma/mapproxy/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index 75a6ecac099c..8c81b04f3b8b 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -1,26 +1,27 @@ { lib, - python3, fetchFromGitHub, + + python3Packages, }: -with python3.pkgs; -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mapproxy"; - version = "3.1.3"; + version = "4.0.1"; + disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mapproxy"; repo = "mapproxy"; tag = version; - hash = "sha256-Dltr4JlgE1aJfSybTbAxlUyjqkfaobupNNSj90j9taE="; + hash = "sha256-bqM25exBPUB7hFtseWMw4Q1W6IeHLx+JrplOkZVEIl0="; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" ''; - dependencies = [ + dependencies = with python3Packages; [ boto3 # needed for caches service future jsonschema @@ -33,13 +34,10 @@ buildPythonApplication rec { setuptools werkzeug ]; + # Tests are disabled: # 1) Dependency list is huge. # https://github.com/mapproxy/mapproxy/blob/master/requirements-tests.txt - # - # 2) There are security issues with package Riak - # https://github.com/NixOS/nixpkgs/issues/33876 - # https://github.com/NixOS/nixpkgs/pull/56480 doCheck = false; meta = {