From 389bca777e371b17d631c4836c3262aa31fc1776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 10:18:31 -0700 Subject: [PATCH 1/4] fittrackee: rename from fit-trackee The former aligns with what the package is called on PyPI. --- .../default.nix => by-name/fi/fittrackee/package.nix} | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{servers/geospatial/fit-trackee/default.nix => by-name/fi/fittrackee/package.nix} (98%) diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/by-name/fi/fittrackee/package.nix similarity index 98% rename from pkgs/servers/geospatial/fit-trackee/default.nix rename to pkgs/by-name/fi/fittrackee/package.nix index 72ddd146a88c0..c066ffd5e63ec 100644 --- a/pkgs/servers/geospatial/fit-trackee/default.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -25,7 +25,7 @@ let in python.pkgs.buildPythonApplication rec { - pname = "fit-trackee"; + pname = "fittrackee"; version = "0.8.6"; pyproject = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d89be65d4e3cb..3f3b4ca2f0f75 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -464,6 +464,7 @@ mapAliases ({ firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 + fit-trackee = fittrackee; # added 2024-09-03 flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 flintqs = throw "FlintQS has been removed due to lack of maintenance and security issues; use SageMath or FLINT instead"; # Added 2024-03-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c734ccfa53581..e15d23e64c264 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25955,8 +25955,6 @@ with pkgs; ### SERVERS / GEOSPATIAL - fit-trackee = callPackage ../servers/geospatial/fit-trackee { }; - martin = callPackage ../servers/geospatial/martin { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From a402cd72f93e00c475d2e0f85f0f925898286149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 10:20:26 -0700 Subject: [PATCH 2/4] fittrackee: format with nixfmt-rfc-style --- pkgs/by-name/fi/fittrackee/package.nix | 62 ++++++++++++++------------ 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index c066ffd5e63ec..23a2268c78d6b 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -1,9 +1,10 @@ -{ lib -, python3 -, fetchFromGitHub -, fetchPypi -, postgresql -, postgresqlTestHook +{ + fetchFromGitHub, + fetchPypi, + lib, + postgresql, + postgresqlTestHook, + python3, }: let python = python3.override { @@ -53,29 +54,32 @@ python.pkgs.buildPythonApplication rec { "pyopenssl" ]; - dependencies = with python.pkgs; [ - authlib - babel - click - dramatiq - flask - flask-bcrypt - flask-dramatiq - flask-limiter - flask-migrate - flask-sqlalchemy - gpxpy - gunicorn - humanize - psycopg2 - pyjwt - pyopenssl - pytz - shortuuid - sqlalchemy - staticmap - ua-parser - ] ++ dramatiq.optional-dependencies.redis + dependencies = + with python.pkgs; + [ + authlib + babel + click + dramatiq + flask + flask-bcrypt + flask-dramatiq + flask-limiter + flask-migrate + flask-sqlalchemy + gpxpy + gunicorn + humanize + psycopg2 + pyjwt + pyopenssl + pytz + shortuuid + sqlalchemy + staticmap + ua-parser + ] + ++ dramatiq.optional-dependencies.redis ++ flask-limiter.optional-dependencies.redis; pythonImportsCheck = [ "fittrackee" ]; From d22c1f8639db18bd99214e822f50e706dd493793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 10:21:02 -0700 Subject: [PATCH 3/4] fittrackee: use psycopg2-binary --- pkgs/by-name/fi/fittrackee/package.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index 23a2268c78d6b..f21da61f969fb 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -37,11 +37,6 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-lTDS+HfYG6ayXDotu7M2LUrw+1ZhQ0ftw0rTn4Mr3rQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail psycopg2-binary psycopg2 - ''; - build-system = [ python.pkgs.poetry-core ]; @@ -70,7 +65,7 @@ python.pkgs.buildPythonApplication rec { gpxpy gunicorn humanize - psycopg2 + psycopg2-binary pyjwt pyopenssl pytz From 6367bd6796e839a117ace66ce1e3cd03491dbfd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 10:22:15 -0700 Subject: [PATCH 4/4] fittrackee: 0.8.6 -> 0.8.8 Diff: https://github.com/SamR1/FitTrackee/compare/refs/tags/v0.8.6...v0.8.8 Changelog: https://github.com/SamR1/FitTrackee/blob/refs/tags/v0.8.8/CHANGELOG.md --- pkgs/by-name/fi/fittrackee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index f21da61f969fb..b69d3b428ade6 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -27,14 +27,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "fittrackee"; - version = "0.8.6"; + version = "0.8.8"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; rev = "refs/tags/v${version}"; - hash = "sha256-lTDS+HfYG6ayXDotu7M2LUrw+1ZhQ0ftw0rTn4Mr3rQ="; + hash = "sha256-IO6M+HXAR3Gn0/71KwkaQr6sB0eCQzmnqHYgO+mzIZM="; }; build-system = [