diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/by-name/fi/fittrackee/package.nix similarity index 70% rename from pkgs/servers/geospatial/fit-trackee/default.nix rename to pkgs/by-name/fi/fittrackee/package.nix index 72ddd146a88c..b69d3b428ade 100644 --- a/pkgs/servers/geospatial/fit-trackee/default.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 { @@ -25,22 +26,17 @@ let in python.pkgs.buildPythonApplication rec { - pname = "fit-trackee"; - version = "0.8.6"; + pname = "fittrackee"; + 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="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail psycopg2-binary psycopg2 - ''; - build-system = [ python.pkgs.poetry-core ]; @@ -53,29 +49,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-binary + pyjwt + pyopenssl + pytz + shortuuid + sqlalchemy + staticmap + ua-parser + ] + ++ dramatiq.optional-dependencies.redis ++ flask-limiter.optional-dependencies.redis; pythonImportsCheck = [ "fittrackee" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b43d6b13df8e..8bc72301739f 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 e79374a38a3f..fae6f5baeb00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25953,8 +25953,6 @@ with pkgs; ### SERVERS / GEOSPATIAL - fit-trackee = callPackage ../servers/geospatial/fit-trackee { }; - martin = callPackage ../servers/geospatial/martin { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; };