From f45a488ecb584a8c0bdb0efd12406757db9bac3f Mon Sep 17 00:00:00 2001
From: imrying <philiprying@gmail.com>
Date: Fri, 29 Mar 2024 09:40:42 +0100
Subject: [PATCH 1/2] maintainers: add imrying

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6903a1e2581f7..4edfda51596b2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8470,6 +8470,12 @@
       fingerprint = "F5B2 BE1B 9AAD 98FE 2916  5597 3665 FFF7 9D38 7BAA";
     }];
   };
+  imrying = {
+    email = "philiprying@gmail.com";
+    github = "imrying";
+    githubId = 36996706;
+    name = "Philip Rying";
+  };
   imuli = {
     email = "i@imu.li";
     github = "imuli";

From 4f6dbf2696503bfaf6c2644f7e9a7cda6c887785 Mon Sep 17 00:00:00 2001
From: imrying <philiprying@gmail.com>
Date: Fri, 29 Mar 2024 09:50:27 +0100
Subject: [PATCH 2/2] dstep: init at 1.0.4

---
 pkgs/by-name/ds/dstep/dub-lock.json |  3 +++
 pkgs/by-name/ds/dstep/package.nix   | 34 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/ds/dstep/dub-lock.json
 create mode 100644 pkgs/by-name/ds/dstep/package.nix

diff --git a/pkgs/by-name/ds/dstep/dub-lock.json b/pkgs/by-name/ds/dstep/dub-lock.json
new file mode 100644
index 0000000000000..18a1e415e5622
--- /dev/null
+++ b/pkgs/by-name/ds/dstep/dub-lock.json
@@ -0,0 +1,3 @@
+{
+  "dependencies": {}
+}
diff --git a/pkgs/by-name/ds/dstep/package.nix b/pkgs/by-name/ds/dstep/package.nix
new file mode 100644
index 0000000000000..ef1d8b8f11a2b
--- /dev/null
+++ b/pkgs/by-name/ds/dstep/package.nix
@@ -0,0 +1,34 @@
+{ lib, buildDubPackage, fetchFromGitHub, clang, ldc, which }:
+buildDubPackage rec {
+  pname = "dstep";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "jacob-carlborg";
+    repo = "dstep";
+    rev = "v${version}";
+    hash = "sha256-ZFz2+GtBk3StqXo/9x47xrDFdz5XujHR62hj0p3AjcY=";
+  };
+
+  dubLock = ./dub-lock.json;
+
+  nativeBuildInputs = [ ldc which clang ];
+
+  preConfigure = ''
+    ./configure --llvm-path ${lib.getLib clang.cc}
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bin/dstep -t $out/bin
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A tool for converting C and Objective-C headers to D modules";
+    homepage = "https://github.com/jacob-carlborg/dstep";
+    license = licenses.boost;
+    mainProgram = "dstep";
+    maintainers = with maintainers; [ imrying ];
+  };
+}