From 51bfd931ed95e5ecf581abb676283a52a17d7e3b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 11 Aug 2019 18:25:37 -0700
Subject: [PATCH 1/2] maintainers: add emily

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2312f3fe7558..de3917bc50f3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1518,6 +1518,11 @@
     github = "liclac";
     name = "embr";
   };
+  emily = {
+    email = "nixpkgs@emily.moe";
+    github = "emilazy";
+    name = "Emily";
+  };
   ederoyd46 = {
     email = "matt@ederoyd.co.uk";
     github = "ederoyd46";

From 42e55dbe9a5bf4d132c105475e43ec614a2c5fec Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 11 Aug 2019 18:28:48 -0700
Subject: [PATCH 2/2] stm32loader: init at 0.5.0

---
 .../python-modules/stm32loader/default.nix    | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/stm32loader/default.nix

diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix
new file mode 100644
index 000000000000..13272a5a0b71
--- /dev/null
+++ b/pkgs/development/python-modules/stm32loader/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, progress
+, pyserial
+, pytest
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "stm32loader";
+  version = "0.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1w6jg4dcyz6si6dcyx727sxi75wnl0j89xkiwqmsw286s1y8ijjw";
+  };
+
+  propagatedBuildInputs = [ progress pyserial ];
+
+  checkInputs = [ pytest ] ++ lib.optional isPy27 mock;
+
+  checkPhase = ''
+    pytest --strict tests/unit
+  '';
+
+  meta = with lib; {
+    description = "Flash firmware to STM32 microcontrollers in Python";
+    homepage = https://github.com/florisla/stm32loader;
+    changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ emily ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44c0e02ebbc5..50dbb8ca63c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6104,6 +6104,8 @@ in
 
   stdman = callPackage ../data/documentation/stdman { };
 
+  stm32loader = with python3Packages; toPythonApplication stm32loader;
+
   storebrowse = callPackage ../tools/system/storebrowse { };
 
   stubby = callPackage ../tools/networking/stubby { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a89c4bf837b8..b09b98253d3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1160,6 +1160,8 @@ in {
 
   statistics = callPackage ../development/python-modules/statistics { };
 
+  stm32loader = callPackage ../development/python-modules/stm32loader { };
+
   stumpy = callPackage ../development/python-modules/stumpy { };
 
   sumo = callPackage ../development/python-modules/sumo { };