diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /pkgs/development/python-modules | |
parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/development/python-modules')
3 files changed, 45 insertions, 63 deletions
diff --git a/pkgs/development/python-modules/cgkit/scons-env.patch b/pkgs/development/python-modules/cgkit/scons-env.patch new file mode 100644 index 000000000000..65e9d58a0ae4 --- /dev/null +++ b/pkgs/development/python-modules/cgkit/scons-env.patch @@ -0,0 +1,22 @@ +diff --git a/supportlib/SConstruct b/supportlib/SConstruct +index 7f797b9..07907e9 100644 +--- a/supportlib/SConstruct ++++ b/supportlib/SConstruct +@@ -5,7 +5,7 @@ + # library. + ###################################################################### + +-import sys, glob, os.path ++import sys, glob, os.path, os + + # Read the options + vars = Variables("cpp_config.cfg") +@@ -16,7 +16,7 @@ vars.Add("CPPPATH", "The include directories", []) + vars.Add("MSVS_VERSION", "The preferred version of MS Visual Studio") + + # Create the construction environment +-env = Environment(variables = vars) ++env = Environment(variables = vars, ENV = os.environ) + + # Build the files in "obj" + env.VariantDir("obj", "src", duplicate=0) diff --git a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch deleted file mode 100644 index 5aa4af873cd5..000000000000 --- a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5574aba60ed76f2bae947722122ac4d71ab8ed5a Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA <i.tkomiya@gmail.com> -Date: Mon, 18 Jan 2016 12:38:02 +0900 -Subject: [PATCH] Fix tests are broken with pygments-2.1 - ---- - tests/test_build_html.py | 2 +- - tests/test_intl.py | 10 ++++++---- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/tests/test_build_html.py b/tests/test_build_html.py -index e330761..17ea089 100644 ---- a/tests/test_build_html.py -+++ b/tests/test_build_html.py -@@ -82,7 +82,7 @@ def checker(nodes): - (".//a[@href='_downloads/img1.png']", ''), - (".//pre", u'"quotes"'), - (".//pre", u"'included'"), -- (".//pre/span[@class='s']", u'üöä'), -+ (".//pre/span[@class='s2']", u'üöä'), - (".//div[@class='inc-pyobj1 highlight-text']//pre", - r'^class Foo:\n pass\n\s*$'), - (".//div[@class='inc-pyobj2 highlight-text']//pre", -diff --git a/tests/test_intl.py b/tests/test_intl.py -index 4c665d4..b24ec65 100644 ---- a/tests/test_intl.py -+++ b/tests/test_intl.py -@@ -694,14 +694,15 @@ def test_additional_targets_should_not_be_translated(app, status, warning): - yield assert_count(expected_expr, result, 1) - - # C code block with lang should not be translated but be *C* highlighted -- expected_expr = """<span class="cp">#include <stdio.h></span>""" -+ expected_expr = ("""<span class="cp">#include</span> """ -+ """<span class="cpf"><stdio.h></span>""") - yield assert_count(expected_expr, result, 1) - - # doctest block should not be translated but be highlighted - expected_expr = ( - """<span class="gp">>>> </span>""" - """<span class="kn">import</span> <span class="nn">sys</span> """ -- """<span class="c"># sys importing</span>""") -+ """<span class="c1"># sys importing</span>""") - yield assert_count(expected_expr, result, 1) - - ## raw.txt -@@ -754,14 +755,15 @@ def test_additional_targets_should_be_translated(app, status, warning): - yield assert_count(expected_expr, result, 1) - - # C code block with lang should be translated and be *C* highlighted -- expected_expr = """<span class="cp">#include <STDIO.H></span>""" -+ expected_expr = ("""<span class="cp">#include</span> """ -+ """<span class="cpf"><STDIO.H></span>""") - yield assert_count(expected_expr, result, 1) - - # doctest block should not be translated but be highlighted - expected_expr = ( - """<span class="gp">>>> </span>""" - """<span class="kn">import</span> <span class="nn">sys</span> """ -- """<span class="c"># SYS IMPORTING</span>""") -+ """<span class="c1"># SYS IMPORTING</span>""") - yield assert_count(expected_expr, result, 1) - - ## raw.txt diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix new file mode 100644 index 000000000000..7cfcb1e0f0d0 --- /dev/null +++ b/pkgs/development/python-modules/yolk/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildPythonApplication, pythonPackages }: + +with lib; + +buildPythonApplication rec { + name = "yolk-${version}"; + version = "0.4.3"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/y/yolk/yolk-${version}.tar.gz"; + sha256 = "1f6xwx210jnl5nq0m3agh2p1cxmaizawaf3fwq43q4yw050fn1qw"; + }; + + buildInputs = with pythonPackages; [ nose ]; + + meta = { + description = "Command-line tool for querying PyPI and Python packages installed on your system"; + homepage = "https://github.com/cakebread/yolk"; + maintainer = with maintainers; [ profpatsch ]; + license = licenses.bsd3; + }; +} + |