From 286c8d9eada6e04a83df5a75204d46be3dc4651a Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 27 Feb 2022 18:14:59 +0100 Subject: [PATCH] terminal-life: rename wiki-fetch to wik --- .../{python-wiki-fetch.nix => python-wik.nix} | 15 ++++----- overlays/python-wiki-fetch.patch | 32 ------------------- 2 files changed, 7 insertions(+), 40 deletions(-) rename overlays/{python-wiki-fetch.nix => python-wik.nix} (55%) delete mode 100644 overlays/python-wiki-fetch.patch diff --git a/overlays/python-wiki-fetch.nix b/overlays/python-wik.nix similarity index 55% rename from overlays/python-wiki-fetch.nix rename to overlays/python-wik.nix index fde08eed..e53f705b 100644 --- a/overlays/python-wiki-fetch.nix +++ b/overlays/python-wik.nix @@ -1,13 +1,13 @@ final: prev: with prev.python39Packages; { python-wiki-fetch = buildPythonPackage rec { - pname = "fetch"; - version = "unstable-2022-02-25"; + pname = "wik"; + version = "1.2.0"; src = prev.fetchFromGitHub { owner = "yashsinghcodes"; - repo = "fetch"; - rev = "b946b4d8c9bbe6d62fa8c95ad284e1fc9665caf2"; - sha256 = "sha256-zs32iAEoRudO1dpRQpghmJM94+FF/N13H31Shqqp71Y="; + repo = pname; + rev = "b226c5d80735f419db4d641f80d8a4c99bd826d8"; + sha256 = "sha256-SW0G6sHggVPFZ1NHgMDmdOEjt06xdb5QfxL3fnhQiZs="; }; checkPhase = '' @@ -15,12 +15,11 @@ final: prev: with prev.python39Packages; { ${python.interpreter} test.py ''; + format = "flit"; + propagatedBuildInputs = [ beautifulsoup4 requests - wheel ]; - - patches = ./python-wiki-fetch.patch; }; } diff --git a/overlays/python-wiki-fetch.patch b/overlays/python-wiki-fetch.patch deleted file mode 100644 index 09bb13a4..00000000 --- a/overlays/python-wiki-fetch.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -3,13 +3,6 @@ from os import name, path - from sys import version - import setuptools - --req_pkgs = [ -- 'bs4', -- 'requests', -- 'wheel' --] -- -- - with open("README.md","r") as f: - long_description = f.read() - -@@ -25,7 +18,7 @@ setuptools.setup( - packages = setuptools.find_packages(), - entry_points={ - 'console_scripts': [ -- 'fetch=fetch.fetch:arguments', -+ 'wiki=fetch.fetch:arguments', - ] - }, - python_requires='>=3.*', -@@ -36,6 +29,4 @@ setuptools.setup( - "Development Status :: 5 - Production/Stable", - "Environment :: Console", - ], -- install_requires=req_pkgs, -- setup_requires=req_pkgs, - )