From 7fc16866965558898a14ba1544305bd87eb7fc97 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Mon, 15 Jan 2024 20:42:27 +0000
Subject: [PATCH] shells/axidraw: add more packages

---
 flake.nix                    |  8 +++-----
 packages/axidraw/modules.nix | 13 ++++++++++++-
 shells/axidraw/default.nix   |  6 ++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index f6af43e..187708b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,12 +50,10 @@
             // final.callPackage ./packages/kernelPatches { };
 
           pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-            (pythonFinal: pythonPrev: {
-              inherit (final.callPackage ./packages/axidraw/modules.nix {
+            (pythonFinal: pythonPrev:
+              (final.callPackage ./packages/axidraw/modules.nix {
                 inherit pythonFinal pythonPrev;
-              })
-                ink-extensions plotink axidrawinternal axicli;
-            })
+              }))
           ];
         };
       };
diff --git a/packages/axidraw/modules.nix b/packages/axidraw/modules.nix
index 48dc401..6007c75 100644
--- a/packages/axidraw/modules.nix
+++ b/packages/axidraw/modules.nix
@@ -1,4 +1,4 @@
-{ pythonFinal, pythonPrev, fetchPypi, fetchzip }:
+{ pythonFinal, pythonPrev, fetchPypi, fetchzip, fetchurl }:
 let
   inherit (pythonFinal) buildPythonPackage;
 
@@ -10,6 +10,17 @@ let
     hash = "sha256-RPh00jiiH1RqqKZ10ylFP1J+iBYl5VOmZ8g0vFH8Ibg=";
   };
 in {
+  drawsvg = buildPythonPackage {
+    pname = "drawsvg";
+    version = "2.3.0";
+    format = "wheel";
+    src = fetchurl {
+      url =
+        "https://files.pythonhosted.org/packages/27/4f/65d72a014026495d8d2847e66bbe542cf899e50f087a50e0abab9c58ef3c/drawsvg-2.3.0-py3-none-any.whl";
+      sha256 = "1gqa5q5b7y38isyw1kgq2lprw5709jv13pic9s6bk80dbm32pbck";
+    };
+  };
+
   ink-extensions = buildPythonPackage rec {
     pname = "ink_extensions";
     version = "1.3.2";
diff --git a/shells/axidraw/default.nix b/shells/axidraw/default.nix
index 087bbaa..fefe73d 100644
--- a/shells/axidraw/default.nix
+++ b/shells/axidraw/default.nix
@@ -1,10 +1,12 @@
-{ lib, mkShell, python3, inkscape-with-extensions, inkscape-extensions }:
+{ lib, mkShell, python3, inkscape-with-extensions, inkscape-extensions, jupyter
+}:
 mkShell {
   packages = [
     (inkscape-with-extensions.override {
       inkscapeExtensions = [ inkscape-extensions.axidraw ];
     })
     python3
-  ] ++ (with python3.pkgs; [ ipython requests axicli ]);
+    jupyter
+  ] ++ (with python3.pkgs; [ ipython requests axicli drawsvg ]);
 
 }