pkgs/yarr: switch back to upstream now that manifest patch is in \o/

pkgs/yarr.nix

@@ -3,16 +3,17 @@
 with lib;
 buildGoModule rec {
   pname = "yarr";
-  version = "2.3";
+  version = "2023-01-30";
 
   src = fetchFromGitHub {
     owner = "nkanaev";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-LW0crWdxS6zcY5rxR0F2FLDYy9Ph2ZKyB/5VFVss+tA=";
+    #rev = "v${version}";
+    rev = "c092842ee4a9621aff12d439f2fedd95058010fe";
+    sha256 = "sha256-VTEe+7x6DVXJFS+AEnfcUaag85zzK5Xve0zp1Polw7I=";
   };
 
-  vendorSha256 = "sha256-dseEvPu7VapyPzGKjqlFfXeaJdRF19YxCfZVn+ePYBc=";
+  vendorSha256 = null;
 
   ldflags = [ "-X main.Version=${version}" ];
 
@@ -20,8 +21,6 @@ buildGoModule rec {
 
   proxyVendor = true;
 
-  patches = [ ./yarr_manifest.diff ];
-
   doCheck = false;
 
   subPackages = [ "./src/main.go" ];

pkgs/yarr_manifest.diff

@@ -1,49 +0,0 @@
-diff --git a/src/assets/assetsfs.go b/src/assets/assetsfs.go
-index 29f3a36..0edf300 100644
---- a/src/assets/assetsfs.go
-+++ b/src/assets/assetsfs.go
-@@ -1,3 +1,4 @@
-+//go:build release
- // +build release
- 
- package assets
-@@ -5,6 +6,7 @@ package assets
- import "embed"
- 
- //go:embed *.html
-+//go:embed *.json
- //go:embed graphicarts
- //go:embed javascripts
- //go:embed stylesheets
-diff --git a/src/assets/index.html b/src/assets/index.html
-index 2124973..73346b2 100644
---- a/src/assets/index.html
-+++ b/src/assets/index.html
-@@ -6,6 +6,7 @@
-     <link rel="stylesheet" href="./static/stylesheets/bootstrap.min.css">
-     <link rel="stylesheet" href="./static/stylesheets/app.css">
-     <link rel="icon shortcut" href="./static/graphicarts/icon.png">
-+    <link rel="manifest" href="./static/manifest.json" />
-     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-     <script>
-         window.app = window.app || {}
-diff --git a/src/assets/manifest.json b/src/assets/manifest.json
-new file mode 100644
-index 0000000..45f4e81
---- /dev/null
-+++ b/src/assets/manifest.json
-@@ -0,0 +1,14 @@
-+{
-+  "$schema": "https://json.schemastore.org/web-manifest-combined.json",
-+  "name": "YARR",
-+  "short_name": "YARR",
-+  "start_url": "/",
-+  "display": "standalone",
-+  "description": "Yet Another RSS Reader.",
-+  "background_color": "#fff",
-+  "icons": [{
-+    "src": "/static/graphicarts/icon.png",
-+    "sizes": "69x69",
-+    "type": "image/png"
-+  }]
-+}