build: remove raven patches

blaggacao · Aug 6, 2024 · 5564e73 · 5564e73
1 parent 93550b6
commit 5564e73
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 33 deletions.
diff --git a/apps/sources/newver.json b/apps/sources/newver.json
@@ -62,10 +62,10 @@
  "url": "https://github.com/frappe/print_designer/releases/tag/v1.3.3"
  },
  "raven": {
- "version": "v1.6.4",
- "gitref": "refs/tags/v1.6.4",
- "revision": "943509478306a2e3a05026cde87d4f7009fc1f10",
- "url": "https://github.com/The-Commit-Company/Raven/releases/tag/v1.6.4"
+ "version": "v1.6.5",
+ "gitref": "refs/tags/v1.6.5",
+ "revision": "1a840771215aaade007c8993e23f4ce149322ae3",
+ "url": "https://github.com/The-Commit-Company/Raven/releases/tag/v1.6.5"
  },
  "webshop": {
  "version": "20240607.063925",

diff --git a/apps/sources/oldver.json b/apps/sources/oldver.json
@@ -62,10 +62,10 @@
  "url": "https://github.com/frappe/print_designer/releases/tag/v1.3.3"
  },
  "raven": {
- "version": "v1.6.4",
- "gitref": "refs/tags/v1.6.4",
- "revision": "943509478306a2e3a05026cde87d4f7009fc1f10",
- "url": "https://github.com/The-Commit-Company/Raven/releases/tag/v1.6.4"
+ "version": "v1.6.5",
+ "gitref": "refs/tags/v1.6.5",
+ "revision": "1a840771215aaade007c8993e23f4ce149322ae3",
+ "url": "https://github.com/The-Commit-Company/Raven/releases/tag/v1.6.5"
  },
  "webshop": {
  "version": "20240607.063925",

diff --git a/apps/sources/raven.nix b/apps/sources/raven.nix
@@ -1,16 +1,16 @@
 {
  pname = "raven";
- version = "v1.6.4";
+ version = "v1.6.5";
  meta = {
- url = "https://github.com/The-Commit-Company/Raven/releases/tag/v1.6.4";
- description = "Sources for raven (v1.6.4)";
+ url = "https://github.com/The-Commit-Company/Raven/releases/tag/v1.6.5";
+ description = "Sources for raven (v1.6.5)";
  };
  src = builtins.fetchTree {
  type = "github";
  owner = "The-Commit-Company";
  repo = "Raven";
- narHash = "sha256-nTSjIHT9PpGMn9jBQh3LL9ItLOLNwHo1X2dIFkGWPPQ=";
- rev = "943509478306a2e3a05026cde87d4f7009fc1f10";
+ narHash = "sha256-TmGHx+PnqzB+opz+GBwMM7u2nwGMzQvD21jVPse275g=";
+ rev = "1a840771215aaade007c8993e23f4ce149322ae3";
  };
- passthru = builtins.fromJSON ''{}'';
+ passthru = builtins.fromJSON ''{"since": "v1.0.0", "upstream": "URL: https://github.com/The-Commit-Company/Raven\nPull: +refs/heads/develop:refs/remotes/upstream/develop\nPull: +refs/heads/main:refs/remotes/upstream/main\n"}'';
 }
diff --git a/src/overlays/frappe/raven/default.nix b/src/overlays/frappe/raven/default.nix
@@ -7,8 +7,6 @@
  python,
  extractFrappeMeta,
  mkAssets,
- applyPatches,
- fetchpatch,
 }:
 buildPythonPackage rec {
  inherit
@@ -18,23 +16,7 @@ buildPythonPackage rec {
  format
  ;
 
- src = mkAssets (appSources.raven
- // {
- src = applyPatches {
- inherit (appSources.raven) src;
- name = "raven-prod";
- patches = [
- (fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/The-Commit-Company/Raven/pull/989.patch";
- hash = "sha256-nst92Mr8wQQG4WdRPoGYLLFTJ/cRHarkGHNuYB3O8xE=";
- })
- (fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/The-Commit-Company/Raven/pull/990.patch";
- hash = "sha256-DLambvibZQoKcuQuP3wlI0sNfrMa0zojhmiXuhBAkiE=";
- })
- ];
- };
- });
+ src = mkAssets appSources.raven;
  inherit (appSources.raven) passthru;
 
  nativeBuildInputs = [