From ba907218ef263c3f0653ceac657796389709bc12 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 29 Sep 2017 00:16:36 +0200
Subject: ma pkgs.esptool: 2.0 -> 2.1

---
 makefu/5pkgs/esptool/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'makefu/5pkgs/esptool')

diff --git a/makefu/5pkgs/esptool/default.nix b/makefu/5pkgs/esptool/default.nix
index 84bb232cd..4e0d29e19 100644
--- a/makefu/5pkgs/esptool/default.nix
+++ b/makefu/5pkgs/esptool/default.nix
@@ -13,20 +13,19 @@ let
       doCheck = false;
   };
 in
-buildPythonPackage rec {
-    name = "esptool-${version}";
-    version = "2.0beta2";
+  buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "esptool";
+    version = "2.1";
     propagatedBuildInputs = [
       pyserial
       flake8
       ecdsa
       pyaes
     ];
-    src = fetchFromGitHub {
-      owner = "themadinventor";
-      repo = "esptool";
-      rev = "v${version}";
-      sha256 = "0n96pyi1k4qlyfqk5k7xpgq8726wz74qvd3gqjg0bpsl3wr7l94i";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "08g393fiqhanixzjbs54pqr6xk1a4dsfaddw7gdwfvp3kvwdn2fp";
     };
     doCheck = false;
-}
+  }
-- 
cgit v1.2.3


From f7b367e96d5ed1ee76b1f9d048a7915e3da4e653 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 29 Sep 2017 10:04:56 +0200
Subject: ma udpt,esptool: now in upstream

---
 makefu/5pkgs/esptool/default.nix | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 makefu/5pkgs/esptool/default.nix

(limited to 'makefu/5pkgs/esptool')

diff --git a/makefu/5pkgs/esptool/default.nix b/makefu/5pkgs/esptool/default.nix
deleted file mode 100644
index 4e0d29e19..000000000
--- a/makefu/5pkgs/esptool/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ pkgs, fetchFromGitHub, ... }:
-with pkgs.python2Packages;
-let
-  pyaes = buildPythonPackage rec {
-      name = "pyaes-${version}";
-      version = "1.6.0";
-      src = fetchFromGitHub {
-        owner = "ricmoo";
-        repo = "pyaes";
-        rev = "v${version}";
-        sha256 = "04934a9zgwc8g3qhfrkcfv0bs557paigllnkrnfhp9m1azr3bfqb";
-      };
-      doCheck = false;
-  };
-in
-  buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "esptool";
-    version = "2.1";
-    propagatedBuildInputs = [
-      pyserial
-      flake8
-      ecdsa
-      pyaes
-    ];
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "08g393fiqhanixzjbs54pqr6xk1a4dsfaddw7gdwfvp3kvwdn2fp";
-    };
-    doCheck = false;
-  }
-- 
cgit v1.2.3