Merge staging-next into master

This commit is contained in:
Frederik Rietdijk 2018-12-19 09:08:04 +01:00 committed by GitHub
commit 1a51abe9c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
495 changed files with 1759 additions and 1450 deletions

View File

@ -2525,6 +2525,23 @@ addEnvHooks "$hostOffset" myBashFunction
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>
libiconv, libintl
</term>
<listitem>
<para>
A few libraries automatically add to
<literal>NIX_LDFLAGS</literal> their library, making their
symbols automatically available to the linker. This includes
libiconv and libintl (gettext). This is done to provide
compatibility between GNU Linux, where libiconv and libintl
are bundled in, and other systems where that might not be the
case. Sometimes, this behavior is not desired. To disable
this behavior, set <literal>dontAddExtraLibs</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term> <term>
cmake cmake

View File

@ -20,13 +20,13 @@ auditTmpdir() {
if [[ "$i" =~ .build-id ]]; then continue; fi if [[ "$i" =~ .build-id ]]; then continue; fi
if isELF "$i"; then if isELF "$i"; then
if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR/"; then if { printf :; patchelf --print-rpath "$i"; } | grep -q -F ":$TMPDIR/"; then
echo "RPATH of binary $i contains a forbidden reference to $TMPDIR/" echo "RPATH of binary $i contains a forbidden reference to $TMPDIR/"
exit 1 exit 1
fi fi
fi fi
if isScript "$i"; then if isScript "$i"; then
if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then
if grep -q -F "$TMPDIR/" "$i"; then if grep -q -F "$TMPDIR/" "$i"; then
echo "wrapper script $i contains a forbidden reference to $TMPDIR/" echo "wrapper script $i contains a forbidden reference to $TMPDIR/"

View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tzdata-${version}"; name = "tzdata-${version}";
version = "2018e"; version = "2018g";
srcs = srcs =
[ (fetchurl { [ (fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
sha256 = "0bk97fv2i5ns42prpmlaadsswdjwv0ifi7whj2s4q6l44rcqwa3b"; sha256 = "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2";
}) })
(fetchurl { (fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
sha256 = "1kpb02631s58i068mwq63xlamcv1ffj4p6y4wpb9kdl01vr0qd6a"; sha256 = "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa";
}) })
]; ];

View File

@ -206,6 +206,9 @@ stdenv.mkDerivation (rec {
"--disable-large-address-space" "--disable-large-address-space"
]; ];
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
# Make sure we never relax`$PATH` and hooks support for compatability. # Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true; strictDeps = true;

View File

@ -186,6 +186,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability. # Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true; strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour

View File

@ -167,6 +167,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability. # Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true; strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour

View File

@ -167,6 +167,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability. # Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true; strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour

View File

@ -149,6 +149,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability. # Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true; strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 perl autoconf automake m4 python3
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour

View File

@ -3,16 +3,16 @@
let let
# Note: the version MUST be one version prior to the version we're # Note: the version MUST be one version prior to the version we're
# building # building
version = "1.30.0"; version = "1.30.1";
# fetch hashes by running `print-hashes.sh 1.30.0` # fetch hashes by running `print-hashes.sh 1.30.0`
hashes = { hashes = {
i686-unknown-linux-gnu = "4ceb0e3011d96504587abb7edfdea9c1b4b7cb2c4488cc4a25adc2f3b6a88b21"; i686-unknown-linux-gnu = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf";
x86_64-unknown-linux-gnu = "f620e3125cc505c842150bd873c0603432b6cee984cdae8b226cf92c8aa1a80f"; x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e";
armv7-unknown-linux-gnueabihf = "63991f6769ca8db693562c34ac25473e9d4f9f214d6ee98917891be469d69cfd"; armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b";
aarch64-unknown-linux-gnu = "9690c7c50eba5a8461184ee4138b4c284bad31ccc4aa1f2ddeec58b253e6363e"; aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874";
i686-apple-darwin = "b8e5ac31f0a192a58b0e98ff88c47035a2882598946352fa5a86c28ede079230"; i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083";
x86_64-apple-darwin = "07008d90932712282bc599f1e9a226e97879c758dc1f935e6e2675e45694cc1b"; x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94";
}; };
platform = platform =

View File

@ -7,11 +7,11 @@
let let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
version = "1.30.1"; version = "1.31.0";
cargoVersion = "1.30.0"; cargoVersion = "1.31.0";
src = fetchurl { src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
sha256 = "0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn"; sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs";
}; };
in rec { in rec {
rustc = callPackage ./rustc.nix { rustc = callPackage ./rustc.nix {

View File

@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
&& libSM != null; && libSM != null;
let let
version = "1.12.10"; version = "1.12.12";
sha256 = "1xywijmgfad4m3cxp0b4l6kvypwc53ckmhwwzbrc6n32jwj3ssab"; sha256 = "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm";
self = stdenv.mkDerivation { self = stdenv.mkDerivation {
name = "dbus-${version}"; name = "dbus-${version}";

View File

@ -10,7 +10,7 @@ addEnvHooks "$hostOffset" gettextDataDirsHook
# libintl must be listed in load flags on non-Glibc # libintl must be listed in load flags on non-Glibc
# it doesn't hurt to have it in Glibc either though # it doesn't hurt to have it in Glibc either though
if [ ! -z "@gettextNeedsLdflags@" ]; then if [ -n "@gettextNeedsLdflags@" -a -z "$dontAddExtraLibs" ]; then
# See pkgs/build-support/setup-hooks/role.bash # See pkgs/build-support/setup-hooks/role.bash
getHostRole getHostRole
export NIX_${role_pre}LDFLAGS+=" -lintl" export NIX_${role_pre}LDFLAGS+=" -lintl"

View File

@ -1,11 +1,15 @@
{ version, sha256 }: { version, sha256 }:
{ stdenv, fetchurl, { stdenv, fetchurl
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
# then stops downstream builds (mariadb in particular) from detecting it. This # then stops downstream builds (mariadb in particular) from detecting it. This
# option should remove the prefix and give us a working jemalloc. # option should remove the prefix and give us a working jemalloc.
# Causes segfaults with some software (ex. rustc), but defaults to true for backward # Causes segfaults with some software (ex. rustc), but defaults to true for backward
# compatibility. Ignored on non OSX. # compatibility. Ignored on non OSX.
stripPrefix ? true }: , stripPrefix ? true
, disableInitExecTls ? false
}:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jemalloc-${version}"; name = "jemalloc-${version}";
@ -17,7 +21,11 @@ stdenv.mkDerivation rec {
}; };
# see the comment on stripPrefix # see the comment on stripPrefix
configureFlags = stdenv.lib.optional (stdenv.isDarwin && stripPrefix) "--with-jemalloc-prefix="; configureFlags = []
++ optional (stdenv.isDarwin && stripPrefix) [ "--with-jemalloc-prefix=" ]
++ optional disableInitExecTls [ "--disable-initial-exec-tls" ]
;
doCheck = true; doCheck = true;
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -2,5 +2,7 @@
# it doesn't hurt to have it in Glibc either though # it doesn't hurt to have it in Glibc either though
# See pkgs/build-support/setup-hooks/role.bash # See pkgs/build-support/setup-hooks/role.bash
getHostRole if [ -z "$dontAddExtraLibs" ]; then
export NIX_${role_pre}LDFLAGS+=" -liconv" getHostRole
export NIX_${role_pre}LDFLAGS+=" -liconv"
fi

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libmicrohttpd-${version}"; name = "libmicrohttpd-${version}";
version = "0.9.60"; version = "0.9.61";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
sha256 = "0wf457bqbdvx53clk4dg2620p83vk4757l7lrpvmxrd9jlzms3nd"; sha256 = "0dfl96l5wxqmswdqsdxqisflvm0padk9rikxyrhrx9rhm6s6ki6v";
}; };
outputs = [ "out" "dev" "devdoc" "info" ]; outputs = [ "out" "dev" "devdoc" "info" ];

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libmnl }: { stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.1"; version = "1.1.2";
name = "libnftnl-${version}"; name = "libnftnl-${version}";
src = fetchurl { src = fetchurl {
url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
sha256 = "1wmgjfcb35mscb2srzia5931srygywrs1aznxmg67v177x0nasjx"; sha256 = "0pffmsv41alsn5ac7mwnb9fh3qpwzqk13jrzn6c5i71wq6kbgix5";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, flex, bison }: { stdenv, fetchurl, flex, bison }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpcap-1.8.1"; name = "libpcap-1.9.0";
src = fetchurl { src = fetchurl {
url = "https://www.tcpdump.org/release/${name}.tar.gz"; url = "https://www.tcpdump.org/release/${name}.tar.gz";
sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7"; sha256 = "06bhydl4vr4z9c3vahl76f2j96z1fbrcl7wwismgs4sris08inrf";
}; };
nativeBuildInputs = [ flex bison ]; nativeBuildInputs = [ flex bison ];
@ -27,26 +27,10 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace " -arch i386" "" substituteInPlace configure --replace " -arch i386" ""
''; '';
patches = [
(fetchpatch {
url = "https://sources.debian.net/data/main/libp/libpcap/1.8.1-3/debian/patches/disable-remote.diff";
sha256 = "0dvjax9c0spvq8cdjnkbnm65wlzaml259yragf95kzg611vszfmj";
})
# See https://github.com/wjt/bustle/commit/f62cf6bfa662af4ae39effbbd4891bc619e3b4e9
(fetchpatch {
url = "https://github.com/the-tcpdump-group/libpcap/commit/2be9c29d45fb1fab8e9549342a30c160b7dea3e1.patch";
sha256 = "1g8mh942vr0abn48g0bdvi4gmhq1bz0l80276603y7064qhy3wq5";
})
(fetchpatch {
url = "https://github.com/the-tcpdump-group/libpcap/commit/1a6b088a88886eac782008f37a7219a32b86da45.patch";
sha256 = "1n5ylm7ch3i1lh4y2q16b0vabgym8g8mqiqxpqcdkjdn05c1wflr";
})
];
preInstall = ''mkdir -p $out/bin''; preInstall = ''mkdir -p $out/bin'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.tcpdump.org; homepage = https://www.tcpdump.org;
description = "Packet Capture Library"; description = "Packet Capture Library";
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz ];

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcre2-${version}"; name = "pcre2-${version}";
version = "10.31"; version = "10.32";
src = fetchurl { src = fetchurl {
url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2"; url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2";
sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0"; sha256 = "0bkwp2czcckvvbdls7b331cad11rxsm020aqhrbz84z8bp68k7pj";
}; };
configureFlags = [ configureFlags = [

View File

@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
sha256 = "0c91y61y4gy6p91cwbzg32dhavw4b7fflg370rimqhdxpzdfr1rg"; sha256 = "0c91y61y4gy6p91cwbzg32dhavw4b7fflg370rimqhdxpzdfr1rg";
}; };
patches = [
# CVE-2018-19788 - high UID fixup
(fetchpatch {
url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5230646dc6876ef6e27f57926b1bad348f636147.patch";
name = "CVE-2018-19788.patch";
sha256 = "1y3az4mlxx8k1zcss5qm7k102s7k1kqgcfnf11j9678fh7p008vp";
})
];
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i -e "s/-Wl,--as-needed//" configure.ac sed -i -e "s/-Wl,--as-needed//" configure.ac

View File

@ -79,12 +79,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openblas-${version}"; name = "openblas-${version}";
version = "0.3.3"; version = "0.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xianyi"; owner = "xianyi";
repo = "OpenBLAS"; repo = "OpenBLAS";
rev = "v${version}"; rev = "v${version}";
sha256 = "0cpkvfvc14xm9mifrm919rp8vrq70gpl7r2sww4f0izrl39wklwx"; sha256 = "1jdq4msfyg13pdmwwfqpixf4fshss68qzls820lmn0i6y7h4aix3";
}; };
inherit blas64; inherit blas64;

View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wayland-protocols-${version}"; name = "wayland-protocols-${version}";
version = "1.16"; version = "1.17";
src = fetchurl { src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1icqikvhgv9kcf8lcqml3w9fb8q3igr4c3471jb6mlyw3yaqa53b"; sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View File

@ -26,11 +26,11 @@ let
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "Cython"; pname = "Cython";
version = "0.29"; version = "0.29.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "15zama7fgp7yyi3z39xp3z2lvwcgch8fn3ycscw2cs37vqg6v4cl"; sha256 = "15zv9c4ami9hzya28wz1shqljbbk5sxdvqbjxqnf15ssk137daqq";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0yi1r13p3l1d5dpdfnyp239l6l17nwvyky8y62nmmqxlsp2ja9hi"; sha256 = "112625c5d5b4e35aad301ef9e937b7275043d310d75bd76e2b2dd07147c8217a";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

View File

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, isPy3k , isPy3k
, fetchPypi , fetchPypi
, fetchpatch
, doit , doit
, glibcLocales , glibcLocales
, pytest , pytest
@ -54,6 +55,11 @@ buildPythonPackage rec {
sha256 = "18bq68f9v7xk9ahjl6x4k77yysq5g6g07ng2ndbg35kcsdnw4nk6"; sha256 = "18bq68f9v7xk9ahjl6x4k77yysq5g6g07ng2ndbg35kcsdnw4nk6";
}; };
patches = fetchpatch {
url = https://github.com/getnikola/nikola/commit/d40be74a86af71b5206dc22beb82fcd0d08ea2f6.patch;
sha256 = "0disr8bxbfjymwlbm82mxkal3ynnv8zfiqsgfh9fkqhb35bn4l8j";
};
checkPhase = '' checkPhase = ''
LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test . LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test .
''; '';

View File

@ -1,5 +1,4 @@
{ stdenv { stdenv
, lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, imagemagick , imagemagick
@ -15,33 +14,30 @@ let
imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}"; imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}";
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "Wand"; pname = "Wand";
version = "0.4.4"; version = "0.4.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "28e0454c9d16d69c5d5034918d96320d8f9f1377b4fdaf4944eec2f938c74704"; sha256 = "b40a2215545e8c7193b3fccd6e7251dc556ec9b878a4f67d992b056ff396bc65";
}; };
checkInputs = [ pytest pytest_xdist memory_profiler psutil ]; checkInputs = [ pytest pytest_xdist memory_profiler psutil ];
buildInputs = [ imagemagick ]; buildInputs = [ imagemagick ];
patches = [
./libraries.patch
];
inherit magick_wand_library imagemagick_library; inherit magick_wand_library imagemagick_library;
postPatch = '' postPatch = ''
substituteAllInPlace wand/api.py substituteAllInPlace wand/api.py
''; '';
# No tests # tests not included with pypi release
doCheck = false; doCheck = false;
meta = {
meta = with stdenv.lib; {
description = "Ctypes-based simple MagickWand API binding for Python"; description = "Ctypes-based simple MagickWand API binding for Python";
homepage = http://wand-py.org/; homepage = http://wand-py.org/;
license = with lib.licenses; [ mit ]; license = [ licenses.mit ];
}; };
passthru = { passthru = {

View File

@ -1,149 +0,0 @@
diff --git a/wand/api.py b/wand/api.py
index 2c18513..1a1b511 100644
--- a/wand/api.py
+++ b/wand/api.py
@@ -43,98 +43,6 @@ class c_magick_char_p(ctypes.c_char_p):
"""
library.MagickRelinquishMemory(self)
-
-def library_paths():
- """Iterates for library paths to try loading. The result paths are not
- guaranteed that they exist.
-
- :returns: a pair of libwand and libmagick paths. they can be the same.
- path can be ``None`` as well
- :rtype: :class:`tuple`
-
- """
- libwand = None
- libmagick = None
- versions = '', '-6', '-Q16', '-Q8', '-6.Q16'
- options = '', 'HDRI', 'HDRI-2'
- system = platform.system()
- magick_home = os.environ.get('MAGICK_HOME')
-
- if system == 'Windows':
- # ImageMagick installers normally install coder and filter DLLs in
- # subfolders, we need to add those folders to PATH, otherwise loading
- # the DLL later will fail.
- try:
- with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
- r"SOFTWARE\ImageMagick\Current") as reg_key:
- libPath = winreg.QueryValueEx(reg_key, "LibPath")
- coderPath = winreg.QueryValueEx(reg_key, "CoderModulesPath")
- filterPath = winreg.QueryValueEx(reg_key, "FilterModulesPath")
- magick_home = libPath[0]
- os.environ['PATH'] += (';' + libPath[0] + ";" +
- coderPath[0] + ";" + filterPath[0])
- except OSError:
- # otherwise use MAGICK_HOME, and we assume the coder and
- # filter DLLs are in the same directory
- pass
-
- def magick_path(path):
- return os.path.join(magick_home, *path)
- combinations = itertools.product(versions, options)
- for suffix in (version + option for version, option in combinations):
- # On Windows, the API is split between two libs. On other platforms,
- # it's all contained in one.
- if magick_home:
- if system == 'Windows':
- libwand = 'CORE_RL_wand_{0}.dll'.format(suffix),
- libmagick = 'CORE_RL_magick_{0}.dll'.format(suffix),
- yield magick_path(libwand), magick_path(libmagick)
- libwand = 'libMagickWand{0}.dll'.format(suffix),
- libmagick = 'libMagickCore{0}.dll'.format(suffix),
- yield magick_path(libwand), magick_path(libmagick)
- elif system == 'Darwin':
- libwand = 'lib', 'libMagickWand{0}.dylib'.format(suffix),
- yield magick_path(libwand), magick_path(libwand)
- else:
- libwand = 'lib', 'libMagickWand{0}.so'.format(suffix),
- yield magick_path(libwand), magick_path(libwand)
- if system == 'Windows':
- libwand = ctypes.util.find_library('CORE_RL_wand_' + suffix)
- libmagick = ctypes.util.find_library('CORE_RL_magick_' + suffix)
- yield libwand, libmagick
- libwand = ctypes.util.find_library('libMagickWand' + suffix)
- libmagick = ctypes.util.find_library('libMagickCore' + suffix)
- yield libwand, libmagick
- else:
- libwand = ctypes.util.find_library('MagickWand' + suffix)
- yield libwand, libwand
-
-
-def load_library():
- """Loads the MagickWand library.
-
- :returns: the MagickWand library and the ImageMagick library
- :rtype: :class:`ctypes.CDLL`
-
- """
- tried_paths = []
- for libwand_path, libmagick_path in library_paths():
- if libwand_path is None or libmagick_path is None:
- continue
- try:
- tried_paths.append(libwand_path)
- libwand = ctypes.CDLL(libwand_path)
- if libwand_path == libmagick_path:
- libmagick = libwand
- else:
- tried_paths.append(libmagick_path)
- libmagick = ctypes.CDLL(libmagick_path)
- except (IOError, OSError):
- continue
- return libwand, libmagick
- raise IOError('cannot find library; tried paths: ' + repr(tried_paths))
-
-
if not hasattr(ctypes, 'c_ssize_t'):
if ctypes.sizeof(ctypes.c_uint) == ctypes.sizeof(ctypes.c_void_p):
ctypes.c_ssize_t = ctypes.c_int
@@ -176,43 +84,14 @@ class AffineMatrix(ctypes.Structure):
# Preserve the module itself even if it fails to import
sys.modules['wand._api'] = sys.modules['wand.api']
-try:
- libraries = load_library()
-except (OSError, IOError):
- msg = 'http://docs.wand-py.org/en/latest/guide/install.html'
- if sys.platform.startswith(('dragonfly', 'freebsd')):
- msg = 'pkg install'
- elif sys.platform == 'win32':
- msg += '#install-imagemagick-on-windows'
- elif sys.platform == 'darwin':
- mac_pkgmgrs = {'brew': 'brew install freetype imagemagick',
- 'port': 'port install imagemagick'}
- for pkgmgr in mac_pkgmgrs:
- with os.popen('which ' + pkgmgr) as f:
- if f.read().strip():
- msg = mac_pkgmgrs[pkgmgr]
- break
- else:
- msg += '#install-imagemagick-on-mac'
- else:
- distname, _, __ = platform.linux_distribution()
- distname = (distname or '').lower()
- if distname in ('debian', 'ubuntu'):
- msg = 'apt-get install libmagickwand-dev'
- elif distname in ('fedora', 'centos', 'redhat'):
- msg = 'yum install ImageMagick-devel'
- raise ImportError('MagickWand shared library not found.\n'
- 'You probably had not installed ImageMagick library.\n'
- 'Try to install:\n ' + msg)
-
#: (:class:`ctypes.CDLL`) The MagickWand library.
-library = libraries[0]
+library = ctypes.CDLL("@magick_wand_library@")
#: (:class:`ctypes.CDLL`) The ImageMagick library. It is the same with
#: :data:`library` on platforms other than Windows.
#:
#: .. versionadded:: 0.1.10
-libmagick = libraries[1]
+libmagick = ctypes.CDLL("@imagemagick_library@")
try:
library.MagickWandGenesis.argtypes = []

View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "absl-py"; pname = "absl-py";
version = "0.4.1"; version = "0.6.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1e6e70506fb4d867cf269af7bcc27b744c36bbc4c516f0f8ccf2039956deea72"; sha256 = "87519e3b91a3d573664c6e2ee33df582bb68dca6642ae3cf3a4361b1c0a4e9d6";
}; };
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];

View File

@ -21,5 +21,6 @@ buildPythonPackage rec {
maintainers = with maintainers; [ fridh ]; maintainers = with maintainers; [ fridh ];
license = with licenses; [ bsd3 ]; license = with licenses; [ bsd3 ];
homepage = https://github.com/python-acoustics/python-acoustics; homepage = https://github.com/python-acoustics/python-acoustics;
broken = true;
}; };
} }

View File

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioeventlet"; pname = "aioeventlet";
version = "0.4"; version = "0.5.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "19krvycaiximchhv1hcfhz81249m3w3jrbp2h4apn1yf4yrc4y7y"; sha256 = "cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a";
}; };
propagatedBuildInputs = [ eventlet trollius asyncio ]; propagatedBuildInputs = [ eventlet trollius asyncio ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiohttp-jinja2"; pname = "aiohttp-jinja2";
version = "1.0.0"; version = "1.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "df1ba60b8779d232a23e5e38589b85f6430e9ace5adce546353155349bdea023"; sha256 = "aef9b6595f962182ad00c990095fb51d731c280e1d183e2b28cf0bdb5a942d0c";
}; };
propagatedBuildInputs = [ aiohttp jinja2 ]; propagatedBuildInputs = [ aiohttp jinja2 ];

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "alembic"; pname = "alembic";
version = "1.0.0"; version = "1.0.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "52d73b1d750f1414fa90c25a08da47b87de1e4ad883935718a8f36396e19e78e"; sha256 = "4b6ff7433247fe80b6ef522ef3763acb959cbdef027d03f76f4cd3c7118c1872";
}; };
buildInputs = [ pytest pytestcov mock coverage ]; buildInputs = [ pytest pytestcov mock coverage ];

View File

@ -1,30 +1,33 @@
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch { stdenv, buildPythonPackage, fetchPypi, fetchpatch
, pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales , pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales
, entrypoints, jsonschema, numpy, pandas, six, toolz, typing }: , entrypoints, jsonschema, numpy, pandas, six, toolz, typing
, pythonOlder, recommonmark }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "altair"; pname = "altair";
version = "2.1.0"; version = "2.2.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e8b222588dde98ec614e6808357fde7fa321118db44cc909df2bf30158d931c0"; sha256 = "c158699026eb5a19f95c1ca742e2e82bc20c27013ef5785f10836283e2233f8a";
}; };
patches = fetchpatch { checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ];
url = https://github.com/altair-viz/altair/commit/bfca8aecce9593c48aa5834e3f8f841deb58391c.patch;
sha256 = "01izc5d8c6ry3mh0k0hfasb6jc4720g75yw2qdlp9ja8mnjsp4k3";
};
checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales ]; propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz ]
++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
# hack to prevent typing from being required for python > 3.5
postPatch = ''
substituteInPlace requirements.txt \
--replace "typing" ""
'';
checkPhase = '' checkPhase = ''
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8
py.test altair --doctest-modules py.test altair --doctest-modules
''; '';
propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz typing ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A declarative statistical visualization library for Python."; description = "A declarative statistical visualization library for Python.";
homepage = https://github.com/altair-viz/altair; homepage = https://github.com/altair-viz/altair;

View File

@ -4,19 +4,20 @@
, pytest , pytest
, py , py
, mock , mock
, pkgs , glibcLocales
, iocapture
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "argh"; pname = "argh";
version = "0.26.1"; version = "0.26.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1nqham81ihffc9xmw85dz3rg3v90rw7h0dp3dy0bh3qkp4n499q6"; sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65";
}; };
buildInputs = [ pytest py mock pkgs.glibcLocales ]; checkInputs = [ pytest py mock glibcLocales iocapture ];
checkPhase = '' checkPhase = ''
export LANG="en_US.UTF-8" export LANG="en_US.UTF-8"

View File

@ -1,9 +1,9 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: { stdenv, buildPythonPackage, fetchPypi, isPy34 }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "asyncio"; pname = "asyncio";
version = "3.4.3"; version = "3.4.3";
disabled = pythonOlder "3.3"; disabled = !isPy34;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "atomicwrites"; pname = "atomicwrites";
version = "1.1.5"; version = "1.2.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585"; sha256 = "ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "attrs"; pname = "attrs";
version = "18.1.0"; version = "18.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b"; sha256 = "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69";
}; };
# macOS needs clang for testing # macOS needs clang for testing

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "autopep8"; pname = "autopep8";
version = "1.4.2"; version = "1.4.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1b8d42ebba751a91090d3adb5c06840b1151d71ed43e1c7a9ed6911bfe8ebe6c"; sha256 = "33d2b5325b7e1afb4240814fe982eea3a92ebea712869bfd08b3c0393404248c";
}; };
propagatedBuildInputs = [ pycodestyle ]; propagatedBuildInputs = [ pycodestyle ];

View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "av"; pname = "av";
version = "0.5.3"; version = "6.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0k5nbff8c2wxc8wnyn1qghndbd2rjck1y3552s63w41mccj1k1qr"; sha256 = "9037d73d7a812c3dc75d9cc27d03215483c9e782eae63a07142c0725c6bd2df0";
}; };
buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ]; buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];

View File

@ -1,23 +1,28 @@
{ stdenv { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, numpy , numpy
, pytestrunner
, pytest
, h5py
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.3.0";
pname = "awkward"; pname = "awkward";
version = "0.5.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "fc3080c66987f2a03aa9ba0809e51227eb7aa34198da4b1ee4deb95356409693"; sha256 = "bc824882f80ae07d442a011eb6d14a6fce581e022d4ff6c73d89d93c832ee3cc";
}; };
buildInputs = [ pytestrunner h5py ];
checkInputs = [ pytest ];
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];
meta = with stdenv.lib; { meta = with lib; {
description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy.";
homepage = https://github.com/scikit-hep/awkward-array; homepage = https://github.com/scikit-hep/awkward-array;
description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];
}; };

View File

@ -2,12 +2,12 @@
, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.12.1"; version = "1.12.2";
pname = "aws-adfs"; pname = "aws-adfs";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "72725d7005252b96ccfa9719fe4beec2b86301bff894d4d97a50fc1d05393fd8"; sha256 = "e35fbd33e1878310099346a95b7eb5244831c9f5f6554bca7193ac50dcd41aa3";
}; };
# Relax version constraint # Relax version constraint

View File

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aws-sam-translator"; pname = "aws-sam-translator";
version = "1.6.1"; version = "1.8.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "23160f717bd65de810fa538b7c145eae4384d10adb460e375d148de7f283bd10"; sha256 = "bdf9ba476a9a7726fe93746670ccae257955352d98b231f32e9529f01db7ef3b";
}; };
# Tests are not included in the PyPI package # Tests are not included in the PyPI package

View File

@ -5,19 +5,20 @@
, wrapt , wrapt
, requests , requests
, future , future
, botocore
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aws-xray-sdk"; pname = "aws-xray-sdk";
version = "1.1.2"; version = "2.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "8ec3c6c82e76c03799ec209ed59642d78f62218db6a430f7e2d20491cac3c5ef"; sha256 = "fc5537268cc8041f74e14077c4b4b4cef0f3de25ecef793ace63cedf87fe4a2a";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
jsonpickle wrapt requests future jsonpickle wrapt requests future botocore
]; ];
meta = { meta = {

View File

@ -7,14 +7,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.0.0"; version = "1.1.16";
pname = "azure-common"; pname = "azure-common";
disabled = isPyPy; disabled = isPyPy;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491"; sha256 = "2606ae77ff81c0036965b92ec2efe03eaec02a66714140ca0f7aa401b8b9bbb0";
}; };
propagatedBuildInputs = [ azure-nspkg ]; propagatedBuildInputs = [ azure-nspkg ];

View File

@ -6,13 +6,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.20.0"; version = "4.3.1";
pname = "azure-mgmt-compute"; pname = "azure-mgmt-compute";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v"; sha256 = "5b0c2390af3e29d910e3d6e7a72b0be59d6e15933740dd193129217c000e4fed";
}; };
preConfigure = '' preConfigure = ''

View File

@ -6,13 +6,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.20.1"; version = "2.2.1";
pname = "azure-mgmt-network"; pname = "azure-mgmt-network";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; sha256 = "a4327bccc435ca4f829ac18f82f17923b490958c202af7a86044ccabeaaa5401";
}; };
preConfigure = '' preConfigure = ''

View File

@ -5,13 +5,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.0.0"; version = "3.0.2";
pname = "azure-mgmt-nspkg"; pname = "azure-mgmt-nspkg";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52";
}; };
propagatedBuildInputs = [ azure-nspkg ]; propagatedBuildInputs = [ azure-nspkg ];

View File

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
version = "0.20.1"; version = "2.0.0";
pname = "azure-mgmt-resource"; pname = "azure-mgmt-resource";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; sha256 = "2e83289369be88d0f06792118db5a7d4ed7150f956aaae64c528808da5518d7f";
}; };
preConfigure = '' preConfigure = ''

View File

@ -6,13 +6,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.20.0"; version = "3.0.0";
pname = "azure-mgmt-storage"; pname = "azure-mgmt-storage";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; sha256 = "24c52b9dcb5e224ca9572d6ec39b53d332bdfe01818e85ec1cc1b5bedf16ce07";
}; };
preConfigure = '' preConfigure = ''

View File

@ -4,13 +4,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.0.0"; version = "3.0.2";
pname = "azure-nspkg"; pname = "azure-nspkg";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "293f286c15ea123761f30f5b1cb5adebe5f1e5009efade923c6dd1e017621bf7"; sha256 = "e7d3cea6af63e667d87ba1ca4f8cd7cb4dfca678e4c55fc1cedb320760e39dd0";
}; };
meta = with pkgs.lib; { meta = with pkgs.lib; {

View File

@ -7,13 +7,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.20.1"; version = "0.20.6";
pname = "azure-servicemanagement-legacy"; pname = "azure-servicemanagement-legacy";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs"; sha256 = "c883ff8fa3d4f4cb7b9344e8cb7d92a9feca2aa5efd596237aeea89e5c10981d";
}; };
propagatedBuildInputs = [ azure-common requests ]; propagatedBuildInputs = [ azure-common requests ];

View File

@ -10,13 +10,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.11.0"; version = "4.0.0";
pname = "azure"; pname = "azure";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24"; sha256 = "7d6afa332fccffe1a9390bcfac5122317eec657c6029f144d794603a81cd0e50";
}; };
propagatedBuildInputs = [ dateutil pyopenssl requests ] propagatedBuildInputs = [ dateutil pyopenssl requests ]

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "backports.shutil_which"; pname = "backports.shutil_which";
version = "3.5.1"; version = "3.5.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "16sa3adkf71862cb9pk747pw80a2f1v5m915ijb4fgj309xrlhyx"; sha256 = "fe39f567cbe4fad89e8ac4dbeb23f87ef80f7fe8e829669d0221ecdb0437c133";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

View File

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bleach"; pname = "bleach";
version = "2.1.4"; version = "3.0.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0ee95f6167129859c5dce9b1ca291ebdb5d8cd7e382ca0e237dfd0dad63f63d8"; sha256 = "48d39675b80a75f6d1c3bdbffec791cf0bbbab665cf01e20da701c77de278718";
}; };
checkInputs = [ pytest pytestrunner ]; checkInputs = [ pytest pytestrunner ];

View File

@ -1,20 +1,29 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, six
, nose
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "blessings"; pname = "blessings";
version = "1.6"; version = "1.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "01rhgn2c3xjf9h1lxij9m05iwf2ba6d0vd7nic26c2gic4q73igd"; sha256 = "98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d";
}; };
# 4 failing tests, 2to3 # 4 failing tests, 2to3
doCheck = false; doCheck = false;
propagatedBuildInputs = [ six ];
checkInputs = [ nose ];
checkPhase = ''
nosetests
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/erikrose/blessings; homepage = https://github.com/erikrose/blessings;
description = "A thin, practical wrapper around terminal coloring, styling, and positioning"; description = "A thin, practical wrapper around terminal coloring, styling, and positioning";

View File

@ -33,11 +33,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bokeh"; pname = "bokeh";
version = "1.0.0"; version = "1.0.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1h1g3jw53srcvbgl1jb9p2rfi7kjz6c91hbqxfbr3s2wx1f67ahn"; sha256 = "43aa8b867f2db99c0cf3178149d2533e9e954a8355d6161381d0b8765c90db5e";
}; };
disabled = isPyPy; disabled = isPyPy;

View File

@ -9,9 +9,9 @@ let
}; };
setuptools_source = fetchPypi { setuptools_source = fetchPypi {
pname = "setuptools"; pname = "setuptools";
version = "40.4.3"; version = "40.6.2";
format = "wheel"; format = "wheel";
sha256 = "1zzryv1fqx4nk7hzv4afxpl8k7f60lc0qkhxlc8sqjs4igakfhff"; sha256 = "88ee6bcd5decec9bd902252e02e641851d785c6e5e75677d2744a9d13fed0b0a";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

View File

@ -1,6 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchPypi
, botocore , botocore
, jmespath , jmespath
, s3transfer , s3transfer
@ -13,13 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3"; pname = "boto3";
version = "1.7.84"; version = "1.9.62"; # N.B: if you change this, change botocore too
src = fetchFromGitHub { src = fetchPypi {
owner = "boto"; inherit pname version;
repo = "boto3"; sha256 = "0rf3ik4bqr0qab2648rcaahycr2sih257ngz8brizyfln0lk1sg9";
rev = version;
sha256 = "0d9kqjqmnn53p1xpmdbbjxcxv2482yx3vjhxw8izp0mpq58i5c14";
}; };
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
@ -47,4 +45,4 @@ buildPythonPackage rec {
services like Amazon S3 and Amazon EC2. services like Amazon S3 and Amazon EC2.
''; '';
}; };
} }

View File

@ -7,15 +7,16 @@
, simplejson , simplejson
, mock , mock
, nose , nose
, urllib3
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore"; pname = "botocore";
version = "1.10.84"; version = "1.12.62"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "d3e4b5a2c903ea30d19d41ea2f65d0e51dce54f4f4c4dfd6ecd7b04f240844a8"; sha256 = "0zgq3cldrh1x65s3vy1mhp1h5nnsdxw7ig1v0di7p8yns3iazsv7";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -24,6 +25,7 @@ buildPythonPackage rec {
docutils docutils
ordereddict ordereddict
simplejson simplejson
urllib3
]; ];
checkInputs = [ mock nose ]; checkInputs = [ mock nose ];

View File

@ -4,19 +4,20 @@
, pytest , pytest
, jinja2 , jinja2
, selenium , selenium
, six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "branca"; pname = "branca";
version = "0.3.0"; version = "0.3.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "bea38396cf58fd7173ac942277fe4138127eb1546622684206cb34d344b03fb4"; sha256 = "3e762c9bdf40725f3d05ea1fda8fae9b470bfada6474e43a1242c8204a7bb15e";
}; };
checkInputs = [ pytest selenium ]; checkInputs = [ pytest selenium ];
propagatedBuildInputs = [ jinja2 ]; propagatedBuildInputs = [ jinja2 six ];
# Seems to require a browser # Seems to require a browser
doCheck = false; doCheck = false;

View File

@ -24,11 +24,11 @@ let
package = buildPythonPackage rec { package = buildPythonPackage rec {
pname = "buildbot"; pname = "buildbot";
version = "1.4.0"; version = "1.5.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0dfa926nh642i3bnpzlz0q347zicyx6wswjfqbniri59ya64fncx"; sha256 = "d02a717222bcdc98205624c7d6b0b2ae24653170f2971946f26bf8cadea4fd52";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -7,20 +7,21 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cached-property"; pname = "cached-property";
version = "1.4.2"; version = "1.5.1";
# conftest.py is missing in PyPI tarball # conftest.py is missing in PyPI tarball
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pydanny"; owner = "pydanny";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0gjmgfilhljkx2b60cjikwh55jg2jwxhwi8hgkrzdnzk465ywhrw"; sha256 = "0xh0pwmiikx0il9nnfyf034ydmlw6992s0d209agd9j5d3s2k5q6";
}; };
checkInputs = [ pytest freezegun ]; checkInputs = [ pytest freezegun ];
# https://github.com/pydanny/cached-property/issues/131
checkPhase = '' checkPhase = ''
py.test py.test -k "not test_threads_ttl_expiry"
''; '';
meta = { meta = {

View File

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-can"; pname = "python-can";
version = "2.2.1"; version = "3.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b"; sha256 = "0d2ddb3b663af51b11a4c7fb7a577c63302a831986239f82bb6af65efc065b07";
}; };
propagatedBuildInputs = [ wrapt pyserial ]; propagatedBuildInputs = [ wrapt pyserial ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cement"; pname = "cement";
version = "3.0.0"; version = "3.0.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e50e1033d61d18b36787a60d52cad0d3fe20780e7e2f78f0204bde32000645f9"; sha256 = "8c692493c9d97b07e4a2c0770223fa5ee12a3110cfcb246d7d26fffe22edd22e";
}; };
# Disable test tests since they depend on a memcached server running on # Disable test tests since they depend on a memcached server running on

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "certifi"; pname = "certifi";
version = "2018.8.24"; version = "2018.10.15";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "376690d6f16d32f9d1fe8932551d80b23e9d393a8578c5633a2ed39a64861638"; sha256 = "6d58c986d22b038c8c0df30d639f23a3e6d172a05c3583e766f4c0b785c0986a";
}; };
meta = { meta = {

View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "chainer"; pname = "chainer";
version = "4.4.0"; version = "5.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9cc4d43e1ea3e0766e211e4e755dbb879f2cf27a805cfa52e32b99fd1e5f24dd"; sha256 = "74c11c3f20c33f85d3f42cc237a55efc384dc6f42035d6d2448318b182f236ee";
}; };
checkInputs = [ checkInputs = [

View File

@ -0,0 +1,65 @@
{ lib
, buildPythonPackage
, fetchPypi
, attrs
, botocore
, click
, enum-compat
, jmespath
, pip
, setuptools
, six
, typing
, wheel
, pythonOlder
, watchdog
, pytest
, hypothesis
, mock
}:
buildPythonPackage rec {
pname = "chalice";
version = "1.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "783ba3c603b944ba32f0ee39f272dc192f2097cfc520692f4dcb718bebdf940e";
};
checkInputs = [ watchdog pytest hypothesis mock ];
propagatedBuildInputs = [
attrs
botocore
click
enum-compat
jmespath
pip
setuptools
six
wheel
typing
];
# conftest.py not included with pypi release
doCheck = false;
postPatch = ''
substituteInPlace setup.py \
--replace 'pip>=9,<=18' 'pip' \
--replace 'typing==3.6.4' 'typing' \
--replace 'attrs==17.4.0' 'attrs' \
--replace 'click>=6.6,<7.0' 'click'
'';
checkPhase = ''
pytest tests
'';
meta = with lib; {
description = "Python Serverless Microframework for AWS";
homepage = https://github.com/aws/chalice;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -3,11 +3,11 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "channels"; pname = "channels";
version = "2.1.3"; version = "2.1.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "8d503d18b92cef488ba68808a2205e055d29a6a1abae92d277f8f7a9c8752f13"; sha256 = "48f97f1801e0a8da6d01430d16d4ed8bd460d4ec3130c66075fb94b12bb30a67";
}; };
# Files are missing in the distribution # Files are missing in the distribution

View File

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "CherryPy"; pname = "CherryPy";
version = "17.3.0"; version = "18.0.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c3e4d76232ade4c47666b9008f92556465df517b8dca833ece3bed027028ae7d"; sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
}; };
propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ]; propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];

View File

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cli_helpers"; pname = "cli_helpers";
version = "1.0.2"; version = "1.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1z5rqm8pznj6bvivm2al8rsxm82rai8hc9bqrgh3ksnbzg2kfy7p"; sha256 = "7c2038bba0c41f41acae0f6e660ff3b00d69f55d9d968f024952cace78111e12";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -2,11 +2,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "click"; pname = "click";
version = "6.7"; version = "7.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "Click";
sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; inherit version;
sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7";
}; };
patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll { patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll {

View File

@ -1,11 +1,13 @@
--- a/click/_unicodefun.py 2018-06-11 15:08:59.369358278 +0200 diff --git a/click/_unicodefun.py b/click/_unicodefun.py
+++ b/click/_unicodefun.py 2018-06-11 15:09:09.342325998 +0200 index 620edff..85a3c98 100644
@@ -60,7 +60,7 @@ --- a/click/_unicodefun.py
extra = '' +++ b/click/_unicodefun.py
@@ -63,7 +63,7 @@ def _verify_python3_env():
if os.name == 'posix': if os.name == 'posix':
import subprocess import subprocess
- rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE, try:
+ rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE, - rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()[0] + rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE,
good_locales = set() stderr=subprocess.PIPE).communicate()[0]
has_c_utf8 = False except OSError:
rv = b''

View File

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "clize"; pname = "clize";
version = "3.0"; version = "4.0.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1xkr3h404d7pgj5gdpg6bddv3v3yq2hgx8qlwkgw5abg218k53hm"; sha256 = "dbcfba5571dc30aaf90dc98fc279e2aab69d0f8f3665fc0394fbc10a87a2be60";
}; };
buildInputs = [ dateutil ]; buildInputs = [ dateutil ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cloudpickle"; pname = "cloudpickle";
version = "0.5.6"; version = "0.6.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0390ecb3731ac035d74c34651460f4a683e9ef7443861712b8d56c20c2f92113"; sha256 = "f169a8523a40eb0a3452e1878aac31da6759409fbafa51dd50d89d4a6b42bcf1";
}; };
buildInputs = [ pytest mock ]; buildInputs = [ pytest mock ];

View File

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ClusterShell"; pname = "ClusterShell";
version = "1.8"; version = "1.8.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1bm0pq8w2rql9q9i2bhs865rqvb6zck3h3gkb1d0mh59arrr7p4m"; sha256 = "e913efb4fe017eed9731d5ad8be397509e7f1966e6cb6441ee2bce074b16b310";
}; };
propagatedBuildInputs = [ pyyaml ]; propagatedBuildInputs = [ pyyaml ];

View File

@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, future }: { lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, future }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "CommonMark"; pname = "commonmark";
version = "0.7.5"; version = "0.8.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4dfbbd1dbc669a9b71a015032b2bbe5c4b019ca8b6ca410d89cf7020de46d2c0"; sha256 = "abcbc854e0eae5deaf52ae5e328501b78b4a0758bf98ac8bb792fce993006084";
}; };
preCheck = '' preCheck = ''

View File

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cornice"; pname = "cornice";
version = "3.4.1"; version = "3.4.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a7f8db903ba06c2584c7db4474459de3565d90b5e4ae4b97c687840e11d5b7fd"; sha256 = "c88f246aa6a84a0cdbaa8231a062c60e18ad9c0a65dc178f536ce5eb3a831418";
}; };
propagatedBuildInputs = [ pyramid simplejson six venusian ]; propagatedBuildInputs = [ pyramid simplejson six venusian ];

View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "coverage"; pname = "coverage";
version = "4.5.1"; version = "4.5.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1"; sha256 = "ab235d9fe64833f12d1334d29b558aacedfbca2356dfb9691f2d0d38a8a7bfb4";
}; };
# No tests in archive # No tests in archive

View File

@ -16,12 +16,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "coveralls"; pname = "coveralls";
name = "${pname}-python-${version}"; name = "${pname}-python-${version}";
version = "1.4.0"; version = "1.5.1";
# wanted by tests # wanted by tests
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7ddb2e3114db9604a7cb1fcc68a7dcca32dce346f5ba568c99979b38e166f5a6"; sha256 = "ab638e88d38916a6cedbf80a9cd8992d5fa55c77ab755e262e00b36792b7cd6d";
}; };
checkInputs = [ checkInputs = [

View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cufflinks"; pname = "cufflinks";
version = "0.13.0"; version = "0.14.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "59f1bae67aaa5042c8f9f94caba44b9b8e6e530ce9e81f6e06b643aca253d2f4"; sha256 = "4188324361cc584214150aadaeb28ed07e9d150adb714b53c5f09d5b3fcdd28a";
}; };
propagatedBuildInputs = [ pandas plotly colorlover ]; propagatedBuildInputs = [ pandas plotly colorlover ];

View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cupy"; pname = "cupy";
version = "4.4.1"; version = "5.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "d46a3eea628a17b9c3f446e4b13513a1f0cc0b9930214417b41c90dcf0bb427f"; sha256 = "557e665d6f2e74e21987b6736d580ec919f51205623fe3d79df06b9d22b3e09d";
}; };
checkInputs = [ checkInputs = [

View File

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cx_Oracle"; pname = "cx_Oracle";
version = "6.4.1"; version = "7.0.0";
buildInputs = [ odpic ]; buildInputs = [ odpic ];
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "3519bf3263c9892aaadc844735aca02d3773ed9b92f97e069cd1726882a7d1b6"; sha256 = "75ee5edccf385d8e8b1443058909fbf3477bb1db12ab7f367aafba8d993fc828";
}; };
preConfigure = '' preConfigure = ''

View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cypari2"; pname = "cypari2";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade # upgrade may break sage, please test the sage build or ping @timokau on upgrade
version = "1.3.1"; version = "2.0.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r"; sha256 = "32fad615d773e9b5a9394c078ddc2c868e64e35f1ac9633ff90b456901b9d886";
}; };
# This differs slightly from the default python installPhase in that it pip-installs # This differs slightly from the default python installPhase in that it pip-installs

View File

@ -32,9 +32,9 @@ buildPythonPackage rec {
checkInputs = [ nose ]; checkInputs = [ nose ];
propagatedBuildInputs = [ toolz ]; propagatedBuildInputs = [ toolz ];
# Disable failing test https://github.com/pytoolz/cytoolz/issues/97 # Failing test https://github.com/pytoolz/cytoolz/issues/122
checkPhase = '' checkPhase = ''
NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} NOSE_EXCLUDE=test_introspect_builtin_modules nosetests -v $out/${python.sitePackages}
''; '';
meta = { meta = {

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "daemonize"; pname = "daemonize";
version = "2.4.2"; version = "2.4.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0y139sq657bpzfv6k0aqm4071z4s40i6ybpni9qvngvdcz6r86n2"; sha256 = "c0194e861826be456c7c69985825ac7b79632d8ac7ad4cde8e12fee7971468c8";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -11,12 +11,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.1.0"; version = "0.2.0";
pname = "dask-glm"; pname = "dask-glm";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5a38d17538558fe6a3457cd67eed0a90a5dff51a9eaebb496efb68fc432ed89a"; sha256 = "58b86cebf04fe5b9e58092e1c467e32e60d01e11b71fdc628baaa9fc6d1adee5";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

View File

@ -10,12 +10,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.1.2"; version = "0.2.0";
pname = "dask-image"; pname = "dask-image";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "401e2c345a582eb2859a4a2a4a6fcfbc85beece59705f3ead9b6708a0cd183e7"; sha256 = "bece2ea347f963dc0168c7d5fdfd11e51b47d9c857d3bc56144d7c146964a23f";
}; };
checkInputs = [ pytest scikitimage ]; checkInputs = [ pytest scikitimage ];

View File

@ -8,12 +8,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.4.0"; version = "0.4.1";
pname = "dask-jobqueue"; pname = "dask-jobqueue";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c73dae82b2a1d2a9f4ef17778f0de7a9237671a7fd3374aadd9d2bc07e92e848"; sha256 = "e559077fd27b68c325f06e3666e7072913f5282ad62347a233ca95ae00a4ced7";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

View File

@ -19,12 +19,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.10.0"; version = "0.11.0";
pname = "dask-ml"; pname = "dask-ml";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4b6ca548c7282c1b6983e696e4bdfa0a2d7b51b168928b9322ea7a4b9a9f20f9"; sha256 = "a9e8e69494560dc23534adb236e88b3b21dc30a156648453c9c6e4b27ff2df96";
}; };
checkInputs = [ pytest xgboost tensorflow joblib distributed ]; checkInputs = [ pytest xgboost tensorflow joblib distributed ];

View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dask"; pname = "dask";
version = "0.18.2"; version = "0.20.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "8fba559911788010ecedf58e540004d56d09f7829a1400dd72b74ffedafafabc"; sha256 = "d4139a03ab5eb6cedeb06cf1e39af90fb5226ca214d77408def7677d7e6b7af3";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

View File

@ -4,22 +4,21 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "datadog"; pname = "datadog";
version = "0.23.0"; version = "0.25.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6ed9aec2b3a26722b74465c2ed36d2efdb9c9fac1a07a84d81fa2fc0cfa66ae4"; sha256 = "e71f9024fb0b968bd704178c7e48fa41ce728281cc6913994db5e065596cddf1";
}; };
postPatch = ''
find . -name '*.pyc' -exec rm {} \;
'';
propagatedBuildInputs = [ decorator requests simplejson ]; propagatedBuildInputs = [ decorator requests simplejson ];
checkInputs = [ nose mock ]; checkInputs = [ nose mock ];
# v0.20.0 tests are nondeterministic:
# test_send_batch_metrics: https://hydra.nixos.org/build/74920933
# test_timed_decorator_threaded: https://hydra.nixos.org/build/74328993
doCheck = false;
meta = with lib; { meta = with lib; {
description = "The Datadog Python library"; description = "The Datadog Python library";
license = licenses.bsd3; license = licenses.bsd3;

View File

@ -5,12 +5,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.9.4"; version = "0.9.5";
pname = "DataModelDict"; pname = "DataModelDict";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "97d8e999e000cf69c48e57b1a72eb45a27d83576a38c6cd8550c230b018be7af"; sha256 = "afa15c137c09e7d937e31c8956fd8092be0251c9869a6b7c1d0f81c0901bc47d";
}; };
propagatedBuildInputs = [ xmltodict ]; propagatedBuildInputs = [ xmltodict ];

View File

@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }: { stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-dateutil"; pname = "python-dateutil";
version = "2.7.3"; version = "2.7.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8"; sha256 = "88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02";
}; };
propagatedBuildInputs = [ six setuptools_scm ]; propagatedBuildInputs = [ six setuptools_scm ];

View File

@ -1,17 +1,24 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, nose, six, pyyaml, mock
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "ddt"; pname = "ddt";
version = "1.0.0"; version = "1.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e24ecb7e2cf0bf43fa9d4255d3ae2bd0b7ce30b1d1b89ace7aa68aca1152f37a"; sha256 = "898364fc34b27981b925171a0011c174c94633cb678eb1fac05fe7a234c7912c";
}; };
checkInputs = [ nose six pyyaml mock ];
checkPhase = ''
nosetests -s
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Data-Driven/Decorated Tests, a library to multiply test cases"; description = "Data-Driven/Decorated Tests, a library to multiply test cases";
homepage = https://github.com/txels/ddt; homepage = https://github.com/txels/ddt;

View File

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "deform"; pname = "deform";
version = "2.0.6"; version = "2.0.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "bda0b809c8a668e105e30650a6766103207eafdd12c313acd59274ccd2c4d297"; sha256 = "2ff29c32ebe544c0f0a77087e268b2cd9cb4b11fa35af3635d5b42913f88d74a";
}; };
postPatch = '' postPatch = ''

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dependency-injector"; pname = "dependency-injector";
version = "3.13.2"; version = "3.14.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0kgb40qspibr1x8ksv0whrr7v0jy20dnqzmc591hm2y4kwzl5hdw"; sha256 = "f478a26e9bf3111ce98bbfb8502af274643947f87a7e12a6481a35eaa693062b";
}; };
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];

View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "detox"; pname = "detox";
version = "0.13"; version = "0.15";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "f0c2af9c29f8e200a50b561ccc531df3087c80e7d3de6cfa9828f5fea3c8f56c"; sha256 = "accde1a79b621df9dfd55b97460e80743a771a3d9a1acd900489a4355f0cc8c7";
}; };
buildInputs = [ pytest ]; buildInputs = [ pytest ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "devpi-common"; pname = "devpi-common";
version = "3.2.3"; version = "3.3.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "d2ecae3a92b2da62ecc6586d1c40d265e61bce70d7f1be2327e8b98598ba2687"; sha256 = "30833581d03e07d7574b2ff698d213c984777dd44dd47c45c54d31858c694c94";
}; };
propagatedBuildInputs = [ requests py ]; propagatedBuildInputs = [ requests py ];

View File

@ -21,12 +21,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dftfit"; pname = "dftfit";
version = "0.4.22"; version = "0.5.0";
disabled = (!isPy3k); disabled = (!isPy3k);
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "06dbdc21cf9ed199bfceae5301172bee2164a3b9ef6f0814a089530c320ebb3a"; sha256 = "fd9e777157669d004e7c25adce3e7c697234283384c99aa0c23454173a14a7a8";
}; };
buildInputs = [ pytestrunner ]; buildInputs = [ pytestrunner ];

View File

@ -26,12 +26,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "distributed"; pname = "distributed";
version = "1.24.1"; version = "1.24.2";
# get full repository need conftest.py to run tests # get full repository need conftest.py to run tests
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "13qch8wgjzx9zadaxasym3bp3a74bg5snhnbznpggssv3hyshca7"; sha256 = "8ab24f0ea634dab7b6667c32b18c98794141f3ef3b081293dfea1943498ce987";
}; };
checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];

View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-colorful"; pname = "django-colorful";
version = "1.2"; version = "1.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0y34hzvfrm1xbxrd8frybc9yzgqvz4c07frafipjikw7kfjsw8az"; sha256 = "fd246f2fb297ed074dc4349966d33a1c82d0308b7fb0d6ef6e2e76b90cefffb7";
}; };
# Tests aren't run # Tests aren't run

Some files were not shown because too many files have changed in this diff Show More