From 6457a26021136eafdb7c2063653010ce4fce36de Mon Sep 17 00:00:00 2001
From: Jesse Wattenbarger <jwatt@broken.watch>
Date: Wed, 8 Apr 2020 21:52:50 -0400
Subject: maintainers: add jwatt

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 38ed481b7c63..14675f3e23bc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3901,6 +3901,12 @@
     githubId = 2396926;
     name = "Justin Woo";
   };
+  jwatt = {
+    email = "jwatt@broken.watch";
+    github = "jjwatt";
+    githubId = 2397327;
+    name = "Jesse Wattenbarger";
+  };
   jwiegley = {
     email = "johnw@newartisans.com";
     github = "jwiegley";
-- 
cgit 1.4.1


From 2d3371713897cb124abf351f9aed2377a4b2fadf Mon Sep 17 00:00:00 2001
From: Jesse Wattenbarger <jwatt@broken.watch>
Date: Wed, 8 Apr 2020 21:56:26 -0400
Subject: dasm: init at 2.20.13

Co-authored-by: Daniel Schaefer <git@danielschaefer.me>
---
 pkgs/development/compilers/dasm/default.nix | 34 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/compilers/dasm/default.nix

diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix
new file mode 100644
index 000000000000..1eb233b90b7f
--- /dev/null
+++ b/pkgs/development/compilers/dasm/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "dasm";
+  version = "2.20.13";
+
+  src = fetchFromGitHub {
+    owner = "dasm-assembler";
+    repo = "dasm";
+    rev = version;
+    sha256 = "1nr4kvw42vyc6i4p1c06jlih11rhbjjxc27dc7cx5qj635xf4jcf";
+  };
+
+  configurePhase = false;
+  installPhase = ''
+    mkdir -p $out/bin
+    install bin/* $out/bin
+  '';
+
+  preCheck = ''
+    patchShebangs ./test/
+  '';
+
+  checkTarget = "test";
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Assembler for 6502 and other 8-bit microprocessors";
+    homepage = "https://dasm-assembler.github.io";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.jwatt ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 311a9d48e68c..31c01fda93e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8212,6 +8212,8 @@ in
 
   scry = callPackage ../development/tools/scry {};
 
+  dasm = callPackage ../development/compilers/dasm/default.nix { };
+
   dbmate = callPackage ../development/tools/database/dbmate { };
 
   devpi-client = python3Packages.callPackage ../development/tools/devpi-client {};
-- 
cgit 1.4.1