Merge staging into staging-next

Merging staging into staging-next even though we haven't merged staging-next into master yet.
The motivation for this merge is that it's been a while since we merged into master causing
the 3 branches to diverge too much.
This commit is contained in:
Frederik Rietdijk 2018-11-03 12:45:23 +01:00
commit 64e19fdeda
374 changed files with 10255 additions and 7124 deletions

View file

@ -484,9 +484,9 @@ and in this case the `python35` interpreter is automatically used.
### Interpreters
Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
respectively `python27`, `python34`, `python35`, `python36` and `python37`. The PyPy interpreter
is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
`python35`. The default interpreter, `python`, maps to `python2`.
`python37`. The default interpreter, `python`, maps to `python2`.
The Nix expressions for the interpreters can be found in
`pkgs/development/interpreters/python`.
@ -538,7 +538,7 @@ sets are
and the aliases
* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
* `pkgs.python3Packages` pointing to `pkgs.python36Packages`
* `pkgs.python3Packages` pointing to `pkgs.python37Packages`
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
#### `buildPythonPackage` function

View file

@ -19,6 +19,8 @@
<itemizedlist>
<listitem>
<para>
The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
<para />
</listitem>
</itemizedlist>

View file

@ -15,13 +15,13 @@ assert mouseSupport -> gpm-ncurses != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "w3m-0.5.3+git20161120";
name = "w3m-0.5.3+git20180125";
src = fetchFromGitHub {
owner = "tats";
repo = "w3m";
rev = "v0.5.3+git20161120";
sha256 = "06n5a9jdyihkd4xdjmyci32dpqp1k2l5awia5g9ng0bn256bacdc";
rev = "v0.5.3+git20180125";
sha256 = "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90";
};
NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl";

View file

@ -39,7 +39,17 @@ stdenv.mkDerivation rec {
./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
];
packageUpgradePatches = [
packageUpgradePatches = let
fetchSageCommit = { rev, ...}@args: (
fetchpatch ({
url = "https://git.sagemath.org/sage.git/patch/?h=${rev}";
# TODO better https://git.sagemath.org/sage.git/patch/?id=${rev} ?
# We don't care about sage's own build system (which builds all its dependencies).
# Exclude build system changes to avoid conflicts.
excludes = [ "build/*" ];
} // builtins.removeAttrs args [ "rev" ])
);
in [
# New glpk version has new warnings, filter those out until upstream sage has found a solution
# https://trac.sagemath.org/ticket/24824
./patches/pari-stackwarn.patch # not actually necessary since tha pari upgrade, but necessary for the glpk patch to apply
@ -53,12 +63,18 @@ stdenv.mkDerivation rec {
./patches/numpy-1.15.1.patch
# ntl upgrade
# https://trac.sagemath.org/ticket/25532#comment:29
(fetchpatch {
name = "lcalc-c++11.patch";
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa";
sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb";
})
(fetchpatch {
name = "cython-0.29.patch";
url = "https://git.sagemath.org/sage.git/patch/?h=f77de1d0e7f90ee12761140500cb8cbbb789ab20";
sha256 = "14wrpy8jgbnpza1j8a2nx8y2r946y82pll1fv3cn6gpfmm6640l3";
})
# https://trac.sagemath.org/ticket/26360
(fetchpatch {
name = "arb-2.15.1.patch";

View file

@ -52,12 +52,9 @@ with builtins;
let version = "4.8.5";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches = [ ]
++ optional enableParallelBuilding ../parallel-bconfig.patch
patches = [ ../parallel-bconfig.patch ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
@ -180,14 +177,14 @@ stdenv.mkDerivation ({
inherit patches;
hardeningDisable = [ "format" ];
outputs = [ "out" "lib" "man" "info" ];
setOutputFlags = false;
NIX_NO_SELF_RPATH = true;
libc_dev = stdenv.cc.libc_dev;
hardeningDisable = [ "format" ];
postPatch =
if targetPlatform != hostPlatform || stdenv.cc.libc != null then
# On NixOS, use the right path to the dynamic linker instead of
@ -214,20 +211,27 @@ stdenv.mkDerivation ({
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkgconfig);
buildInputs = [ gmp mpfr libmpc libelf ]
++ (optional (cloog != null) cloog)
# For building runtime libs
depsBuildTarget =
if hostPlatform == buildPlatform then [
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
] else assert targetPlatform == hostPlatform; [ # build != host == target
stdenv.cc
];
buildInputs = [
gmp mpfr libmpc libelf
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (cloog != null) cloog)
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
@ -359,8 +363,8 @@ stdenv.mkDerivation ({
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ])
);
++ optionals javaAwtGtk [ gmp mpfr ]
));
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
@ -387,7 +391,8 @@ stdenv.mkDerivation ({
hardeningUnsupportedFlags = [ "stackprotector" ];
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;

View file

@ -1,4 +1,4 @@
{ stdenv, targetPackages, fetchurl, noSysDirs, fetchpatch
{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
, langObjC ? stdenv.targetPlatform.isDarwin
, langObjCpp ? stdenv.targetPlatform.isDarwin
@ -52,13 +52,10 @@ with builtins;
let version = "4.9.4";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
[ ../use-source-date-epoch.patch ]
++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ]
[ ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
@ -188,8 +185,6 @@ stdenv.mkDerivation ({
inherit patches;
hardeningDisable = [ "format" ];
outputs = if langJava || langGo then ["out" "man" "info"]
else [ "out" "lib" "man" "info" ];
setOutputFlags = false;
@ -197,6 +192,8 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
hardeningDisable = [ "format" ];
postPatch =
if targetPlatform != hostPlatform || stdenv.cc.libc != null then
# On NixOS, use the right path to the dynamic linker instead of
@ -239,8 +236,6 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
@ -255,8 +250,7 @@ stdenv.mkDerivation ({
''
+ stdenv.lib.optionalString (langJava || langGo) ''
export lib=$out;
''
;
'';
dontDisableStatic = true;
@ -268,7 +262,8 @@ stdenv.mkDerivation ({
[
"--with-gmp-include=${gmp.dev}/include"
"--with-gmp-lib=${gmp.out}/lib"
"--with-mpfr=${mpfr.dev}"
"--with-mpfr-include=${mpfr.dev}/include"
"--with-mpfr-lib=${mpfr.out}/lib"
"--with-mpc=${libmpc}"
] ++
optional (libelf != null) "--with-libelf=${libelf}" ++
@ -381,7 +376,8 @@ stdenv.mkDerivation ({
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]));
++ optionals javaAwtGtk [ gmp mpfr ]
));
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
@ -402,10 +398,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -429,7 +428,8 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos;
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

View file

@ -49,9 +49,6 @@ with stdenv.lib;
with builtins;
let version = "5.5.0";
sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -170,7 +167,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
inherit sha256;
sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
};
inherit patches;
@ -244,12 +241,10 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@ -408,10 +403,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -435,6 +433,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

View file

@ -48,9 +48,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
let version = "6.4.0";
enableParallelBuilding = true;
let version = "6.5.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -59,8 +57,6 @@ let version = "6.4.0";
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
;
@ -170,7 +166,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5";
sha256 = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby";
};
inherit patches;
@ -245,12 +241,9 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@ -263,8 +256,7 @@ stdenv.mkDerivation ({
''
+ stdenv.lib.optionalString (langJava || langGo) ''
export lib=$out;
''
;
'';
dontDisableStatic = true;
@ -391,7 +383,8 @@ stdenv.mkDerivation ({
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]));
++ optionals javaAwtGtk [ gmp mpfr ]
));
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
@ -412,10 +405,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -439,6 +435,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

View file

@ -39,8 +39,6 @@ with builtins;
let version = "7.3.0";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
@ -221,12 +219,9 @@ stdenv.mkDerivation ({
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
@ -361,10 +356,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -388,6 +386,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

View file

@ -39,8 +39,6 @@ with builtins;
let version = "8.2.0";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
@ -210,12 +208,9 @@ stdenv.mkDerivation ({
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@ -339,10 +334,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -366,6 +364,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

View file

@ -40,8 +40,6 @@ with builtins;
let version = "7-20170409";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
@ -179,12 +177,9 @@ stdenv.mkDerivation ({
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@ -311,10 +306,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -338,6 +336,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
broken = true;

View file

@ -36,9 +36,7 @@ in stdenv.mkDerivation (rec {
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
buildInputs = [ libxml2 libffi ]
# TODO(@Ericson2314): Remove next mass rebuild
++ stdenv.lib.optionals (stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ libcxxabi ];
buildInputs = [ libxml2 libffi ];
propagatedBuildInputs = [ ncurses zlib ];

View file

@ -2,23 +2,14 @@
let self =
stdenv.mkDerivation rec {
name = "c-ares-1.14.0";
name = "c-ares-1.15.0";
src = fetchurl {
url = "https://c-ares.haxx.se/download/${name}.tar.gz";
sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
};
configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null;
# ares_android.h header is missing
# see issue https://github.com/c-ares/c-ares/issues/216
postPatch = if stdenv.hostPlatform.isAndroid then ''
cp ${fetchurl {
url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h";
sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8";
}} ares_android.h
'' else null;
configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ];
meta = with stdenv.lib; {
description = "A C library for asynchronous DNS requests";

View file

@ -10,14 +10,14 @@
assert glSupport -> libGL != null;
let
version = "1.15.14";
version = "1.16.0";
inherit (stdenv.lib) optional optionals;
in stdenv.mkDerivation rec {
name = "cairo-${version}";
src = fetchurl {
url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
sha256 = "1399jfdpdhn4hf812hxlj1gyi3bznxwzhp2rnyq1nxjs05n6nmhn";
sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
};
outputs = [ "out" "dev" "devdoc" ];

View file

@ -133,9 +133,7 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison ];
# TODO make linuxHeaders unconditional next mass rebuild
buildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) linuxHeaders
++ lib.optionals withGd [ gd libpng ];
buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ];
# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to
# prevent a retained dependency on the bootstrap tools in the stdenv-linux

View file

@ -8,7 +8,7 @@
}:
let
version = "2.0.0";
version = "2.1.0";
inherit (stdenv.lib) optional optionals optionalString;
in
@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "0rc93p62r74aq11h7pjb6fbwqdipq8gzh94xi0jn9kn475l3z5yc";
sha256 = "1y8jzm76wj8pcj3z47fikhasipyizd6w9r20yc7p139jqxp4jnwf";
};
postPatch = ''

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
stdenv.mkDerivation rec {
name = "libdrm-2.4.94";
name = "libdrm-2.4.96";
src = fetchurl {
url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "1ghn3l1dv1rsp9z6jpmy4ryna1s8rm4xx0ds532041bnlfq5jg5p";
sha256 = "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd";
};
outputs = [ "out" "dev" "bin" ];

View file

@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
name = "libgcrypt-${version}";
version = "1.8.3";
version = "1.8.4";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36";
sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n";
};
outputs = [ "out" "dev" "info" ];
@ -21,9 +21,6 @@ stdenv.mkDerivation rec {
# The build enables -O2 by default for everything else.
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
# Accepted upstream, should be in next update: #42150, https://dev.gnupg.org/T4034
patches = [ ./fix-jent-locking.patch ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ libgpgerror ]

View file

@ -1,29 +0,0 @@
From bbe989be6ca5e093d5244413590bd80e12c2ec9b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 17 Jun 2018 18:53:58 -0500
Subject: [PATCH] rndjent: move locking to fix trying to obtain held lock,
hanging
---
random/rndjent.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/random/rndjent.c b/random/rndjent.c
index 0c5a820b..3740ddd4 100644
--- a/random/rndjent.c
+++ b/random/rndjent.c
@@ -334,9 +334,10 @@ _gcry_rndjent_get_version (int *r_active)
{
if (r_active)
{
- lock_rng ();
/* Make sure the RNG is initialized. */
_gcry_rndjent_poll (NULL, 0, 0);
+
+ lock_rng ();
/* To ease debugging we store 2 for a clock_gettime based
* implementation and 1 for a rdtsc based code. */
*r_active = jent_rng_collector? is_rng_available () : 0;
--
2.18.0-rc2

View file

@ -67,7 +67,7 @@ let
in
let
version = "18.2.2";
version = "18.2.4";
branch = head (splitString "." version);
in
@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
sha256 = "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3";
sha256 = "0knbr6nl7qk5bijz6p7yqr8fc806gvmz9p6jlnvdaxkqnpmil7b2";
};
prePatch = "patchShebangs .";

View file

@ -1,4 +1,4 @@
From 9c9df280b318c26aece9873cf77b32e4f95634c1 Mon Sep 17 00:00:00 2001
From 2a1e32b4105fe95413a615a44d40938920ea1a19 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 6 Aug 2018 15:52:11 -0300
Subject: [PATCH] disk_cache: include dri driver path in cache key
@ -11,10 +11,10 @@ timestamps in /nix/store are zero.
2 files changed, 6 insertions(+)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 07bf052175..aea09f60b3 100644
index bafb57439a..a22e2e41eb 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -30,6 +30,9 @@ noinst_LTLIBRARIES = \
@@ -35,6 +35,9 @@ noinst_LTLIBRARIES = \
libmesautil.la \
libxmlconfig.la
@ -25,28 +25,28 @@ index 07bf052175..aea09f60b3 100644
$(PTHREAD_CFLAGS) \
-I$(top_srcdir)/include
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 4a762eff20..8086c0be75 100644
index 368ec41792..071220b2ba 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *timestamp,
@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
/* Create driver id keys */
size_t ts_size = strlen(timestamp) + 1;
size_t id_size = strlen(driver_id) + 1;
+ size_t key_size = strlen(DISK_CACHE_KEY) + 1;
size_t gpu_name_size = strlen(gpu_name) + 1;
cache->driver_keys_blob_size += ts_size;
cache->driver_keys_blob_size += id_size;
+ cache->driver_keys_blob_size += key_size;
cache->driver_keys_blob_size += gpu_name_size;
/* We sometimes store entire structs that contains a pointers in the cache,
@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *timestamp,
@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
uint8_t *drv_key_blob = cache->driver_keys_blob;
DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size)
DRV_KEY_CPY(drv_key_blob, timestamp, ts_size)
DRV_KEY_CPY(drv_key_blob, driver_id, id_size)
+ DRV_KEY_CPY(drv_key_blob, DISK_CACHE_KEY, key_size)
DRV_KEY_CPY(drv_key_blob, gpu_name, gpu_name_size)
DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size)
DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size)
--
2.18.0
2.19.1

View file

@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
sha256 = "1l5rir8d73x97p3p1x4l8cawjc9m2adnippnb27fmrbcd3rfaxbl";
};
patches = [ ./fix-stream-operator.patch /* can't fetchpatch during bootstrap */ ];
outputs = [ "bin" "out" "dev" "lib" ];
nativeBuildInputs = [ pkgconfig ];

View file

@ -0,0 +1,63 @@
From 153531d4d0ebe00ac95047dbf1fec1d9d694f29f Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 7 Oct 2018 22:19:00 +0900
Subject: [PATCH] nghttpx: Use the same type as standard stream operator<<
---
src/shrpx_log.cc | 4 ++--
src/shrpx_log.h | 20 ++++++++++++++------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/shrpx_log.cc b/src/shrpx_log.cc
index 8459d15e3..6966cf945 100644
--- a/src/shrpx_log.cc
+++ b/src/shrpx_log.cc
@@ -228,7 +228,7 @@ Log &Log::operator<<(const ImmutableString &s) {
return *this;
}
-Log &Log::operator<<(int64_t n) {
+Log &Log::operator<<(long long n) {
if (n >= 0) {
return *this << static_cast<uint64_t>(n);
}
@@ -262,7 +262,7 @@ Log &Log::operator<<(int64_t n) {
return *this;
}
-Log &Log::operator<<(uint64_t n) {
+Log &Log::operator<<(unsigned long long n) {
if (flags_ & fmt_hex) {
write_hex(n);
return *this;
diff --git a/src/shrpx_log.h b/src/shrpx_log.h
index 1130b8da8..17b90536e 100644
--- a/src/shrpx_log.h
+++ b/src/shrpx_log.h
@@ -100,12 +100,20 @@ class Log {
Log &operator<<(const char *s);
Log &operator<<(const StringRef &s);
Log &operator<<(const ImmutableString &s);
- Log &operator<<(int16_t n) { return *this << static_cast<int64_t>(n); }
- Log &operator<<(int32_t n) { return *this << static_cast<int64_t>(n); }
- Log &operator<<(int64_t n);
- Log &operator<<(uint16_t n) { return *this << static_cast<uint64_t>(n); }
- Log &operator<<(uint32_t n) { return *this << static_cast<uint64_t>(n); }
- Log &operator<<(uint64_t n);
+ Log &operator<<(short n) { return *this << static_cast<long long>(n); }
+ Log &operator<<(int n) { return *this << static_cast<long long>(n); }
+ Log &operator<<(long n) { return *this << static_cast<long long>(n); }
+ Log &operator<<(long long n);
+ Log &operator<<(unsigned short n) {
+ return *this << static_cast<unsigned long long>(n);
+ }
+ Log &operator<<(unsigned int n) {
+ return *this << static_cast<unsigned long long>(n);
+ }
+ Log &operator<<(unsigned long n) {
+ return *this << static_cast<unsigned long long>(n);
+ }
+ Log &operator<<(unsigned long long n);
Log &operator<<(float n) { return *this << static_cast<double>(n); }
Log &operator<<(double n);
Log &operator<<(long double n);

View file

@ -5,4 +5,12 @@ callPackage ./generic.nix (args // rec {
branch = "2.3";
revision = "v${version}";
sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz";
patches = [
(fetchpatch {
name = "CVE-2018-7648.patch";
url = "https://github.com/uclouvain/openjpeg/commit/cc3824767bde397fedb8a1ae4786a222ba860c8d.patch";
sha256 = "1j5nxmlgyfkxldk2f1ij6h850xw45q3b5brxqa04dxsfsv8cdj5j";
})
];
})

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }:
stdenv.mkDerivation rec {
name = "speex-1.2rc2";
name = "speex-1.2.0";
src = fetchurl {
url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
sha256 = "14g8ph39inkrif749lzjm089g7kwk0hymq1a3i9ch5gz8xr7r8na";
sha256 = "150047wnllz4r94whb9r73l5qf0z5z3rlhy98bawfbblmkq8mbpa";
};
postPatch = ''

View file

@ -13,6 +13,7 @@
let
excludedTests = []
++ [ "reimport_from_subinterpreter" ]
# cython's testsuite is not working very well with libc++
# We are however optimistic about things outside of testsuite still working
++ stdenv.lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ]
@ -25,11 +26,11 @@ let
in buildPythonPackage rec {
pname = "Cython";
version = "0.28.5";
version = "0.29";
src = fetchPypi {
inherit pname version;
sha256 = "b64575241f64f6ec005a4d4137339fb0ba5e156e826db2fdb5f458060d9979e0";
sha256 = "15zama7fgp7yyi3z39xp3z2lvwcgch8fn3ycscw2cs37vqg6v4cl";
};
nativeBuildInputs = [

View file

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, eventlet
, trollius
, asyncio
, mock
, python
}:
buildPythonPackage rec {
pname = "aioeventlet";
version = "0.4";
src = fetchPypi {
inherit pname version;
sha256 = "19krvycaiximchhv1hcfhz81249m3w3jrbp2h4apn1yf4yrc4y7y";
};
propagatedBuildInputs = [ eventlet trollius asyncio ];
buildInputs = [ mock ];
# 2 tests error out
doCheck = false;
checkPhase = ''
${python.interpreter} runtests.py
'';
meta = with stdenv.lib; {
description = "aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes";
homepage = http://aioeventlet.readthedocs.org/;
license = licenses.asl20;
};
}

View file

@ -0,0 +1,33 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytest
, py
, mock
, pkgs
}:
buildPythonPackage rec {
pname = "argh";
version = "0.26.1";
src = fetchPypi {
inherit pname version;
sha256 = "1nqham81ihffc9xmw85dz3rg3v90rw7h0dp3dy0bh3qkp4n499q6";
};
buildInputs = [ pytest py mock pkgs.glibcLocales ];
checkPhase = ''
export LANG="en_US.UTF-8"
py.test
'';
meta = with stdenv.lib; {
homepage = http://github.com/neithere/argh/;
description = "An unobtrusive argparse wrapper with natural syntax";
license = licenses.lgpl2;
maintainers = with maintainers; [ domenkozar ];
};
}

View file

@ -4,11 +4,11 @@
}:
buildPythonPackage rec {
pname = "autobahn";
version = "18.8.2";
version = "18.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "448df2e241011ea2948799918930042d81e63d26b01912c472f5a9a37f42f319";
sha256 = "b5767bebd94ba13fc286604f889f208e7babc77d72d9f372d331bc14c89c5a40";
};
propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++

View file

@ -0,0 +1,43 @@
{ stdenv
, buildPythonPackage
, fetchurl
, numpy
, matplotlib
, pillow
, setuptools
, pkgs
}:
buildPythonPackage rec {
pname = "basemap";
version = "1.0.7";
src = fetchurl {
url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz";
sha256 = "0ca522zirj5sj10vg3fshlmgi615zy5gw2assapcj91vsvhc4zp0";
};
propagatedBuildInputs = [ numpy matplotlib pillow ];
buildInputs = [ setuptools pkgs.geos pkgs.proj ];
# Standard configurePhase from `buildPythonPackage` seems to break the setup.py script
configurePhase = ''
export GEOS_DIR=${pkgs.geos}
'';
# The 'check' target is not supported by the `setup.py` script.
# TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`)
doCheck = false;
meta = with stdenv.lib; {
homepage = "https://matplotlib.org/basemap/";
description = "Plot data on map projections with matplotlib";
longDescription = ''
An add-on toolkit for matplotlib that lets you plot data on map projections with
coastlines, lakes, rivers and political boundaries. See
http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do.
'';
license = with licenses; [ mit gpl2 ];
};
}

View file

@ -0,0 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "blessings";
version = "1.6";
src = fetchPypi {
inherit pname version;
sha256 = "01rhgn2c3xjf9h1lxij9m05iwf2ba6d0vd7nic26c2gic4q73igd";
};
# 4 failing tests, 2to3
doCheck = false;
meta = with stdenv.lib; {
homepage = https://github.com/erikrose/blessings;
description = "A thin, practical wrapper around terminal coloring, styling, and positioning";
license = licenses.mit;
maintainers = with maintainers; [ domenkozar ];
};
}

View file

@ -0,0 +1,23 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPyPy
}:
buildPythonPackage rec {
pname = "blist";
version = "1.3.6";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is";
};
meta = with stdenv.lib; {
homepage = http://stutzbachenterprises.com/blist/;
description = "A list-like type with better asymptotic performance and similar performance on small lists";
license = licenses.bsd0;
};
}

View file

@ -3,9 +3,9 @@
let
wheel_source = fetchPypi {
pname = "wheel";
version = "0.32.1";
version = "0.32.2";
format = "wheel";
sha256 = "15hizylh761jcaz8zfdc3wg30jf33izaakyv1p82ppx2y5rgg8cz";
sha256 = "1216licil12jjixfqvkb84xkync5zz0fdc2kgzhl362z3xqjsgn9";
};
setuptools_source = fetchPypi {
pname = "setuptools";

View file

@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchgit
, sphinx
, isPy3k
}:
buildPythonPackage rec {
pname = "cliapp";
version = "1.20150305";
disabled = isPy3k;
src = fetchgit {
url = "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp";
rev = "569df8a5959cd8ef46f78c9497461240a5aa1123";
sha256 = "882c5daf933e4cf089842995efc721e54361d98f64e0a075e7373b734cd899f3";
};
buildInputs = [ sphinx ];
# error: invalid command 'test'
doCheck = false;
meta = with stdenv.lib; {
homepage = http://liw.fi/cliapp/;
description = "Python framework for Unix command line programs";
license = licenses.gpl2;
maintainers = with maintainers; [ rickynils ];
};
}

View file

@ -0,0 +1,39 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, python
, mock
, blessings
, nose
, nose_progressive
, pillow
, args
, pkgs
}:
buildPythonPackage rec {
pname = "clint";
version = "0.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "1an5lkkqk1zha47198p42ji3m94xmzx1a03dn7866m87n4r4q8h5";
};
LC_ALL="en_US.UTF-8";
checkPhase = ''
${python.interpreter} test_clint.py
'';
buildInputs = [ mock nose nose_progressive pkgs.glibcLocales ];
propagatedBuildInputs = [ pillow blessings args ];
meta = with stdenv.lib; {
homepage = https://github.com/kennethreitz/clint;
description = "Python Command Line Interface Tools";
license = licenses.isc;
maintainers = with maintainers; [ domenkozar ];
};
}

View file

@ -0,0 +1,26 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, dateutil
, sigtools
}:
buildPythonPackage rec {
pname = "clize";
version = "3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1xkr3h404d7pgj5gdpg6bddv3v3yq2hgx8qlwkgw5abg218k53hm";
};
buildInputs = [ dateutil ];
propagatedBuildInputs = [ sigtools ];
meta = with stdenv.lib; {
description = "Command-line argument parsing for Python";
homepage = "https://github.com/epsy/clize";
license = licenses.mit;
};
}

View file

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchurl
, cliapp
, ttystatus
, markdown
, isPy3k
, isPyPy
}:
buildPythonPackage rec {
name = "cmdtest-${version}";
version = "0.18";
disabled = isPy3k || isPyPy;
src = fetchurl {
url = "http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_${version}.orig.tar.xz";
sha256 = "068f24k8ad520hcf8g3gj7wvq1wspyd46ay0k9xa360jlb4dv2mn";
};
propagatedBuildInputs = [ cliapp ttystatus markdown ];
# TODO: cmdtest tests must be run before the buildPhase
doCheck = false;
meta = with stdenv.lib; {
homepage = http://liw.fi/cmdtest/;
description = "Black box tests Unix command line tools";
license = licenses.gpl3;
};
}

View file

@ -0,0 +1,21 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "daemonize";
version = "2.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "0y139sq657bpzfv6k0aqm4071z4s40i6ybpni9qvngvdcz6r86n2";
};
meta = with stdenv.lib; {
description = "Library to enable your code run as a daemon process on Unix-like systems";
homepage = https://github.com/thesharp/daemonize;
license = licenses.mit;
};
}

View file

@ -0,0 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, nose
}:
buildPythonPackage rec {
pname = "datadiff";
version = "1.1.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "f1402701063998f6a70609789aae8dc05703f3ad0a34882f6199653654c55543";
};
buildInputs = [ nose ];
meta = with stdenv.lib; {
description = "DataDiff";
homepage = https://sourceforge.net/projects/datadiff/;
license = licenses.asl20;
};
}

View file

@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, pyparsing
}:
buildPythonPackage rec {
pname = "dot2tex";
version = "2.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a";
};
# Tests fail with 3.x. Furthermore, package is no longer maintained.
disabled = isPy3k;
propagatedBuildInputs = [ pyparsing ];
meta = with stdenv.lib; {
description = "Convert graphs generated by Graphviz to LaTeX friendly formats";
homepage = "https://github.com/kjellmf/dot2tex";
license = licenses.mit;
};
}

View file

@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, zope_interface
, zope_testing
}:
buildPythonPackage rec {
pname = "eggdeps";
version = "0.4";
src = fetchPypi {
inherit pname version;
sha256 = "a99de5e4652865224daab09b2e2574a4f7c1d0d9a267048f9836aa914a2caf3a";
};
propagatedBuildInputs = [ zope_interface zope_testing ];
# tests fail, see http://hydra.nixos.org/build/4316603/log/raw
doCheck = false;
meta = with stdenv.lib; {
description = "A tool which computes a dependency graph between active Python eggs";
homepage = http://thomas-lotze.de/en/software/eggdeps/;
license = licenses.zpl20;
};
}

View file

@ -4,6 +4,7 @@
, configparser
, pytest
, isPy3k
, isPy27
}:
buildPythonPackage rec {
@ -19,8 +20,15 @@ buildPythonPackage rec {
propagatedBuildInputs = lib.optional (!isPy3k) configparser;
checkPhase = ''
py.test tests
checkPhase = let
# On python2 with pytest 3.9.2 (not with pytest 3.7.4) the test_bad
# test fails. It tests that a warning (exectly one) is thrown on a "bad"
# path. The pytest upgrade added some warning, resulting in two warnings
# being thrown.
# upstream: https://github.com/takluyver/entrypoints/issues/23
pyTestArgs = if isPy27 then "-k 'not test_bad'" else "";
in ''
py.test ${pyTestArgs} tests
'';
meta = {

View file

@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy27
, oauth2
}:
buildPythonPackage rec {
pname = "evernote";
version = "1.25.0";
disabled = ! isPy27; #some dependencies do not work with py3
src = fetchPypi {
inherit pname version;
sha256 = "1lwlg6fpi3530245jzham1400a5b855bm4sbdyck229h9kg1v02d";
};
propagatedBuildInputs = [ oauth2 ];
meta = with stdenv.lib; {
description = "Evernote SDK for Python";
homepage = http://dev.evernote.com;
license = licenses.asl20;
maintainers = with maintainers; [ hbunke ];
};
}

View file

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, six
, monotonic
, testtools
, python
, isPy3k
}:
buildPythonPackage rec {
pname = "fasteners";
version = "0.14.1";
src = fetchPypi {
inherit pname version;
sha256 = "063y20kx01ihbz2mziapmjxi2cd0dq48jzg587xdsdp07xvpcz22";
};
propagatedBuildInputs = [ six monotonic testtools ];
checkPhase = ''
${python.interpreter} -m unittest discover
'';
# Tests are written for Python 3.x only (concurrent.futures)
doCheck = isPy3k;
meta = with stdenv.lib; {
description = "Fasteners";
homepage = https://github.com/harlowja/fasteners;
license = licenses.asl20;
};
}

View file

@ -0,0 +1,29 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, flask
, jinja2
, speaklater
, Babel
, pytz
}:
buildPythonPackage rec {
pname = "Flask-Babel";
version = "0.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "16b80cipdba9xj3jlaiaq6wgrgpjb70w3j01jjy9hbp4k71kd6yj";
};
propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ];
meta = with stdenv.lib; {
description = "Adds i18n/l10n support to Flask applications";
homepage = https://github.com/mitsuhiko/flask-babel;
license = licenses.bsd0;
maintainers = with maintainers; [ matejc ];
};
}

View file

@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, dateutil
, six
, mock
, nose
}:
buildPythonPackage rec {
pname = "freezegun";
version = "0.3.8";
src = fetchPypi {
inherit pname version;
sha256 = "1sf38d3ibv1jhhvr52x7dhrsiyqk1hm165dfv8w8wh0fhmgxg151";
};
propagatedBuildInputs = [ dateutil six ];
buildInputs = [ mock nose ];
meta = with stdenv.lib; {
description = "FreezeGun: Let your Python tests travel through time";
homepage = "https://github.com/spulec/freezegun";
license = licenses.asl20;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "funcy";
version = "1.6";
src = fetchPypi {
inherit pname version;
sha256 = "511495db0c5660af18d3151b008c6ce698ae7fbf60887278e79675e35eed1f01";
};
# No tests
doCheck = false;
meta = with stdenv.lib; {
description = "Collection of fancy functional tools focused on practicality";
homepage = "http://funcy.readthedocs.org/";
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchurl
}:
buildPythonPackage rec {
pname = "gdata";
version = "2.0.18";
src = fetchurl {
url = "https://gdata-python-client.googlecode.com/files/${pname}-${version}.tar.gz";
sha256 = "1dpxl5hwyyqd71avpm5vkvw8fhlvf9liizmhrq9jphhrx0nx5rsn";
};
# Fails with "error: invalid command 'test'"
doCheck = false;
meta = with stdenv.lib; {
homepage = https://code.google.com/p/gdata-python-client/;
description = "Python client library for Google data APIs";
license = licenses.asl20;
};
}

View file

@ -0,0 +1,38 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, isPy27
, thrift
, beautifulsoup4
, markdown2
, sqlalchemy
, html2text
, evernote
}:
buildPythonPackage rec {
version = "2015-05-11";
pname = "geeknote";
disabled = ! isPy27;
src = fetchFromGitHub {
owner = "VitaliyRodnenko";
repo = "geeknote";
rev = "8489a87d044e164edb321ba9acca8d4631de3dca";
sha256 = "0l16v4xnyqnsf84b1pma0jmdyxvmfwcv3sm8slrv3zv7zpmcm3lf";
};
/* build with tests fails with "Can not create application dirictory :
/homeless-shelter/.geeknotebuilder". */
doCheck = false;
propagatedBuildInputs = [ thrift beautifulsoup4 markdown2 sqlalchemy html2text evernote ];
meta = with stdenv.lib; {
description = "Work with Evernote from command line";
homepage = http://www.geeknote.me;
license = licenses.gpl1;
maintainers = with maintainers; [ hbunke ];
};
}

View file

@ -0,0 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, sqlalchemy
, shapely
}:
buildPythonPackage rec {
pname = "GeoAlchemy2";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0p2h1kgl5b0jz8wadx485vjh1mmm5s67p71yxh9lhp1441hkfswf";
};
propagatedBuildInputs = [ sqlalchemy shapely ];
meta = with stdenv.lib; {
homepage = http://geoalchemy.org/;
license = licenses.mit;
description = "Toolkit for working with spatial databases";
};
}

View file

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy27
, mock
, tox
, pylint
}:
buildPythonPackage rec {
pname = "geopy";
version = "1.11.0";
disabled = !isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "04j1lxcsfyv03h0n0q7p2ig7a4n13x4x20fzxn8bkazpx6lyal22";
};
doCheck = false; # too much
buildInputs = [ mock tox pylint ];
meta = with stdenv.lib; {
homepage = "https://github.com/geopy/geopy";
description = "Python Geocoding Toolbox";
license = licenses.mit;
};
}

View file

@ -0,0 +1,29 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, requests
, gevent
}:
buildPythonPackage rec {
pname = "grequests";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c";
};
# No tests in archive
doCheck = false;
propagatedBuildInputs = [ requests gevent ];
meta = with stdenv.lib; {
description = "Asynchronous HTTP requests";
homepage = https://github.com/kennethreitz/grequests;
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ matejc ];
};
}

View file

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, nose
, hglib
, isPy3k
, isPyPy
}:
buildPythonPackage rec {
pname = "hgsvn";
version = "0.3.11";
disabled = isPy3k || isPyPy;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0yvhwdh8xx8rvaqd3pnnyb99hfa0zjdciadlc933p27hp9rf880p";
};
buildInputs = [ nose ];
propagatedBuildInputs = [ hglib ];
doCheck = false; # too many assumptions
meta = with stdenv.lib; {
homepage = https://pypi.python.org/pypi/hgsvn;
description = "A set of scripts to work locally on Subversion checkouts using Mercurial";
license = licenses.gpl2;
};
}

View file

@ -0,0 +1,21 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "html2text";
version = "2016.9.19";
src = fetchPypi {
inherit pname version;
sha256 = "554ef5fd6c6cf6e3e4f725a62a3e9ec86a0e4d33cd0928136d1c79dbeb7b2d55";
};
meta = with stdenv.lib; {
description = "Turn HTML into equivalent Markdown-structured text";
homepage = https://github.com/Alir3z4/html2text/;
license = licenses.gpl3;
};
}

View file

@ -9,7 +9,7 @@ buildPythonPackage rec {
# pytz fake_factory django numpy pytest
# If you need these, you can just add them to your environment.
version = "3.66.2";
version = "3.79.3";
pname = "hypothesis";
# Use github tarballs that includes tests
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "HypothesisWorks";
repo = "hypothesis-python";
rev = "hypothesis-python-${version}";
sha256 = "17ywbwa76z7f0pgash0003fvm25fsj7hxdrdiprdbv99y3i8bm88";
sha256 = "1ay0kwh5315scv7yz9xxrr7shynyx6flgplc1qzbz3j21cyx3yn7";
};
postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";

View file

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchurl
, isPy34
, isPy35
, mock
}:
buildPythonPackage rec {
pname = "IMAPClient";
version = "0.13";
disabled = isPy34 || isPy35;
src = fetchurl {
url = "http://freshfoo.com/projects/IMAPClient/${pname}-${version}.tar.gz";
sha256 = "0v7kd1crdbff0rmh4ddm5qszkis6hpk9084qh94al8h7g4y9l3is";
};
buildInputs = [ mock ];
preConfigure = ''
sed -i '/distribute_setup/d' setup.py
substituteInPlace setup.py --replace "mock==0.8.0" "mock"
'';
meta = with stdenv.lib; {
homepage = http://imapclient.freshfoo.com/;
description = "Easy-to-use, Pythonic and complete IMAP client library";
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,26 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, six
}:
buildPythonPackage rec {
pname = "importmagic";
version = "0.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "194bl8l8sc2ibwi6g5kz6xydkbngdqpaj6r2gcsaw1fc73iswwrj";
};
propagatedBuildInputs = [ six ];
doCheck = false; # missing json file from tarball
meta = with stdenv.lib; {
description = "Python Import Magic - automagically add, remove and manage imports";
homepage = https://github.com/alecthomas/importmagic;
license = licenses.bsd0;
};
}

View file

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, python
}:
buildPythonPackage rec {
pname = "isodate";
version = "0.5.4";
src = fetchPypi {
inherit pname version;
sha256 = "42105c41d037246dc1987e36d96f3752ffd5c0c24834dd12e4fdbe1e79544e31";
};
# Judging from SyntaxError
doCheck = !(isPy3k);
checkPhase = ''
${python.interpreter} -m unittest discover -s src/isodate/tests
'';
meta = with stdenv.lib; {
description = "ISO 8601 date/time parser";
homepage = http://cheeseshop.python.org/pypi/isodate;
license = licenses.bsd0;
};
}

View file

@ -0,0 +1,38 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pip
, pbr
, mock
, python-jenkins
, pyyaml
, six
, stevedore
, isPy27
}:
buildPythonPackage rec {
pname = "jenkins-job-builder";
version = "2.0.0.0b2";
disabled = !isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1y0yl2w6c9c91f9xbjkvff1ag8p72r24nzparrzrw9sl8kn9632x";
};
patchPhase = ''
export HOME=$TMPDIR
'';
buildInputs = [ pip ];
propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore ];
meta = with stdenv.lib; {
description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
homepage = "https://docs.openstack.org/infra/system-config/jjb.html";
license = licenses.asl20;
maintainers = with maintainers; [ garbas ];
};
}

View file

@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytz
, requests
, coverage
, mock
, nose
, unittest2
}:
buildPythonPackage rec {
pname = "jenkinsapi";
version = "0.2.32";
src = fetchPypi {
inherit pname version;
sha256 = "0fcc78b8dfc87237942aad2a8be54dbc08bc4afceaa7f6897f3d894e7d4bfd22";
};
propagatedBuildInputs = [ pytz requests ];
buildInputs = [ coverage mock nose unittest2 ];
meta = with stdenv.lib; {
description = "A Python API for accessing resources on a Jenkins continuous-integration server";
homepage = https://github.com/salimfadhley/jenkinsapi;
maintainers = with maintainers; [ drets ];
license = licenses.mit;
};
}

View file

@ -0,0 +1,51 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPyPy
, isPy3k
, python
}:
buildPythonPackage rec {
version = "0.99.2dev-384-2b73caca";
pname = "kaa-base";
src = fetchPypi {
inherit pname version;
sha256 = "0k3zzz84wzz9q1fl3vvqr2ys96z9pcf4viq9q6s2a63zaysmcfd2";
};
doCheck = false;
disabled = isPyPy || isPy3k;
# Same as in buildPythonPackage except that it does not pass --old-and-unmanageable
installPhase = ''
runHook preInstall
mkdir -p "$out/lib/${python.libPrefix}/site-packages"
export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
${python}/bin/${python.executable} setup.py install \
--install-lib=$out/lib/${python.libPrefix}/site-packages \
--prefix="$out"
eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
if [ -e "$eapth" ]; then
mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth
fi
rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Generic application framework, providing the foundation for other modules";
homepage = https://github.com/freevo/kaa-base;
license = licenses.lgpl21;
maintainers = with maintainers; [ ];
};
}

View file

@ -0,0 +1,56 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, kaa-base
, isPyPy
, isPy3k
, python
, pkgs
}:
buildPythonPackage rec {
version = "0.7.8dev-r4569-20111003";
pname = "kaa-metadata";
disabled = isPyPy || isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0bkbzfgxvmby8lvzkqjp86anxvv3vjd9nksv2g4l7shsk1n7y27a";
};
doCheck = false;
buildInputs = [ pkgs.libdvdread ];
propagatedBuildInputs = [ kaa-base ];
# Same as in buildPythonPackage except that it does not pass --old-and-unmanageable
installPhase = ''
runHook preInstall
mkdir -p "$out/lib/${python.libPrefix}/site-packages"
export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
${python}/bin/${python.executable} setup.py install \
--install-lib=$out/lib/${python.libPrefix}/site-packages \
--prefix="$out"
eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
if [ -e "$eapth" ]; then
mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth
fi
rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files";
homepage = https://github.com/freevo/kaa-metadata;
license = licenses.gpl2;
maintainers = with maintainers; [ ];
};
}

View file

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchurl
, sphinx
, tracing
, ttystatus
, cliapp
}:
buildPythonPackage rec {
pname = "larch";
version = "1.20131130";
src = fetchurl {
url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz";
sha256 = "1hfanp9l6yc5348i3f5sb8c5s4r43y382hflnbl6cnz4pm8yh5r7";
};
buildInputs = [ sphinx ];
propagatedBuildInputs = [ tracing ttystatus cliapp ];
# error: invalid command 'test'
doCheck = false;
meta = with stdenv.lib; {
homepage = http://liw.fi/larch/;
description = "Python B-tree library";
license = licenses.gpl3;
maintainers = with maintainers; [ rickynils ];
};
}

View file

@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, numpy
, Theano
, isPy3k
}:
buildPythonPackage rec {
pname = "Lasagne";
version = "0.1";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0cqj86rdm6c7y5vq3i13qy76fg5xi3yjp4r0hpqy8hvynv54wqrw";
};
propagatedBuildInputs = [ numpy Theano ];
# there are no tests
doCheck = false;
meta = with stdenv.lib; {
description = "Lightweight library to build and train neural networks in Theano";
homepage = "https://github.com/Lasagne/Lasagne";
maintainers = with maintainers; [ NikolaMandic ];
license = licenses.mit;
};
}

View file

@ -0,0 +1,36 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytest
, pkgs
}:
buildPythonPackage rec {
pname = "libarchive-c";
version = "2.7";
src = fetchPypi {
inherit pname version;
sha256 = "011bfsmqpcwd6920kckllh7zhw2y4rrasgmddb7wjzn2hg1xpsjn";
};
buildInputs = [ pytest pkgs.glibcLocales ];
LC_ALL="en_US.UTF-8";
postPatch = ''
substituteInPlace libarchive/ffi.py --replace \
"find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'"
'';
checkPhase = ''
py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar'
'';
meta = with stdenv.lib; {
homepage = https://github.com/Changaco/python-libarchive-c;
description = "Python interface to libarchive";
license = licenses.cc0;
};
}

View file

@ -0,0 +1,26 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pbr
}:
buildPythonPackage rec {
pname = "linecache2";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb";
};
buildInputs = [ pbr ];
# circular dependencies for tests
doCheck = false;
meta = with stdenv.lib; {
description = "A backport of linecache to older supported Pythons";
homepage = "https://github.com/testing-cabal/linecache2";
license = licenses.psfl;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, nose
}:
buildPythonPackage rec {
pname = "lz4";
version = "0.8.2";
src = fetchPypi {
inherit pname version;
sha256 = "1irad4sq4hdr30fr53smvv3zzk4rddcf9b4jx19w8s9xsxhr1x3b";
};
buildInputs = [ nose ];
meta = with stdenv.lib; {
description = "Compression library";
homepage = https://github.com/python-lz4/python-lz4;
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,23 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy36
}:
buildPythonPackage rec {
pname = "mailcap-fix";
version = "1.0.1";
disabled = isPy36; # this fix is merged into python 3.6
src = fetchPypi {
inherit pname version;
sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i";
};
meta = with stdenv.lib; {
description = "A patched mailcap module that conforms to RFC 1524";
homepage = "https://github.com/michael-lazar/mailcap_fix";
license = licenses.unlicense;
};
}

View file

@ -0,0 +1,26 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy27
, click
}:
buildPythonPackage rec {
pname = "maildir-deduplicate";
version = "1.0.2";
disabled = !isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1xy5z756alrjgpl9qx2gdx898rw1mryrqkwmipbh39mgrvkl3fz9";
};
propagatedBuildInputs = [ click ];
meta = with stdenv.lib; {
description = "Command-line tool to deduplicate mails from a set of maildir folders";
homepage = "https://github.com/kdeldycke/maildir-deduplicate";
license = licenses.gpl2;
};
}

View file

@ -0,0 +1,26 @@
{ stdenv
, buildPythonPackage
, fetchurl
, isPyPy
, isPy3k
}:
buildPythonPackage rec {
version = "0.4.10";
pname = "mmpython";
src = fetchurl {
url = http://sourceforge.net/projects/mmpython/files/latest/download;
sha256 = "1b7qfad3shgakj37gcj1b9h78j1hxlz6wp9k7h76pb4sq4bfyihy";
name = "${pname}-${version}.tar.gz";
};
disabled = isPyPy || isPy3k;
meta = with stdenv.lib; {
description = "Media Meta Data retrieval framework";
homepage = https://sourceforge.net/projects/mmpython/;
license = licenses.gpl2;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pymongo
}:
buildPythonPackage rec {
pname = "mongodict";
version = "0.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "0nv5amfs337m0gbxpjb0585s20rndqfc3mfrzq1iwgnds5gxcrlw";
};
propagatedBuildInputs = [ pymongo ];
meta = with stdenv.lib; {
description = "MongoDB-backed Python dict-like interface";
homepage = "https://github.com/turicas/mongodict/";
license = licenses.gpl3;
};
}

View file

@ -0,0 +1,40 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, python
, subunit
, testrepository
, testtools
, six
, pbr
, fixtures
, isPy36
}:
buildPythonPackage rec {
pname = "mox3";
version = "0.23.0";
src = fetchPypi {
inherit pname version;
sha256 = "0q26sg0jasday52a7y0cch13l0ssjvr4yqnvswqxsinj1lv5ld88";
};
patchPhase = ''
sed -i 's@python@${python.interpreter}@' .testr.conf
'';
buildInputs = [ subunit testrepository testtools six ];
propagatedBuildInputs = [ pbr fixtures ];
# FAIL: mox3.tests.test_mox.RegexTest.testReprWithFlags
# ValueError: cannot use LOCALE flag with a str pattern
doCheck = !isPy36;
meta = with stdenv.lib; {
description = "Mock object framework for Python";
homepage = https://docs.openstack.org/mox3/latest/;
license = licenses.asl20;
};
}

View file

@ -0,0 +1,39 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, pafy
}:
buildPythonPackage rec {
name = "mps-youtube-${version}";
version = "0.2.7.1";
disabled = (!isPy3k);
src = fetchFromGitHub {
owner = "mps-youtube";
repo = "mps-youtube";
rev = "v${version}";
sha256 = "16zn5gwb3568w95lr21b88zkqlay61p1541sa9c3x69zpi8v0pys";
};
propagatedBuildInputs = [ pafy ];
# disabled due to error in loading unittest
# don't know how to make test from: <mps_youtube. ...>
doCheck = false;
# before check create a directory and redirect XDG_CONFIG_HOME to it
preCheck = ''
mkdir -p check-phase
export XDG_CONFIG_HOME=$(pwd)/check-phase
'';
meta = with stdenv.lib; {
description = "Terminal based YouTube player and downloader";
homepage = https://github.com/np1/mps-youtube;
license = licenses.gpl3;
maintainers = with maintainers; [ odi ];
};
}

View file

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, neovim
, click
, pygobject3
, isPy27
, pkgs
}:
buildPythonPackage rec {
pname = "neovim-pygui";
version = "0.1.3";
disabled = !isPy27;
src = fetchFromGitHub {
owner = "neovim";
repo = "python-gui";
rev = version;
sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz";
};
propagatedBuildInputs = [ neovim click pygobject3 pkgs.gobjectIntrospection pkgs.makeWrapper pkgs.gtk3 ];
patchPhase = ''
sed -i -e "s|entry_points=entry_points,|entry_points=dict(console_scripts=['pynvim=neovim.ui.cli:main [GUI]']),|" setup.py
'';
postInstall = ''
wrapProgram $out/bin/pynvim \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix PYTHONPATH : "${pygobject3}/lib/python2.7/site-packages:$PYTHONPATH"
'';
}

View file

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, nose
, pillow
, blessings
, isPy3k
}:
buildPythonPackage rec {
pname = "nose-progressive";
version = "1.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "0mfbjv3dcg23q0a130670g7xpfyvgza4wxkj991xxh8w9hs43ga4";
};
buildInputs = [ nose ];
propagatedBuildInputs = [ pillow blessings ];
# fails with obscure error
doCheck = !isPy3k;
meta = with stdenv.lib; {
homepage = https://github.com/erikrose/nose-progressive;
description = "A testrunner with a progress bar and smarter tracebacks";
license = licenses.mit;
maintainers = with maintainers; [ domenkozar ];
};
}

View file

@ -16,12 +16,12 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
version = "1.15.2";
version = "1.15.3";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1";
sha256 = "1c0c80e74759fa4942298044274f2c11b08c86230b25b8b819e55e644f5ff2b6";
};
disabled = isPyPy;

View file

@ -0,0 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, six
, beautifulsoup4
}:
buildPythonPackage rec {
pname = "ofxparse";
version = "0.14";
src = fetchPypi {
inherit pname version;
sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a";
};
propagatedBuildInputs = [ six beautifulsoup4 ];
meta = with stdenv.lib; {
homepage = "http://sites.google.com/site/ofxparse";
description = "Tools for working with the OFX (Open Financial Exchange) file format";
license = licenses.mit;
};
}

View file

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, python
, sqlalchemy
}:
buildPythonPackage rec {
pname = "ofxtools";
version = "0.3.8";
src = fetchPypi {
inherit pname version;
sha256 = "88f289a60f4312a1599c38a8fb3216e2b46d10cc34476f9a16a33ac8aac7ec35";
};
checkPhase = ''
${python.interpreter} -m unittest discover -s ofxtools
'';
buildInputs = [ sqlalchemy ];
meta = with stdenv.lib; {
homepage = "https://github.com/csingley/ofxtools";
description = "Library for working with Open Financial Exchange (OFX) formatted data used by financial institutions";
license = licenses.mit;
broken = true;
};
}

View file

@ -0,0 +1,23 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
}:
buildPythonPackage rec {
pname = "pagerduty";
version = "0.2.1";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "e8c237239d3ffb061069aa04fc5b3d8ae4fb0af16a9713fe0977f02261d323e9";
};
meta = with stdenv.lib; {
homepage = http://github.com/samuel/python-pagerduty;
description = "Library for the PagerDuty service API";
license = licenses.bsd0;
};
}

View file

@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, mock
, nose
, pep8
, pylint
, mccabe
}:
buildPythonPackage rec {
version = "1.6.1";
pname = "pamqp";
src = fetchPypi {
inherit pname version;
sha256 = "1vmyvynqzx5zvbipaxff4fnzy3h3dvl3zicyr15yb816j93jl2ca";
};
buildInputs = [ mock nose pep8 pylint mccabe ];
meta = with stdenv.lib; {
description = "RabbitMQ Focused AMQP low-level library";
homepage = https://pypi.python.org/pypi/pamqp;
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec{
version = "1.4.1";
pname = "pandocfilters";
src = fetchPypi {
inherit pname version;
sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd";
};
# No tests available
doCheck = false;
meta = with stdenv.lib; {
description = "A python module for writing pandoc filters, with a collection of examples";
homepage = https://github.com/jgm/pandocfilters;
license = licenses.mit;
};
}

View file

@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytest
, pytestrunner
, future
}:
buildPythonPackage rec {
pname = "parsedatetime";
version = "2.3";
src = fetchPypi {
inherit pname version;
sha256 = "1vkrmd398s11h1zn3zaqqsiqhj9lwy1ikcg6irx2lrgjzjg3rjll";
};
buildInputs = [ pytest pytestrunner ];
propagatedBuildInputs = [ future ];
meta = with stdenv.lib; {
description = "Parse human-readable date/time text";
homepage = "https://github.com/bear/parsedatetime";
license = licenses.asl20;
};
}

View file

@ -0,0 +1,34 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytest
, pytestrunner
, six
, w3lib
, lxml
, cssselect
}:
buildPythonPackage rec {
pname = "parsel";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0a34d1c0bj1fzb5dk5744m2ag6v3b8glk4xp0amqxdan9ldbcd97";
};
buildInputs = [ pytest pytestrunner ];
propagatedBuildInputs = [ six w3lib lxml cssselect ];
checkPhase = ''
py.test
'';
meta = with stdenv.lib; {
homepage = "https://github.com/scrapy/parsel";
description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors";
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, nose
, six
}:
buildPythonPackage rec {
version = "0.7.0";
pname = "parsimonious";
src = fetchFromGitHub {
repo = "parsimonious";
owner = "erikrose";
rev = version;
sha256 = "087npc8ccryrxabmqifcz56w4wd0hzmv0mc91wrbhc1sil196j0a";
};
propagatedBuildInputs = [ nose six ];
meta = with stdenv.lib; {
homepage = "https://github.com/erikrose/parsimonious";
description = "Fast arbitrary-lookahead parser written in pure Python";
license = licenses.mit;
};
}

View file

@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, nose
, six
}:
buildPythonPackage rec {
pname = "paste";
version = "2.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3";
};
checkInputs = [ nose ];
propagatedBuildInputs = [ six ];
# Certain tests require network
checkPhase = ''
NOSE_EXCLUDE=test_ok,test_form,test_error,test_stderr,test_paste_website nosetests
'';
meta = with stdenv.lib; {
description = "Tools for using a Web Server Gateway Interface stack";
homepage = http://pythonpaste.org/;
license = licenses.mit;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, nose
}:
buildPythonPackage rec {
version = "1.5.2";
pname = "PasteDeploy";
src = fetchPypi {
inherit pname version;
sha256 = "d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb";
};
buildInputs = [ nose ];
meta = with stdenv.lib; {
description = "Load, configure, and compose WSGI applications and servers";
homepage = http://pythonpaste.org/deploy/;
license = licenses.mit;
};
}

View file

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, nose
, six
, paste
, PasteDeploy
, cheetah
, argparse
}:
buildPythonPackage rec {
version = "1.7.5";
pname = "PasteScript";
src = fetchPypi {
inherit pname version;
sha256 = "2b685be69d6ac8bc0fe6f558f119660259db26a15e16a4943c515fbee8093539";
};
buildInputs = [ nose ];
propagatedBuildInputs = [ six paste PasteDeploy cheetah argparse ];
doCheck = false;
meta = with stdenv.lib; {
description = "A pluggable command-line frontend, including commands to setup package file layouts";
homepage = http://pythonpaste.org/script/;
license = licenses.mit;
};
}

View file

@ -0,0 +1,26 @@
{ stdenv
, buildPythonPackage
, fetchzip
}:
buildPythonPackage rec {
version = "1.16";
pname = "patch";
src = fetchzip {
url = "mirror://pypi/p/${pname}/${pname}-${version}.zip";
sha256 = "1nj55hvyvzax4lxq7vkyfbw91pianzr3hp7ka7j12pgjxccac50g";
stripRoot = false;
};
# No tests included in archive
doCheck = false;
meta = with stdenv.lib; {
description = "A library to parse and apply unified diffs";
homepage = https://github.com/techtonik/python-patch/;
license = licenses.mit;
maintainers = [ maintainers.igsha ];
};
}

View file

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, dill
, pox
, ppft
, multiprocess
}:
buildPythonPackage rec {
pname = "pathos";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "e35418af733bf434da83746d46acca94375d6e306b3df330b2a1808db026a188";
};
propagatedBuildInputs = [ dill pox ppft multiprocess ];
# Require network
doCheck = false;
meta = with stdenv.lib; {
description = "Parallel graph management and execution in heterogeneous computing";
homepage = http://www.cacr.caltech.edu/~mmckerns/pathos.htm;
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pdfkit";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1p1m6gp51ql3wzjs2iwds8sc3hg1i48yysii9inrky6qc3s6q5vf";
};
# tests are not distributed
doCheck = false;
meta = with stdenv.lib; {
homepage = https://pypi.python.org/pypi/pdfkit;
description = "Wkhtmltopdf python wrapper to convert html to pdf using the webkit rendering engine and qt";
license = licenses.mit;
};
}

View file

@ -0,0 +1,26 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pythonAtLeast
}:
buildPythonPackage rec {
pname = "pep8";
version = "1.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900";
};
# FAIL: test_checkers_testsuite (testsuite.test_all.Pep8TestCase)
doCheck = false;
meta = with stdenv.lib; {
homepage = "http://pep8.readthedocs.org/";
description = "Python style guide checker";
license = licenses.mit;
maintainers = with maintainers; [ garbas ];
};
}

View file

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
}:
buildPythonPackage rec {
pname = "percol";
version = "0.0.8";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "169s5mhw1s60qbsd6pkf9bb2x6wfgx8hn8nw9d4qgc68qnnpp2cj";
};
meta = with stdenv.lib; {
homepage = https://github.com/mooz/percol;
description = "Adds flavor of interactive filtering to the traditional pipe concept of shell";
license = licenses.mit;
maintainers = with maintainers; [ koral ];
};
}

View file

@ -0,0 +1,21 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pexif";
version = "0.15";
src = fetchPypi {
inherit pname version;
sha256 = "45a3be037c7ba8b64bbfc48f3586402cc17de55bb9d7357ef2bc99954a18da3f";
};
meta = with stdenv.lib; {
description = "A module for editing JPEG EXIF data";
homepage = http://www.benno.id.au/code/pexif/;
license = licenses.mit;
};
}

View file

@ -0,0 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytz
}:
buildPythonPackage rec {
pname = "pg8000";
version = "1.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "188658db63c2ca931ae1bf0167b34efaac0ecc743b707f0118cc4b87e90ce488";
};
propagatedBuildInputs = [ pytz ];
meta = with stdenv.lib; {
homepage = https://github.com/realazthat/aiopg8000;
description = "PostgreSQL interface library, for asyncio";
maintainers = with maintainers; [ garbas domenkozar ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pgpdump";
version = "1.5";
src = fetchPypi {
inherit pname version;
sha256 = "0s4nh8h7qsdj2yf29bspjs1zvxd4lcd11r6g11dp7fppgf2h0iqw";
};
# Disabling check because of: https://github.com/toofishes/python-pgpdump/issues/18
doCheck = false;
meta = with stdenv.lib; {
description = "Python library for parsing PGP packets";
homepage = https://github.com/toofishes/python-pgpdump;
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pathpy
, pathlib2
, pythonOlder
}:
buildPythonPackage rec {
version = "0.7.4";
pname = "pickleshare";
src = fetchPypi {
inherit pname version;
sha256 = "84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b";
};
propagatedBuildInputs = [ pathpy ]
++ stdenv.lib.optional (pythonOlder "3.4") pathlib2;
# No proper test suite
doCheck = false;
meta = with stdenv.lib; {
description = "Tiny 'shelve'-like database with concurrency support";
homepage = https://github.com/vivainio/pickleshare;
license = licenses.mit;
};
}

View file

@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, nose
}:
buildPythonPackage rec {
pname = "pid";
version = "2.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "0cylj8p25nwkdfgy4pzai21wyzmrxdqlwwbzqag9gb5qcjfdwk05";
};
buildInputs = [ nose ];
# No tests included
doCheck = false;
meta = with stdenv.lib; {
description = "Pidfile featuring stale detection and file-locking";
homepage = https://github.com/trbs/pid/;
license = licenses.asl20;
};
}

View file

@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pygments
, isPy3k
}:
buildPythonPackage rec {
version = "0.8.0";
pname = "piep";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1wgkg1kc28jpya5k4zvbc9jmpa60b3d5c3gwxfbp15hw6smyqirj";
};
propagatedBuildInputs = [ pygments ];
meta = with stdenv.lib; {
description = "Bringing the power of python to stream editing";
homepage = https://github.com/timbertson/piep;
maintainers = with maintainers; [ timbertson ];
license = licenses.gpl3;
};
}

View file

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, nose
, mock
, pyyaml
, unittest2
, pyev
, twisted
, tornado
}:
buildPythonPackage rec {
pname = "pika";
version = "0.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "0nb4h08di432lv7dy2v9kpwgk0w92f24sqc2hw2s9vwr5b8v8xvj";
};
# Tests require twisted which is only availalble for python-2.x
doCheck = !isPy3k;
buildInputs = [ nose mock pyyaml unittest2 pyev ]
++ stdenv.lib.optionals (!isPy3k) [ twisted tornado ];
meta = with stdenv.lib; {
description = "Pure-Python implementation of the AMQP 0-9-1 protocol";
homepage = https://pika.readthedocs.org;
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,36 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pillow
, nose_progressive
, nose
, mock
, blessings
}:
buildPythonPackage rec {
pname = "pilkit";
version = "1.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "e00585f5466654ea2cdbf7decef9862cb00e16fd363017fa7ef6623a16b0d2c7";
};
preConfigure = ''
substituteInPlace setup.py --replace 'nose==1.2.1' 'nose'
'';
# tests fail, see https://github.com/matthewwithanm/pilkit/issues/9
doCheck = false;
buildInputs = [ pillow nose_progressive nose mock blessings ];
meta = with stdenv.lib; {
homepage = http://github.com/matthewwithanm/pilkit/;
description = "A collection of utilities and processors for the Python Imaging Libary";
license = licenses.bsd0;
maintainers = with maintainers; [ domenkozar ];
};
}

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