From 9295ffbf8edc76c777146b6d1b65d75118f2103b Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 13 Dec 2018 03:01:45 +0000 Subject: [PATCH 1/4] pythonPackages.namedlist: init at 1.7 --- .../python-modules/namedlist/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/namedlist/default.nix diff --git a/pkgs/development/python-modules/namedlist/default.nix b/pkgs/development/python-modules/namedlist/default.nix new file mode 100644 index 000000000000..ae07076bb057 --- /dev/null +++ b/pkgs/development/python-modules/namedlist/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "namedlist"; + version = "1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "11n9c4a5ak9971awkf1g92m6mcmiprhrw98ik2cmjsqxmz73j2qr"; + }; + + # Test file has a `unittest.main()` at the bottom that fails the tests; + # py.test can run the tests without it. + postPatch = '' + substituteInPlace test/test_namedlist.py --replace "unittest.main()" "" + ''; + + checkInputs = [ pytest ]; + checkPhase = '' + py.test + ''; + + meta = { + description = "Similar to namedtuple, but instances are mutable"; + homepage = https://bitbucket.org/ericvsmith/namedlist; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ivan ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9ecf9495e17..2586ca756f0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3076,6 +3076,8 @@ in { namebench = callPackage ../development/python-modules/namebench { }; + namedlist = callPackage ../development/python-modules/namedlist { }; + nameparser = callPackage ../development/python-modules/nameparser { }; nbconvert = callPackage ../development/python-modules/nbconvert { }; From 33b906bacfb97182879e98bf9d8884a806c87d56 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 13 Dec 2018 06:53:44 +0000 Subject: [PATCH 2/4] pythonPackages.ludios_wpull: init at 3.0.7 --- .../python-modules/ludios_wpull/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/ludios_wpull/default.nix diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix new file mode 100644 index 000000000000..1c707b320310 --- /dev/null +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, chardet +, dnspython +, html5-parser +, lxml +, namedlist +, sqlalchemy +, tornado_4 +, Yapsy +}: + +buildPythonPackage rec { + pname = "ludios_wpull"; + version = "3.0.7"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + rev = "${version}"; + owner = "ludios"; + repo = "wpull"; + sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf"; + }; + + propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado_4 Yapsy ]; + + # Test suite has tests that fail on all platforms + doCheck = false; + + meta = { + description = "Web crawler; fork of wpull used by grab-site"; + homepage = https://github.com/ludios/wpull; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ivan ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2586ca756f0e..4a0fea0b4f32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1872,6 +1872,8 @@ in { lpod = callPackage ../development/python-modules/lpod { }; + ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; + luftdaten = callPackage ../development/python-modules/luftdaten { }; m2r = callPackage ../development/python-modules/m2r { }; From cb3e6e72b9f6d5427b8f757df23c9d00c6521e6f Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 13 Dec 2018 10:48:18 +0000 Subject: [PATCH 3/4] pythonPackages.fb-re2: init at 1.0.6 --- .../python-modules/fb-re2/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/fb-re2/default.nix diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix new file mode 100644 index 000000000000..88a75d29fd18 --- /dev/null +++ b/pkgs/development/python-modules/fb-re2/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, re2 +, pytest +}: + +buildPythonPackage rec { + pname = "fb-re2"; + version = "1.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wd97qdcafcca90s6692g2dmzl5n6cdvm20vn7pmag3l9gvx395c"; + }; + + buildInputs = [ re2 ]; + + checkInputs = [ pytest ]; + checkPhase = '' + py.test + ''; + + meta = { + description = "Python wrapper for Google's RE2"; + homepage = https://github.com/facebook/pyre2; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ivan ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a0fea0b4f32..8020cf2fb898 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1671,6 +1671,8 @@ in { then callPackage ../development/python-modules/faulthandler {} else throw "faulthandler is built into ${python.executable}"; + fb-re2 = callPackage ../development/python-modules/fb-re2 { }; + flit = callPackage ../development/python-modules/flit { }; flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; From 66f59ee1ad3707fb25078f2f68e5b359eef98a6b Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Fri, 14 Dec 2018 02:20:17 +0000 Subject: [PATCH 4/4] grab-site: init at 2.1.11 --- pkgs/tools/backup/grab-site/default.nix | 30 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/backup/grab-site/default.nix diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix new file mode 100644 index 000000000000..7209afd8e7ed --- /dev/null +++ b/pkgs/tools/backup/grab-site/default.nix @@ -0,0 +1,30 @@ +{ stdenv, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + version = "2.1.11"; + name = "grab-site-${version}"; + + src = fetchFromGitHub { + rev = "${version}"; + owner = "ludios"; + repo = "grab-site"; + sha256 = "0w24ngr2b7nipqiwkxpql2467b5aq2vbknkb0sry6a457kb5ppsl"; + }; + + propagatedBuildInputs = with python3Packages; [ + click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet + ]; + + checkPhase = '' + export PATH=$PATH:$out/bin + bash ./tests/offline-tests + ''; + + meta = with stdenv.lib; { + description = "Crawler for web archiving with WARC output"; + homepage = https://github.com/ludios/grab-site; + license = licenses.mit; + maintainers = with maintainers; [ ivan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 209a90a16017..3e392af3f650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10004,6 +10004,8 @@ in gperftools = callPackage ../development/libraries/gperftools { }; + grab-site = callPackage ../tools/backup/grab-site { }; + grib-api = callPackage ../development/libraries/grib-api { }; grpc = callPackage ../development/libraries/grpc { };