Refactor flake patching/recursion

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

packages/obsidian/plugins/better-word-count/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-better-word-count
-pkgs.buildNpmPackage rec {
+pkgs.buildNpmPackage (finalAttrs: {
   pname = "better-word-count";
   version = "0.10.1";
 
   src = pkgs.fetchFromGitHub {
     owner = "lukeleppan";
-    repo = pname;
-    rev = version;
+    repo = "better-word-count";
+    rev = finalAttrs.version;
     hash = "sha256-+z31nYnCrHjuV4ICVO+cKBM5q/zYA7Ju+J+6eU7t9Bo=";
   };
 
@@ -23,4 +23,4 @@ pkgs.buildNpmPackage rec {
     cp ./dist/main.js $out/main.js
     cp ./src/styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/dataview/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-dataview
-pkgs.buildNpmPackage rec {
+pkgs.buildNpmPackage (finalAttrs: {
   pname = "dataview";
   version = "0.5.70";
 
   src = pkgs.fetchFromGitHub {
     owner = "blacksmithgu";
     repo = "obsidian-dataview";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-qz2Un5r4bZyX0mZ7J7Yvd/gSWKn/GxUUrC7OF2jTL3c=";
   };
 
@@ -23,4 +23,4 @@ pkgs.buildNpmPackage rec {
     cp ./build/main.js $out/main.js
     cp ./styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/excalidraw/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-excalidraw --subpackage mathjaxToSVG
-pkgs.buildNpmPackage rec {
+pkgs.buildNpmPackage (finalAttrs: {
   pname = "obsidian.plugins.excalidraw";
   version = "2.13.0";
 
   pkg = pkgs.fetchFromGitHub {
     owner = "zsviczian";
     repo = "obsidian-excalidraw-plugin";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-zZDKgVQDwa2Mb5DQtu5/QUQnMbBudQxhrVSNr8Xi44o=";
   };
 
@@ -15,7 +15,7 @@ pkgs.buildNpmPackage rec {
     pname = "obsidian.plugins.excalidraw.mathjaxToSVG";
     version = "1.0.0";
 
-    src = "${pkg}/MathjaxToSVG";
+    src = "${finalAttrs.pkg}/MathjaxToSVG";
     npmDepsHash = "sha256-AosKWlX08dpXNQ2YlrfR6jEInmU02Ztf26nmV19Jxok=";
 
     configurePhase = ''
@@ -28,7 +28,7 @@ pkgs.buildNpmPackage rec {
     '';
   };
 
-  src = pkg;
+  src = finalAttrs.pkg;
 
   npmDepsHash = "sha256-Cb8PTYW2fxYLlvCrDJhtV5KnOMkSTlBO8QJR4p6wyr8=";
   npmPackFlags = [ "--ignore-scripts" ];
@@ -36,7 +36,7 @@ pkgs.buildNpmPackage rec {
   configurePhase = ''
     mkdir dist
     mkdir -p ./MathjaxToSVG/dist
-    cp ${mathjaxToSVG}/index.js ./MathjaxToSVG/dist/index.js
+    cp ${finalAttrs.mathjaxToSVG}/index.js ./MathjaxToSVG/dist/index.js
   '';
 
   installPhase = ''
@@ -45,4 +45,4 @@ pkgs.buildNpmPackage rec {
     cp ./dist/main.js $out/main.js
     cp ./dist/styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/kanban/default.nix

@@ -1,18 +1,18 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-kanban
-pkgs.stdenv.mkDerivation rec {
+pkgs.stdenv.mkDerivation (finalAttrs: {
   pname = "kanban";
   version = "2.0.51";
 
   src = pkgs.fetchFromGitHub {
     owner = "mgmeyers";
     repo = "obsidian-kanban";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-NahypggwPrub2KxRBAn54ZpEInP1V+6l/xmUKUt6myA=";
   };
 
   offlineCache = pkgs.fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
+    yarnLock = finalAttrs.src + "/yarn.lock";
     hash = "sha256-eof2W9Ja4RlmjQ0SnaF/jadHX3GRkCRrMwZU2z0M/Jk=";
   };
 
@@ -29,4 +29,4 @@ pkgs.stdenv.mkDerivation rec {
     cp ./main.js $out/main.js
     cp ./styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/languagetool/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-languagetool
-pkgs.stdenv.mkDerivation rec {
+pkgs.stdenv.mkDerivation (finalAttrs: {
   pname = "languagetool";
   version = "0.3.7";
 
   src = pkgs.fetchFromGitHub {
     owner = "Clemens-E";
     repo = "obsidian-languagetool-plugin";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-OsdOOrXNoraKuFPqvgn6pj6ZagEbiFCJyQ529eyZXUU=";
   };
 
@@ -17,7 +17,7 @@ pkgs.stdenv.mkDerivation rec {
   ];
 
   offlineCache = pkgs.fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
+    yarnLock = finalAttrs.src + "/yarn.lock";
     hash = "sha256-749RGQmg9Mte7TR6k3qP6xcb8+rj/C60LYLbF8j8gNc=";
   };
 
@@ -34,4 +34,4 @@ pkgs.stdenv.mkDerivation rec {
     cp ./main.js $out/main.js
     cp ./styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/linter/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-linter
-pkgs.buildNpmPackage rec {
+pkgs.buildNpmPackage (finalAttrs: {
   pname = "linter";
   version = "1.29.2";
 
   src = pkgs.fetchFromGitHub {
     owner = "platers";
     repo = "obsidian-linter";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-I60nP99bdQfvq+GYtUvHPpYqp/nqpn3BqrgZzgPzRpI=";
   };
 
@@ -20,4 +20,4 @@ pkgs.buildNpmPackage rec {
     cp ./main.js $out/main.js
     cp ./src/styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/map-view/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-map-view
-pkgs.buildNpmPackage rec {
+pkgs.buildNpmPackage (finalAttrs: {
   pname = "map-view";
   version = "5.5.0";
 
   src = pkgs.fetchFromGitHub {
     owner = "esm7";
     repo = "obsidian-map-view";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-HiH6KPLnCNyidp6TI7HJK4aj5SL0B0xO6HOWUgjVdd4=";
   };
 
@@ -25,4 +25,4 @@ pkgs.buildNpmPackage rec {
     cp ./dist/main.js $out/main.js
     cp ./dist/styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/minimal-settings/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-minimal-settings
-pkgs.buildNpmPackage rec {
+pkgs.buildNpmPackage (finalAttrs: {
   pname = "minimal-settings";
   version = "8.1.1";
 
   src = pkgs.fetchFromGitHub {
     owner = "kepano";
     repo = "obsidian-minimal-settings";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-JcWqSVgSRJAm0QiLnGuPpv0S9SVZw7UdtuKnvUAKiwQ=";
   };
 
@@ -22,4 +22,4 @@ pkgs.buildNpmPackage rec {
     cp ./main.js $out/main.js
     cp ./styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/outliner/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-outliner
-pkgs.buildNpmPackage rec {
+pkgs.buildNpmPackage (finalAttrs: {
   pname = "outliner";
   version = "4.9.0";
 
   src = pkgs.fetchFromGitHub {
     owner = "vslinko";
     repo = "obsidian-outliner";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-W8cEAuFwGZUJvJgZo9Yz5aJV7xfm5kFZ9bpvwSPWhmE=";
   };
 
@@ -20,4 +20,4 @@ pkgs.buildNpmPackage rec {
     cp ./main.js $out/main.js
     cp ./styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/style-settings/default.nix

@@ -1,24 +1,24 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-style-settings --src-attr unpatchedSrc
-pkgs.stdenv.mkDerivation rec {
+pkgs.stdenv.mkDerivation (finalAttrs: {
   pname = "style-settings";
   version = "1.0.9";
 
   unpatchedSrc = pkgs.fetchFromGitHub {
     owner = "mgmeyers";
     repo = "obsidian-style-settings";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-eNbZQ/u3mufwVX+NRJpMSk5uGVkWfW0koXKq7wg9d+I=";
   };
 
   # Wrap in applyPatches so that offlineCache below is built correctly
   src = pkgs.applyPatches {
-    src = unpatchedSrc;
+    src = finalAttrs.unpatchedSrc;
     patches = [ ./package-lock.patch ];
   };
 
   offlineCache = pkgs.fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+    yarnLock = "${finalAttrs.src}/yarn.lock";
     hash = "sha256-tqX09XWI3ZL9bXVdjgsAEuvfCAjnyWj5uSWGFbNApds=";
   };
 
@@ -35,4 +35,4 @@ pkgs.stdenv.mkDerivation rec {
     cp ./main.js $out/main.js
     cp ./styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/tasks/default.nix

@@ -1,18 +1,18 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-tasks
-pkgs.stdenv.mkDerivation rec {
+pkgs.stdenv.mkDerivation (finalAttrs: {
   pname = "tasks";
   version = "7.20.0";
 
   src = pkgs.fetchFromGitHub {
     owner = "obsidian-tasks-group";
     repo = "obsidian-tasks";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-K9/H2BgruB1O9KwW+xoiCsuXFfu6o4xZDCI40OEmh+o=";
   };
 
   offlineCache = pkgs.fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
+    yarnLock = finalAttrs.src + "/yarn.lock";
     hash = "sha256-ecPZvpMQkL2o0X4qx6h1jwQVZrtTC3+Aj7n/SBLRQbo=";
   };
 
@@ -29,4 +29,4 @@ pkgs.stdenv.mkDerivation rec {
     cp ./main.js $out/main.js
     cp ./styles.css $out/styles.css
   '';
-}
+})

packages/obsidian/plugins/url-into-selection/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-url-into-selection
-pkgs.buildNpmPackage rec {
+pkgs.buildNpmPackage (finalAttrs: {
   pname = "url-into-selection";
   version = "1.7.0";
 
   src = pkgs.fetchFromGitHub {
     owner = "denolehov";
     repo = "obsidian-url-into-selection";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-xmKJOuXirg/LFVK/0925fazW+cm+XUlLpAUgpAS6bZI=";
   };
 
@@ -21,4 +21,4 @@ pkgs.buildNpmPackage rec {
     cp ./manifest.json $out/manifest.json
     cp ./main.js $out/main.js
   '';
-}
+})

packages/obsidian/themes/minimal/default.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-theme-minimal
-pkgs.buildNpmPackage rec {
+pkgs.buildNpmPackage (finalAttrs: {
   pname = "minimal";
   version = "8.0.1";
 
   src = pkgs.fetchFromGitHub {
     owner = "kepano";
     repo = "obsidian-minimal";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-9FHkJ47R+cy2Pq62OuUUZQLSxd929xUIsQcpFGb4rso=";
   };
 
@@ -25,4 +25,4 @@ pkgs.buildNpmPackage rec {
     cp ./manifest.json $out/manifest.json
     cp ./theme.css $out/theme.css
   '';
-}
+})