From 648c983db6509061f5a4e725f421241dc706097c Mon Sep 17 00:00:00 2001
From: "eyjhbb@gmail.com" <eyjhbb@gmail.com>
Date: Wed, 30 Jan 2019 23:19:15 +0100
Subject: [PATCH 1/2] maintainers: added eyJhb to maintainers list

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cf02bc641518..6670b44f6409 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1495,6 +1495,11 @@
     github = "expipiplus1";
     name = "Joe Hermaszewski";
   };
+  eyjhb = {
+    email = "eyjhbb@gmail.com";
+    github = "eyJhb";
+    name = "eyJhb";
+  };
   f--t = {
     email = "git@f-t.me";
     github = "f--t";

From 31c3d157aeb52814bcf4d6daf0d23978f9693dae Mon Sep 17 00:00:00 2001
From: "eyjhbb@gmail.com" <eyjhbb@gmail.com>
Date: Wed, 30 Jan 2019 23:19:37 +0100
Subject: [PATCH 2/2] arduino-mk: init at 1.6.0

---
 .../arduino/arduino-mk/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/arduino/arduino-mk/default.nix

diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix
new file mode 100644
index 000000000000..9cefd1dfe54f
--- /dev/null
+++ b/pkgs/development/arduino/arduino-mk/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "1.6.0";
+  name = "arduino-mk-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "sudar";
+    repo   = "Arduino-Makefile";
+    rev    = "${version}";
+    sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x";
+  };
+
+  phases = ["installPhase"];
+  installPhase = "ln -s $src $out";
+
+  meta = {
+    description = "Makefile for Arduino sketches";
+    homepage = https://github.com/sudar/Arduino-Makefile;
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.eyjhb ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0de7bc686c32..07e3d1b2241b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -507,6 +507,8 @@ in
     withGui = false;
   };
 
+  arduino-mk = callPackage ../development/arduino/arduino-mk {};
+
   apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {};
 
   arguments = callPackage ../development/libraries/arguments { };