From 90abd5e27f7db156974e6cc536f339a3e3e558fd Mon Sep 17 00:00:00 2001
From: ocfox <i@ocfox.me>
Date: Sun, 18 Feb 2024 11:54:13 +0800
Subject: [PATCH] das: 0.3.8 -> 1.0.3

Diff: https://github.com/snovvcrash/DivideAndScan/compare/v0.3.8...v1.0.3

Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
---
 .../das/default.nix => by-name/da/das/package.nix}  | 13 +++++++------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/{tools/security/das/default.nix => by-name/da/das/package.nix} (77%)

diff --git a/pkgs/tools/security/das/default.nix b/pkgs/by-name/da/das/package.nix
similarity index 77%
rename from pkgs/tools/security/das/default.nix
rename to pkgs/by-name/da/das/package.nix
index 2f7cd2fa98f7..3ed340e72edb 100644
--- a/pkgs/tools/security/das/default.nix
+++ b/pkgs/by-name/da/das/package.nix
@@ -5,24 +5,24 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "das";
-  version = "0.3.8";
-  format = "pyproject";
+  version = "1.0.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snovvcrash";
     repo = "DivideAndScan";
     rev = "refs/tags/v${version}";
-    hash = "sha256-a9gnEBTvZshw42M/GrpCgjZh6FOzL45aZqGRyeHO0ec=";
+    hash = "sha256-WZmWpcBqxsNH96nVWwoepFhsvdxZpYKmAjNd7ghIJMA=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace 'networkx = "^2.8.4"' 'networkx = "*"' \
-      --replace 'pandas = "^1.4.2"' 'pandas = "*"'
+      --replace 'netaddr = "^0.8.0"' 'netaddr = "*"'
   '';
 
-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
+  nativeBuildInputs = [
+    python3.pkgs.poetry-core
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -47,5 +47,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/snovvcrash/DivideAndScan";
     license = licenses.bsd2;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "das";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec9b96b86674..b18c18cefa45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4972,8 +4972,6 @@ with pkgs;
 
   dapr-cli = callPackage ../development/tools/dapr/cli { };
 
-  das = callPackage ../tools/security/das { };
-
   dasel = callPackage ../applications/misc/dasel { };
 
   dasher = callPackage ../applications/accessibility/dasher { };