From 3ed98a38f1b6a55a719a90b410810192496057e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 04:37:57 +0000 Subject: [PATCH 1/6] mapproxy: 2.2.0 -> 3.0.1 --- pkgs/servers/geospatial/mapproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/servers/geospatial/mapproxy/default.nix index b27797883e0d..ccd193453093 100644 --- a/pkgs/servers/geospatial/mapproxy/default.nix +++ b/pkgs/servers/geospatial/mapproxy/default.nix @@ -6,10 +6,10 @@ with python3.pkgs; buildPythonApplication rec { pname = "MapProxy"; - version = "2.2.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - hash = "sha256-2FEgfdo8i/R5lU0G514zJcaIRe8y60Vm0jHOBEaoEwI="; + hash = "sha256-2So0e5VDWde33bNksdhzdaiOp4XkHcyULeBifV5OtKM="; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" From 88bee160aa5a026ae384e94e10f551afa41765ea Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 1 Sep 2024 20:08:43 +0400 Subject: [PATCH 2/6] mapproxy: migrate to by-name --- .../mapproxy/default.nix => by-name/ma/mapproxy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/geospatial/mapproxy/default.nix => by-name/ma/mapproxy/package.nix} (100%) diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/by-name/ma/mapproxy/package.nix similarity index 100% rename from pkgs/servers/geospatial/mapproxy/default.nix rename to pkgs/by-name/ma/mapproxy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b005d902b096..d8c4ad01484d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25976,8 +25976,6 @@ with pkgs; fit-trackee = callPackage ../servers/geospatial/fit-trackee { }; - mapproxy = callPackage ../servers/geospatial/mapproxy { }; - martin = callPackage ../servers/geospatial/martin { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From 9762339aaab340e350527492929c65809a5a9232 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 1 Sep 2024 20:11:07 +0400 Subject: [PATCH 3/6] mapproxy: add geospatial team to maintainers --- pkgs/by-name/ma/mapproxy/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index ccd193453093..454e9329819a 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -32,10 +32,11 @@ buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/issues/33876 # https://github.com/NixOS/nixpkgs/pull/56480 doCheck = false; - meta = with lib; { + + meta = { description = "Open source proxy for geospatial data"; homepage = "https://mapproxy.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ rakesh4g ]; + license = lib.licenses.asl20; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]); }; } From a5b7de6f2f42080a2b9fd4cdd2437ded7cef617e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 1 Sep 2024 20:39:45 +0400 Subject: [PATCH 4/6] mapproxy: nixfmt-rfc-style --- pkgs/by-name/ma/mapproxy/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index 454e9329819a..f3d01c508577 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -1,15 +1,16 @@ -{ lib -, python3 -, fetchPypi +{ + lib, + python3, + fetchPypi, }: with python3.pkgs; buildPythonApplication rec { - pname = "MapProxy"; + pname = "mapproxy"; version = "3.0.1"; src = fetchPypi { - inherit pname version; - hash = "sha256-2So0e5VDWde33bNksdhzdaiOp4XkHcyULeBifV5OtKM="; + inherit pname version; + hash = "sha256-2So0e5VDWde33bNksdhzdaiOp4XkHcyULeBifV5OtKM="; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" @@ -34,9 +35,9 @@ buildPythonApplication rec { doCheck = false; meta = { - description = "Open source proxy for geospatial data"; - homepage = "https://mapproxy.org/"; - license = lib.licenses.asl20; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]); + description = "Open source proxy for geospatial data"; + homepage = "https://mapproxy.org/"; + license = lib.licenses.asl20; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]); }; } From ab77074b9616d3f93cef4745c99156953a2b077f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 1 Sep 2024 21:25:37 +0400 Subject: [PATCH 5/6] mapproxy: fix dependencies --- pkgs/by-name/ma/mapproxy/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index f3d01c508577..77b16300a5c6 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -15,8 +15,11 @@ buildPythonApplication rec { prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" ''; - propagatedBuildInputs = [ + + dependencies = [ boto3 # needed for caches service + future + jsonschema pillow pyyaml pyproj @@ -24,6 +27,7 @@ buildPythonApplication rec { gdal lxml setuptools + werkzeug ]; # Tests are disabled: # 1) Dependency list is huge. From d47fe12b69909831ae289175352721815cf4f18d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 1 Sep 2024 21:33:47 +0400 Subject: [PATCH 6/6] mapproxy: switch from fetchPypi to fetchFromGitHub --- pkgs/by-name/ma/mapproxy/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index 77b16300a5c6..ef39151c0104 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -1,17 +1,21 @@ { lib, python3, - fetchPypi, + fetchFromGitHub, }: with python3.pkgs; buildPythonApplication rec { pname = "mapproxy"; version = "3.0.1"; - src = fetchPypi { - inherit pname version; - hash = "sha256-2So0e5VDWde33bNksdhzdaiOp4XkHcyULeBifV5OtKM="; + + src = fetchFromGitHub { + owner = "mapproxy"; + repo = "mapproxy"; + rev = version; + hash = "sha256-74hUJIy1+DaKjUsCgd4+2MdMPGqqDUuHDrhBCFNn8Dk="; }; + prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" '';