From f5014e47feea55c2b15af3570c5e9df54e3c8263 Mon Sep 17 00:00:00 2001 From: ayazhafiz Date: Sun, 31 Oct 2021 21:43:56 -0400 Subject: [PATCH 1/6] wheel-filename: init at 1.3.0 --- .../python-modules/wheel-filename/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/wheel-filename/default.nix diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix new file mode 100644 index 000000000000..d1db6af025c9 --- /dev/null +++ b/pkgs/development/python-modules/wheel-filename/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchurl +, attrs +}: + +buildPythonPackage rec { + pname = "wheel-filename"; + version = "1.3.0"; + format = "wheel"; + + src = fetchurl { + url = "https://github.com/jwodder/wheel-filename/releases/download/v1.1.0/wheel_filename-1.1.0-py3-none-any.whl"; + sha256 = "0aee45553f34e3a1b8a5db64aa832326f13c138b7f925a53daf96f984f9e6a38"; + }; + + buildInputs = [ + attrs + ]; + + meta = with lib; { + homepage = "https://github.com/jwodder/wheel-filename"; + description = "Parse wheel filenames"; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 319b83c1e52b..240da76ca4fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9793,6 +9793,8 @@ in { wheel = callPackage ../development/python-modules/wheel { }; + wheel-filename = callPackage ../development/python-modules/wheel-filename { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; whirlpool-sixth-sense = callPackage ../development/python-modules/whirlpool-sixth-sense { }; From 97452c285cb2b36455ca37dd101cc33d12f24b4e Mon Sep 17 00:00:00 2001 From: ayazhafiz Date: Sun, 31 Oct 2021 21:44:39 -0400 Subject: [PATCH 2/6] headerparser: init at 0.4.0 --- .../python-modules/headerparser/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/headerparser/default.nix diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix new file mode 100644 index 000000000000..8e7ddbb0c2c9 --- /dev/null +++ b/pkgs/development/python-modules/headerparser/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, entry-points-txt +, six +}: + +buildPythonPackage rec { + pname = "headerparser"; + version = "0.4.0"; + + src = fetchPypi{ + inherit pname; + inherit version; + sha256 = "b8ceae4c5e6133fda666d022684e93f9b3d45815c2c7881018123c71ff28c5cc"; + }; + + buildInputs = [ + six + ]; + + meta = with lib; { + homepage = "https://github.com/jwodder/headerparser"; + description = "argparse for mail-style headers"; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 240da76ca4fb..d0416bf6b367 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3434,6 +3434,8 @@ in { hdmedians = callPackage ../development/python-modules/hdmedians { }; + headerparser = callPackage ../development/python-modules/headerparser { }; + heapdict = callPackage ../development/python-modules/heapdict { }; helpdev = callPackage ../development/python-modules/helpdev { }; From a5fbf1487adcd2c1171bb4d0da17898381d01234 Mon Sep 17 00:00:00 2001 From: ayazhafiz Date: Sun, 31 Oct 2021 21:45:08 -0400 Subject: [PATCH 3/6] entry-points-txt: init at 0.1.0 --- .../entry-points-txt/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/entry-points-txt/default.nix diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix new file mode 100644 index 000000000000..04fc2cd0b7b3 --- /dev/null +++ b/pkgs/development/python-modules/entry-points-txt/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchurl +}: + +buildPythonPackage rec { + pname = "entry-points-txt"; + version = "0.1.0"; + format = "wheel"; + + src = fetchurl { + url = "https://github.com/jwodder/entry-points-txt/releases/download/v0.1.0/entry_points_txt-0.1.0-py3-none-any.whl"; + sha256 = "29773bed3d9d337766a394e19d6f7ab0be3ed7d6f3ebb753ff0f7f48f056aa8e"; + }; + + meta = with lib; { + homepage = "https://github.com/jwodder/entry-points-txt"; + description = "Read & write entry_points.txt files"; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0416bf6b367..e3c2b6b80ba0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2434,6 +2434,8 @@ in { routerFeatures = true; }; + entry-points-txt = callPackage ../development/python-modules/entry-points-txt { }; + entrypoint2 = callPackage ../development/python-modules/entrypoint2 { }; entrypoints = callPackage ../development/python-modules/entrypoints { }; From 5ce67c6a9b63cc64a048789453b44e6c57501ddd Mon Sep 17 00:00:00 2001 From: ayazhafiz Date: Sun, 31 Oct 2021 21:45:41 -0400 Subject: [PATCH 4/6] wheel-inspect: init at 1.7.0 wheel-inspect has a dependency on readme_renderer~=24.0.0, but the version of readme_renderer in nixpkgs is at major 29 (currently). To deal with this, we build a readme_renderer version at 24 inline with the wheel-inspect derivation. --- .../python-modules/wheel-inspect/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/wheel-inspect/default.nix diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix new file mode 100644 index 000000000000..c5ee6a72c39c --- /dev/null +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchurl +, bleach, docutils, pygments, six +, attrs, entry-points-txt, headerparser, packaging, wheel-filename +}: + +# wheel-filename is stuck on readme_renderer~=24.0.0, but the upstream is at a +# future version. +let readme_renderer_24 = buildPythonPackage rec { + pname = "readme_renderer"; + version = "24.0.0"; + format = "wheel"; + + src = fetchurl { + url = "https://files.pythonhosted.org/packages/c3/7e/d1aae793900f36b097cbfcc5e70eef82b5b56423a6c52a36dce51fedd8f0/readme_renderer-24.0-py2.py3-none-any.whl"; + sha256 = "c8532b79afc0375a85f10433eca157d6b50f7d6990f337fa498c96cd4bfc203d"; + }; + + doCheck = false; + + buildInputs = [ + bleach + docutils + pygments + six + ]; + + meta = with lib; { + description = "Python library for rendering readme descriptions"; + homepage = "https://github.com/pypa/readme_renderer"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +}; + +in buildPythonPackage rec { + version = "1.7.0"; + pname = "wheel-inspect"; + format = "wheel"; + + src = fetchurl { + url = "https://github.com/jwodder/wheel-inspect/releases/download/v1.7.0/wheel_inspect-1.7.0-py3-none-any.whl"; + sha256 = "69b34de1f4464ddfc76280c4563e4afc644de2c88e3ae6882f030afdad3d73e4"; + }; + + propagatedBuildInputs = [ + attrs + bleach + docutils + entry-points-txt + headerparser + packaging + pygments + readme_renderer_24 + wheel-filename + ]; + + meta = with lib; { + homepage = "https://github.com/jwodder/wheel-inspect"; + description = "Extract information from wheels"; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3c2b6b80ba0..430e4c9b7fea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9799,6 +9799,8 @@ in { wheel-filename = callPackage ../development/python-modules/wheel-filename { }; + wheel-inspect = callPackage ../development/python-modules/wheel-inspect { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; whirlpool-sixth-sense = callPackage ../development/python-modules/whirlpool-sixth-sense { }; From c6e744c9f2dc2dc6f181235bb1286dfae11e8759 Mon Sep 17 00:00:00 2001 From: ayazhafiz Date: Sun, 31 Oct 2021 22:01:54 -0400 Subject: [PATCH 5/6] maintainers: add ayazhafiz --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f1fb6baea38a..2b0154dc530b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1151,6 +1151,12 @@ githubId = 56650223; name = "Artturi N"; }; + ayazhafiz = { + email = "ayaz.hafiz.1@gmail.com"; + github = "ayazhafiz"; + githubId = 262763; + name = "Ayaz Hafiz"; + }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; From 7bc749e0640d5a3d8b4b7122ace4a3e4980af7a0 Mon Sep 17 00:00:00 2001 From: ayazhafiz Date: Sun, 31 Oct 2021 22:02:28 -0400 Subject: [PATCH 6/6] maintainers: add ayazhafiz to entry-points-txt, headerparser, wheel-filename, wheel-inspect --- pkgs/development/python-modules/entry-points-txt/default.nix | 1 + pkgs/development/python-modules/headerparser/default.nix | 1 + pkgs/development/python-modules/wheel-filename/default.nix | 1 + pkgs/development/python-modules/wheel-inspect/default.nix | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix index 04fc2cd0b7b3..d52e9ea0d3be 100644 --- a/pkgs/development/python-modules/entry-points-txt/default.nix +++ b/pkgs/development/python-modules/entry-points-txt/default.nix @@ -17,5 +17,6 @@ buildPythonPackage rec { homepage = "https://github.com/jwodder/entry-points-txt"; description = "Read & write entry_points.txt files"; license = with licenses; [ mit ]; + maintainers = with lib.maintainers; [ ayazhafiz ]; }; } diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix index 8e7ddbb0c2c9..3ad265c217f7 100644 --- a/pkgs/development/python-modules/headerparser/default.nix +++ b/pkgs/development/python-modules/headerparser/default.nix @@ -23,5 +23,6 @@ buildPythonPackage rec { homepage = "https://github.com/jwodder/headerparser"; description = "argparse for mail-style headers"; license = with licenses; [ mit ]; + maintainers = with lib.maintainers; [ ayazhafiz ]; }; } diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix index d1db6af025c9..351bc86686a3 100644 --- a/pkgs/development/python-modules/wheel-filename/default.nix +++ b/pkgs/development/python-modules/wheel-filename/default.nix @@ -22,5 +22,6 @@ buildPythonPackage rec { homepage = "https://github.com/jwodder/wheel-filename"; description = "Parse wheel filenames"; license = with licenses; [ mit ]; + maintainers = with lib.maintainers; [ ayazhafiz ]; }; } diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index c5ee6a72c39c..88fd592da8fb 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -30,7 +30,7 @@ let readme_renderer_24 = buildPythonPackage rec { description = "Python library for rendering readme descriptions"; homepage = "https://github.com/pypa/readme_renderer"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + maintainers = with lib.maintainers; [ ayazhafiz ]; }; }; @@ -60,5 +60,6 @@ in buildPythonPackage rec { homepage = "https://github.com/jwodder/wheel-inspect"; description = "Extract information from wheels"; license = with licenses; [ mit ]; + maintainers = with lib.maintainers; [ ayazhafiz ]; }; }