public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into closure-size

Browse Source 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
This commit is contained in:
Vladimír Čunát
2016-04-10 11:17:52 +02:00
parent 50fccad582 2463e09173
commit 30f14243c3
344 changed files with 58220 additions and 29215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/python-modules/cgkit/scons-env.patch Normal file
View File

@@ -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)

63
pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch
View File

@@ -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 &lt;stdio.h&gt;</span>"""
+ expected_expr = ("""<span class="cp">#include</span> """
+ """<span class="cpf">&lt;stdio.h&gt;</span>""")
yield assert_count(expected_expr, result, 1)
# doctest block should not be translated but be highlighted
expected_expr = (
"""<span class="gp">&gt;&gt;&gt; </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 &lt;STDIO.H&gt;</span>"""
+ expected_expr = ("""<span class="cp">#include</span> """
+ """<span class="cpf">&lt;STDIO.H&gt;</span>""")
yield assert_count(expected_expr, result, 1)
# doctest block should not be translated but be highlighted
expected_expr = (
"""<span class="gp">&gt;&gt;&gt; </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

23
pkgs/development/python-modules/yolk/default.nix Normal file
View File

@@ -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;
};
}