From 2a6f48769c9766c862e72f50eb2dd9ab78c224f0 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 29 Sep 2024 19:08:48 -0400 Subject: [PATCH 1/3] miniflux: add updateScript --- pkgs/servers/miniflux/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 9e0e854435c8..8590cce0b5ff 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch2, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests, nix-update-script }: buildGoModule rec { pname = "miniflux"; @@ -26,7 +26,10 @@ buildGoModule rec { installManPage miniflux.1 ''; - passthru.tests = nixosTests.miniflux; + passthru = { + tests = nixosTests.miniflux; + updateScript = nix-update-script { }; + }; meta = with lib; { description = "Minimalist and opinionated feed reader"; From 1ff2dee679c55363ecec39392136f07cc6dca893 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 29 Sep 2024 19:11:07 -0400 Subject: [PATCH 2/3] miniflux: 2.2.0 -> 2.2.1 https://miniflux.app/releases/2.2.1.html --- pkgs/servers/miniflux/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 8590cce0b5ff..c3e590e80fd4 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; rev = "refs/tags/${version}"; - hash = "sha256-JE0sHxmvLGvbgOqH5f7OONAvP93dJLWLAbgTnlNHGHE="; + hash = "sha256-b4slACQl+3vDsioULVKscBhS8LvTxCUPDnO7GlT46CM="; }; - vendorHash = "sha256-Y5FcKmvYMN9Q9/VpP8IWclFXt7gl61UiyPJ+Rdmlito="; + vendorHash = "sha256-PL5tc6MQRHloc3Dfw+FpWdqrXErFPjEb8RNPmHr7jSk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5254a83b0fb..821fff842acc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25050,7 +25050,9 @@ with pkgs; azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; - miniflux = callPackage ../servers/miniflux { }; + miniflux = callPackage ../servers/miniflux { + buildGoModule = buildGo123Module; + }; inherit (callPackage ../servers/mir { }) mir From d7f0cdec396ef119fe287bf653f64c7f50f80d47 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 29 Sep 2024 19:13:02 -0400 Subject: [PATCH 3/3] miniflux: move to by-name --- .../miniflux/default.nix => by-name/mi/miniflux/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers/miniflux/default.nix => by-name/mi/miniflux/package.nix} (100%) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/by-name/mi/miniflux/package.nix similarity index 100% rename from pkgs/servers/miniflux/default.nix rename to pkgs/by-name/mi/miniflux/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 821fff842acc..87ebacfe0869 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25050,7 +25050,7 @@ with pkgs; azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; - miniflux = callPackage ../servers/miniflux { + miniflux = callPackage ../by-name/mi/miniflux/package.nix { buildGoModule = buildGo123Module; };