From 0dccca9517ba1e0e0c8c97feb1cb8964714bcbe2 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 11 Apr 2020 00:26:06 -0400 Subject: [PATCH 1/4] maintainers: add glittershark --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b59199bc767..4fe586f5d92 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2804,6 +2804,16 @@ githubId = 615606; name = "Glenn Searby"; }; + glittershark = { + name = "Griffin Smith"; + email = "root@gws.fyi"; + github = "glittershark"; + githubId = 1481027; + keys = [{ + longkeyid = "rsa2048/0x44EF5B5E861C09A7"; + fingerprint = "0F11 A989 879E 8BBB FDC1 E236 44EF 5B5E 861C 09A7"; + }]; + }; gloaming = { email = "ch9871@gmail.com"; github = "gloaming"; From a48804d24b5b42277c23dcb75e13f00c57dfe3dd Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 11 Apr 2020 00:31:25 -0400 Subject: [PATCH 2/4] pythonPackages.aadict: init at 0.2.3 --- .../python-modules/aadict/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/aadict/default.nix diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix new file mode 100644 index 00000000000..2587260748f --- /dev/null +++ b/pkgs/development/python-modules/aadict/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, nose +, coverage +}: + +buildPythonPackage rec { + pname = "aadict"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "013pn9ii6mkql6khgdvsd1gi7zmya418fhclm5fp7dfvann2hwx7"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ nose coverage ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/metagriffin/aadict"; + description = "An auto-attribute dict (and a couple of other useful dict functions)."; + maintainers = with maintainers; [ glittershark ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b467ac52388..e0b7f1485d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -134,6 +134,8 @@ in { pynamodb = callPackage ../development/python-modules/pynamodb { }; + aadict = callPackage ../development/python-modules/aadict { }; + absl-py = callPackage ../development/python-modules/absl-py { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; From 58ee17a508c615184e54eb978df40118d4b945c8 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 11 Apr 2020 00:52:58 -0400 Subject: [PATCH 3/4] pythonPackages.globre: init at 0.1.5 Disabled this on python >= 3.7, since the test suite fails, though I'm sure if someone else wants it on a new python version the test suite could be fixed. --- .../python-modules/globre/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/globre/default.nix diff --git a/pkgs/development/python-modules/globre/default.nix b/pkgs/development/python-modules/globre/default.nix new file mode 100644 index 00000000000..ff2302f5467 --- /dev/null +++ b/pkgs/development/python-modules/globre/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, pythonAtLeast +, buildPythonPackage +, fetchPypi +, nose +, coverage +}: + +buildPythonPackage rec { + pname = "globre"; + version = "0.1.5"; + # https://github.com/metagriffin/globre/issues/7 + disabled = pythonAtLeast "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qhjpg0722871dm5m7mmldf6c7mx58fbdvk1ix5i3s9py82448gf"; + }; + + checkInputs = [ nose coverage ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/metagriffin/globre"; + description = "A python glob-like regular expression generation library."; + maintainers = with maintainers; [ glittershark ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0b7f1485d9..f66de2e9b58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -741,6 +741,8 @@ in { glob2 = callPackage ../development/python-modules/glob2 { }; + globre = callPackage ../development/python-modules/globre { }; + glom = callPackage ../development/python-modules/glom { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; From e1024031bb3d920df7a86973dad9f8e0da9d53bf Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 11 Apr 2020 01:11:11 -0400 Subject: [PATCH 4/4] pythonPackages.pxml: init at 0.2.13 --- .../python-modules/pxml/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pxml/default.nix diff --git a/pkgs/development/python-modules/pxml/default.nix b/pkgs/development/python-modules/pxml/default.nix new file mode 100644 index 00000000000..229b174adec --- /dev/null +++ b/pkgs/development/python-modules/pxml/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, pythonAtLeast +, isPy27 +, buildPythonPackage +, fetchPypi +, blessings +, six +, nose +, coverage +}: + +buildPythonPackage rec { + pname = "pxml"; + version = "0.2.13"; + disabled = pythonAtLeast "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c9zzfv6ciyf9qm7556wil45xxgykg1cj8isp1b88gimwcb2hxg4"; + }; + + propagatedBuildInputs = [ blessings six ]; + checkInputs = [ nose coverage ]; + + # test_prefixedWhitespace fails due to a python3 StringIO issue requiring + # bytes rather than str + checkPhase = '' + nosetests -e 'test_prefixedWhitespace' + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/metagriffin/pxml"; + description = ''A python library and command-line tool to "prettify" and colorize XML.''; + maintainers = with maintainers; [ glittershark ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f66de2e9b58..e3fb152f0a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3231,6 +3231,8 @@ in { inherit (pkgs) lzo; }; + pxml = callPackage ../development/python-modules/pxml { }; + junos-eznc = callPackage ../development/python-modules/junos-eznc {}; raven = callPackage ../development/python-modules/raven { };