From 7bd29c7ddf2b6a14efe3a1c2432f2d38eb83b29b Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Sat, 31 Aug 2024 21:00:28 +0800
Subject: [PATCH 1/2] notes: move to by-name

---
 .../default.nix => by-name/no/notes/package.nix}   | 14 ++++++--------
 pkgs/top-level/all-packages.nix                    |  4 ----
 2 files changed, 6 insertions(+), 12 deletions(-)
 rename pkgs/{applications/office/notes/default.nix => by-name/no/notes/package.nix} (89%)

diff --git a/pkgs/applications/office/notes/default.nix b/pkgs/by-name/no/notes/package.nix
similarity index 89%
rename from pkgs/applications/office/notes/default.nix
rename to pkgs/by-name/no/notes/package.nix
index 7f41ca33e3dc..54219756c7ef 100644
--- a/pkgs/applications/office/notes/default.nix
+++ b/pkgs/by-name/no/notes/package.nix
@@ -2,10 +2,8 @@
 , stdenv
 , fetchFromGitHub
 , cmake
-, wrapQtAppsHook
-, qtbase
-, qtdeclarative
-, Cocoa
+, qt6
+, darwin
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,14 +22,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtdeclarative
+    qt6.qtbase
+    qt6.qtdeclarative
   ] ++ lib.optionals stdenv.isDarwin [
-    Cocoa
+    darwin.apple_sdk.frameworks.Cocoa
   ];
 
   postInstall = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c972e7862a8..521c6dd3c12b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10782,10 +10782,6 @@ with pkgs;
 
   notify-osd = callPackage ../applications/misc/notify-osd { };
 
-  notes = qt6Packages.callPackage ../applications/office/notes {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
-  };
-
   notes-up = callPackage ../applications/office/notes-up { };
 
   notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { };

From eb7d2ec2e9b33369a0d6ffef0bce6a40cb30923c Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Sat, 31 Aug 2024 21:06:54 +0800
Subject: [PATCH 2/2] notes: 2.2.1 -> 2.3.0

---
 pkgs/by-name/no/notes/package.nix | 43 +++++++++++++++++--------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix
index 54219756c7ef..c9ca49ffe745 100644
--- a/pkgs/by-name/no/notes/package.nix
+++ b/pkgs/by-name/no/notes/package.nix
@@ -1,20 +1,24 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, qt6
-, darwin
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  qt6,
+  darwin,
+  overrideSDK,
 }:
-
-stdenv.mkDerivation (finalAttrs: {
+let
+  stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
   pname = "notes";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "nuttyartist";
     repo = "notes";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ShChF87ysRoisKshY86kJTa3ZAiQhBOImuL8OsEqgBo=";
+    hash = "sha256-Z89Z7Il9K9pOxvNfFCoRUkRs0Wf5a6TQACDbBrQhGyw=";
     fetchSubmodules = true;
   };
 
@@ -25,12 +29,14 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qt6.qtbase
-    qt6.qtdeclarative
-  ] ++ lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.Cocoa
-  ];
+  buildInputs =
+    [
+      qt6.qtbase
+      qt6.qtdeclarative
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk_11_0.frameworks.Cocoa
+    ];
 
   postInstall = lib.optionalString stdenv.isDarwin ''
     mkdir $out/Applications
@@ -39,11 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Fast and beautiful note-taking app";
+    homepage = "https://github.com/nuttyartist/notes";
     mainProgram = "notes";
-    downloadPage = "https://github.com/nuttyartist/notes";
-    homepage = "https://www.get-notes.com";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ zendo ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ zendo ];
   };
 })