Merge commit '30d031b5d8d05422586043c3f105f4d9110e4f59' into HEAD

This commit is contained in:
Frederik Rietdijk 2018-02-08 12:14:07 +01:00
commit 50a9d51a09
100 changed files with 674 additions and 507 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem
# mandatory
, qtpy, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
, pyflakes, rope, sphinx, nbconvert, mccabe
, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle
# optional
, numpy ? null, scipy ? null, matplotlib ? null
# optional
@ -10,17 +10,21 @@
buildPythonApplication rec {
pname = "spyder";
version = "3.2.4";
namePrefix = "";
version = "3.2.6";
src = fetchPypi {
inherit pname version;
sha256 = "028hg71gfq2yrplwhhl7hl4rbwji1l0zxzghblwmb0i443ki10v3";
sha256 = "87d6a4f5ee1aac4284461ee3584c3ade50cb53feb3fe35abebfdfb9be18c526a";
};
# Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
postPatch = ''
substituteInPlace setup.py --replace 'pyqt5;python_version>="3"' ' '
'';
propagatedBuildInputs = [
jedi pycodestyle psutil qtpy pyflakes rope numpy scipy matplotlib pylint
numpydoc qtconsole qtawesome nbconvert mccabe
jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
];
# There is no test for spyder

View File

@ -36,7 +36,7 @@ in stdenv.mkDerivation (rec {
mv compiler-rt-* $sourceRoot/projects/compiler-rt
'';
outputs = [ "out" ]
outputs = [ "out" "python" ]
++ stdenv.lib.optional enableSharedLibraries "lib";
nativeBuildInputs = [ cmake python ]
@ -120,7 +120,11 @@ in stdenv.mkDerivation (rec {
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
'';
postInstall = stdenv.lib.optionalString enableSharedLibraries ''
postInstall = ''
mkdir -p $python/share
mv $out/share/opt-viewer $python/share/opt-viewer
''
+ stdenv.lib.optionalString enableSharedLibraries ''
moveToOutput "lib/libLLVM-*" "$lib"
moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \

View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
name = "boehm-gc-${version}";
version = "7.6.2";
version = "7.6.4";
src = fetchurl {
urls = [
"http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
];
sha256 = "07nli9hgdzc09qzw169sn7gchkrn5kqgyniv2rspcy1xaq2j04dx";
sha256 = "076dzsqqyxd3nlzs0z277vvhqjp8nv5dqi763s0m90zr6ljiyk5r";
};
buildInputs = [ libatomic_ops ];

View File

@ -144,7 +144,7 @@ stdenv.mkDerivation {
postFixup = ''
# Make boost header paths relative so that they are not runtime dependencies
find "$dev/include" \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
-exec sed '1i#line 1 "{}"' -i '{}' \;
'' + optionalString (hostPlatform.libc == "msvcrt") ''
$RANLIB "$out/lib/"*.a

View File

@ -1,16 +1,22 @@
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
, bzip2, libcroco, libintlOrEmpty, darwin
, bzip2, libcroco, libintlOrEmpty, darwin, rust
, withGTK ? false, gtk3 ? null
, gobjectIntrospection ? null, enableIntrospection ? false }:
# no introspection by default, it's too big
let
version = "2.42.2";
releaseVersion = (lib.concatStringsSep "." (lib.lists.take 2
(lib.splitString "." version)));
in
stdenv.mkDerivation rec {
name = "librsvg-2.40.19";
name = "librsvg-${version}";
src = fetchurl {
url = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz";
sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z";
url = "mirror://gnome/sources/librsvg/${releaseVersion}/${name}.tar.xz";
sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562";
};
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
@ -22,7 +28,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
nativeBuildInputs = [ pkgconfig ]
nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices
]);

View File

@ -2,14 +2,14 @@
, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
version = "1.18.0";
version = "1.19.1";
name = "libuv-${version}";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${version}";
sha256 = "0s71c2y4ll3vp463hsdk74q4hr7wprkxc2a4agw3za2hhzcb95pd";
sha256 = "020jap4xvjns1rgb2kvpf1nib3f2d5fyqh04afgkk32hiag0kn66";
};
postPatch = let

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, alsaLib, freepats }:
stdenv.mkDerivation rec {
name = "wildmidi-0.3.9";
name = "wildmidi-0.4.2";
src = fetchurl {
url = "https://github.com/Mindwerks/wildmidi/archive/${name}.tar.gz";
sha256 = "1fbcsvzn8akvvy7vg6vmnikcc8gh405b4gp1r016bq7yginljwwp";
sha256 = "178hm2wh5h7apkcb1a0dyla2ia8569php8ikz62rh0g6dp5l67am";
};
nativeBuildInputs = [ cmake ];

View File

@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "adal";
version = "0.4.7";
version = "0.5.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "114046ac85d0054791c21b00922f26286822bc6f2ba3716db42e7e57f762ef20";
sha256 = "120821f72ca9d59a7c7197fc14d0e27448ff8d331fae230f92d713b9b5c721f7";
};
propagatedBuildInputs = [ requests pyjwt dateutil ];

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "agate-excel";
version = "0.2.1";
version = "0.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7";
sha256 = "8923f71ee2b5b7b21e52fb314a769b28fb902f647534f5cbbb41991d8710f4c7";
};
propagatedBuildInputs = [ agate openpyxl xlrd ];

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "agate-sql";
version = "0.5.2";
version = "0.5.3";
src = fetchPypi {
inherit pname version;
sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14";
sha256 = "877b7b85adb5f0325455bba8d50a1623fa32af33680b554feca7c756a15ad9b4";
};
propagatedBuildInputs = [ agate sqlalchemy ];

View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "ansicolor";
version = "0.2.4";
version = "0.2.6";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h";
sha256 = "d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d";
};
meta = with stdenv.lib; {

View File

@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchurl, six }:
buildPythonPackage rec {
version = "2.1.0";
version = "2.1.1";
pname = "asgiref";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/a/asgiref/${name}.tar.gz";
sha256 = "2bfd70fcc51df4036768b91d7b13524090dc8f366d79fa44ba2b0aeb47306344";
sha256 = "112828022d772925b47b22caf8108dadd3b26bb0af719eb01b2c3a807795429d";
};
propagatedBuildInputs = [ six ];

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "astroid";
version = "1.6.0";
version = "1.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "71dadba2110008e2c03f9fde662ddd2053db3c0489d0e03c94e828a0399edd4f";
sha256 = "f0a0e386dbca9f93ea9f3ea6f32b37a24720502b7baa9cb17c3976a680d43a06";
};
propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]

View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "autopep8";
version = "1.3.3";
version = "1.3.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "0c1gl648g2xnz3j0rsp71ld4i32zlglmqjvqf4q8r08jp3zpny7z";
sha256 = "c7be71ab0cb2f50c9c22c82f0c9acaafc6f57492c3fbfee9790c415005c2b9a5";
};
propagatedBuildInputs = [ pycodestyle ];

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "botocore";
version = "1.8.33";
version = "1.8.36";
src = fetchPypi {
inherit pname version;
sha256 = "fa29ea54f26b1193682332d3b4cdde7aa79b4eaccb23f70e88672509c24546f4";
sha256 = "b2c9e0fd6d14910f759a33c19f8315dddedbb3c5569472b7be7ceed4f001a675";
};
propagatedBuildInputs = [

View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "zc.buildout";
version = "2.10.0";
version = "2.11.0";
name = "${pname}-nix-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
sha256 = "00wi0f6wpfl2gywr02x2yqvx6i1k0ll5w4lhdl0khijk4g7mk8dq";
sha256 = "092b0a147d5fb4e79ee0afde665570f85738e714463854f9e4f7f38d0b27ea82";
};
patches = [ ./nix.patch ];

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "chainer";
version = "3.2.0";
version = "3.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0mbc8kwk7pvg03bf0j57a48gr6rsdg4lzmyj0dak8y2l4lmyskpw";
sha256 = "0669375e5b09d687781a37d6c025ee0a6015f575b4d2c70a2ad09c33b8228f86";
};
checkInputs = [

View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "channels";
name = "${pname}-${version}";
version = "1.1.8";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0gsy3hwn1vd709jkw8ay44qrm6aw7qggr312z8xwzq0x4ihjda02";
sha256 = "c365492b90bd936c763e06cd76bda96cd3e70e5a5d2a196c25754e0c1d8da85a";
};
# Files are missing in the distribution

View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "click-threading";
version = "0.4.2";
version = "0.4.4";
src = fetchPypi {
inherit pname version;
sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609";
sha256 = "b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7";
};
checkInputs = [ pytest ];

View File

@ -0,0 +1,67 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, openssl
, cryptography_vectors
, darwin
, idna
, asn1crypto
, packaging
, six
, pythonOlder
, enum34
, ipaddress
, isPyPy
, cffi
, pytest
, pretend
, iso8601
, pytz
, hypothesis
}:
let
version = "2.1.4";
in assert version == cryptography_vectors.version; buildPythonPackage rec {
# also bump cryptography_vectors
pname = "cryptography";
inherit version;
src = fetchPypi {
inherit pname version;
sha256 = "e4d967371c5b6b2e67855066471d844c5d52d210c36c28d49a8507b96e2c5291";
};
outputs = [ "out" "dev" ];
buildInputs = [ openssl cryptography_vectors ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
propagatedBuildInputs = [
idna
asn1crypto
packaging
six
] ++ stdenv.lib.optional (pythonOlder "3.4") enum34
++ stdenv.lib.optional (pythonOlder "3.3") ipaddress
++ stdenv.lib.optional (!isPyPy) cffi;
checkInputs = [
pytest
pretend
iso8601
pytz
hypothesis
];
# The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary
# compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't
# use it. This boils down to them checking compatibility with `getentropy` in two different places,
# so let's neuter the second test.
postPatch = ''
substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"'
'';
# IOKit's dependencies are inconsistent between OSX versions, so this is the best we
# can do until nix 1.11's release
__impureHostDeps = [ "/usr/lib" ];
}

View File

@ -0,0 +1,18 @@
{ buildPythonPackage
, fetchPypi
, cryptography
}:
buildPythonPackage rec {
# also bump cryptography
pname = "cryptography_vectors";
version = "2.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "78c4b4f3f84853ea5d038e2f53d355229dd8119fe9cf949c3e497c85c760a5ca";
};
# No tests included
doCheck = false;
}

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "cupy";
version = "2.2.0";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0si0ri8azxvxh3lpm4l4g60jf4nwzibi53yldbdbzb1svlqq060r";
sha256 = "7426f6332cb01513d2a6a687792dfa17c678ff64dd1b19b04559ddd5672c833f";
};
checkInputs = [

View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "daphne";
name = "${pname}-${version}";
version = "1.4.2";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "302725f223853b05688f28c361e050f8db9568b1ce27340c76272c26b49e6d72";
sha256 = "ecd43a2dd889fb74e16bf8b7f67c076c4ec1b36229ce782272e46c50d56174dd";
};
buildInputs = [ hypothesis ];

View File

@ -0,0 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "dicttoxml";
version = "1.7.4";
src = fetchPypi {
inherit pname version;
sha256 = "ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45";
};
# No tests in archive
doCheck = false;
meta = {
description = "Converts a Python dictionary or other native data type into a valid XML string";
homepage = https://github.com/quandyfactory/dicttoxml;
license = lib.licenses.gpl2;
};
}

View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "django-polymorphic";
version = "1.3";
version = "2.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "8737b465ebf5fad772b4c52272189c352f5904f468d298584a3469187e3207ad";
sha256 = "78f666149ea10cdda08ac6c25ddf4b4e582ee380be87e7968bfed008ef39dfa5";
};
checkInputs = [ django ];

View File

@ -3,13 +3,13 @@
, ipaddress, backports_ssl_match_hostname, docker_pycreds
}:
buildPythonPackage rec {
version = "2.7.0";
version = "3.0.0";
pname = "docker";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/docker/${name}.tar.gz";
sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c";
sha256 = "4a1083656c6ac7615c19094d9b5e052f36e38d0b07e63d7e506c9b5b32c3abe2";
};
propagatedBuildInputs = [

View File

@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "edward";
version = "1.3.4";
version = "1.3.5";
name = "${pname}-${version}";
disabled = !(isPy27 || pythonAtLeast "3.4");
src = fetchPypi {
inherit pname version;
sha256 = "10d6d7886235f4b9fa4ba401daef87c27937a04d2763f507643d730e51de37b6";
sha256 = "3818b39e77c26fc1a37767a74fdd5e7d02877d75ed901ead2f40bd03baaa109f";
};
# disabled for now due to Tensorflow trying to create files in $HOME:

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "filelock";
version = "3.0.0";
version = "3.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "b3ad481724adfb2280773edd95ce501e497e88fa4489c6e41e637ab3fd9a456c";
sha256 = "011327d4ed939693a5b28c0fdf2fd9bda1f68614c1d6d0643a89382ce9843a71";
};
meta = with stdenv.lib; {

View File

@ -11,11 +11,11 @@ buildPythonPackage rec {
name = "${pname}-${version}";
pname = "ftfy";
# latest is 5.1.1, buy spaCy requires 4.4.3
version = "5.2.0";
version = "5.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "b9f84a1437f68ad0bb964fd9da9f6b88d090113ec9e78f290f6d6d0221468e38";
sha256 = "0ba702d5138f9b35df32b55920c9466208608108f1f3d5de1a68c17e3d68cb7f";
};
propagatedBuildInputs = [ html5lib wcwidth];

View File

@ -13,10 +13,10 @@
buildPythonPackage rec {
pname = "gensim";
name = "${pname}-${version}";
version = "3.2.0";
version = "3.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "db00b68c6567ba0598d400b917c889e8801adf249170ce0a80ec38187d1b0797";
sha256 = "6b2a813887583e63c8cedd26a91782e5f1e416a11f85394a92ae3ff908e0be03";
};
propagatedBuildInputs = [ smart_open numpy six scipy

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "0.30.0";
version = "0.31.0";
src = fetchPypi {
inherit pname version;
sha256 = "0ckigh6bfzhflhllqdnfygm8w0r6ncp0myf1midifx7sn880g4pa";
sha256 = "b0f6a542165750e42b1c92e6c465e8dc35c38d138ae7f08174971ab9b0df2a71";
};
propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ];

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "grpcio";
version = "1.8.4";
version = "1.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "88d87aab9c7889b3ab29dd74aac1a5493ed78b9bf5afba1c069c9dd5531f951d";
sha256 = "b61d3a7c45aa08f15dfa735a6a8282b5097be91ff36ad347594d3945ffc12181";
};
propagatedBuildInputs = [ six protobuf ]

View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "python-hglib";
version = "2.4";
version = "2.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "0qll9cc9ndqizby00gxdcf6d0cysdhjkr8670a4ffrk55bcnwgb9";
sha256 = "fee180bb6796e5d2d25158b2d3c9f048648e427dd28b23a58d369adb14dd67cb";
};
checkInputs = [ nose ];

View File

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "ipywidgets";
version = "7.1.0";
version = "7.1.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "3e2be7dea4f97c9a4df71ef065cad9f2e420dd901127bf7cb690fb56d2b34ea3";
sha256 = "69e8c444e99601e6f9b9e9e596c87c19665fc73c2dd05cd507c94f35fba2959d";
};
# Tests are not distributed

View File

@ -1,16 +1,13 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
{ stdenv, buildPythonPackage, fetchPypi
, pytest, markupsafe }:
buildPythonPackage rec {
pname = "Jinja2";
version = "2.9.6";
name = "${pname}-${version}";
version = "2.10";
src = fetchFromGitHub {
owner = "pallets";
repo = "jinja";
rev = version;
sha256 = "1xxc5vdhz214aawmllv0fi4ak6d7zac662yb7gn1xfgqfz392pg5";
src = fetchPypi {
inherit pname version;
sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4";
};
checkInputs = [ pytest ];
@ -29,7 +26,6 @@ buildPythonPackage rec {
Django inspired non-XML syntax but supports inline expressions and
an optional sandboxed environment.
'';
platforms = platforms.all;
maintainers = with maintainers; [ pierron garbas sjourdois ];
};
}

View File

@ -11,19 +11,20 @@
, ipython
, mock
, pytest
, tornado
}:
buildPythonPackage rec {
pname = "jupyter_client";
version = "5.2.1";
version = "5.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "462790d46b244f0a631ea5e3cd5cdbad6874d5d24cc0ff512deb7c16cdf8653d";
sha256 = "83d5e23132f0d8f79ccd3939f53fb9fa97f88a896a85114dc48d0e86909b06c4";
};
checkInputs = [ ipykernel ipython mock pytest ];
propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py;
propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil tornado ] ++ lib.optional isPyPy py;
checkPhase = ''
py.test

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "keyring";
version = "10.6.0";
version = "11.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "69c2b69d66a0db1165c6875c1833c52f4dc62179959692b30c8c4a4b8390d895";
sha256 = "b4607520a7c97be96be4ddc00f4b9dac65f47a45af4b4cd13ed5a8879641d646";
};
buildInputs = [

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "limits";
version = "1.2.1";
version = "1.3";
src = fetchPypi {
inherit pname version;
sha256 = "0dfbrmqixsvhvzqgd4s8rfj933k1w5q4bm23pp9zyp70xlb0mfmd";
sha256 = "a017b8d9e9da6761f4574642149c337f8f540d4edfe573fb91ad2c4001a2bc76";
};
propagatedBuildInputs = [ six ];

View File

@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "magic-wormhole";
version = "0.10.3";
version = "0.10.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "48465d58f9c0d729dc586627cf280830e7ed59f9e7999946ae1d763c6b8db999";
sha256 = "cd3105975e71bc6437848c7fc9f0b23ef0e0c625c8b19ec66a5ddc727c6d11ae";
};
checkInputs = [ mock ];

View File

@ -21,13 +21,13 @@ assert enableTk -> (tcl != null)
assert enableQt -> pyqt4 != null;
buildPythonPackage rec {
version = "2.1.1";
version = "2.1.2";
pname = "matplotlib";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/m/matplotlib/${name}.tar.gz";
sha256 = "659f5e1aa0e0f01488c61eff47560c43b8be511c6a29293d7f3896ae17bd8b23";
sha256 = "725a3f12739d133adfa381e1b33bd70c6f64db453bfc536e148824816e568894";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "nbxmpp";
version = "0.6.2";
version = "0.6.3";
src = fetchPypi {
inherit pname version;
sha256 = "10bfb12b083a7509779298c31b4b61e2ed7e78d1960cbcfb3de8d38f3b830991";
sha256 = "dd66e701a4856e3cace8f4865837ccc9bcfcdb286df01f01aa19531f5d834a83";
};
meta = with stdenv.lib; {

View File

@ -29,11 +29,11 @@ assert !isPy3k -> configparser != null;
buildPythonPackage rec {
pname = "nipype";
version = "0.14.0";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0airdrh93vwmbfkqxp5cqfzm0zzqcvjnvphv3zhg197y39xxpl1k";
sha256 = "4c14c6cae1f530f89d76fa8136d52488b1daf3a02179da65121b76eaf4a6f0ea";
};
doCheck = false; # fails with TypeError: None is not callable

View File

@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "notebook";
version = "5.3.1";
version = "5.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "12vk3shylx61whdchxbg71mdlwiw2l31vl227sqwpb0p67bbw2rq";
sha256 = "dd431fad9bdd25aa9ff8265da096ef770475e21bf1d327982611a7de5cd904ca";
};
LC_ALL = "en_US.utf8";

View File

@ -1,13 +1,13 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "olefile";
version = "0.44";
version = "0.45.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1bbk1xplmrhymqpk6rkb15sg7v9qfih7zh23p6g2fxxas06cmwk1";
sha256 = "2b6575f5290de8ab1086f8c5490591f7e0885af682c7c1793bdaf6e64078d385";
};
meta = with stdenv.lib; {

View File

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "openpyxl";
version = "2.4.9";
version = "2.5.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "95e007f4d121f4fd73f39a6d74a883c75e9fa9d96de91d43c1641c103c3a9b18";
sha256 = "0ff2e0c2c85cbf42e82dd223e7f2401a62dc73c18cd9e5dd7763dc6c8014ebde";
};
checkInputs = [ pytest ];

View File

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, nose
, mock
}:
buildPythonPackage rec {
pname = "ovh";
version = "0.4.8";
# Needs yanc
doCheck = false;
src = fetchPypi {
inherit pname version;
sha256 = "79fa4bdc61b9953af867676a9558d9e792b9fde568c980efe848a40565a217cd";
};
meta = {
description = "Thin wrapper around OVH's APIs";
homepage = http://api.ovh.com/;
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.makefu ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, python
, fetchpatch
}:
buildPythonPackage rec {
pname = "packet-python";
version = "1.37.1";
src = fetchPypi {
inherit pname version;
sha256 = "316941d2473c0f42ac17ac89e9aa63a023bb96f35cf8eafe9e091ea424892778";
};
propagatedBuildInputs = [ requests ];
checkPhase = ''
${python.interpreter} -m unittest discover -s test
'';
patches = [
(fetchpatch {
url = https://github.com/packethost/packet-python/commit/361ad0c60d0bfce2a992eefd17e917f9dcf36400.patch;
sha256 = "1cmzyq0302y4cqmim6arnvn8n620qysq458g2w5aq4zj1vz1q9g1";
})
];
# Not all test files are included in archive
doCheck = false;
meta = {
description = "A Python client for the Packet API.";
homepage = "https://github.com/packethost/packet-python";
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ dipinhora ];
};
}

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pecan";
version = "1.2.1";
version = "1.3.2";
patches = [
./python36_test_fix.patch
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "0ikc32rd2hr8j2jxc0mllvdjvxydx3fwfp3z8sdxmkzdkixlb5cd";
sha256 = "24f06cf88a488b75f433e62b33c1c97e4575d0cd91eec9eec841a81cecfd6de3";
};
propagatedBuildInputs = [ singledispatch logutils ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pendulum";
version = "1.3.2";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "1j6hdsdhhw4d6fy9byr0vyxqnb53ap8bh2a0cibl7p0ks0zvb14j";
sha256 = "e996c34fb101c9c6d88a839c19af74d7c067b92ed3371274efcf4d4b6dc160a6";
};
propagatedBuildInputs = [ dateutil pytzdata tzlocal ];

View File

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "plotly";
version = "2.2.3";
version = "2.3.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "dadd2263f1c0449b248fd3742a077d9594935921a9597529be76d6a841237ab0";
sha256 = "95e72273699108f215886ab961dbf0890904d39583be39eabcd0788bc7ccf695";
};
propagatedBuildInputs = [

View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
buildPythonPackage rec {
version = "3.4.7";
version = "3.4.9";
pname = "pycryptodome";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";
sha256 = "18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7";
sha256 = "00cc7767c7bbe91f15a65a1b2ebe7a08002b8ae8221c1dcecc5c5c9ab6f79753";
};
meta = {

View File

@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "pycryptodomex";
name = "${pname}-${version}";
version = "3.4.7";
version = "3.4.9";
meta = {
description = "A self-contained cryptographic library for Python";
@ -13,6 +13,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "52aa2e540d06d63636e4b5356957c520611e28a88386bad4d18980e4b00e0b5a";
sha256 = "d078b67be76ccafa8b7cc391e87151b80b0ef9bfbeee8a95d286e522cc7537f7";
};
}

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pyemd";
version = "0.4.4";
version = "0.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "13y06y7r1697cv4r430g45fxs40i2yk9xn0dk9nqlrpddw3a0mr4";
sha256 = "fc81c2116f8573e559dfbb8d73e03d9f73c22d0770559f406516984302e07e70";
};
propagatedBuildInputs = [ numpy ];

View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pylint";
version = "1.8.1";
version = "1.8.2";
src = fetchPypi {
inherit pname version;
sha256 = "3035e44e37cd09919e9edad5573af01d7c6b9c52a0ebb4781185ae7ab690458b";
sha256 = "4fe3b99da7e789545327b75548cee6b511e4faa98afe268130fea1af4b5ec022";
};
buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];

View File

@ -0,0 +1,46 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, openssl
, cryptography
, pyasn1
, idna
, pytest
, pretend
, flaky
, glibcLocales
}:
buildPythonPackage rec {
pname = "pyOpenSSL";
version = "17.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773";
};
outputs = [ "out" "dev" ];
preCheck = ''
sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py
# https://github.com/pyca/pyopenssl/issues/692
sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py
'';
checkPhase = ''
runHook preCheck
export LANG="en_US.UTF-8"
py.test
runHook postCheck
'';
# Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1
# for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail.
doCheck = !stdenv.isDarwin;
buildInputs = [ openssl ];
propagatedBuildInputs = [ cryptography pyasn1 idna ];
checkInputs = [ pytest pretend flaky glibcLocales ];
}

View File

@ -6,14 +6,13 @@
let
pname = "PyQt";
version = "5.9.2";
version = "5.10";
inherit (pythonPackages) buildPythonPackage python dbus-python sip;
in buildPythonPackage {
pname = pname;
version = version;
format = "other";
name = pname + "-" + version;
meta = with lib; {
description = "Python bindings for Qt5";
@ -25,10 +24,10 @@ in buildPythonPackage {
src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
sha256 = "15439gxari6azbfql20ksz8h4gv23k3kfyjyr89h2yy9k32xm461";
sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl";
};
nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs
@ -43,10 +42,10 @@ in buildPythonPackage {
lndir ${dbus-python} $out
rm -rf "$out/nix-support"
export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages}
substituteInPlace configure.py \
--replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \
--replace 'install_dir=pydbusmoddir' "install_dir='$out/${python.sitePackages}/dbus/mainloop'" \
--replace "ModuleMetadata(qmake_QT=['webkitwidgets'])" "ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport'])"
${python.executable} configure.py -w \

View File

@ -2,7 +2,7 @@
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k
}:
buildPythonPackage rec {
version = "3.3.2";
version = "3.4.0";
pname = "pytest";
preCheck = ''
@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "53548280ede7818f4dc2ad96608b9f08ae2cc2ca3874f2ceb6f97e3583f25bc4";
sha256 = "6074ea3b9c999bd6d0df5fa9d12dd95ccd23550df2a582f5f5b848331d2e82ca";
};
checkInputs = [ hypothesis ];

View File

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi, python }:
buildPythonPackage rec {
pname = "pytz";
version = "2017.3";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "fae4cffc040921b8a2d60c6cf0b5d662c1190fe54d718271db4eb17d44a185b7";
};
checkPhase = ''
${python.interpreter} -m unittest discover -s pytz/tests
'';
meta = with lib; {
description = "World timezone definitions, modern and historical";
homepage = "http://pythonhosted.org/pytz";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytzdata";
version = "2017.3.1";
version = "2018.3";
src = fetchPypi {
inherit pname version;
sha256 = "1wi3jh39zsa9iiyyhynhj7w5b2p9wdyd0ppavpsrmf3wxvr7cwz8";
sha256 = "4e2cceb54335cd6c28caea46b15cd592e2aec5e8b05b0241cbccfb1b23c02ae7";
};
# No tests

View File

@ -0,0 +1,20 @@
{ lib, buildPythonPackage, fetchPypi, libyaml }:
buildPythonPackage rec {
pname = "PyYAML";
version = "3.12";
src = fetchPypi {
inherit pname version;
sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab";
};
propagatedBuildInputs = [ libyaml ];
meta = with lib; {
description = "The next generation YAML parser and emitter for Python";
homepage = https://github.com/yaml/pyyaml;
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View File

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, numpy
, python
}:
buildPythonPackage rec {
pname = "quantities";
version = "0.12.1";
src = fetchPypi {
inherit pname version;
sha256 = "0a03e8511db603c57ca80dee851c43f08d0457f4d592bcac2e154570756cb934";
};
propagatedBuildInputs = [ numpy ];
checkPhase = ''
${python.interpreter} setup.py test -V 1
'';
meta = {
description = "Quantities is designed to handle arithmetic and";
homepage = http://python-quantities.readthedocs.io/;
license = lib.licenses.bsd2;
};
}

View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "requestsexceptions";
version = "1.3.0";
version = "1.4.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "0gim00vi7vfq16y8b9m1vpy01grqvrdrbh88jb98qx6n6sk1n54g";
sha256 = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065";
};
propagatedBuildInputs = [ pbr ];

View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "restview";
name = "${pname}-${version}";
version = "2.8.0";
version = "2.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "5f6f1523228eab3269f59dd03ac560f7d370cd81df6fdbcb4914b5e6bd896a11";
sha256 = "45320b4e52945d23b3f1aeacc7ff97a3b798204fe625f8b81ed5322326d5bcd1";
};
propagatedBuildInputs = [ docutils readme_renderer pygments ];

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "Shapely";
version = "1.6.3";
version = "1.6.4.post1";
src = fetchPypi {
inherit pname version;
sha256 = "14152f111c7711fc6756fd538ec12fc8cdde7419f869b244922f71f61b2a6c6b";
sha256 = "30df7572d311514802df8dc0e229d1660bc4cbdcf027a8281e79c5fc2fcf02f2";
};
buildInputs = [ geos glibcLocales cython ];

View File

@ -0,0 +1,21 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "simplegeneric";
version = "0.8.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173";
};
meta = {
description = "Simple generic functions";
homepage = http://cheeseshop.python.org/pypi/simplegeneric;
license = lib.licenses.zpl21;
};
}

View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
name = "${pname}-${version}";
version = "1.2.1";
version = "1.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "9ede7070d6fd18f28058be88296ed67893e2637465516d6a596cd9afea97b154";
sha256 = "64b4720f0a8e033db0154d3824f5bf677cf2797e11d44743cf0aebd2a0499d9d";
};
checkInputs = [

View File

@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "sybil";
version = "1.0.6";
version = "1.0.7";
src = fetchPypi {
inherit pname version;
sha256 = "5bd7dd09eff68cbec9062e6950124fadfaaccbc0f50b23c1037f4d70ae86f0f1";
sha256 = "86332553392f865403883e44695bd8d9d47fe3887c01e17591955237b8fd2d8f";
};
checkInputs = [ pytest nose ];

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, glibcLocales
, mpmath
}:
buildPythonPackage rec {
pname = "sympy";
version = "1.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4";
};
checkInputs = [ glibcLocales ];
propagatedBuildInputs = [ mpmath ];
# Bunch of failures including transients.
doCheck = false;
preCheck = ''
export LANG="en_US.UTF-8"
'';
meta = {
description = "A Python library for symbolic mathematics";
homepage = http://www.sympy.org/;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ lovek323 ];
};
}

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "testfixtures";
version = "5.3.1";
version = "5.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "670ade9410b7132278209e6a2e893caf098b040c4ba4d5ea848367a9c5588728";
sha256 = "338aed9695c432b7c9b8a271dabb521e3e7e2c96b11f7b4e60552f1c8408a8f0";
};
checkInputs = [ mock manuel pytest sybil zope_component ];

View File

@ -1,14 +1,14 @@
{ stdenv, fetchPypi, buildPythonPackage, lib }:
buildPythonPackage rec {
version = "3.9.1";
version = "3.9.2";
pname = "thespian";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0b303bv85176xd5mf3q5j549s28wi70ck2xxgj1cvpydh23dzipb";
sha256 = "aec9793fecf45bb91fe919dc61b5c48a4aadfb9f94b06cd92883df7952eacf95";
};
# Do not run the test suite: it takes a long time and uses

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "tifffile";
version = "0.13.4";
version = "0.13.5";
src = fetchPypi {
inherit pname version;
sha256 = "43d3903e8ea4542aaa4759ec3683641555d3a15e68fa5a41aaf14cce4110641a";
sha256 = "bca0fc9eaf609a27ebd99d8466e05d5a6e79389957f17582b70643dbca65e3d8";
};
checkInputs = [ nose ];

View File

@ -0,0 +1,29 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, python }:
let
testDir = if isPy3k then "src" else "python2";
in buildPythonPackage rec {
pname = "typing";
version = "3.6.4";
src = fetchPypi {
inherit pname version;
sha256 = "d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2";
};
# Error for Python3.6: ImportError: cannot import name 'ann_module'
# See https://github.com/python/typing/pull/280
doCheck = pythonOlder "3.6";
checkPhase = ''
cd ${testDir}
${python.interpreter} -m unittest discover
'';
meta = with lib; {
description = "Backport of typing module to Python versions older than 3.5";
homepage = https://docs.python.org/3/library/typing.html;
license = licenses.psfl;
};
}

View File

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
}:
buildPythonPackage rec {
pname = "webcolors";
version = "1.7";
src = fetchPypi {
inherit pname version;
sha256 = "e47e68644d41c0b1f1e4d939cfe4039bdf1ab31234df63c7a4f59d4766487206";
};
checkPhase = ''
${python.interpreter} -m unittest discover -s tests
'';
meta = {
description = "Library for working with color names/values defined by the HTML and CSS specifications";
homepage = https://bitbucket.org/ubernostrum/webcolors/overview/;
license = lib.licenses.bsd3;
};
}

View File

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "widgetsnbextension";
name = "${pname}-${version}";
version = "3.1.0";
version = "3.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "67fc28c3b9fede955d69bccbd92784e3f0c6d0dee3a71532cd3367c257feb178";
sha256 = "02edabcaeaa247721df8027f660f3384c20f30c4865a7ea5dd80685c368736df";
};
propagatedBuildInputs = [ notebook ];

View File

@ -5,7 +5,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "9.4.0";
sha256 = "035j44xkji9dxddlqws6ykkbyphbkhwhz700arpgz20jz3qf20vm";
version = "9.5.0";
sha256 = "0v8lspfca820mf45dj9hb56q00syhrqw5wmqmy1vnrcb6wx4csv6";
patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
}

View File

@ -1,19 +1,22 @@
{ stdenv, fetchurl, kernel, coreutils, pciutils, gettext }:
{ stdenv, buildPackages, fetchurl, kernel, pciutils, gettext }:
stdenv.mkDerivation {
name = "cpupower-${kernel.version}";
src = kernel.src;
buildInputs = [ coreutils pciutils gettext ];
nativeBuildInputs = [ gettext ];
buildInputs = [ pciutils ];
postPatch = ''
cd tools/power/cpupower
sed -i 's,/bin/true,${coreutils}/bin/true,' Makefile
sed -i 's,/bin/pwd,${coreutils}/bin/pwd,' Makefile
sed -i 's,/usr/bin/install,${coreutils}/bin/install,' Makefile
sed -i 's,/bin/true,${buildPackages.coreutils}/bin/true,' Makefile
sed -i 's,/bin/pwd,${buildPackages.coreutils}/bin/pwd,' Makefile
sed -i 's,/usr/bin/install,${buildPackages.coreutils}/bin/install,' Makefile
'';
makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ];
installFlags = [
"bindir=$(out)/bin"
"sbindir=$(out)/sbin"

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "iproute2-${version}";
version = "4.14.1";
version = "4.15.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
sha256 = "0rq0n7yxb0hmk0s6wx5awzjgf7ikjbibd0a5ix20ldfcmxlc0fnl";
sha256 = "0mc3g4kj7h3jhwz2b2gdf41gp6bhqn7axh4mnyvhkdnpk5m63m28";
};
preConfigure = ''

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "iptables-${version}";
version = "1.6.1";
version = "1.6.2";
src = fetchurl {
url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
sha256 = "1x8c9y340x79djsq54bc1674ryv59jfphrk4f88i7qbvbnyxghhg";
sha256 = "0crp0lvh5m2f15pr8cw97h8yb8zjj10x95zj06j46cr68vx2vl2m";
};
nativeBuildInputs = [ bison flex pkgconfig ];

View File

@ -16,7 +16,7 @@
*/
{ stdenv, version, kernelPlatform, extraConfig, features }:
{ stdenv, version, extraConfig, features }:
with stdenv.lib;
@ -682,6 +682,5 @@ with stdenv.lib;
WW_MUTEX_SELFTEST? n
''}
${kernelPlatform.kernelExtraConfig or ""}
${extraConfig}
''

View File

@ -13,18 +13,18 @@ use strict;
use IPC::Open2;
use Cwd;
my $wd = getcwd;
# exported via nix
my $debug = $ENV{'DEBUG'};
my $autoModules = $ENV{'AUTO_MODULES'};
my $preferBuiltin = $ENV{'PREFER_BUILTIN'};
my $ignoreConfigErrors = $ENV{'ignoreConfigErrors'};
my $buildRoot = $ENV{'BUILD_ROOT'};
$SIG{PIPE} = 'IGNORE';
# Read the answers.
my %answers;
my %requiredAnswers;
open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die;
open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die "Could not open answer file";
while (<ANSWERS>) {
chomp;
s/#.*//;
@ -40,7 +40,7 @@ close ANSWERS;
sub runConfig {
# Run `make config'.
my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$wd config SHELL=bash ARCH=$ENV{ARCH}");
my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH}");
# Parse the output, look for questions and then send an
# appropriate answer.
@ -122,7 +122,7 @@ runConfig;
# there. `make config' often overrides answers if later questions
# cause options to be selected.
my %config;
open CONFIG, "<.config" or die;
open CONFIG, "<$buildRoot/.config" or die "Could not read .config";
while (<CONFIG>) {
chomp;
if (/^CONFIG_([A-Za-z0-9_]+)="(.*)"$/) {
@ -137,7 +137,7 @@ while (<CONFIG>) {
close CONFIG;
foreach my $name (sort (keys %answers)) {
my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1"
my $f = $requiredAnswers{$name} && $ignoreConfigErrors ne "1"
? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; };
&$f("unused option: $name\n") unless defined $config{$name};
&$f("option not set correctly: $name (wanted '$answers{$name}', got '$config{$name}')\n")

View File

@ -1,3 +1,11 @@
{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl
, ncurses
, libelf
, utillinux
, writeTextFile, ubootTools
, callPackage
}:
{ stdenv, buildPackages, perl, buildLinux
, # The kernel source tarball.
@ -28,7 +36,7 @@
, extraMeta ? {}
, hostPlatform
, ...
}:
} @ args:
assert stdenv.isLinux;
@ -45,8 +53,10 @@ let
} // features) kernelPatches;
config = import ./common-config.nix {
inherit stdenv version extraConfig;
kernelPlatform = hostPlatform.platform;
inherit stdenv version ;
# append extraConfig for backwards compatibility but also means the user can't override the kernelExtraConfig part
extraConfig = extraConfig + lib.optionalString (hostPlatform.platform ? kernelExtraConfig) hostPlatform.platform.kernelExtraConfig;
features = kernelFeatures; # Ensure we know of all extra patches, etc.
};
@ -68,7 +78,9 @@ let
nativeBuildInputs = [ perl ];
platformName = hostPlatform.platform.name;
# e.g. "defconfig"
kernelBaseConfig = hostPlatform.platform.kernelBaseConfig;
# e.g. "bzImage"
kernelTarget = hostPlatform.platform.kernelTarget;
autoModules = hostPlatform.platform.kernelAutoModules;
preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false;
@ -83,25 +95,25 @@ let
inherit (kernel) src patches preUnpack;
buildPhase = ''
cd $buildRoot
export buildRoot="''${buildRoot:-build}"
# Get a basic config file for later refinement with $generateConfig.
make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C ../$sourceRoot O=$PWD $kernelBaseConfig ARCH=$arch
make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$arch
# Create the config file.
echo "generating kernel configuration..."
echo "$kernelConfig" > kernel-config
DEBUG=1 ARCH=$arch KERNEL_CONFIG=kernel-config AUTO_MODULES=$autoModules \
PREFER_BUILTIN=$preferBuiltin SRC=../$sourceRoot perl -w $generateConfig
echo "$kernelConfig" > "$buildRoot/kernel-config"
DEBUG=1 ARCH=$arch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig
'';
installPhase = "mv .config $out";
installPhase = "mv $buildRoot/.config $out";
enableParallelBuilding = true;
};
kernel = buildLinux {
inherit version modDirVersion src kernelPatches stdenv extraMeta configfile;
kernel = (callPackage ./manual-config.nix {}) {
inherit version modDirVersion src kernelPatches stdenv extraMeta configfile hostPlatform;
config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
};

View File

@ -1,6 +1,6 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
buildLinux (args // rec {
version = "4.13.16";
extraMeta.branch = "4.13";

View File

@ -2,7 +2,7 @@
with stdenv.lib;
import ./generic.nix (args // rec {
buildLinux (args // rec {
version = "4.14.18";
# branchVersion needs to be x.y

View File

@ -2,8 +2,8 @@
with stdenv.lib;
import ./generic.nix (args // rec {
version = "4.15.2";
buildLinux (args // rec {
version = "4.15.1";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

View File

@ -1,6 +1,6 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
buildLinux (args // rec {
version = "4.4.115";
extraMeta.branch = "4.4";

View File

@ -1,6 +1,6 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
buildLinux (args // rec {
version = "4.9.80";
extraMeta.branch = "4.9";

View File

@ -4,7 +4,7 @@ let
modDirVersion = "4.14.12";
tag = "r23";
in
stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
stdenv.lib.overrideDerivation (buildLinux (args // rec {
version = "${modDirVersion}-ti-${tag}";
inherit modDirVersion;

View File

@ -15,7 +15,7 @@ let
modDirVersion = "${modVersion}-hardened";
in
import ./generic.nix (args // {
buildLinux (args // {
inherit modDirVersion;
version = "${version}-${revision}";

View File

@ -1,9 +1,10 @@
{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
import ./generic.nix (rec {
buildLinux (rec {
mptcpVersion = "0.93";
modDirVersion = "4.9.60";
version = "${modDirVersion}-mptcp_v${mptcpVersion}";
# autoModules= true;
extraMeta = {
branch = "4.4";
@ -43,4 +44,4 @@ import ./generic.nix (rec {
TCP_CONG_BALIA m
'' + (args.extraConfig or "");
} // args // (args.argsOverride or {}))
} // args)

View File

@ -4,7 +4,7 @@ let
modDirVersion = "4.9.59";
tag = "1.20171029";
in
stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
stdenv.lib.overrideDerivation (buildLinux (args // rec {
version = "${modDirVersion}-${tag}";
inherit modDirVersion;

View File

@ -1,6 +1,6 @@
{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args:
import ./generic.nix (args // rec {
buildLinux (args // rec {
version = "4.12.2";
extraMeta.branch = "4.12-2";

View File

@ -1,6 +1,6 @@
{ stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
buildLinux (args // rec {
version = "4.11.2017.08.23";
modDirVersion = "4.11.0";
extraMeta.branch = "master";

View File

@ -1,6 +1,6 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
import ./generic.nix (args // rec {
buildLinux (args // rec {
version = "4.15-rc9";
modDirVersion = "4.15.0-rc9";
extraMeta.branch = "4.15";

View File

@ -1,8 +1,8 @@
{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl
, ncurses ? null
, libelf
, utillinux
, writeTextFile, ubootTools
, hostPlatform
}:
let
@ -34,7 +34,9 @@ in {
# Use defaultMeta // extraMeta
extraMeta ? {},
# Whether to utilize the controversial import-from-derivation feature to parse the config
allowImportFromDerivation ? false
allowImportFromDerivation ? false,
hostPlatform
}:
let
@ -86,8 +88,6 @@ let
inherit src;
preUnpack = ''
mkdir build
export buildRoot="$(pwd)/build"
'';
patches = map (p: p.patch) kernelPatches;
@ -102,7 +102,25 @@ let
configurePhase = ''
runHook preConfigure
mkdir build
export buildRoot="$(pwd)/build"
echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"
if [[ -z "$buildRoot" || ! -d "$buildRoot" ]]; then
echo "set $buildRoot to the build folder please"
exit 1
fi
if [ -f "$buildRoot/.config" ]; then
echo "Could not link $buildRoot/.config : file exists"
exit 1
fi
ln -sv ${configfile} $buildRoot/.config
# reads the existing .config file and prompts the user for options in
# the current kernel source that are not found in the file.
make $makeFlags "''${makeFlagsArray[@]}" oldconfig
runHook postConfigure
@ -115,6 +133,8 @@ let
# Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged.
buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")
cd $buildRoot
'';
buildFlags = [
@ -136,7 +156,7 @@ let
postInstall = ''
mkdir -p $dev
cp $buildRoot/vmlinux $dev/
cp vmlinux $dev/
'' + (optionalString installsFirmware ''
mkdir -p $out/lib/firmware
'') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
@ -151,7 +171,7 @@ let
unlink $out/lib/modules/${modDirVersion}/source
mkdir -p $dev/lib/modules/${modDirVersion}/build
cp -dpR ../$sourceRoot $dev/lib/modules/${modDirVersion}/source
cp -dpR .. $dev/lib/modules/${modDirVersion}/source
cd $dev/lib/modules/${modDirVersion}/source
cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
@ -170,7 +190,7 @@ let
# from drivers/ in the future; it adds 50M to keep all of its
# headers on 3.10 though.
chmod u+w -R ../source
chmod u+w -R ..
arch=$(cd $dev/lib/modules/${modDirVersion}/build/arch; ls)
# Remove unused arches

View File

@ -50,13 +50,13 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do
# Rewrite the expression
sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then
sed -i "\#import ./generic.nix (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
sed -i "\#buildLinux (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
fi
sed -i "\#import ./generic.nix (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
# Commit the changes
git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
git commit -m "kernel: $OLDVER -> $V" >/dev/null 2>&1
echo "Updated $OLDVER -> $V"
done

View File

@ -26,12 +26,12 @@ let
in buildPythonPackage rec {
pname = "awscli";
version = "1.14.29";
version = "1.14.32";
namePrefix = "";
src = fetchPypi {
inherit pname version;
sha256 = "96edb1dd72fbc13638967fe07c436e95133169759cc962b973bb79ba959bc652";
sha256 = "09i82nf43pv5v598wvbj4nk1bfc64wp7xzlx5ykaca5m40lkarz0";
};
# No tests included

View File

@ -15,10 +15,22 @@ let
enableStatic = true;
enableMinimal = true;
extraConfig = ''
CONFIG_FEATURE_FANCY_ECHO y
CONFIG_FEATURE_SH_MATH y
CONFIG_FEATURE_SH_MATH_64 y
CONFIG_ASH y
CONFIG_ASH_BUILTIN_ECHO y
CONFIG_ASH_BUILTIN_TEST y
CONFIG_ASH_OPTIMIZE_FOR_SIZE y
CONFIG_ASH_ALIAS y
CONFIG_ASH_BASH_COMPAT y
CONFIG_ASH_CMDCMD y
CONFIG_ASH_ECHO y
CONFIG_ASH_GETOPTS y
CONFIG_ASH_INTERNAL_GLOB y
CONFIG_ASH_JOB_CONTROL y
CONFIG_ASH_PRINTF y
CONFIG_ASH_TEST y
'';
};

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib kmod which ];
makeFlags = "SHARED=yes PREFIX=\${out}";
makeFlags = [ "SHARED=yes" "PREFIX=\${out}" "STRIP=" "HOST=${stdenv.hostPlatform.system}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ];
installTargets = "install install-lib";

View File

@ -1727,7 +1727,7 @@ with pkgs;
curl = callPackage ../tools/networking/curl rec {
fetchurl = fetchurlBoot;
http2Support = !stdenv.isDarwin;
http2Support = true;
zlibSupport = true;
sslSupport = zlibSupport;
scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
@ -13208,7 +13208,7 @@ with pkgs;
# A function to build a manually-configured kernel
linuxManualConfig = pkgs.buildLinux;
buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {});
keyutils = callPackage ../os-specific/linux/keyutils { };

View File

@ -2787,65 +2787,9 @@ in {
};
};
cryptography = buildPythonPackage rec {
# also bump cryptography_vectors
pname = "cryptography";
name = "${pname}-${version}";
version = "2.0.3";
cryptography = callPackage ../development/python-modules/cryptography { };
src = fetchPypi {
inherit pname version;
sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a";
};
outputs = [ "out" "dev" ];
buildInputs = [ pkgs.openssl self.cryptography_vectors ]
++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security;
propagatedBuildInputs = with self; [
idna
asn1crypto
packaging
six
] ++ optional (pythonOlder "3.4") enum34
++ optional (pythonOlder "3.3") ipaddress
++ optional (!isPyPy) cffi;
checkInputs = with self; [
pytest
pretend
iso8601
pytz
hypothesis
];
# The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary
# compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't
# use it. This boils down to them checking compatibility with `getentropy` in two different places,
# so let's neuter the second test.
postPatch = ''
substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"'
'';
# IOKit's dependencies are inconsistent between OSX versions, so this is the best we
# can do until nix 1.11's release
__impureHostDeps = [ "/usr/lib" ];
};
cryptography_vectors = buildPythonPackage rec {
# also bump cryptography
pname = "cryptography_vectors";
version = self.cryptography.version;
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1";
};
# No tests included
doCheck = false;
};
cryptography_vectors = callPackage ../development/python-modules/cryptography_vectors { };
curtsies = callPackage ../development/python-modules/curtsies { };
@ -3208,9 +3152,9 @@ in {
};
};
pytest = self.pytest_33;
pytest = self.pytest_34;
pytest_33 = callPackage ../development/python-modules/pytest/default.nix{
pytest_34 = callPackage ../development/python-modules/pytest/default.nix{
hypothesis = self.hypothesis.override {
# hypothesis requires pytest that causes dependency cycle
doCheck = false;
@ -13783,17 +13727,6 @@ in {
pygments = callPackage ../development/python-modules/Pygments { };
# For Pelican 3.6.3
pygments_2_0 = self.pygments.overrideAttrs( oldAttrs: rec {
version = "2.0.2";
name = "Pygments-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/P/Pygments/${name}.tar.gz";
sha256 = "7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51";
};
});
pygpgme = callPackage ../development/python-modules/pygpgme { };
pylint = callPackage ../development/python-modules/pylint { };
@ -14643,39 +14576,7 @@ in {
doCheck = false;
};
pyopenssl = buildPythonPackage rec {
pname = "pyOpenSSL";
name = "${pname}-${version}";
version = "17.2.0";
src = self.fetchPypi {
inherit pname version;
sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax";
};
outputs = [ "out" "dev" ];
preCheck = ''
sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py
# https://github.com/pyca/pyopenssl/issues/692
sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py
'';
checkPhase = ''
runHook preCheck
export LANG="en_US.UTF-8"
py.test
runHook postCheck
'';
# Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1
# for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail.
doCheck = !stdenv.isDarwin;
buildInputs = [ pkgs.openssl self.pytest pkgs.glibcLocales self.pretend self.flaky ];
propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ];
};
pyopenssl = callPackage ../development/python-modules/pyopenssl { };
pyquery = buildPythonPackage rec {
name = "pyquery-${version}";
@ -14942,27 +14843,7 @@ in {
};
};
pytz = buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pytz";
version = "2017.2";
src = fetchPypi {
inherit pname version;
sha256 = "12cmd3j46d2gcw08bspvp6s9icfcvx88zjz52n1bli9dyvl5dh7m";
extension = "zip";
};
checkPhase = ''
python -m unittest discover -s pytz/tests
'';
meta = {
description = "World timezone definitions, modern and historical";
homepage = "http://pythonhosted.org/pytz";
license = licenses.mit;
};
};
pytz = callPackage ../development/python-modules/pytz { };
pytzdata = callPackage ../development/python-modules/pytzdata { };
@ -15033,23 +14914,7 @@ in {
pyaml = callPackage ../development/python-modules/pyaml { };
pyyaml = buildPythonPackage (rec {
name = "PyYAML-3.12";
src = pkgs.fetchurl {
url = "http://pyyaml.org/download/pyyaml/${name}.zip";
sha256 = "19s1lxi0idq4a0bpvld866pv5b16lqxypyswmsdi5ys4210jxj2s";
};
buildInputs = with self; [ pkgs.pyrex ];
propagatedBuildInputs = with self; [ pkgs.libyaml ];
meta = {
description = "The next generation YAML parser and emitter for Python";
homepage = http://pyyaml.org;
license = licenses.free; # !?
};
});
pyyaml = callPackage ../development/python-modules/pyyaml { };
rabbitpy = buildPythonPackage rec {
version = "0.26.2";
@ -15220,20 +15085,7 @@ in {
qtpy = callPackage ../development/python-modules/qtpy { };
quantities = buildPythonPackage rec {
name = "quantities-0.10.1";
src = pkgs.fetchurl {
url = "mirror://pypi/q/quantities/quantities-0.10.1.tar.gz";
sha256 = "2d27caf31a5e0c37130ac0c14bfa8f9412a5ff1fbf3378a1d6085594776c4315";
};
meta = with pkgs.stdenv.lib; {
description = "Quantities is designed to handle arithmetic and";
homepage = http://packages.python.org/quantities;
license = licenses.bsd2;
};
};
quantities = callPackage ../development/python-modules/quantities { };
qutip = buildPythonPackage rec {
name = "qutip-2.2.0";
@ -15712,21 +15564,7 @@ in {
};
};
typing = buildPythonPackage rec {
name = "typing-${version}";
version = "3.5.3.0";
src = pkgs.fetchurl {
url = "mirror://pypi/t/typing/${name}.tar.gz";
sha256 = "08gz3grrh3vph5ib1w5x1ssnpzvj077x030lx63fxs4kwg3slbfa";
};
meta = {
description = "Backport of typing module to Python versions older than 3.5";
homepage = "https://docs.python.org/3.5/library/typing.html";
license = licenses.psfl;
};
};
typing = callPackage ../development/python-modules/typing { };
typeguard = callPackage ../development/python-modules/typeguard { };
@ -15969,22 +15807,7 @@ in {
};
};
simplegeneric = buildPythonPackage rec {
version = "0.8.1";
name = "simplegeneric-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/s/simplegeneric/${name}.zip";
sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173";
};
meta = {
description = "Simple generic functions";
homepage = http://cheeseshop.python.org/pypi/simplegeneric;
license = licenses.zpl21;
};
};
simplegeneric = callPackage ../development/python-modules/simplegeneric { };
shortuuid = buildPythonPackage rec {
name = "shortuuid-${version}";
@ -16466,33 +16289,7 @@ in {
};
};
sympy = buildPythonPackage rec {
name = "sympy-1.0";
src = pkgs.fetchurl {
url = "mirror://pypi/s/sympy/${name}.tar.gz";
sha256 = "1bpzjwr9hrr7w88v4vgnj9lr6vxcldc94si13n8xpr1rv08d5b1y";
};
buildInputs = [ pkgs.glibcLocales ];
propagatedBuildInputs = with self; [ mpmath ];
# Bunch of failures including transients.
doCheck = false;
preCheck = ''
export LANG="en_US.UTF-8"
'';
meta = {
description = "A Python library for symbolic mathematics";
homepage = http://www.sympy.org/;
license = licenses.bsd3;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
};
sympy = callPackage ../development/python-modules/sympy { };
pilkit = buildPythonPackage rec {
name = "pilkit-1.1.4";
@ -18328,24 +18125,7 @@ EOF
};
};
webcolors = buildPythonPackage rec {
name = "webcolors-1.4";
src = pkgs.fetchurl {
url = "mirror://pypi/w/webcolors/${name}.tar.gz";
sha256 = "304fc95dab2848c7bf64f378356766e692c2f8b4a8b15fa3509544e6412936e8";
};
# error: invalid command 'test'
doCheck = false;
meta = {
description = "Library for working with color names/values defined by the HTML and CSS specifications";
homepage = https://bitbucket.org/ubernostrum/webcolors/overview/;
license = licenses.bsd3;
platforms = platforms.unix;
};
};
webcolors = callPackage ../development/python-modules/webcolors { };
webencodings = callPackage ../development/python-modules/webencodings { };
@ -20551,21 +20331,7 @@ EOF
};
};
dicttoxml = buildPythonPackage rec {
name = "dicttoxml-1.6.4";
src = pkgs.fetchurl {
url = "mirror://pypi/d/dicttoxml/dicttoxml-1.6.4.tar.gz";
sha256 = "5f29e95fec56680823dc41911c04c2af08727ee53c1b60e83c489212bab71161";
};
propagatedBuildInputs = with self; [ ];
meta = {
description = "Summary";
homepage = https://github.com/quandyfactory/dicttoxml;
};
};
dicttoxml = callPackage ../development/python-modules/dicttoxml { };
markdown2 = callPackage ../development/python-modules/markdown2 { };
@ -21078,25 +20844,7 @@ EOF
};
};
ovh = buildPythonPackage rec {
name = "ovh-${version}";
version = "0.4.5";
doCheck = false; #test needs packages too explicit
buildInputs = with self; [ d2to1 ];
propagatedBuildInputs = with self; [ requests ];
src = pkgs.fetchurl {
url = "mirror://pypi/o/ovh/ovh-${version}.tar.gz";
sha256 = "1wf2p1sbg34jpj97r3w5nx9pj6vp0mlprry3vw2xav3dv02qv2af";
};
meta = {
description = "Thin wrapper around OVH's APIs";
homepage = https://pypi.python.org/pypi/ovh;
license = licenses.bsd2;
maintainers = [ maintainers.makefu ];
};
};
ovh = callPackage ../development/python-modules/ovh { };
willow = buildPythonPackage rec {
name = "willow-${version}";
@ -21760,26 +21508,6 @@ EOF
};
};
pybrain = buildPythonPackage rec {
name = "pybrain-${version}";
version = "0.3.3";
src = pkgs.fetchurl {
url = "https://github.com/pybrain/pybrain/archive/${version}.tar.gz";
sha256 = "114m99vsrps2gjqfm3i3kxx4nibjhjdzphsy2bhrxa5q3h2q14dz";
};
propagatedBuildInputs = with self; [ scipy ];
meta = {
homepage = "http://pybrain.org/";
description = "Modular Machine Learning Library for Python";
license = licenses.bsd3;
maintainers = with maintainers; [ NikolaMandic ];
broken = true; # See https://github.com/NixOS/nixpkgs/pull/29198
};
};
threadpool = buildPythonPackage rec {
name = "threadpool-${version}";
version = "1.3.2";
@ -22072,24 +21800,7 @@ EOF
whoosh = callPackage ../development/python-modules/whoosh { };
packet-python = buildPythonPackage rec {
name = "${pname}-${version}";
pname = "packet-python";
version = "1.33";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/eb/82/f0506bd964501f958ac6a37e843ccb7bd9e712732886258314d55f0ec710/packet-python-1.33.tar.gz";
sha256 = "0bmvfmvjm8jx0y8sv0jf5mhv0h3v8idx0sc5myxs7ig200584dd3";
};
propagatedBuildInputs = with self; [ requests ];
meta = {
description = "A Python client for the Packet API.";
homepage = "https://github.com/packethost/packet-python";
license = licenses.lgpl3;
maintainers = with maintainers; [ dipinhora ];
platforms = platforms.all;
};
};
packet-python = callPackage ../development/python-modules/packet-python { };
pwntools = callPackage ../development/python-modules/pwntools { };