From f7703314e8b1ba65ee228d5d8257353197fbeb2a Mon Sep 17 00:00:00 2001
From: Ilya Savitsky <ipsavitsky234@gmail.com>
Date: Thu, 24 Apr 2025 21:05:58 +0100
Subject: [PATCH 1/2] maintainers: add ipsavitsky

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 13942931a005..c3a8b645cfd2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11115,6 +11115,12 @@
     githubId = 22628816;
     name = "Sophia Caspe";
   };
+  ipsavitsky = {
+    email = "ipsavitsky234@gmail.com";
+    github = "ipsavitsky";
+    githubId = 33558632;
+    name = "Ilya Savitsky";
+  };
   iquerejeta = {
     github = "iquerejeta";
     githubId = 31273774;

From 1d916135fc33f945271995fbe0c62fabcbb0c9a9 Mon Sep 17 00:00:00 2001
From: Ilya Savitsky <ipsavitsky234@gmail.com>
Date: Sun, 20 Apr 2025 16:31:01 +0100
Subject: [PATCH 2/2] dscanner: init at 0.15.2

---
 maintainers/maintainer-list.nix            | 12 ++---
 pkgs/by-name/ds/dscanner/dub-lock.json     | 32 +++++++++++++
 pkgs/by-name/ds/dscanner/fix_version.patch | 12 +++++
 pkgs/by-name/ds/dscanner/package.nix       | 52 ++++++++++++++++++++++
 4 files changed, 102 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/ds/dscanner/dub-lock.json
 create mode 100644 pkgs/by-name/ds/dscanner/fix_version.patch
 create mode 100644 pkgs/by-name/ds/dscanner/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c3a8b645cfd2..50de760004fd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11109,18 +11109,18 @@
     githubId = 16307070;
     name = "iosmanthus";
   };
-  iqubic = {
-    email = "sophia.b.caspe@gmail.com";
-    github = "iqubic";
-    githubId = 22628816;
-    name = "Sophia Caspe";
-  };
   ipsavitsky = {
     email = "ipsavitsky234@gmail.com";
     github = "ipsavitsky";
     githubId = 33558632;
     name = "Ilya Savitsky";
   };
+  iqubic = {
+    email = "sophia.b.caspe@gmail.com";
+    github = "iqubic";
+    githubId = 22628816;
+    name = "Sophia Caspe";
+  };
   iquerejeta = {
     github = "iquerejeta";
     githubId = 31273774;
diff --git a/pkgs/by-name/ds/dscanner/dub-lock.json b/pkgs/by-name/ds/dscanner/dub-lock.json
new file mode 100644
index 000000000000..bed28efa167b
--- /dev/null
+++ b/pkgs/by-name/ds/dscanner/dub-lock.json
@@ -0,0 +1,32 @@
+{
+  "dependencies": {
+    "dcd": {
+      "version": "0.16.0-beta.2",
+      "sha256": "0756q02q1jbimrqn814b3j7q042vlxb7vva1rq823jx148r23d4d"
+    },
+    "dsymbol": {
+      "version": "0.13.0",
+      "sha256": "1lpwdri2bv5avs3hr0j1i00kjwdbs9nkc13wzlmjalfzjhqqqvci"
+    },
+    "emsi_containers": {
+      "version": "0.9.0",
+      "sha256": "1viz1fjh6jhfvl0d25bb1q7aclm1hrs0d7hhcx1d9c0gg5k6lcpm"
+    },
+    "inifiled": {
+      "version": "1.3.3",
+      "sha256": "01hw0lb9n6vwmx6vj5nq2awg54l5pvngqhzxfj2kmg99az84dg6d"
+    },
+    "libddoc": {
+      "version": "0.8.0",
+      "sha256": "0vxhkd92rxrkrz0svapdnkzh1bdqhws6wakhjj7szmkvykjgwksc"
+    },
+    "libdparse": {
+      "version": "0.23.2",
+      "sha256": "0bcaasam3iiqisilyx4ysxahjmgifn7i8ny155nwg64bjjibd8dk"
+    },
+    "stdx-allocator": {
+      "version": "2.77.5",
+      "sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj"
+    }
+  }
+}
diff --git a/pkgs/by-name/ds/dscanner/fix_version.patch b/pkgs/by-name/ds/dscanner/fix_version.patch
new file mode 100644
index 000000000000..b04cc127f55c
--- /dev/null
+++ b/pkgs/by-name/ds/dscanner/fix_version.patch
@@ -0,0 +1,12 @@
+diff --git a/dub.json b/dub.json
+index 72cb269..1ea3903 100644
+--- a/dub.json
++++ b/dub.json
+@@ -21,7 +21,4 @@
+   "stringImportPaths" : [
+     "bin"
+   ],
+-  "preBuildCommands" : [
+-    "\"$DC\" -run \"$PACKAGE_DIR/dubhash.d\""
+-  ]
+ }
diff --git a/pkgs/by-name/ds/dscanner/package.nix b/pkgs/by-name/ds/dscanner/package.nix
new file mode 100644
index 000000000000..64158fadbc98
--- /dev/null
+++ b/pkgs/by-name/ds/dscanner/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildDubPackage,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildDubPackage rec {
+  pname = "dscanner";
+  version = "0.15.2";
+
+  src = fetchFromGitHub {
+    owner = "dlang-community";
+    repo = "D-Scanner";
+    tag = "v${version}";
+    hash = "sha256-7lZhYlK07VWpSRnzawJ2RL69/U/AH/qPyQY4VfbnVn4=";
+  };
+
+  preBuild = ''
+    mkdir -p bin/
+    echo "v${version}" > bin/dubhash.txt
+  '';
+
+  patches = [
+    ./fix_version.patch
+  ];
+
+  dubLock = ./dub-lock.json;
+
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bin/dscanner -t $out/bin
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  meta = {
+    description = "Swiss-army knife for D source code";
+    changelog = "https://github.com/dlang-community/D-Scanner/releases/tag/v${version}";
+    homepage = "https://github.com/dlang-community/D-Scanner";
+    mainProgram = "dscanner";
+    maintainers = with lib.maintainers; [ ipsavitsky ];
+    license = lib.licenses.boost;
+  };
+}