nur-packages

commit 7c580a8bf9400cd8156540b87726172e2ee434ac
parent f3e93fee9e300f68f699b67d11488d836060799e
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Mon,  5 Apr 2021 01:09:46 +0300

Fix mikatools

Diffstat:
M
nix/sources.json
 | 
14
--------------
M
pkgs/development/python-modules/mikatools/default.nix
 | 
20
+++++++++++++-------

2 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -636,20 +636,6 @@
         "url": "https://github.com/semlanik/microjson/archive/0d9f50e407cd117e56582faf0d99bfececc1b6ea.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "mikatools": {
-        "branch": "master",
-        "builtin": false,
-        "date": "2020-09-11T21:36:14Z",
-        "description": "Mikatools provides fast and easy methods for common Python coding tasks",
-        "homepage": "https://github.com/mikahama/mikatools",
-        "owner": "mikahama",
-        "repo": "mikatools",
-        "rev": "e2f4d210f88904b5f6d368b638f7bb664b2e0f36",
-        "sha256": "0gpmwrkvn1x8sjq1681flpdma6miipw1vcmc99l15cg80sy3rz2l",
-        "type": "tarball",
-        "url": "https://github.com/mikahama/mikatools/archive/e2f4d210f88904b5f6d368b638f7bb664b2e0f36.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "morse-talk": {
         "branch": "master",
         "builtin": false,
diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/development/python-modules/mikatools/default.nix
@@ -1,17 +1,23 @@
-{ lib, python3Packages, sources }:
+{ lib, fetchFromGitHub, python3Packages }:
 
-python3Packages.buildPythonPackage {
-  pname = "mikatools-unstable";
-  version = lib.substring 0 10 sources.mikatools.date;
+python3Packages.buildPythonPackage rec {
+  pname = "mikatools";
+  version = "1.0.0";
 
-  src = sources.mikatools;
+  src = fetchFromGitHub {
+    owner = "mikahama";
+    repo = pname;
+    rev = version;
+    sha256 = "1sj39slscbk8zqxs15bc31r0vn3wr6sq7zk18gw8plfk6ccs9yq9";
+  };
 
-  propagatedBuildInputs = with python3Packages; [ requests clint ];
+  propagatedBuildInputs = with python3Packages; [ requests clint cryptography ];
 
   checkInputs = with python3Packages; [ pytestCheckHook ];
 
   meta = with lib; {
-    inherit (sources.mikatools) description homepage;
+    description = "Mikatools provides fast and easy methods for common Python coding tasks";
+    homepage = "https://github.com/mikahama/mikatools";
     license = licenses.mit;
     maintainers = [ maintainers.sikmir ];
   };