From d62a3558843daf869ecd1a608cfba7a7439e1b30 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 14 Jun 2018 10:25:14 +0900 Subject: pythonPackages.wcwith: 0.1.6 -> 0.1.7 --- pkgs/top-level/python-packages.nix | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c694f4d801b..7fe5f9f9ffca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14845,30 +14845,7 @@ EOF imagemagick = pkgs.imagemagickBig; }; - wcwidth = buildPythonPackage rec { - name = "wcwidth-${version}"; - version = "0.1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/wcwidth/${name}.tar.gz"; - sha256 = "02wjrpf001gjdjsaxxbzcwfg19crlk2dbddayrfc2v06f53yrcyw"; - }; - - # Checks fail due to missing tox.ini file: - doCheck = false; - - meta = { - description = "Measures number of Terminal column cells of wide-character codes"; - longDescription = '' - This API is mainly for Terminal Emulator implementors -- any Python - program that attempts to determine the printable width of a string on - a Terminal. It is implemented in python (no C library calls) and has - no 3rd-party dependencies. - ''; - homepage = https://github.com/jquast/wcwidth; - license = licenses.mit; - }; - }; + wcwidth = callPackage ../development/python-modules/wcwidth { }; web = buildPythonPackage rec { version = "0.37"; -- cgit 1.4.1 From 65b15ba6a96760125cc3984893f587af1ffacaac Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 15 Jun 2018 03:42:45 +0900 Subject: pythonPackages.cmd2: keep 0.8 version ...which is the last one with python2 support until ~ august 2018 --- pkgs/development/python-modules/cmd2/old.nix | 49 ++++++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/cmd2/old.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix new file mode 100644 index 000000000000..5ffa51def0d2 --- /dev/null +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchPypi, buildPythonPackage, pythonOlder +, pyperclip, six, pyparsing, vim +, contextlib2 ? null, subprocess32 ? null +, pytest, mock, which, fetchFromGitHub, glibcLocales +}: +buildPythonPackage rec { + pname = "cmd2"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "python-cmd2"; + repo = "cmd2"; + rev = version; + sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; + }; + + LC_ALL="en_US.UTF-8"; + + postPatch = stdenv.lib.optional stdenv.isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + mkdir bin + echo '#/bin/sh' > bin/pbpaste + echo '#/bin/sh' > bin/pbcopy + chmod +x bin/{pbcopy,pbpaste} + export PATH=$(realpath bin):$PATH + ''; + + checkInputs= [ pytest mock which vim glibcLocales ]; + checkPhase = '' + # test_path_completion_user_expansion might be fixed in the next release + py.test -k 'not test_path_completion_user_expansion' + ''; + doCheck = !stdenv.isDarwin; + + propagatedBuildInputs = [ + pyperclip + six + pyparsing + ] + ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 + ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 + ; + + meta = with stdenv.lib; { + description = "Enhancements for standard library's cmd module"; + homepage = https://github.com/python-cmd2/cmd2; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7fe5f9f9ffca..e16bb977fae2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9142,7 +9142,9 @@ in { cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {}; cachetools = callPackage ../development/python-modules/cachetools {}; - cmd2 = callPackage ../development/python-modules/cmd2 {}; + cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {}; + cmd2_9 = callPackage ../development/python-modules/cmd2 {}; + cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9; warlock = buildPythonPackage rec { name = "warlock-${version}"; -- cgit 1.4.1 From de0c67572f25a898e227084562f71d01cbd67b4f Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sun, 15 Jul 2018 15:29:23 +0200 Subject: python.pkgs.vega_datasets: init at 0.5.0 --- .../python-modules/vega_datasets/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/vega_datasets/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix new file mode 100644 index 000000000000..a7b6c6865cca --- /dev/null +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pandas, pytest }: + +buildPythonPackage rec { + pname = "vega_datasets"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fa672ba89ded093b30c6d59fce10aca3ac7c927df254e588da7b6d14f695181"; + }; + + propagatedBuildInputs = [ pandas ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test vega_datasets --doctest-modules + ''; + + meta = with lib; { + description = "A Python package for offline access to vega datasets"; + homepage = https://github.com/altair-viz/vega_datasets; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index add15eaae888..bd9d62c3e632 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14566,6 +14566,8 @@ in { }; }; + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + virtkey = callPackage ../development/python-modules/virtkey { }; virtual-display = callPackage ../development/python-modules/virtual-display { }; -- cgit 1.4.1 From dab1b67f9aacc388332867fb2ee9490828e6ae45 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 15 Jul 2018 11:16:32 -0400 Subject: pythonPackages.aws-adfs: init at 0.12.0 (#43458) --- .../python-modules/aws-adfs/default.nix | 33 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/aws-adfs/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix new file mode 100644 index 000000000000..c42ad6f1d6c9 --- /dev/null +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi +, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: + +buildPythonPackage rec { + version = "0.12.0"; + pname = "aws-adfs"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cjrm61k6905dmhgrqyc5caxx5hbhj3sr6cx4r6sbdyz453i7pc6"; + }; + + # Relax version constraint + patchPhase = '' + sed -i 's/coverage < 4/coverage/' setup.py + ''; + + # Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset + HOME = "."; + + # Required for python3 tests, along with glibcLocales + LC_ALL = "en_US.UTF-8"; + + checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; + propagatedBuildInputs = [ lxml boto3 requests click configparser ]; + + meta = { + description = "Command line tool to ease aws cli authentication against ADFS"; + homepage = https://github.com/venth/aws-adfs; + license = lib.licenses.psfl; + maintainers = [ lib.maintainers.bhipple ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd9d62c3e632..f04e149bac97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -205,6 +205,8 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + # packages defined elsewhere amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; -- cgit 1.4.1 From 4626d0b2556a5cab8f6ff7fd7cd9966a7ab5a36b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 15 Jul 2018 13:42:44 -0500 Subject: gnomecast: init at 1.4.0 also pycaption, required dep. --- pkgs/applications/video/gnomecast/default.nix | 28 +++++++++++++++ .../python-modules/pycaption/default.nix | 41 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 1 + 4 files changed, 72 insertions(+) create mode 100644 pkgs/applications/video/gnomecast/default.nix create mode 100644 pkgs/development/python-modules/pycaption/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix new file mode 100644 index 000000000000..a2faaf39f082 --- /dev/null +++ b/pkgs/applications/video/gnomecast/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, gtk3, gobjectIntrospection, ffmpeg, wrapGAppsHook }: + +with python3Packages; +buildPythonApplication rec { + pname = "gnomecast"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "17hxqpisw6j6caw6bzp0wd0p3idqy6a78wwwk8kms6hpxasirwyk"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = [ + PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python + gtk3 gobjectIntrospection + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) + ''; + + meta = with lib; { + description = "A native Linux GUI for Chromecasting local files"; + homepage = https://github.com/keredson/gnomecast; + license = with licenses; [ gpl3 ]; + }; +} diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix new file mode 100644 index 000000000000..845630e514fa --- /dev/null +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchpatch +, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +, beautifulsoup4, lxml, cssutils, future, enum34, six +}: + +buildPythonPackage rec { + pname = "pycaption"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f2hx9ky65c4niws3x5yx59yi8mqqrw9b2cghd220g4hj9yl800h"; + }; + + disabled = !isPy3k; + + prePatch = '' + substituteInPlace setup.py \ + --replace 'beautifulsoup4>=4.2.1,<4.5.0' \ + 'beautifulsoup4>=4.2.1,<=4.6.0' + ''; + + # don't require enum34 on python >= 3.4 + patches = [ + (fetchpatch { + url = "https://github.com/pbs/pycaption/pull/161.patch"; + sha256 = "0p58awpsqx1qc3x9zfl1gd85h1nk7204lzn4kglsgh1bka0j237j"; + }) + ]; + + propagatedBuildInputs = [ beautifulsoup4 lxml cssutils future enum34 six ]; + + # Tests not included in pypi (?) + doCheck = false; + + meta = with lib; { + description = "Closed caption converter"; + homepage = https://github.com/pbs/pycaption; + license = with licenses; [ asl20 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc216ac311c9..c98815169aeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16490,6 +16490,8 @@ with pkgs; gmtp = callPackage ../applications/misc/gmtp {}; + gnomecast = callPackage ../applications/video/gnomecast { }; + gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f04e149bac97..c7b0e838ae6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10376,6 +10376,7 @@ in { }; }; + pycaption = callPackage ../development/python-modules/pycaption { }; pycdio = buildPythonPackage rec { name = "pycdio-2.0.0"; -- cgit 1.4.1