From 167017f7d62eb4ad94842823af8236a74ea95488 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 10 May 2026 19:15:42 +1000
Subject: [PATCH 1/4] drawy: 1.0.0 -> 1.0.1

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/dr/drawy/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dr/drawy/package.nix b/pkgs/by-name/dr/drawy/package.nix
index c743c0cf6a91..eab511a9e02b 100644
--- a/pkgs/by-name/dr/drawy/package.nix
+++ b/pkgs/by-name/dr/drawy/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "drawy";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "graphics";
     repo = "drawy";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-K070SiIf2bj1r44tixUZbsLYDxT65lEW0g68ENg3ZiE=";
+    hash = "sha256-Y6CAdHgcCK9lIae+CwqSGml+FAvVzLzyIAKdw85dKmQ=";
   };
 
   strictDeps = true;
@@ -55,8 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://apps.kde.org/drawy/";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
-      yiyu
       quarterstar
+      sigmasquadron
+      yiyu
     ];
     mainProgram = "drawy";
     platforms = lib.platforms.all;

From ef8b0e25d9f7d7bf1f93a3733a4aa64001ffa4c1 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 10 May 2026 19:15:42 +1000
Subject: [PATCH 2/4] drawy: enable __structuredAttrs

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/dr/drawy/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/dr/drawy/package.nix b/pkgs/by-name/dr/drawy/package.nix
index eab511a9e02b..64be50840d1c 100644
--- a/pkgs/by-name/dr/drawy/package.nix
+++ b/pkgs/by-name/dr/drawy/package.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Y6CAdHgcCK9lIae+CwqSGml+FAvVzLzyIAKdw85dKmQ=";
   };
 
+  __structuredAttrs = true;
   strictDeps = true;
 
   nativeBuildInputs = [

From 59ac7405064254ad5e99755a6f72b1792ee5a25a Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 10 May 2026 19:15:42 +1000
Subject: [PATCH 3/4] drawy: shorten buildInput calls

Instead of repeating kdePackages. and qt6. for every attribute,
we can use scoped with attr; calls that are far more readable.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/dr/drawy/package.nix | 34 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/dr/drawy/package.nix b/pkgs/by-name/dr/drawy/package.nix
index 64be50840d1c..db2c2d64113e 100644
--- a/pkgs/by-name/dr/drawy/package.nix
+++ b/pkgs/by-name/dr/drawy/package.nix
@@ -32,22 +32,24 @@ stdenv.mkDerivation (finalAttrs: {
     shared-mime-info
   ];
 
-  buildInputs = [
-    qt6.qtbase
-    qt6.qttools
-
-    kdePackages.extra-cmake-modules
-    kdePackages.kconfig
-    kdePackages.kconfigwidgets
-    kdePackages.kcoreaddons
-    kdePackages.kcrash
-    kdePackages.kdoctools
-    kdePackages.ki18n
-    kdePackages.kiconthemes
-    kdePackages.kwidgetsaddons
-    kdePackages.kxmlgui
-    kdePackages.syntax-highlighting
-  ];
+  buildInputs =
+    (with qt6; [
+      qtbase
+      qttools
+    ])
+    ++ (with kdePackages; [
+      extra-cmake-modules
+      kconfig
+      kconfigwidgets
+      kcoreaddons
+      kcrash
+      kdoctools
+      ki18n
+      kiconthemes
+      kwidgetsaddons
+      kxmlgui
+      syntax-highlighting
+    ]);
 
   passthru.updateScript = nix-update-script { };
 

From bb28ced1c909b90490248ce6e442c47123f47dc6 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 10 May 2026 19:15:42 +1000
Subject: [PATCH 4/4] drawy: correct licenses

Originally, drawy was GPL-3-Only. After being transferred to
the KDE GitLab, it was re-licensed based on the KDE reuse
system. See https://invent.kde.org/graphics/drawy/-/tree/master/LICENSES.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/dr/drawy/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/dr/drawy/package.nix b/pkgs/by-name/dr/drawy/package.nix
index db2c2d64113e..c44ef3ca7ba6 100644
--- a/pkgs/by-name/dr/drawy/package.nix
+++ b/pkgs/by-name/dr/drawy/package.nix
@@ -56,7 +56,18 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Handy and infinite brainstorming tool";
     homepage = "https://apps.kde.org/drawy/";
-    license = lib.licenses.gpl3Only;
+    changelog = "https://invent.kde.org/graphics/drawy/-/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = with lib.licenses; [
+      bsd2
+      bsd3
+      cc-by-sa-40
+      cc0
+      gpl2Plus
+      gpl3Plus
+      lgpl2Plus
+      mit
+      ofl
+    ];
     maintainers = with lib.maintainers; [
       quarterstar
       sigmasquadron