build: remove wiki patches

blaggacao · Aug 14, 2024 · 9f6947d · 9f6947d
1 parent c90f626
commit 9f6947d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 26 deletions.
diff --git a/apps/sources/newver.json b/apps/sources/newver.json
@@ -73,9 +73,9 @@
       "url": "https://github.com/frappe/webshop/commit/2ba73816791724acb2e8c7cce35c28a56c537b31"
     },
     "wiki": {
-      "version": "20240722.131419",
-      "revision": "df7b115378575d33677adefc86daf1ee26729005",
-      "url": "https://github.com/frappe/wiki/commit/df7b115378575d33677adefc86daf1ee26729005"
+      "version": "20240814.154017",
+      "revision": "e1f352102282d8999095a5f554dc73aa96b39284",
+      "url": "https://github.com/frappe/wiki/commit/e1f352102282d8999095a5f554dc73aa96b39284"
     }
   }
 }
diff --git a/apps/sources/oldver.json b/apps/sources/oldver.json
@@ -73,9 +73,9 @@
       "url": "https://github.com/frappe/webshop/commit/2ba73816791724acb2e8c7cce35c28a56c537b31"
     },
     "wiki": {
-      "version": "20240722.131419",
-      "revision": "df7b115378575d33677adefc86daf1ee26729005",
-      "url": "https://github.com/frappe/wiki/commit/df7b115378575d33677adefc86daf1ee26729005"
+      "version": "20240814.154017",
+      "revision": "e1f352102282d8999095a5f554dc73aa96b39284",
+      "url": "https://github.com/frappe/wiki/commit/e1f352102282d8999095a5f554dc73aa96b39284"
     }
   }
 }
diff --git a/apps/sources/wiki.nix b/apps/sources/wiki.nix
@@ -1,16 +1,16 @@
 {
   pname = "wiki";
-  version = "20240722.131419";
+  version = "20240814.154017";
   meta = {
-    url = "https://github.com/frappe/wiki/commit/df7b115378575d33677adefc86daf1ee26729005";
-    description = "Sources for wiki (20240722.131419)";
+    url = "https://github.com/frappe/wiki/commit/e1f352102282d8999095a5f554dc73aa96b39284";
+    description = "Sources for wiki (20240814.154017)";
   };
   src = builtins.fetchTree {
     type = "github";
     owner = "frappe";
     repo = "wiki";
-    narHash = "sha256-XnCaOl6RoN078+mhxLcl3rgsd4yiBxY86eXDB3ZuZF0=";
-    rev = "df7b115378575d33677adefc86daf1ee26729005";
+    narHash = "sha256-tNXxlqKOPiqBL/mc7n0O9y3pwVajj+VrNdyusQ34sUY=";
+    rev = "e1f352102282d8999095a5f554dc73aa96b39284";
   };
   passthru = builtins.fromJSON ''{}'';
 }
diff --git a/src/overlays/frappe/wiki/default.nix b/src/overlays/frappe/wiki/default.nix
@@ -6,8 +6,6 @@
   flit-core,
   extractFrappeMeta,
   mkAssets,
-  applyPatches,
-  fetchpatch,
 }:
 buildPythonPackage rec {
   inherit
@@ -18,19 +16,7 @@ buildPythonPackage rec {
   pname = "wiki";
   version = "3.x-dev";
 
-  src = mkAssets (appSources.wiki
-    // {
-      src = applyPatches {
-        inherit (appSources.wiki) src;
-        name = "wiki";
-        patches = [
-          (fetchpatch {
-            url = "https://patch-diff.githubusercontent.com/raw/frappe/wiki/pull/261.patch";
-            hash = "sha256-xVXpvrvEjzSnqcRzDldMII2W7yQBxaj86T3ptK6lFnc=";
-          })
-        ];
-      };
-    });
+  src = mkAssets appSources.wiki;
   inherit (appSources.wiki) passthru;
 
   nativeBuildInputs = [