From 9c8a87d88f7beb338907c012a2f1956a73a53c72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 00:42:03 +0000
Subject: [PATCH 1/2] sfeed: 2.0 -> 2.1

---
 pkgs/by-name/sf/sfeed/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sf/sfeed/package.nix b/pkgs/by-name/sf/sfeed/package.nix
index a3d3349b504fa..fe66ee679b6f0 100644
--- a/pkgs/by-name/sf/sfeed/package.nix
+++ b/pkgs/by-name/sf/sfeed/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   pname = "sfeed";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchgit {
     url = "git://git.codemadness.org/sfeed";
     rev = version;
-    sha256 = "sha256-DbzJWi9wAc7w2Z0bQt5PEFOuu9L3xzNrJvCocvCer34=";
+    sha256 = "sha256-KVZsVCTkwyOVr37vIXbiPjQLnb9lbuIlNxpZNvHxbEo=";
   };
 
   buildInputs = [ ncurses ];

From b915f84168c3c6a782d8b2e338862820724261cf Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 27 Dec 2024 22:11:31 +0400
Subject: [PATCH 2/2] sfeed: modernize

---
 pkgs/by-name/sf/sfeed/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sf/sfeed/package.nix b/pkgs/by-name/sf/sfeed/package.nix
index fe66ee679b6f0..87a1dd0ba2f75 100644
--- a/pkgs/by-name/sf/sfeed/package.nix
+++ b/pkgs/by-name/sf/sfeed/package.nix
@@ -5,14 +5,14 @@
   ncurses,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sfeed";
   version = "2.1";
 
   src = fetchgit {
     url = "git://git.codemadness.org/sfeed";
-    rev = version;
-    sha256 = "sha256-KVZsVCTkwyOVr37vIXbiPjQLnb9lbuIlNxpZNvHxbEo=";
+    tag = finalAttrs.version;
+    hash = "sha256-KVZsVCTkwyOVr37vIXbiPjQLnb9lbuIlNxpZNvHxbEo=";
   };
 
   buildInputs = [ ncurses ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   # otherwise does not find SIGWINCH
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://codemadness.org/sfeed-simple-feed-parser.html";
     description = "RSS and Atom parser (and some format programs)";
     longDescription = ''
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
       to import and export OPML and to fetch, filter, merge and order feed
       items.
     '';
-    license = licenses.isc;
-    maintainers = [ maintainers.matthiasbeyer ];
-    platforms = platforms.all;
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.matthiasbeyer ];
+    platforms = lib.platforms.all;
   };
-}
+})