nur-packages

commit f3e93fee9e300f68f699b67d11488d836060799e
parent 090a80834bb8fc5be688dd54a00160aa9165d086
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sun,  4 Apr 2021 23:33:34 +0300

Fix garmin-uploader

Diffstat:
M
nix/sources.json
 | 
14
--------------
M
pkgs/garmin/garmin-uploader/default.nix
 | 
20
+++++++++++++-------

2 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -387,20 +387,6 @@
         "url": "https://github.com/xinebf/google-translate-for-goldendict/archive/37c2cf96fe5584d766211f72aa0f7002fe334168.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "gupload": {
-        "branch": "master",
-        "builtin": false,
-        "date": "2021-02-27T22:03:06Z",
-        "description": "Garmin Connect Python Uploader",
-        "homepage": "https://github.com/La0/garmin-uploader",
-        "owner": "La0",
-        "repo": "garmin-uploader",
-        "rev": "d1426ac61a48479a610c969c4bf37a186f717504",
-        "sha256": "1nkkhj30yb00l0an3ds4x4gzcmmfkba4aj84ifbi4zr3xmzkhxiq",
-        "type": "tarball",
-        "url": "https://github.com/La0/garmin-uploader/archive/d1426ac61a48479a610c969c4bf37a186f717504.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "hfst": {
         "branch": "master",
         "builtin": false,
diff --git a/pkgs/garmin/garmin-uploader/default.nix b/pkgs/garmin/garmin-uploader/default.nix
@@ -1,19 +1,25 @@
-{ lib, python3Packages, mercantile, pymbtiles, sources }:
+{ lib, fetchFromGitHub, python3Packages }:
 
-python3Packages.buildPythonApplication {
-  pname = "garmin-uploader-unstable";
-  version = lib.substring 0 10 sources.gupload.date;
+python3Packages.buildPythonApplication rec {
+  pname = "garmin-uploader";
+  version = "1.0.9";
 
-  src = sources.gupload;
+  src = fetchFromGitHub {
+    owner = "La0";
+    repo = "garmin-uploader";
+    rev = version;
+    sha256 = "1nkkhj30yb00l0an3ds4x4gzcmmfkba4aj84ifbi4zr3xmzkhxiq";
+  };
 
-  propagatedBuildInputs = with python3Packages; [ requests ];
+  propagatedBuildInputs = with python3Packages; [ requests six ];
 
   checkInputs = with python3Packages; [ pytestCheckHook ];
 
   doCheck = false;
 
   meta = with lib; {
-    inherit (sources.gupload) description homepage;
+    description = "Garmin Connect Python Uploader";
+    homepage = "https://github.com/La0/garmin-uploader";
     license = licenses.gpl2;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;