From 714410a12c2f02f85d70ce0c0f11be29ee739591 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Jul 2023 09:27:36 +0200 Subject: [PATCH 1/3] urlscan: add changelog to meta --- pkgs/applications/misc/urlscan/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 726c749d604d..1cbb7809e313 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -20,11 +20,14 @@ python3Packages.buildPythonApplication rec { doCheck = false; # No tests available - pythonImportsCheck = [ "urlscan" ]; + pythonImportsCheck = [ + "urlscan" + ]; meta = with lib; { description = "Mutt and terminal url selector (similar to urlview)"; homepage = "https://github.com/firecat53/urlscan"; + changelog = "https://github.com/firecat53/urlscan/releases/tag/${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dpaetzel jfrankenau ]; }; From 62e11bcb582f79f9158bf4de28069ed5743dadaf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Jul 2023 09:32:33 +0200 Subject: [PATCH 2/3] urlscan: migrate to python3.pkgs --- pkgs/applications/misc/urlscan/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 1cbb7809e313..bbeefc4e20cf 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -1,9 +1,9 @@ { lib -, python3Packages , fetchFromGitHub +, python3 }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "urlscan"; version = "0.9.10"; @@ -14,11 +14,12 @@ python3Packages.buildPythonApplication rec { hash = "sha256-lCOOVAdsr5LajBGY7XUi4J5pJqm5rOH5IMKhA6fju5w="; }; - propagatedBuildInputs = [ - python3Packages.urwid + propagatedBuildInputs = with python3.pkgs; [ + urwid ]; - doCheck = false; # No tests available + # No tests available + doCheck = false; pythonImportsCheck = [ "urlscan" From 67b8982a7af412714ee50cb6368a6e764977f09b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Jul 2023 09:10:58 +0200 Subject: [PATCH 3/3] urlscan: 0.9.10 -> 1.0.0 Changelog: https://github.com/firecat53/urlscan/releases/tag/1.0.0 --- pkgs/applications/misc/urlscan/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index bbeefc4e20cf..6b95a9b97340 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -5,15 +5,23 @@ python3.pkgs.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.10"; + version = "1.0.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; - rev = version; - hash = "sha256-lCOOVAdsr5LajBGY7XUi4J5pJqm5rOH5IMKhA6fju5w="; + rev = "refs/tags/${version}"; + hash = "sha256-IvCdc4f784hBM+TEa0zIACz/1/FUnEpGxHUGiS85tt8="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = with python3.pkgs; [ + hatchling + hatch-vcs + ]; + propagatedBuildInputs = with python3.pkgs; [ urwid ];