diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-06 12:07:37 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-06 12:07:37 +0200 |
commit | f504af072bc5cf49da008e6970c214255d5f46ed (patch) | |
tree | f2849cd5d239a32d7a2fbdff1dc5b3a0ed369b96 /pkgs/development/python-modules | |
parent | 11ceef47699fb0911bea790e4b8059d97e95ad14 (diff) | |
parent | 6820e2f0dd16104961d6fc7e8e38846807159c4e (diff) | |
download | nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.gz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.bz2 nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.lz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.xz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.zst nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.zip |
Merge branch 'master' into staging-next
There's been some large rebuild on master. I don't really have time ATM to find what it was.
Diffstat (limited to 'pkgs/development/python-modules')
5 files changed, 88 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix new file mode 100644 index 000000000000..0d25d7cdbe98 --- /dev/null +++ b/pkgs/development/python-modules/basiciw/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, gcc +, wirelesstools +, isPy27 +, isPyPy +}: + +buildPythonPackage rec { + pname = "basiciw"; + version = "0.2.2"; + + disabled = isPy27 || isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1ajmflvvlkflrcmqmkrx0zaira84z8kv4ssb2jprfwvjh8vfkysb"; + }; + + buildInputs = [ gcc ]; + propagatedBuildInputs = [ wirelesstools ]; + + meta = { + description = "Get info about wireless interfaces using libiw"; + homepage = https://github.com/enkore/basiciw; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; + }; +} diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix new file mode 100644 index 000000000000..7a17fd0f1d0a --- /dev/null +++ b/pkgs/development/python-modules/beaker/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, mock +, webtest +, sqlalchemy +, pycrypto +, isPy27 +, funcsigs +, pycryptopp +}: + +buildPythonPackage rec { + pname = "Beaker"; + version = "1.8.0"; + + # The pypy release do not contains the tests + src = fetchFromGitHub { + owner = "bbangert"; + repo = "beaker"; + rev = "${version}"; + sha256 = "17yfr7a307n8rdl09was4j60xqk2s0hk0hywdkigrpj4qnw0is7g"; + }; + + buildInputs = + [ nose + mock + webtest + ]; + propagatedBuildInputs = [ + sqlalchemy + pycrypto + ] ++ lib.optionals (isPy27) [ + funcsigs + pycryptopp + ]; + + meta = { + description = "A Session and Caching library with WSGI Middleware"; + maintainers = with lib.maintainers; [ garbas domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index f2066fee2a4a..36f581c98afb 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch # Build dependencies , glibcLocales # Test dependencies @@ -36,6 +37,16 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'gnureadline'" " " ''; + patches = [ + # improve cython support, needed by sage, accepted upstream + # https://github.com/ipython/ipython/pull/11139 + (fetchpatch { + name = "signature-use-inspect.patch"; + url = "https://github.com/ipython/ipython/commit/8d399b98d3ed5c765835594100c4d36fb2f739dc.patch"; + sha256 = "1r7v9clwwbskmj4y160vcj6g0vzqbvnj4y1bm2n4bskafapm42g0"; + }) + ]; + buildInputs = [ glibcLocales ]; checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index ce24fd48dd4b..b8d0c077d664 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "af3a3252bc58f8642a641601ba59096c22e4aa49cdc1ed4b0df2314f4f027f0d"; + sha256 = "00x28z6diw06gakb5isbfha5z2n63yyncv4za303nsgzxvlihmx0"; }; propagatedBuildInputs = [ blessings mozterm six ]; diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix index 358b21893fa6..c7f2b4cbc349 100644 --- a/pkgs/development/python-modules/mozterm/default.nix +++ b/pkgs/development/python-modules/mozterm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six }: buildPythonPackage rec { pname = "mozterm"; @@ -7,6 +7,8 @@ buildPythonPackage rec { # name 'unicode' is not defined disabled = isPy3k; + propagatedBuildInputs = [six]; + src = fetchPypi { inherit pname version; sha256 = "b1e91acec188de07c704dbb7b0100a7be5c1e06567b3beb67f6ea11d00a483a4"; |