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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-11-12 19:01:36 +01:00
parent 3fd80c6215 daf3297cb4
commit 3b052406ea
143 changed files with 1836 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/development/python-modules/docker_compose/default.nix
View File

@@ -1,47 +0,0 @@
{ stdenv, buildPythonApplication, fetchPypi, pythonOlder
, mock, pytest, nose
, pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests
, six, texttable, websocket_client, cached-property
, enum34, functools32,
}:
buildPythonApplication rec {
version = "1.23.1";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
sha256 = "15jijx3md70b9xw8818xjm70nr9pc27p7v7is0yi6agf8scvvqkq";
};
# lots of networking and other fails
doCheck = false;
checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [
pyyaml backports_ssl_match_hostname colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client
docopt cached-property
] ++
stdenv.lib.optional (pythonOlder "3.4") enum34 ++
stdenv.lib.optional (pythonOlder "3.2") functools32;
postPatch = ''
# Remove upper bound on requires, see also
# https://github.com/docker/compose/issues/4431
sed -i "s/, < .*',$/',/" setup.py
'';
postInstall = ''
mkdir -p $out/share/bash-completion/completions/
cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose
'';
meta = with stdenv.lib; {
homepage = https://docs.docker.com/compose/;
description = "Multi-container orchestration for Docker";
license = licenses.asl20;
maintainers = with maintainers; [
jgeerds
];
};
}

25
pkgs/development/python-modules/dpath/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchPypi, buildPythonPackage
, mock, nose
}:
buildPythonPackage rec {
pname = "dpath";
version = "1.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "0gr7816pnzbyh9h1ia0qz0q1f9zfzacwb8dc36js8hw8x14myqqg";
};
checkInputs = [ mock nose ];
checkPhase = ''
nosetests
'';
meta = with stdenv.lib; {
homepage = https://github.com/akesterson/dpath-python;
license = [ licenses.mit ];
description = "A python library for accessing and searching dictionaries via /slashed/paths ala xpath";
maintainers = [ maintainers.mmlb ];
};
}

14
pkgs/development/python-modules/homeassistant-pyozw/default.nix Normal file
View File

@@ -0,0 +1,14 @@
{ python_openzwave, fetchPypi }:
python_openzwave.overridePythonAttrs (oldAttrs: rec {
pname = "homeassistant_pyozw";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "bca4062906f65db9b4668388e6755d6ea3ee9e1b02ad3ed81738bb4d32a79342";
};
meta.homepage = https://github.com/home-assistant/python-openzwave;
})

91
pkgs/development/python-modules/matplotlib/2.nix Normal file
View File

@@ -0,0 +1,91 @@
{ stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
, freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
, enableGhostscript ? false, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobjectIntrospection
, enableGtk3 ? false, cairo
, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt4
, libcxx
, Cocoa
, pythonOlder
}:
assert enableGhostscript -> ghostscript != null;
assert enableGtk2 -> pygtk != null;
assert enableTk -> (tcl != null)
&& (tk != null)
&& (tkinter != null)
&& (libX11 != null)
;
assert enableQt -> pyqt4 != null;
buildPythonPackage rec {
version = "2.2.3";
pname = "matplotlib";
src = fetchPypi {
inherit pname version;
sha256 = "7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
XDG_RUNTIME_DIR = "/tmp";
buildInputs = [ python which sphinx stdenv ]
++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs =
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
libpng pkgconfig mock pytz ]
++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt4 ]
++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ];
patches =
[ ./basedirlist.patch ] ++
stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv-2.2.3.patch ];
# Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
# corresponding interpreter object for its library paths. This fails if
# `$DISPLAY` is not set. The fallback option assumes that Tcl/Tk are both
# installed under the same path which is not true in Nix.
# With the following patch we just hard-code these paths into the install
# script.
postPatch =
let
inherit (stdenv.lib.strings) substring;
tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"'';
in
stdenv.lib.optionalString enableTk
"sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
checkPhase = ''
${python.interpreter} tests.py
'';
# Test data is not included in the distribution (the `tests` folder
# is missing)
doCheck = false;
prePatch = ''
# Failing test: ERROR: matplotlib.tests.test_style.test_use_url
sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py
# Failing test: ERROR: test suite for <class 'matplotlib.sphinxext.tests.test_tinypages.TestTinyPages'>
sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py
# Transient errors
sed -i 's/test_invisible_Line_rendering/noop/' lib/matplotlib/tests/test_lines.py
'';
meta = with stdenv.lib; {
description = "Python plotting library, making publication quality plots";
homepage = "https://matplotlib.org/";
maintainers = with maintainers; [ lovek323 ];
};
}

10
pkgs/development/python-modules/matplotlib/darwin-stdenv-2.2.3.patch Normal file
View File

@@ -0,0 +1,10 @@
--- a/src/_macosx.m 2015-10-30 00:46:20.000000000 +0200
+++ b/src/_macosx.m 2015-11-01 14:52:25.000000000 +0200
@@ -6264,6 +6264,7 @@
static bool verify_framework(void)
{
+ return true; /* nixpkgs darwin stdenv */
#ifdef COMPILING_FOR_10_6
NSRunningApplication* app = [NSRunningApplication currentApplication];
NSApplicationActivationPolicy activationPolicy = [app activationPolicy];

14
pkgs/development/python-modules/matplotlib/darwin-stdenv.patch
View File

@@ -1,10 +1,12 @@
--- a/src/_macosx.m 2015-10-30 00:46:20.000000000 +0200
+++ b/src/_macosx.m 2015-11-01 14:52:25.000000000 +0200
@@ -6264,6 +6264,7 @@
diff -ruN matplotlib-3.0.0/src/_macosx.m matplotlib-3.0.0.patched/src/_macosx.m
--- matplotlib-3.0.0/src/_macosx.m 2018-09-16 00:35:21.000000000 +0200
+++ matplotlib-3.0.0.patched/src/_macosx.m 2018-11-03 13:14:33.000000000 +0100
@@ -2577,6 +2577,7 @@
static bool verify_framework(void)
{
+ return true; /* nixpkgs darwin stdenv */
#ifdef COMPILING_FOR_10_6
NSRunningApplication* app = [NSRunningApplication currentApplication];
NSApplicationActivationPolicy activationPolicy = [app activationPolicy];
ProcessSerialNumber psn;
/* These methods are deprecated, but they don't require the app to
have started */

16
pkgs/development/python-modules/matplotlib/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
{ stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
, freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
, enableGhostscript ? false, ghostscript ? null, gtk3
, enableGhostscript ? true, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobjectIntrospection
, enableGtk3 ? false, cairo
, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
@@ -21,12 +21,14 @@ assert enableTk -> (tcl != null)
assert enableQt -> pyqt4 != null;
buildPythonPackage rec {
version = "2.2.3";
version = "3.0.2";
pname = "matplotlib";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5";
sha256 = "c94b792af431f6adb6859eb218137acd9a35f4f7442cea57e4a59c54751c36af";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
@@ -44,8 +46,7 @@ buildPythonPackage rec {
++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt4 ]
++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ];
++ stdenv.lib.optionals enableQt [ pyqt4 ];
patches =
[ ./basedirlist.patch ] ++
@@ -84,9 +85,8 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Python plotting library, making publication quality plots";
homepage = "http://matplotlib.sourceforge.net/";
homepage = "https://matplotlib.org/";
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
}

21
pkgs/development/python-modules/plyplus/default.nix Normal file
View File

@@ -0,0 +1,21 @@
{ lib, fetchPypi, buildPythonPackage, ply, isPy3k }:
buildPythonPackage rec {
pname = "PlyPlus";
version = "0.7.5";
src = fetchPypi {
inherit pname version;
sha256 = "0g3flgfm3jpb2d8v9z0qmbwca5gxdqr10cs3zvlfhv5cs06ahpnp";
};
propagatedBuildInputs = [ ply ];
disabled = isPy3k;
meta = {
homepage = https://github.com/erezsh/plyplus;
description = "A general-purpose parser built on top of PLY";
maintainers = with lib.maintainers; [ twey ];
license = lib.licenses.mit;
};
}

4
pkgs/development/python-modules/py3status/default.nix
View File

@@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "py3status";
version = "3.13";
version = "3.14";
src = fetchPypi {
inherit pname version;
sha256 = "b4262db0b3b181fbf1a44679cd817c1cf0126ec34b3537550e294208f413daac";
sha256 = "8775fb3903458a519593fc22b712ccac598464e319a12b9fdf04803fa60a1583";
};
doCheck = false;

3
pkgs/development/python-modules/pytest/default.nix
View File

@@ -24,8 +24,7 @@ buildPythonPackage rec {
checkPhase = ''
runHook preCheck
# Re-enable warnings because the test suite relies on it.
PYTHONWARNINGS= $out/bin/py.test -x testing/
$out/bin/py.test -x testing/
runHook postCheck
'';

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

@@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi, six }:
buildPythonPackage rec {
pname = "scour";
version = "0.37";
src = fetchPypi {
inherit pname version;
sha256 = "05k1f8i8v7sp5v39lian865vwvapq05a6vmvk7fwnxv8kivi6ccn";
};
propagatedBuildInputs = [ six ];
# No tests included in archive
doCheck = false;
meta = with lib; {
description = "An SVG Optimizer / Cleaner ";
homepage = https://github.com/scour-project/scour;
license = licenses.asl20;
maintainers = with maintainers; [ worldofpeace ];
};
}