From b6d7b2296d03232d4ff3f97ec80a5716c6e6a1e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Aug 2025 09:28:37 +0200 Subject: [PATCH 1/5] alot: remove disabled --- pkgs/by-name/al/alot/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix index 753ef96c167e..720f5c42bf72 100644 --- a/pkgs/by-name/al/alot/package.nix +++ b/pkgs/by-name/al/alot/package.nix @@ -23,8 +23,6 @@ buildPythonApplication rec { "man" ]; - disabled = !isPy3k; - src = fetchFromGitHub { owner = "pazz"; repo = "alot"; From 7f42749078b76fd89e95e7ef18ab6a30fd48b1df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Aug 2025 09:29:12 +0200 Subject: [PATCH 2/5] alot: migrate to hash --- pkgs/by-name/al/alot/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix index 720f5c42bf72..c57ddcec5383 100644 --- a/pkgs/by-name/al/alot/package.nix +++ b/pkgs/by-name/al/alot/package.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { owner = "pazz"; repo = "alot"; tag = version; - sha256 = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc="; + hash = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc="; }; postPatch = '' From 173d9bc304b1b5d2462cde1a782b0614bfa0b46f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Aug 2025 09:29:57 +0200 Subject: [PATCH 3/5] alot: modernize --- pkgs/by-name/al/alot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix index c57ddcec5383..aa7fb4dcd1b2 100644 --- a/pkgs/by-name/al/alot/package.nix +++ b/pkgs/by-name/al/alot/package.nix @@ -35,12 +35,12 @@ buildPythonApplication rec { --replace-fail /usr/share "$out/share" ''; - nativeBuildInputs = [ + build-system = [ setuptools-scm ] ++ lib.optional withManpage sphinx; - propagatedBuildInputs = [ + dependencies = [ configobj file gpgme From 8451f41c4a31df6ee73b5c34cab0eecfce608b71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Aug 2025 09:30:50 +0200 Subject: [PATCH 4/5] alot: add changelog to meta --- pkgs/by-name/al/alot/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix index aa7fb4dcd1b2..86e687adc23d 100644 --- a/pkgs/by-name/al/alot/package.nix +++ b/pkgs/by-name/al/alot/package.nix @@ -96,6 +96,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/pazz/alot"; description = "Terminal MUA using notmuch mail"; + changelog = "https://github.com/pazz/alot/releases/tag/${src.tag}"; mainProgram = "alot"; license = licenses.gpl3Plus; platforms = platforms.linux; From c1c7807b69b038fb3f6b0b37bf887834cf1845b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Aug 2025 09:57:47 +0200 Subject: [PATCH 5/5] alot: remove with lib; --- pkgs/by-name/al/alot/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix index 86e687adc23d..da68107498d6 100644 --- a/pkgs/by-name/al/alot/package.nix +++ b/pkgs/by-name/al/alot/package.nix @@ -93,13 +93,13 @@ buildPythonApplication rec { sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop ''; - meta = with lib; { + meta = { homepage = "https://github.com/pazz/alot"; description = "Terminal MUA using notmuch mail"; changelog = "https://github.com/pazz/alot/releases/tag/${src.tag}"; mainProgram = "alot"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ milibopp ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ milibopp ]; }; }