From 9f74a469515fbe2693725d41376aa0778b0bc585 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 22 Jul 2020 22:02:50 +0200
Subject: [PATCH] miniflux: 2.0.21 -> 2.0.23

Changelog: https://github.com/miniflux/miniflux/releases/tag/2.0.22
Changelog: https://github.com/miniflux/miniflux/releases/tag/2.0.23
---
 pkgs/servers/miniflux/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix
index 8420f53aba3..55a328b21d5 100644
--- a/pkgs/servers/miniflux/default.nix
+++ b/pkgs/servers/miniflux/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }:
 
-buildGoPackage rec {
+let
   pname = "miniflux";
-  version = "2.0.21";
+  version = "2.0.23";
+
+in buildGoModule {
+  inherit pname version;
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "0yhzmfs35jfc7vq26r9c14v4lnv8sxj3pv23r2cx2rfx47b1zmk7";
+    sha256 = "0v0n5lvrfn3ngs1s1m3hv95dvnqn8ysksb044m4ifk2cr3b77ryc";
   };
 
-  goPackagePath = "miniflux.app";
+  vendorSha256 = "1iin5r9l8wb9gm0bwgdmpx0cp1q35ij4y7zf98lnj2kvb3jv5crp";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -23,9 +26,11 @@ buildGoPackage rec {
 
   postInstall = ''
     mv $out/bin/miniflux.app $out/bin/miniflux
-    installManPage go/src/${goPackagePath}/miniflux.1
+    installManPage miniflux.1
   '';
 
+  passthru.tests = nixosTests.miniflux;
+
   meta = with stdenv.lib; {
     description = "Minimalist and opinionated feed reader";
     homepage = "https://miniflux.app/";
@@ -33,4 +38,3 @@ buildGoPackage rec {
     maintainers = with maintainers; [ rvolosatovs benpye ];
   };
 }
-