From 00edd0346e5b9f2df68a8dfdd6af5f15450949c7 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 28 Nov 2024 13:52:45 +0800 Subject: [PATCH 1/5] pywal16: 3.6.0 -> 3.7.1 --- pkgs/by-name/py/pywal16/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index 189441135aeb..37fe05ee5df1 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -7,17 +7,17 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.6.0"; + version = "3.7.1"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; rev = "refs/tags/${version}"; - hash = "sha256-YKHOH1bEsZHTgYm8AYpfA6C8RtWxAqNQ+GHMcdaj/JU="; + hash = "sha256-XDOmpeONPW6b1ZEGk272wwraTLR8PjjniIXm0M9BGU4="; }; - nativeBuildInputs = [ python3.pkgs.setuptools ]; + build-system = [ python3.pkgs.setuptools ]; nativeCheckInputs = [ python3.pkgs.pytestCheckHook From 3a78dd097dd7057624dc492ce3f5064c6d988cc5 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 28 Nov 2024 14:07:04 +0800 Subject: [PATCH 2/5] pywal16: add man page --- pkgs/by-name/py/pywal16/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index 37fe05ee5df1..211a9229fb34 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -3,6 +3,7 @@ python3, fetchFromGitHub, imagemagick, + installShellFiles, }: python3.pkgs.buildPythonApplication rec { @@ -19,11 +20,17 @@ python3.pkgs.buildPythonApplication rec { build-system = [ python3.pkgs.setuptools ]; + nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ python3.pkgs.pytestCheckHook imagemagick ]; + postInstall = '' + installManPage data/man/man1/wal.1 + ''; + preCheck = '' export HOME=$(mktemp -d) ''; From 9f4747e9d0ec8f808c07bab6f3f3fd197b6ae1a5 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 28 Nov 2024 14:07:22 +0800 Subject: [PATCH 3/5] pywal16: add optional-dependencies --- pkgs/by-name/py/pywal16/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index 211a9229fb34..466475af7006 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -37,6 +37,19 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "pywal" ]; + optional-dependencies = with python3.pkgs; { + colorthief = [ colorthief ]; + colorz = [ colorz ]; + fast-colorthief = [ fast-colorthief ]; + haishoku = [ haishoku ]; + all = [ + colorthief + colorz + ast-colorthief + haishoku + ]; + }; + meta = { description = "16 colors fork of pywal"; homepage = "https://github.com/eylles/pywal16"; From f313eefa97ba49cf02c4fe4b9e2cdb1330d88568 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 28 Nov 2024 14:10:24 +0800 Subject: [PATCH 4/5] pywal16: add updateScript --- pkgs/by-name/py/pywal16/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index 466475af7006..ec8c8e100e77 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, imagemagick, installShellFiles, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { @@ -50,6 +51,8 @@ python3.pkgs.buildPythonApplication rec { ]; }; + passthru.updateScript = nix-update-script { }; + meta = { description = "16 colors fork of pywal"; homepage = "https://github.com/eylles/pywal16"; From e2317b109f26f822bd92dccc251f64100b27e87f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 1 Dec 2024 00:54:38 +0800 Subject: [PATCH 5/5] pywal16: 3.7.1 -> 3.7.2 Diff: https://github.com/eylles/pywal16/compare/refs/tags/3.7.1...3.7.2 Changelog: https://github.com/eylles/pywal16/blob/refs/tags/3.7.2/CHANGELOG.md --- pkgs/by-name/py/pywal16/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index ec8c8e100e77..0c6a226e806d 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.7.1"; + version = "3.7.2"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; - rev = "refs/tags/${version}"; - hash = "sha256-XDOmpeONPW6b1ZEGk272wwraTLR8PjjniIXm0M9BGU4="; + tag = version; + hash = "sha256-aizuON8Y321i7bF2SuC5UC1iOWHY217ccfzY9WmaevQ="; }; build-system = [ python3.pkgs.setuptools ]; @@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "16 colors fork of pywal"; homepage = "https://github.com/eylles/pywal16"; - changelog = "https://github.com/eylles/pywal16/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/eylles/pywal16/blob/refs/tags/${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "wal";