From 99dad9d7f01429f03054d45da8a6468fca0f8793 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 11 Sep 2018 23:51:25 +0200 Subject: [PATCH 1/6] python.pkgs.requests-file: init at 1.4.3 --- .../python-modules/requests-file/default.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/requests-file/default.nix diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix new file mode 100644 index 00000000000..fac22217651 --- /dev/null +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchPypi, buildPythonPackage, requests, six }: + +buildPythonPackage rec { + pname = "requests-file"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yp2jaxg3v86pia0q512dg3hz6s9y5vzdivsgrba1kds05ial14g"; + }; + + propagatedBuildInputs = [ requests six ]; + + meta = { + homepage = https://github.com/dashea/requests-file; + description = "Transport adapter for fetching file:// URLs with the requests python library"; + license = lib.licenses.asl20; + }; + +} From e281f0e68631af7c1ff6e20f1b84683a117b016d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 11 Sep 2018 23:51:50 +0200 Subject: [PATCH 2/6] python.pkgs.tldextract: init at 2.2.0 --- .../python-modules/tldextract/default.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/tldextract/default.nix diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix new file mode 100644 index 00000000000..4e494244d31 --- /dev/null +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage +, requests, requests-file, idna, pytest +, responses +}: + +buildPythonPackage rec { + pname = "tldextract"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d5s8v6kpsgazyahflhji1cfdcf89rv7l7z55v774bhzvcjp2y99"; + }; + + propagatedBuildInputs = [ requests requests-file idna ]; + checkInputs = [ pytest responses ]; + + meta = { + homepage = https://github.com/john-kurkowski/tldextract; + description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List."; + license = lib.licenses.bsd3; + }; + +} From 75b2058aff6bfa56024439edfc7edaf5c3e7a551 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 12 Sep 2018 01:26:25 +0200 Subject: [PATCH 3/6] python.pkgs.pyreadability: init at 0.4.0 --- .../python-modules/pyreadability/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/pyreadability/default.nix diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix new file mode 100644 index 00000000000..a95074b906e --- /dev/null +++ b/pkgs/development/python-modules/pyreadability/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage +, requests, chardet, cssselect, lxml +, pytest +}: + +buildPythonPackage rec { + pname = "PyReadability"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k6fq416pdmjcdqh6gdxl0y0k8kj1zlpzwp5574xsvsha18p2zpn"; + }; + + propagatedBuildInputs = [ requests chardet cssselect lxml ]; + + # ModuleNotFoundError: No module named 'tests' + doCheck = false; + + meta = { + homepage = https://github.com/hyperlinkapp/python-readability; + description = "fast python port of arc90's readability tool, updated to match latest readability.js!"; + license = lib.licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ca55835abf..ed12cf2e17b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2000,6 +2000,8 @@ in { requests-cache = callPackage ../development/python-modules/requests-cache { }; + requests-file = callPackage ../development/python-modules/requests-file { }; + requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; @@ -11141,6 +11143,8 @@ in { }; }); + pyreadability = callPackage ../development/python-modules/pyreadability { }; + pyscss = buildPythonPackage rec { name = "pyScss-${version}"; version = "1.3.5"; @@ -17071,6 +17075,8 @@ EOF textacy = callPackage ../development/python-modules/textacy { }; + tldextract = callPackage ../development/python-modules/tldextract { }; + pyemd = callPackage ../development/python-modules/pyemd { }; pulp = callPackage ../development/python-modules/pulp { }; From dca577a36c4f90cf31de804ce9fb4e6a1aab259e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 12 Sep 2018 01:42:17 +0200 Subject: [PATCH 4/6] python.pkgs.pykeepass: init at 3.0.2 --- .../python-modules/pykeepass/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/pykeepass/default.nix diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix new file mode 100644 index 00000000000..68c35ed0df1 --- /dev/null +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage +, lxml, pycryptodome, construct +, argon2_cffi, dateutil, enum34 +}: + +buildPythonPackage rec { + pname = "pykeepass"; + version = "3.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kfnh42nimsbdpwpny2c9df82b2n4fb5fagh54ck06f3x483vd90"; + }; + + propagatedBuildInputs = [ + lxml pycryptodome construct + argon2_cffi dateutil enum34 + ]; + + meta = { + homepage = https://github.com/pschmitt/pykeepass; + description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; + license = lib.licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed12cf2e17b..54384028abd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -467,6 +467,8 @@ in { pykerberos = callPackage ../development/python-modules/pykerberos { }; + pykeepass = callPackage ../development/python-modules/pykeepass { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; From d117e3ccd8f8e3944d3e2777c06626e5c834a0e1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 12 Sep 2018 03:18:37 +0200 Subject: [PATCH 5/6] python.pkgs.construct: 2.8.16 -> 2.9.45 --- .../python-modules/construct/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 680f6e02cd0..f8e739f0bc7 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,23 +1,26 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, six, pytest, arrow +}: buildPythonPackage rec { - pname = "construct"; - version = "2.8.16"; - name = pname + "-" + version; + pname = "construct"; + version = "2.9.45"; src = fetchFromGitHub { - owner = "construct"; - repo = "construct"; - rev = "v${version}"; - sha256 = "0lzz1dy419n254qccch7yx4nkpwd0fsyjhnsnaf6ysgwzqxxv63j"; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0ig66xrzswpkhhmw123p2nvr15a9lxz54a1fmycfdh09327c1d3y"; }; propagatedBuildInputs = [ six ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest arrow ]; + # TODO: figure out missing dependencies + doCheck = false; checkPhase = '' - py.test -k 'not test_numpy' tests + py.test -k 'not test_numpy and not test_gallery' tests ''; meta = with stdenv.lib; { From cf2603f144b86201635867c7e19f41fd965b382c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 12 Sep 2018 02:41:03 +0200 Subject: [PATCH 6/6] qutebrowser: patch all python scripts --- .../browsers/qutebrowser/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index b4932ee0f1b..b71eea79155 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -55,6 +55,9 @@ in python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs + # scripts and userscripts libs + tldextract beautifulsoup4 + pyreadability pykeepass stem ]; postPatch = '' @@ -81,15 +84,15 @@ in python3Packages.buildPythonApplication rec { "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" # Install scripts - sed -i "s,/usr/bin/qutebrowser,$out/bin/qutebrowser,g" scripts/open_url_in_instance.sh - install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/open_url_in_instance.sh + sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh + install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* - # Install and patch python scripts + # Patch python scripts buildPythonPath "$out $propagatedBuildInputs" - for i in importer dictcli keytester utils; do - install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/$i.py - patchPythonScript "$out/share/qutebrowser/scripts/$i.py" + scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/) + for i in $scripts; do + patchPythonScript "$i" done ''; @@ -97,10 +100,10 @@ in python3Packages.buildPythonApplication rec { wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit" ''; - meta = { - homepage = https://github.com/The-Compiler/qutebrowser; + meta = with stdenv.lib; { + homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jagajaga rnhmjoj ]; }; }