diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cce31b6a537..e60280f30eb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3115,6 +3115,11 @@
github = "olynch";
name = "Owen Lynch";
};
+ OPNA2608 = {
+ email = "christoph.neidahl@gmail.com";
+ github = "OPNA2608";
+ name = "Christoph Neidahl";
+ };
orbekk = {
email = "kjetil.orbekk@gmail.com";
github = "orbekk";
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index e16a021ec20..d4aa5950629 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -154,6 +154,18 @@ in {
'';
};
+ extraModules = mkOption {
+ type = types.listOf types.package;
+ default = [];
+ example = literalExample "[ pkgs.pulseaudio-modules-bt ]";
+ description = ''
+ Extra pulseaudio modules to use. This is intended for out-of-tree
+ pulseaudio modules like extra bluetooth codecs.
+
+ Extra modules take precedence over built-in pulseaudio modules.
+ '';
+ };
+
daemon = {
logLevel = mkOption {
type = types.str;
@@ -236,6 +248,18 @@ in {
systemd.packages = [ overriddenPackage ];
})
+ (mkIf (cfg.extraModules != []) {
+ hardware.pulseaudio.daemon.config.dl-search-path = let
+ overriddenModules = builtins.map
+ (drv: drv.override { pulseaudio = overriddenPackage; })
+ cfg.extraModules;
+ modulePaths = builtins.map
+ (drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules")
+ # User-provided extra modules take precedence
+ (overriddenModules ++ [ overriddenPackage ]);
+ in lib.concatStringsSep ":" modulePaths;
+ })
+
(mkIf hasZeroconf {
services.avahi.enable = true;
})
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 6944d1a4f76..f8524ab99e8 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -1,6 +1,6 @@
# This module provides the proprietary NVIDIA X11 / OpenGL drivers.
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ stdenv, config, lib, pkgs, pkgs_i686, ... }:
with lib;
@@ -23,7 +23,11 @@ let
else null;
nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
- nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
+ nvidia_libs32 =
+ if versionOlder nvidia_x11.version "391" then
+ ((nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }).out
+ else
+ (nvidiaForKernel config.boot.kernelPackages).lib32;
enabled = nvidia_x11 != null;
@@ -98,7 +102,7 @@ in
assertions = [
{
assertion = config.services.xserver.displayManager.gdm.wayland;
- message = "NVidia drivers don't support wayland";
+ message = "NVIDIA drivers don't support wayland";
}
{
assertion = !optimusCfg.enable ||
@@ -161,7 +165,7 @@ in
};
hardware.opengl.package = nvidia_x11.out;
- hardware.opengl.package32 = nvidia_libs32.out;
+ hardware.opengl.package32 = nvidia_libs32;
environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix
index a66a7fbf495..5635d6f0971 100644
--- a/nixos/modules/services/hardware/lirc.nix
+++ b/nixos/modules/services/hardware/lirc.nix
@@ -65,6 +65,10 @@ in {
serviceConfig = {
RuntimeDirectory = "lirc";
+
+ # socket lives in runtime directory; we have to keep is available
+ RuntimeDirectoryPreserve = true;
+
ExecStart = ''
${pkgs.lirc}/bin/lircd --nodaemon \
${escapeShellArgs cfg.extraArguments} \
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 33249aa3e55..d43733484ff 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -602,7 +602,7 @@ in
target = "postfix";
};
- # This makes comfortable for root to run 'postqueue' for example.
+ # This makes it comfortable to run 'postqueue/postdrop' for example.
systemPackages = [ pkgs.postfix ];
};
@@ -616,6 +616,22 @@ in
setgid = true;
};
+ security.wrappers.postqueue = {
+ program = "postqueue";
+ source = "${pkgs.postfix}/bin/postqueue";
+ group = setgidGroup;
+ setuid = false;
+ setgid = true;
+ };
+
+ security.wrappers.postdrop = {
+ program = "postdrop";
+ source = "${pkgs.postfix}/bin/postdrop";
+ group = setgidGroup;
+ setuid = false;
+ setgid = true;
+ };
+
users.users = optional (user == "postfix")
{ name = "postfix";
description = "Postfix mail server user";
diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix
index 1fcfb440485..c6ff540ea12 100644
--- a/nixos/modules/services/misc/weechat.nix
+++ b/nixos/modules/services/misc/weechat.nix
@@ -46,10 +46,12 @@ in
Group = "weechat";
RemainAfterExit = "yes";
};
- script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
+ script = "exec ${config.security.wrapperDir}/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
wantedBy = [ "multi-user.target" ];
wants = [ "network.target" ];
};
+
+ security.wrappers.screen.source = "${pkgs.screen}/bin/screen";
};
meta.doc = ./weechat.xml;
diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml
index 9c9ee0448c9..b7f755bbc5c 100644
--- a/nixos/modules/services/misc/weechat.xml
+++ b/nixos/modules/services/misc/weechat.xml
@@ -54,7 +54,7 @@
Now, the session can be re-attached like this:
-screen -r weechat-screen
+screen -x weechat/weechat-screen
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 3af0441a89d..9f74e496329 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -157,9 +157,9 @@ in
{ description = "hostapd wireless AP";
path = [ pkgs.hostapd ];
- wantedBy = [ "network.target" ];
-
- after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ];
+ after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
+ bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
+ requiredBy = [ "network-link-${cfg.interface}.service" ];
serviceConfig =
{ ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index 49b8db51bcc..46e317a3b12 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -5,20 +5,20 @@
, qtlocation, qtquickcontrols2, qtwebchannel
, qtwebengine, qtx11extras, qtxmlpatterns
, monero, unbound, readline, boost, libunwind
-, pcsclite, zeromq, cppzmq, pkgconfig
+, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "monero-gui-${version}";
- version = "0.12.3.0";
+ version = "0.13.0.3";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i";
+ sha256 = "1rvxwz7p1yw9c817n07m60xvmv2p97s82sfzwkg2x880fpxb0gj9";
};
nativeBuildInputs = [ qmake pkgconfig ];
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
qtdeclarative qtlocation qtquickcontrols2
qtwebchannel qtwebengine qtx11extras
qtxmlpatterns monero unbound readline
- boost libunwind pcsclite zeromq cppzmq
- makeWrapper
+ boost libunwind libsodium pcsclite zeromq
+ cppzmq makeWrapper
];
patches = [
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index a4a884707a9..e344f4d94ba 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit
, cmake, pkgconfig, git
, boost, miniupnpc, openssl, unbound, cppzmq
-, zeromq, pcsclite, readline
+, zeromq, pcsclite, readline, libsodium
, CoreData, IOKit, PCSC
}:
@@ -11,12 +11,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "monero-${version}";
- version = "0.12.3.0";
+ version = "0.13.0.3";
src = fetchgit {
url = "https://github.com/monero-project/monero.git";
rev = "v${version}";
- sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i";
+ sha256 = "03qx8y74zxnmabdi5r3a274pp8zvm3xhkdwi1xf5sb40vf4sfmwb";
};
nativeBuildInputs = [ cmake pkgconfig git ];
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
+ libsodium
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index 2401a610156..edf7a313ff5 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "bs1770gain-${version}";
- version = "0.4.12";
+ version = "0.5.0";
src = fetchurl {
url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
- sha256 = "0n9skdap1vnl6w52fx0gsrjlk7w3xgdwi62ycyf96h29rx059z6a";
+ sha256 = "0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii";
};
buildInputs = [ ffmpeg sox ];
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 611828753e4..a28125d24d4 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -69,7 +69,8 @@ let
name = "clementine-free-${version}";
inherit src patches nativeBuildInputs postPatch;
- buildInputs = buildInputs ++ [ makeWrapper ];
+ # gst_plugins needed for setup-hooks
+ buildInputs = buildInputs ++ [ makeWrapper gst_plugins ];
cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
@@ -101,7 +102,7 @@ let
./clementine-spotify-blob.patch
];
- buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ];
+ buildInputs = buildInputs ++ [ libspotify makeWrapper ];
# Only build and install the Spotify blob
preBuild = ''
cd ext/clementine-spotifyblob
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index 6546fd7866e..4bcddab54a0 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
- gnome3, gtk3, gettext, perl, perlXMLParser, flex, libid3tag,
+ gnome3, gtk3, gettext, perlPackages, flex, libid3tag,
libvorbis, gdk_pixbuf }:
stdenv.mkDerivation rec {
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
buildInputs = [
- curl gettext perl perlXMLParser
+ curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta
- ];
+ ] ++ (with perlPackages; [ perl XMLParser ]);
patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh
diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix
index 77946fc41cc..eea9de5a159 100644
--- a/pkgs/applications/audio/jamin/default.nix
+++ b/pkgs/applications/audio/jamin/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2
-, makeWrapper, pkgconfig, perl, perlXMLParser
+, makeWrapper, pkgconfig, perlPackages
}:
stdenv.mkDerivation {
@@ -11,11 +11,9 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 perl
- perlXMLParser makeWrapper
- ];
-
+ buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
+ ++ (with perlPackages; [ perl XMLParser ]);
+
postInstall = ''
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
'';
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index e3d07fcc245..b377db65c0c 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -1,14 +1,16 @@
{ stdenv
, runCommand
, fetchFromGitHub
-, libpulseaudio
, pulseaudio
, pkgconfig
+, ffmpeg_4
+, patchelf
, libtool
, cmake
, bluez
, dbus
, sbc
+, lib
}:
let
@@ -20,37 +22,52 @@ let
in stdenv.mkDerivation rec {
name = "pulseaudio-modules-bt-${version}";
- version = "unstable-2018-09-11";
+ version = "unstable-2018-10-16";
src = fetchFromGitHub {
owner = "EHfive";
repo = "pulseaudio-modules-bt";
- rev = "9c6ad75382f3855916ad2feaa6b40e37356d80cc";
- sha256 = "1iz4m3y6arsvwcyvqc429w252dl3apnhvl1zhyvfxlbg00d2ii0h";
+ rev = "552c2b48c0cc7dd44d0746b261f7c7d5559e8e30";
+ sha256 = "052jb1hjx1in7bafx4zpn78s7r6f2y7djriwi36dzqy9wmalmyjy";
fetchSubmodules = true;
};
+ patches = [
+ ./fix-install-path.patch
+ ];
+
nativeBuildInputs = [
pkgconfig
+ patchelf
cmake
];
buildInputs = [
- libpulseaudio
pulseaudio
+ ffmpeg_4
libtool
bluez
dbus
sbc
];
- NIX_CFLAGS_COMPILE = [
- "-L${pulseaudio}/lib/pulseaudio"
- ];
-
- prePatch = ''
+ postPatch = ''
+ # Upstream bundles pulseaudio as a submodule
rm -r pa
ln -s ${pulseSources} pa
+
+ # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions
+ substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version}
+ substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version}
+ '';
+
+ postFixup = ''
+ for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
+ orig_rpath=$(patchelf --print-rpath "$so")
+ patchelf \
+ --set-rpath "${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
+ "$so"
+ done
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
new file mode 100644
index 00000000000..2b4ff86ab71
--- /dev/null
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
@@ -0,0 +1,11 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f5baa0..1f35cce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,5 +121,4 @@ INSTALL(TARGETS
+ module-bluez5-device
+ module-bluetooth-discover
+ module-bluetooth-policy
+- LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
+-
++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)
diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix
index d46128c62c0..9c736f5ffb5 100644
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/pkgs/applications/graphics/cinepaint/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms,
- flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
- perlXMLParser, pythonPackages, gettext, intltool, babl, gegl,
+ flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11,
+ pythonPackages, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
@@ -15,10 +15,10 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
- libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
+ libexif zlib libX11 python pygtk gettext intltool babl
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
- ];
+ ] ++ (with perlPackages; [ perl XMLParser ]);
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 222328d2b91..0ce160242e5 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
-perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
+{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages,
+libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
gtk-mac-integration-gtk2 }:
@@ -14,12 +14,13 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
+ [ gtk2 libxml2 gettext python libxml2Python docbook5
libxslt docbook_xsl libart_lgpl hicolor-icon-theme ]
++ stdenv.lib.optional withGNOME libgnomeui
++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
- nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
+ nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ]
+ ++ (with perlPackages; [ perl XMLParser ]);
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough
diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
index 27ca6e26e9f..025b3ae65ec 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk2, perl, perlXMLParser, pkgconfig } :
+{stdenv, fetchurl, gtk2, perlPackages, pkgconfig } :
let version = "0.4"; in
stdenv.mkDerivation {
@@ -21,7 +21,8 @@ stdenv.mkDerivation {
[ ];
nativeBuildInputs = [ pkgconfig ];
-buildInputs = [ gtk2 perl perlXMLParser ];
+ buildInputs = [ gtk2 ]
+ ++ (with perlPackages; [ perl XMLParser ]);
meta = {
description = "Simple GTK+2 color selector";
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index f4d08195309..48ec2a5a014 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft
+{ stdenv, fetchurl, pkgconfig, perlPackages, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge
@@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
'';
- nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env perl perlXMLParser ];
+ nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ]
+ ++ (with perlPackages; [ perl XMLParser ]);
buildInputs = [
libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index d024b0fce99..5e8bb629ce2 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}:
+{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}:
with stdenv.lib;
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "get_iplayer-${version}";
version = "2.99";
-
+
src = fetchFromGitHub {
owner = "get-iplayer";
repo = "get_iplayer";
@@ -34,5 +34,5 @@ buildPerlPackage rec {
homepage = https://squarepenguin.co.uk/;
platforms = platforms.all;
};
-
+
}
diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix
index 149092c70d3..a4889014412 100644
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/pkgs/applications/misc/gpa/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }:
stdenv.mkDerivation rec {
- name = "gpa-0.9.10";
+ name = "gpa-0.10.0";
src = fetchurl {
url = "mirror://gnupg/gpa/${name}.tar.bz2";
- sha256 = "09xphbi2456qynwqq5n0yh0zdmdi2ggrj3wk4hsyh5lrzlvcrff3";
+ sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm";
};
nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index e61613a4b30..adfd9fa7eac 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
- version = "4.1.2";
+ version = "4.2.1";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
rev = "v${version}";
- sha256 = "01c2bswvxqk4biidpfj3hzf0kdk69i56ibk2wfi8v50qm105psli";
+ sha256 = "1rmsrpf5vlqhnyyrhq8apndny88ld2qvfjx6258653pqbimv7mx5";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index b98d10efdee..877a25fe662 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
stdenv'.mkDerivation rec {
name = "xmr-stak-${version}";
- version = "2.4.7";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "fireice-uk";
repo = "xmr-stak";
rev = "${version}";
- sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817";
+ sha256 = "1qls0rai9c1cszcqqqmhcdvcsmm23w1jxzlq2b035apkz7ywbxjl";
};
NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index acd3493fe7c..c18f77f8f99 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -14,7 +14,7 @@
, glib, gtk2, gtk3, dbus-glib
, libXScrnSaver, libXcursor, libXtst, libGLU_combined
, protobuf, speechd, libXdamage, cups
-, ffmpeg, libxslt, libxml2
+, ffmpeg, libxslt, libxml2, at-spi2-core
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
@@ -129,7 +129,8 @@ let
] ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
- ++ optional pulseSupport libpulseaudio;
+ ++ optional pulseSupport libpulseaudio
+ ++ optional (versionAtLeast version "71") at-spi2-core;
patches = [
# As major versions are added, you can trawl the gentoo and arch repos at
@@ -232,7 +233,6 @@ let
is_clang = false;
clang_use_chrome_plugins = false;
remove_webcore_debug_symbols = true;
- use_gtk3 = true;
enable_swiftshader = false;
fieldtrial_testing_like_official_build = true;
@@ -243,6 +243,8 @@ let
google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
google_default_client_id = "404761575300.apps.googleusercontent.com";
google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
+ } // optionalAttrs (versionRange "60" "70") {
+ use_gtk3 = true;
} // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index bcabdf43cd2..1eaaf3b12df 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -1,5 +1,5 @@
{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
-, perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
+, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib
, libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
@@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
- perl perlXMLParser evolution-data-server gnome-doc-utils avahi
+ evolution-data-server gnome-doc-utils avahi
libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite
gnome3.libsoup glib gnome3.defaultIconTheme boost
autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
nss zlib libsecret libXrandr randrproto which libxslt libtasn1
- gmp nettle makeWrapper ];
+ gmp nettle makeWrapper ]
+ ++ (with perlPackages; [ perl XMLParser ]);
preAutoreconf = ''
substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index ec3bb6a463e..12348fe548c 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell
, gst_all_1, startupnotification, gettext
-, perl, perlXMLParser, libxml2, nss, nspr, farstream
+, perlPackages, libxml2, nss, nspr, farstream
, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn
, lib, python, libICE, libXext, libSM
, cyrus_sasl ? null
@@ -40,9 +40,8 @@ let unwrapped = stdenv.mkDerivation rec {
++ (lib.optional (gnutls != null) gnutls)
++ (lib.optional (libgcrypt != null) libgcrypt);
- propagatedBuildInputs = [
- pkgconfig gtk2 perl perlXMLParser gettext
- ];
+ propagatedBuildInputs = [ pkgconfig gtk2 gettext ]
+ ++ (with perlPackages; [ perl XMLParser ]);
patches = [ ./pidgin-makefile.patch ./add-search-path.patch ];
diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix
new file mode 100644
index 00000000000..b5fa1ccc2f4
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonApplication, fetchurl, pythonOlder
+, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig }:
+buildPythonApplication rec {
+ name = "poezio-${version}";
+ version = "0.12";
+
+ disabled = pythonOlder "3.4";
+
+ buildInputs = [ pytest ];
+ propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi ];
+ nativeBuildInputs = [ pkgconfig ];
+
+ src = fetchurl {
+ url = "http://dev.louiz.org/attachments/download/129/${name}.tar.gz";
+ sha256 = "11n9x82xyjwbqk28lsfnvqwn8qc9flv6w2c64camh6j3148ykpvz";
+ };
+
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = with lib; {
+ description = "Free console XMPP client";
+ homepage = https://poez.io;
+ license = licenses.mit;
+ maintainers = [ maintainers.lsix ];
+ };
+ }
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 2a80349c4e6..e08fdad50fb 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit src;
nodejs = nodejs-8_x;
- sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr";
+ sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
};
patches = [ ./isDev.patch ];
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 03a99aea400..1e8080fd9c9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -13,6 +13,8 @@ let
in {
stable = mkTelegram stableVersion;
preview = mkTelegram (stableVersion // {
+ version = "1.4.4";
+ sha256Hash = "1m1j485r3vzpglzfn8l4cqskysvkx8l3pqaw3fgp66jfajbxynf0";
stable = false;
});
}
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index c155d696d39..b1aed5e5f59 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
+{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages
, itstool
}:
@@ -20,19 +20,19 @@ in stdenv.mkDerivation rec {
prePatch = ''
substituteInPlace doc/C/gnumeric.xml \
- --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \
- --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \
- --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1}
+ --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \
+ --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \
+ --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1}
'';
nativeBuildInputs = [ pkgconfig ];
# ToDo: optional libgda, introspection?
buildInputs = [
- intltool perl perlXMLParser bison
+ intltool bison
goffice gtk3 makeWrapper gnome3.defaultIconTheme
python pygobject3 itstool
- ];
+ ] ++ (with perlPackages; [ perl XMLParser ]);
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 7973fa8b3ef..525fc5f1dc2 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
, zlib, libGLU_combined, libGLU, xorg }:
-let version = "4.0.1"; in
+let version = "4.0.2"; in
stdenv.mkDerivation {
name = "gmsh-${version}";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "0s9pay32kci03qx3dlpf9h2n3hihf8zpidjnn8p9vmhnn0vav7rz";
+ sha256 = "03aw3sbz4x998rk29az7mgm0mrdb6614aqnppg81p5jkh5097jgk";
};
# The original CMakeLists tries to use some version of the Lapack lib
diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index 82bcbf74a9e..c52a78ff007 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "git-recent-${version}";
- version = "1.0.4";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "paulirish";
repo = "git-recent";
rev = "v${version}";
- sha256 = "0dbnm5b2v04fy0jgzphm3xvz9scx0n4p10fw8wjd0cy56308h79k";
+ sha256 = "06r1jzmzdv3d4vxdh5qyf5g5rgavxfmh2rpbs7a7byg3k7d77hpn";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index 7b81c28c375..101770da888 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -2,7 +2,7 @@
pythonPackages.buildPythonApplication rec {
name = "git-review-${version}";
- version = "1.26.0";
+ version = "1.27.0";
# Manually set version because prb wants to get it from the git
# upstream repository (and we are installing from tarball instead)
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
src = fetchurl rec {
url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz";
- sha256 = "106nk6p7byf5vi68b2fvmwma5nk7qrv39nfj9p1bfxmb1gjdixhc";
+ sha256 = "0smdkps9avnj58izyfc5m0amq8nafgs9iqlyaf7ncrlvypia1f3q";
};
propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ];
diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index 6c473e2d8dc..d6404a82bc3 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -51,7 +51,7 @@
#AMR-WB IF2 support no
{ stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv
-, pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext
+, pkgconfig, perlPackages, libavc1394, libiec61883, libXv, gettext
, libX11, glib, cairo, intltool, ffmpeg, libv4l
}:
@@ -64,7 +64,8 @@ stdenv.mkDerivation {
};
buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv
- pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages
+ pkgconfig libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages
+ ++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--enable-local-ffmpeg=no" ];
diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
index 24e99d78c48..64fcf0ba04a 100644
--- a/pkgs/applications/video/wxcam/default.nix
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -4,7 +4,7 @@
, libX11, libXv, libSM
, gtk, libglade
, wxGTK
-, perlXMLParser
+, perlPackages
, xvidcore
, mjpegtools
, alsaLib
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with stdenv.lib;
- [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlXMLParser xvidcore mjpegtools alsaLib libv4l cimg ];
+ [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ];
NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg";
@@ -32,10 +32,10 @@ stdenv.mkDerivation rec {
installPhase = ''
make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam"
- '';
-
+ '';
+
meta = with stdenv.lib; {
- description = "An open-source, wxGTK-based webcam app for Linux";
+ description = "An open-source, wxGTK-based webcam app for Linux";
longDescription = ''
wxCam is a webcam application for linux. It supports video recording
(avi uncompressed and Xvid formats), snapshot taking, and some special
diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix
index 663f89b325a..6e07fbb105b 100644
--- a/pkgs/applications/video/xvidcap/default.nix
+++ b/pkgs/applications/video/xvidcap/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk2
+{ stdenv, fetchurl, perlPackages, pkgconfig, gtk2
, scrollkeeper, libglade, libXmu, libX11, libXext, gettext
, lame, libXfixes, libXdamage }:
stdenv.mkDerivation {
name = "xvidcap-1.1.7";
-
+
src = fetchurl {
url = mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz;
sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm";
@@ -14,14 +14,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- perl perlXMLParser gtk2 scrollkeeper
+ gtk2 scrollkeeper
libglade libXmu gettext lame libXdamage libXfixes libXext libX11
- ];
+ ] ++ (with perlPackages; [ perl XMLParser ]);
# !!! don't know why this is necessary
NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s";
- meta = with stdenv.lib; {
+ meta = with stdenv.lib; {
description = "Screencast video catpuring tool";
homepage = http://xvidcap.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix
index a9c53249ae8..dc48a312fb3 100644
--- a/pkgs/build-support/fetchmavenartifact/default.nix
+++ b/pkgs/build-support/fetchmavenartifact/default.nix
@@ -67,7 +67,7 @@ in
# packages packages that mention this derivation in their buildInputs.
installPhase = ''
mkdir -p $out/share/java
- ln -s ${jar} $out/share/java
+ ln -s ${jar} $out/share/java/${artifactId}-${version}.jar
'';
# We also add a `jar` attribute that can be used to easily obtain the path
# to the downloaded jar file.
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index f1df81f2db4..f82ae5f1f9f 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
+{stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool
, libxml2, glib}:
let version = "1.10"; in
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6";
};
- nativeBuildInputs = [
- pkgconfig gettext intltool perl perlXMLParser libxml2 glib
- ];
+ nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]);
+ buildInputs = [ libxml2 glib ];
meta = with stdenv.lib; {
inherit version;
diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
new file mode 100644
index 00000000000..5b96e335c67
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, deepin-wallpapers }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "deepin-desktop-base";
+ version = "2018.7.23";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1n1bjkvhgq138jcg3zkwg55r41056x91mh191mirlpvpic574ydc";
+ };
+
+ buildInputs = [ deepin-wallpapers ];
+
+ postPatch = ''
+ sed -i Makefile -e "s:/usr:$out:" -e "s:/etc:$out/etc:"
+ '';
+
+ postInstall = ''
+ # Remove Deepin distro's lsb-release
+ rm $out/etc/lsb-release
+
+ # Don't override systemd timeouts
+ rm -r $out/etc/systemd
+
+ # Remove apt-specific templates
+ rm -r $out/share/python-apt
+
+ # Remove empty backgrounds directory
+ rm -r $out/share/backgrounds
+
+ # Make a symlink for deepin-version
+ ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Base assets and definitions for Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/deepin-desktop-base;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 291aa8c11be..4e6530c2d18 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -7,6 +7,7 @@ let
dde-api = callPackage ./dde-api { };
dde-calendar = callPackage ./dde-calendar { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
+ deepin-desktop-base = callPackage ./deepin-desktop-base { };
deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
index 4b769f5d0ae..7c713cb9122 100644
--- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
+{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
stdenv.mkDerivation {
name = "scrollkeeper-0.3.14";
@@ -14,6 +14,7 @@ stdenv.mkDerivation {
";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ perl perlXMLParser libxml2 libxslt gettext];
+ buildInputs = [ libxml2 libxslt gettext ]
+ ++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ];
}
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 5ec3b5f59d8..d6dd0601e62 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -7,13 +7,13 @@ let
in
stdenv.mkDerivation rec {
name = "nextpnr-${version}";
- version = "2018.08.09";
+ version = "2018.10.17";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "nextpnr";
- rev = "2e02f2d6166c75b1fcec73d268e97e407071a372";
- sha256 = "1f98mkailn75gz5fvhjhnyr0gwa0r8mm3f2sbvgl0yvys8qi08wr";
+ rev = "529a595157a2eef24f8529b0de0c504a40ed503b";
+ sha256 = "06yp89rpvb2s4zc1qkbcp76kqwkk9s8j2ckblqw547dy5ah2cl7h";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 55faf277b15..48304b6af26 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,11 +1,11 @@
import ./jdk-linux-base.nix {
productVersion = "8";
- patchVersion = "181";
+ patchVersion = "191";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
- sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
- sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
- sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
- sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
+ sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
+ sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
+ sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
+ sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 55faf277b15..48304b6af26 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,11 +1,11 @@
import ./jdk-linux-base.nix {
productVersion = "8";
- patchVersion = "181";
+ patchVersion = "191";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
- sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
- sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
- sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
- sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
+ sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
+ sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
+ sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
+ sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 314fbf354e1..275a25c8495 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
stdenv.mkDerivation rec {
name = "yosys-${version}";
- version = "2018.09.30";
+ version = "2018.10.17";
srcs = [
(fetchFromGitHub {
owner = "yosyshq";
repo = "yosys";
- rev = "4d2917447cc14c590b4fee5ba36948fb4ee6884b";
- sha256 = "0b9mmzq2jhx8x8b58nk97fzh70nbhlc3lcfln5facxddv4mp2gl1";
+ rev = "yosys-0.8";
+ sha256 = "1qwbp8gynlklawzvpa4gdn2x0hs8zln0s3kxjqkhfcjfxffdcpvv";
name = "yosys";
})
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index ef2c33c1091..5803e2946bf 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -194,19 +194,21 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args;
# : { root : Path
+ # , name : Defaulted String
# , source-overrides : Defaulted (Either Path VersionNumber)
# , overrides : Defaulted (HaskellPackageOverrideSet)
# , modifier : Defaulted
# , returnShellEnv : Defaulted
# } -> NixShellAwareDerivation
- # Given a path to a haskell package directory whose cabal file is
- # named the same as the directory name, an optional set of
- # source overrides as appropriate for the 'packageSourceOverrides'
- # function, an optional set of arbitrary overrides, and an optional
- # haskell package modifier, return a derivation appropriate
- # for nix-build or nix-shell to build that package.
+ # Given a path to a haskell package directory, an optional package name
+ # which defaults to the base name of the path, an optional set of source
+ # overrides as appropriate for the 'packageSourceOverrides' function, an
+ # optional set of arbitrary overrides, and an optional haskell package
+ # modifier, return a derivation appropriate for nix-build or nix-shell to
+ # build that package.
developPackage =
{ root
+ , name ? builtins.baseNameOf root
, source-overrides ? {}
, overrides ? self: super: {}
, modifier ? drv: drv
@@ -216,7 +218,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
(pkgs.lib.composeExtensions
(self.packageSourceOverrides source-overrides)
overrides))
- .callCabal2nix (builtins.baseNameOf root) root {};
+ .callCabal2nix name root {};
in if returnShellEnv then (modifier drv).env else modifier drv;
ghcWithPackages = selectFrom: withPackages (selectFrom self);
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 8d4e68bf57c..27d01e4e1f5 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -4,6 +4,8 @@
, postBuild ? ""
, ignoreCollisions ? false
, requiredPythonModules
+# Wrap executables with the given argument.
+, makeWrapperArgs ? []
, }:
# Create a python executable that knows about additional packages.
@@ -32,7 +34,7 @@ let
if [ -f "$prg" ]; then
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
- makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true"
+ makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 53e3f5468ab..971637bc787 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
+{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages
, expat, gettext, intltool, glib, libiconv
, qt4 ? null
, qt4Support ? false
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
patches = [ ./no-mkdir-localstatedir.patch ];
- buildInputs = [ libdaemon dbus perl perlXMLParser glib expat libiconv ]
+ buildInputs = [ libdaemon dbus glib expat libiconv ]
+ ++ (with perlPackages; [ perl XMLParser ])
++ (stdenv.lib.optional qt4Support qt4);
nativeBuildInputs = [ pkgconfig gettext intltool glib ];
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index fce052aeb22..5a11d03c591 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,4 +1,5 @@
{ stdenv, fetchurl
+, buildPackages
, pkgconfig, which, makeWrapper
, zlib, bzip2, libpng, gnumake, glib
@@ -50,6 +51,9 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ];
+ # native compiler to generate building tool
+ CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
+
# The asm for armel is written with the 'asm' keyword.
CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99";
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 04e8eab4d28..b678a089386 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -14,12 +14,15 @@ stdenv.mkDerivation rec {
# in Debian, so we assume they have been sent upstream.
#
patches = [
- ./c-missing_xm_h.patch
- ./c-render_table_crash.patch
+ ./c-missing_xm_h.patch
+ ./c-render_table_crash.patch
./c-xpmpipethrough.patch
];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "An open source clone of the Motif widget set";
+ homepage = http://lesstif.sourceforge.net;
+ platforms = platforms.unix;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix
index 7de72ed73a6..39f493d821c 100644
--- a/pkgs/development/libraries/libHX/default.nix
+++ b/pkgs/development/libraries/libHX/default.nix
@@ -16,14 +16,15 @@ stdenv.mkDerivation rec {
sh autogen.sh
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://libhx.sourceforge.net/;
longDescription = ''
libHX is a C library (with some C++ bindings available) that provides data structures
and functions commonly needed, such as maps, deques, linked lists, string formatting
and autoresizing, option and config file parsing, type checking casts and more.
'';
- maintainers = [ stdenv.lib.maintainers.tstrobel ];
- platforms = stdenv.lib.platforms.linux;
+ maintainers = [ maintainers.tstrobel ];
+ platforms = platforms.linux;
+ license = with licenses; [ gpl3 lgpl21Plus wtfpl ];
};
}
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index 4bb806b91d8..16e9f213ed4 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -25,7 +25,9 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "Library for managing accounts which can be used from GLib applications";
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index b94c845479a..a08a1e33523 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
homepage = https://aomedia.org/av1-features/get-started/;
maintainers = with maintainers; [ kiloreux ];
platforms = platforms.all;
+ license = licenses.bsd2;
};
}
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 54fb89df045..5153b63e91c 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/include
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/binaryanalysisplatform/bap-bindings;
description = "A C library for interacting with BAP";
- maintainers = [ stdenv.lib.maintainers.maurer ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.maurer ];
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 1342ee6773f..501341d202b 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Provides a Qt implementation of the DBusMenu spec";
inherit homepage;
- maintainers = [ ];
inherit (qt4.meta) platforms;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 9c25757efb0..e8651de2b34 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
description = "Provides a Qt implementation of the DBusMenu spec";
maintainers = [ maintainers.ttuegel ];
inherit (qtbase.meta) platforms;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index 8d264c929a5..7b3df42c24c 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/pkgs/development/libraries/libexttextcat/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k";
};
- meta = {
+ meta = with stdenv.lib; {
description = "An N-Gram-Based Text Categorization library primarily intended for language guessing";
homepage = https://wiki.documentfoundation.org/Libexttextcat;
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 5e94d00dcdb..d54f9203d23 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
'';
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
+ homepage = https://www.mono-project.com/docs/gui/libgdiplus/;
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 29f346e9acf..0af0a1227f3 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
- libstartup_notification, libgtop, perl, perlXMLParser,
+ libstartup_notification, libgtop, perlPackages,
autoreconfHook, intltool, docbook_xsl, xauth
}:
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk2 gnome2.GConf libstartup_notification
- gnome3.libgnome-keyring libgtop gnome2.libglade perl perlXMLParser
- ];
+ gnome3.libgnome-keyring libgtop gnome2.libglade
+ ] ++ (with perlPackages; [ perl XMLParser ]);
enableParallelBuilding = true;
@@ -30,26 +30,26 @@ stdenv.mkDerivation rec {
# Patches from the gentoo ebuild
# Fix compilation on bsdc
- ./libgksu-2.0.0-fbsd.patch
+ ./libgksu-2.0.0-fbsd.patch
# Fix wrong usage of LDFLAGS, gentoo bug #226837
- ./libgksu-2.0.7-libs.patch
+ ./libgksu-2.0.7-libs.patch
# Use po/LINGUAS
- ./libgksu-2.0.7-polinguas.patch
+ ./libgksu-2.0.7-polinguas.patch
# Don't forkpty; gentoo bug #298289
- ./libgksu-2.0.12-revert-forkpty.patch
+ ./libgksu-2.0.12-revert-forkpty.patch
# Make this gmake-3.82 compliant, gentoo bug #333961
- ./libgksu-2.0.12-fix-make-3.82.patch
+ ./libgksu-2.0.12-fix-make-3.82.patch
# Do not build test programs that are never executed; also fixes gentoo bug #367397 (underlinking issues).
- ./libgksu-2.0.12-notests.patch
+ ./libgksu-2.0.12-notests.patch
# Fix automake-1.11.2 compatibility, gentoo bug #397411
- ./libgksu-2.0.12-automake-1.11.2.patch
- ];
+ ./libgksu-2.0.12-automake-1.11.2.patch
+ ];
postPatch = ''
# gentoo bug #467026
diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index e7157afbaee..0b496ff593b 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation {
meta = {
inherit (glib.meta) platforms maintainers;
+ license = stdenv.lib.licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 33276b424e7..752d2ce5a1e 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
homepage = https://gnunet.org/gnurl;
maintainers = with maintainers; [ falsifian vrthra ];
platforms = platforms.linux;
+ license = with licenses; [ bsdOriginal mit ];
};
}
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index 74aee0f39c7..f178af34908 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
+{stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib,
libimobiledevice, pythonPackages, mutagen,
monoSupport ? true, mono, gtk-sharp-2_0
@@ -25,8 +25,9 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ];
- nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl] ++
- lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
+ nativeBuildInputs = [ gettext intltool pkgconfig ]
+ ++ (with perlPackages; [ perl XMLParser ])
+ ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
meta = {
homepage = http://gtkpod.sourceforge.net/;
diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix
index 08d80bcf985..298d6124505 100644
--- a/pkgs/development/libraries/libicns/default.nix
+++ b/pkgs/development/libraries/libicns/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libpng jasper ];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Library for manipulation of the Mac OS icns resource format";
+ homepage = https://icns.sourceforge.io;
+ license = with licenses; [ gpl2 lgpl2 lgpl21 ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix
index 45649f944f5..faa070b3468 100644
--- a/pkgs/development/libraries/libiodbc/default.nix
+++ b/pkgs/development/libraries/libiodbc/default.nix
@@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS_BEFORE="-rpath $out/lib"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "iODBC driver manager";
homepage = http://www.iodbc.org;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 7580c1b092e..1616aa1e0cc 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ];
+ license = with licenses; [ mit isc ];
};
}
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index c359ea10b66..36606999f53 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch
-, zlib, xz, python2, findXMLCatalogs
+, zlib, xz, python2, ncurses, findXMLCatalogs
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null
, enableShared ? stdenv.hostPlatform.libc != "msvcrt"
@@ -37,6 +37,7 @@ in stdenv.mkDerivation rec {
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
buildInputs = lib.optional pythonSupport python
+ ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses
# Libxml2 has an optional dependency on liblzma. However, on impure
# platforms, it may end up using that from /usr/lib, and thus lack a
# RUNPATH for that, leading to undefined references for its users.
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index ad6d2df1d8b..13fbe2b55b6 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3
-, libxslt, systemd, libusb, libftdi1 }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3,
+ alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }:
stdenv.mkDerivation rec {
name = "lirc-0.10.1";
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb";
};
+ # Fix installation of Python bindings
+ patches = [ (fetchpatch {
+ url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch";
+ sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly";
+ }) ];
+
postPatch = ''
patchShebangs .
@@ -24,17 +30,17 @@ stdenv.mkDerivation rec {
touch lib/lirc/input_map.inc
'';
- nativeBuildInputs = [ pkgconfig help2man ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig help2man
+ (python3.withPackages (p: with p; [ pyyaml setuptools ])) ];
- buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ]
- ++ (with python3.pkgs; [ python pyyaml setuptools ]);
+ buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-systemdsystemunitdir=$(out)/lib/systemd/system"
- "--enable-uinput" # explicite activation because build env has no uinput
- "--enable-devinput" # explicite activation because build env has not /dev/input
+ "--enable-uinput" # explicit activation because build env has no uinput
+ "--enable-devinput" # explicit activation because build env has no /dev/input
];
installFlags = [
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 79e4c387cdf..883dff56f2e 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -1,11 +1,12 @@
{ stdenv
, fetchFromGitHub
-, autoreconfHook, zlib, gmock
+, autoreconfHook, zlib, gmock, which, buildPackages
, version, sha256
, ...
}:
-stdenv.mkDerivation rec {
+let
+mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
name = "protobuf-${version}";
# make sure you test also -A pythonPackages.protobuf
@@ -28,8 +29,10 @@ stdenv.mkDerivation rec {
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
'';
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ];
+
buildInputs = [ zlib ];
+ configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
enableParallelBuilding = true;
@@ -54,4 +57,7 @@ stdenv.mkDerivation rec {
};
passthru.version = version;
-}
+};
+in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform)
+ then (mkProtobufDerivation null buildPackages.stdenv)
+ else null) stdenv
diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix
index d0a15e866f7..bd79e3628a1 100644
--- a/pkgs/development/libraries/rarian/default.nix
+++ b/pkgs/development/libraries/rarian/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
+{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
let
pname = "rarian";
version = "0.8.1";
@@ -11,7 +11,8 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ perl perlXMLParser libxml2 libxslt];
+ buildInputs = [ libxml2 libxslt ]
+ ++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ];
passthru = {
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index de5eaea842b..53e9ec270ac 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -25,11 +25,11 @@ let
in buildPythonPackage rec {
pname = "Cython";
- version = "0.28.3";
+ version = "0.28.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526";
+ sha256 = "b64575241f64f6ec005a4d4137339fb0ba5e156e826db2fdb5f458060d9979e0";
};
nativeBuildInputs = [
@@ -50,15 +50,6 @@ in buildPythonPackage rec {
doCheck = !stdenv.isDarwin;
- patches = [
- # The following is in GitHub in 0.28.3 but not in the `sdist`.
- # https://github.com/cython/cython/issues/2319
- (fetchpatch {
- url = https://github.com/cython/cython/commit/c485b1b77264c3c75d090a3c526de24966830d42.patch;
- sha256 = "1p6jj9rb097kqvhs5j5127sj5zy18l7x9v0p478cjyzh41khh9r0";
- })
- ];
-
meta = {
description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
homepage = http://cython.org;
diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix
new file mode 100644
index 00000000000..ed89c26943f
--- /dev/null
+++ b/pkgs/development/python-modules/Fabric/default.nix
@@ -0,0 +1,36 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, invoke
+, paramiko
+, cryptography
+, pytest
+, mock
+, pytest-relaxed
+}:
+
+buildPythonPackage rec {
+ pname = "fabric";
+ version = "2.4.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "93684ceaac92e0b78faae551297e29c48370cede12ff0f853cdebf67d4b87068";
+ };
+
+ propagatedBuildInputs = [ invoke paramiko cryptography ];
+ checkInputs = [ pytest mock pytest-relaxed ];
+
+ # ignore subprocess main errors (1) due to hardcoded /bin/bash
+ checkPhase = ''
+ rm tests/main.py
+ pytest tests
+ '';
+
+ meta = with pkgs.lib; {
+ description = "Pythonic remote execution";
+ homepage = https://www.fabfile.org/;
+ license = licenses.bsd2;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index 793488f0b13..a9799807a27 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -45,13 +45,13 @@ let
in buildPythonPackage rec {
pname = "Theano";
- version = "1.0.2";
+ version = "1.0.3";
disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
src = fetchPypi {
inherit pname version;
- sha256 = "6768e003d328a17011e6fca9126fbb8a6ffd3bb13cb21c450f3e724cca29abde";
+ sha256 = "637f3b34d40ef5e0d54dd4c40618475aaa085c26d2491e925c98e2ad4bc2115a";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix
index a2a35f852a3..e5aaa9a6c76 100644
--- a/pkgs/development/python-modules/alabaster/default.nix
+++ b/pkgs/development/python-modules/alabaster/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "alabaster";
- version = "0.7.11";
+ version = "0.7.12";
src = fetchPypi {
inherit pname version;
- sha256 = "b63b1f4dc77c074d386752ec4a8a7517600f6c0db8cd42980cae17ab7b3275d7";
+ sha256 = "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02";
};
propagatedBuildInputs = [ pygments ];
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index f618b05373a..01922f98c40 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -4,11 +4,11 @@
}:
buildPythonPackage rec {
pname = "autobahn";
- version = "18.8.1";
+ version = "18.8.2";
src = fetchPypi {
inherit pname version;
- sha256 = "b69858e0be4bff8437b0bd82a0db1cbef7405e16bd9354ba587c043d6d5e1ad9";
+ sha256 = "448df2e241011ea2948799918930042d81e63d26b01912c472f5a9a37f42f319";
};
propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix
new file mode 100644
index 00000000000..9d0ddc2cad9
--- /dev/null
+++ b/pkgs/development/python-modules/backports_os/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, future
+, isPy3k
+, python
+, hypothesis
+}:
+
+buildPythonPackage rec {
+ version = "0.1.1";
+ pname = "backports.os";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630";
+ };
+
+ buildInputs = [ setuptools_scm ];
+ checkInputs = [ hypothesis ];
+ propagatedBuildInputs = [ future ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover tests
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/pjdelport/backports.os;
+ description = "Backport of new features in Python's os module";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 195a1ccad76..1a005d9e42d 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -4,14 +4,14 @@
, nose, requests }:
buildPythonPackage rec {
- version = "2.1.2";
+ version = "2.1.3";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "d0d5f7088cb6b699cc4d030dad42d20b8228232cdb445bb1330d4ef5e3581f52";
+ sha256 = "4b7b0d3633c82ca88d3cb3d31ad2fd2e45a42401cfa94eaa1cb938ffece34f22";
};
checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix
new file mode 100644
index 00000000000..13aa48f7f8f
--- /dev/null
+++ b/pkgs/development/python-modules/bedup/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, btrfs-progs
+, contextlib2
+, pyxdg
+, pycparser
+, alembic
+, cffi
+, pythonOlder
+, isPyPy
+}:
+
+buildPythonPackage rec {
+ version = "0.10.1";
+ pname = "bedup";
+ disabled = pythonOlder "3.3";
+
+ src = fetchFromGitHub {
+ owner = "g2p";
+ repo = "bedup";
+ rev = "v${version}";
+ sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6";
+ };
+
+ buildInputs = [ btrfs-progs ];
+ propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ]
+ ++ stdenv.lib.optionals (!isPyPy) [ cffi ];
+
+ meta = with stdenv.lib; {
+ description = "Deduplication for Btrfs";
+ longDescription = ''
+ Deduplication for Btrfs. bedup looks for new and changed files,
+ making sure that multiple copies of identical files share space
+ on disk. It integrates deeply with btrfs so that scans are
+ incremental and low-impact.
+ '';
+ homepage = https://github.com/g2p/bedup;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ bluescreen303 ];
+ };
+}
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
new file mode 100644
index 00000000000..9bd7e586820
--- /dev/null
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, zlib
+, xz
+, ncompress
+, gzip
+, bzip2
+, gnutar
+, p7zip
+, cabextract
+, lzma
+, pycrypto
+, pyqtgraph ? null }:
+
+let visualizationSupport = (pyqtgraph != null);
+in
+buildPythonPackage rec {
+ name = "binwalk-${version}";
+ version = "2.1.1";
+
+ src = fetchFromGitHub {
+ owner = "devttys0";
+ repo = "binwalk";
+ rev = "291a03595d17f848c73b74cb6ca508da782cd8f7";
+ sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw";
+ };
+
+ propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ]
+ ++ stdenv.lib.optional visualizationSupport pyqtgraph;
+
+ meta = with stdenv.lib; {
+ homepage = "http://binwalk.org";
+ description = "A tool for searching a given binary image for embedded files";
+ maintainers = [ maintainers.koral ];
+ };
+}
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 613be1f7d6b..d482b7a8c88 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -3,26 +3,26 @@
let
wheel_source = fetchPypi {
pname = "wheel";
- version = "0.31.1";
+ version = "0.32.1";
format = "wheel";
- sha256 = "80044e51ec5bbf6c894ba0bc48d26a8c20a9ba629f4ca19ea26ecfcf87685f5f";
+ sha256 = "15hizylh761jcaz8zfdc3wg30jf33izaakyv1p82ppx2y5rgg8cz";
};
setuptools_source = fetchPypi {
pname = "setuptools";
- version = "40.2.0";
+ version = "40.4.3";
format = "wheel";
- sha256 = "ea3796a48a207b46ea36a9d26de4d0cc87c953a683a7b314ea65d666930ea8e6";
+ sha256 = "1zzryv1fqx4nk7hzv4afxpl8k7f60lc0qkhxlc8sqjs4igakfhff";
};
in stdenv.mkDerivation rec {
pname = "pip";
- version = "18.0";
+ version = "18.1";
name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
src = fetchPypi {
inherit pname version;
format = "wheel";
- sha256 = "070e4bf493c7c2c9f6a08dd797dd3c066d64074c38e9e8a0fb4e6541f266d96c";
+ sha256 = "7909d0a0932e88ea53a7014dfd14522ffef91a464daaaf5c573343852ef98550";
};
unpackPhase = ''
diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix
new file mode 100644
index 00000000000..f1bd8712679
--- /dev/null
+++ b/pkgs/development/python-modules/box2d/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, swig2
+, pkgs-box2d
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "Box2D";
+ version = "2.3.2";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "d1557dffdf9c1d6c796ec5df53e3d93227bb026c14b8411d22c295edaa2fb225";
+ };
+
+ postPatch = ''
+ sed -i "s/'Box2D.tests' : 'tests'//" setup.py
+ '';
+
+ buildInputs = [ swig2 pkgs-box2d ];
+
+ # tests not included with pypi release
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/pybox2d/pybox2d;
+ description = ''
+ A 2D game physics library for Python under
+ the very liberal zlib license
+ '';
+ license = licenses.zlib;
+ maintainers = with maintainers; [ sepi ];
+ };
+}
diff --git a/pkgs/development/python-modules/box2d/disable-test.patch b/pkgs/development/python-modules/box2d/disable-test.patch
deleted file mode 100644
index bc2897a8b10..00000000000
--- a/pkgs/development/python-modules/box2d/disable-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Common subdirectories: Box2D-2.3b0/Box2D and Box2D-2.3b0.new/Box2D
-Common subdirectories: Box2D-2.3b0/examples and Box2D-2.3b0.new/examples
-Common subdirectories: Box2D-2.3b0/library and Box2D-2.3b0.new/library
-diff -u Box2D-2.3b0/setup.py Box2D-2.3b0.new/setup.py
---- Box2D-2.3b0/setup.py 2013-02-02 18:09:34.000000000 +0100
-+++ Box2D-2.3b0.new/setup.py 2014-10-25 13:32:07.136922343 +0200
-@@ -176,7 +176,6 @@
- package_dir = {'Box2D': library_path,
- 'Box2D.b2': os.path.join(library_path, 'b2'),
- 'Box2D.tests' : 'tests'},
-- test_suite = 'tests',
- options = { 'build_ext': { 'swig_opts' : swig_arguments },
- 'egg_info' : { 'egg_base' : library_base },
- },
diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
new file mode 100644
index 00000000000..971aac70ad8
--- /dev/null
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "bsddb3";
+ version = "6.2.6";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "42d621f4037425afcb16b67d5600c4556271a071a9a7f7f2c2b1ba65bc582d05";
+ };
+
+ buildInputs = [ pkgs.db ];
+
+ # Judging from SyntaxError in test
+ doCheck = false; # test suite breaks python3 compatibility
+
+ # Path to database need to be set.
+ # Somehow the setup.py flag is not propagated.
+ #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ];
+ # We can also use a variable
+ preConfigure = ''
+ export BERKELEYDB_DIR=${pkgs.db.dev};
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Python bindings for Oracle Berkeley DB";
+ homepage = https://www.jcea.es/programacion/pybsddb.htm;
+ license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
+ maintainers = [ maintainers.costrouc ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix
new file mode 100644
index 00000000000..4af8b247fcf
--- /dev/null
+++ b/pkgs/development/python-modules/bugz/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "bugz-0.9.3";
+ version = "0.13";
+
+ src = fetchFromGitHub {
+ owner = "williamh";
+ repo = "pybugz";
+ rev = "0.13";
+ sha256 = "1nw07q7r078dp82rcrhvvnhmnaqjx6f8a6cdjgrsiy6fryrx9dwz";
+ };
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://www.liquidx.net/pybugz/;
+ description = "Command line interface for Bugzilla";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.costrouc ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 5a1bc4485b7..c76a930c965 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zc.buildout";
- version = "2.12.1";
+ version = "2.12.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d";
+ sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043";
};
patches = [ ./nix.patch ];
diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index c75b9fdb6cc..ede09373f90 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zc.buildout";
- version = "2.12.1";
+ version = "2.12.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d";
+ sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix
index 469b449483a..d8fc3d99235 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/pkgs/development/python-modules/bumps/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "bumps";
- version = "0.7.10";
+ version = "0.7.11";
propagatedBuildInputs = [six];
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "07917abf7e598f2a42456ca4f704c6da2a5489eaea0b9a7c61ed8a26506737c8";
+ sha256 = "16d24a7f965592d9b02f96e68e6aa70d6fb59abe4db37bb14c4b60c509a3c2ef";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
new file mode 100644
index 00000000000..7f4857a9531
--- /dev/null
+++ b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ version = "asynkdev";
+ pname = "caldavclientlibrary-asynk";
+
+ src = fetchgit {
+ url = "https://github.com/skarra/CalDAVClientLibrary.git";
+ rev = "06699b08190d50cc2636b921a654d67db0a967d1";
+ sha256 = "157q32251ac9x3gdshgrjwsy48nq74vrzviswvph56h9wa8ksnnk";
+ };
+
+ disabled = isPy3k;
+
+ meta = with stdenv.lib; {
+ description = "A Python library and tool for CalDAV";
+
+ longDescription = ''
+ CalDAVCLientLibrary is a Python library and tool for CalDAV.
+
+ This package is the unofficial CalDAVCLientLibrary Python
+ library maintained by the author of Asynk and is needed for
+ that package.
+ '';
+
+ homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/;
+ maintainers = with maintainers; [ pjones ];
+ broken = true; # 2018-04-11
+ };
+
+}
diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix
new file mode 100644
index 00000000000..91e00ed7e43
--- /dev/null
+++ b/pkgs/development/python-modules/capstone/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+}:
+
+buildPythonPackage rec {
+ pname = "capstone";
+ version = "3.0.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225";
+ };
+
+ patches = [
+ (fetchpatch {
+ stripLen = 2;
+ url = "https://patch-diff.githubusercontent.com/raw/aquynh/capstone/pull/783/commits/23fe9f36622573c747e2bab6119ff245437bf276.patch";
+ sha256 = "0yizqrdlxqxn16873593kdx2vrr7gvvilhgcf9xy6hr0603d3m5r";
+ })
+ ];
+
+ postPatch = ''
+ patchShebangs src/make.sh
+ '';
+
+ preCheck = ''
+ mv src/libcapstone.so capstone
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.capstone-engine.org/";
+ license = licenses.bsdOriginal;
+ description = "Capstone disassembly engine";
+ maintainers = with maintainers; [ bennofs ];
+ };
+}
diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix
index df14f44f0b0..0398782900d 100644
--- a/pkgs/development/python-modules/carbon/default.nix
+++ b/pkgs/development/python-modules/carbon/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "carbon";
- version = "1.1.3";
+ version = "1.1.4";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1s7327p30w4l9ak4gc7m5ga521233179n2lr3j0ggfbmfhd6blky";
+ sha256 = "1b70e34ac0f0bd32a03ee14eaf1ed2c857e208984fc9761f59a95c21c5264513";
};
propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ];
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
new file mode 100644
index 00000000000..110cd1e0bd5
--- /dev/null
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+, cython
+, futures
+, six
+, python
+, scales
+, eventlet
+, twisted
+, mock
+, gevent
+, nose
+, pytz
+, pyyaml
+, sure
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "cassandra-driver";
+ version = "3.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1aqmy3psn12lxgp659d0zsxkirxzy5lnbnzxf9xjq1a93s3qm704";
+ };
+
+ buildInputs = [ pkgs.libev cython ];
+
+ propagatedBuildInputs = [ six ]
+ ++ stdenv.lib.optionals (pythonOlder "3.4") [ futures ];
+
+ postPatch = ''
+ sed -i "s/<=1.0.1//" setup.py
+ '';
+
+ checkPhase = ''
+ ${python.interpreter} setup.py gevent_nosetests
+ ${python.interpreter} setup.py eventlet_nosetests
+ '';
+
+ checkInputs = [ scales eventlet twisted mock gevent nose pytz pyyaml sure ];
+
+ # Could not get tests running
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://datastax.github.io/python-driver/;
+ description = "A Python client driver for Apache Cassandra";
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix
new file mode 100644
index 00000000000..f40ff08fcf4
--- /dev/null
+++ b/pkgs/development/python-modules/cddb/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, pkgs
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ name = "CDDB-1.4";
+ disabled = isPy3k;
+
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
+
+ src = pkgs.fetchurl {
+ url = "http://cddb-py.sourceforge.net/${name}.tar.gz";
+ sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = http://cddb-py.sourceforge.net/;
+ description = "CDDB and FreeDB audio CD track info access";
+ license = licenses.gpl2Plus;
+ };
+
+}
diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix
new file mode 100644
index 00000000000..1a2811b50b6
--- /dev/null
+++ b/pkgs/development/python-modules/chameleon/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "Chameleon";
+ version = "2.25";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://chameleon.readthedocs.io/;
+ description = "Fast HTML/XML Template Compiler";
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ garbas domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix
index 74d64d8390c..a5124ac8613 100644
--- a/pkgs/development/python-modules/click-plugins/default.nix
+++ b/pkgs/development/python-modules/click-plugins/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "click-plugins";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1ifphgaw5mmcdnqd0qfnmrbm62q3k6p573aff4cxgpyjxmz5xk3s";
+ sha256 = "dfed74b5063546a137de99baaaf742b4de4337ad2b3e1df5ec7c8a256adc0847";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix
new file mode 100644
index 00000000000..f6c94ace1fa
--- /dev/null
+++ b/pkgs/development/python-modules/closure-linter/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, isPy3k
+, gflags
+}:
+
+/* There is a project called "closure-linter" on PyPI that is the
+ same as this, but it does not appear to be owned by Google.
+ So we're pulling from Google's GitHub repo instead. */
+buildPythonPackage rec {
+ pname = "closure-linter";
+ version = "2.3.19";
+
+ /* This project has no Python 3 support, as noted by
+ https://github.com/google/closure-linter/issues/81 */
+ disabled = isPy3k;
+
+ src = fetchgit {
+ url = "https://github.com/google/closure-linter";
+ rev = "5c27529075bb88bdc45e73008f496dec8438d658";
+ sha256 = "076c7q7pr7akfvq5y8lxr1ab81wwps07gw00igdkcxnc5k9dzxwc";
+ };
+
+ propagatedBuildInputs = [ gflags ];
+
+ meta = with stdenv.lib; {
+ description = "Checks JavaScript files against Google's style guide.";
+ homepage = "https://developers.google.com/closure/utilities/";
+ license = with licenses; [ asl20 ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index f70ebee411a..b00d210a464 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cloudpickle";
- version = "0.5.5";
+ version = "0.5.6";
src = fetchPypi {
inherit pname version;
- sha256 = "6ea4b548f61a4f616b065182716318c7dced8c053517f35ac59cec22802daf3d";
+ sha256 = "0390ecb3731ac035d74c34651460f4a683e9ef7443861712b8d56c20c2f92113";
};
buildInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix
new file mode 100644
index 00000000000..2bcb7165ca1
--- /dev/null
+++ b/pkgs/development/python-modules/cntk/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, pkgs
+, numpy
+, scipy
+, enum34
+, protobuf
+, pip
+, python
+}:
+
+buildPythonPackage rec {
+ inherit (pkgs.cntk) name version src meta;
+
+ buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ];
+ propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ];
+
+ CNTK_LIB_PATH = "${pkgs.cntk}/lib";
+ CNTK_COMPONENT_VERSION = pkgs.cntk.version;
+
+ postPatch = ''
+ cd bindings/python
+ sed -i 's,"libmpi.so.12","${pkgs.openmpi}/lib/libmpi.so",g' cntk/train/distributed.py
+ '';
+
+ postInstall = ''
+ rm -rf $out/${python.sitePackages}/cntk/libs
+ ln -s ${pkgs.cntk}/lib $out/${python.sitePackages}/cntk/libs
+ # It's not installed for some reason.
+ cp cntk/cntk_py.py $out/${python.sitePackages}/cntk
+ '';
+
+ # Actual tests are broken.
+ checkPhase = ''
+ cd $NIX_BUILD_TOP
+ ${python.interpreter} -c "import cntk"
+ '';
+}
diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix
new file mode 100644
index 00000000000..78f0f6fe371
--- /dev/null
+++ b/pkgs/development/python-modules/colanderalchemy/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchpatch
+, fetchPypi
+, unittest2
+, colander
+, sqlalchemy
+}:
+
+buildPythonPackage rec {
+ pname = "ColanderAlchemy";
+ version = "0.3.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw";
+ };
+
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/stefanofontanelli/ColanderAlchemy/commit/b45fe35f2936a5ccb705e9344075191e550af6c9.patch";
+ sha256 = "1kf278wjq49zd6fhpp55vdcawzdd107767shzfck522sv8gr6qvx";
+ })
+ ];
+
+ buildInputs = [ unittest2 ];
+ propagatedBuildInputs = [ colander sqlalchemy ];
+
+ meta = with stdenv.lib; {
+ description = "Autogenerate Colander schemas based on SQLAlchemy models";
+ homepage = https://github.com/stefanofontanelli/ColanderAlchemy;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix
new file mode 100644
index 00000000000..a32c9ebb429
--- /dev/null
+++ b/pkgs/development/python-modules/colored/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "colored";
+ version = "1.1.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1r1vsypk8v7az82d66bidbxlndx1h7xd4m43hpg1a6hsjr30wrm3";
+ };
+
+ # No proper test suite
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://gitlab.com/dslackw/colored;
+ description = "Simple library for color and formatting to terminal";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix
new file mode 100644
index 00000000000..dc7c9c334d3
--- /dev/null
+++ b/pkgs/development/python-modules/cornice/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyramid
+, simplejson
+, six
+, venusian
+}:
+
+buildPythonPackage rec {
+ pname = "cornice";
+ version = "3.4.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a7f8db903ba06c2584c7db4474459de3565d90b5e4ae4b97c687840e11d5b7fd";
+ };
+
+ propagatedBuildInputs = [ pyramid simplejson six venusian ];
+
+ # tests not packaged with pypi release
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/mozilla-services/cornice;
+ description = "Build Web Services with Pyramid";
+ license = licenses.mpl20;
+ maintainers = [ maintainers.costrouc ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 9a836e88752..f9f400408a7 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "cupy";
- version = "4.4.0";
+ version = "4.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "fca0e3d3fdad4c825197ea421bed0d253224b44daf738d82af5cba856c1c0b3e";
+ sha256 = "d46a3eea628a17b9c3f446e4b13513a1f0cc0b9930214417b41c90dcf0bb427f";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index e17bd38da02..f0de39edd0d 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "cvxopt";
- version = "1.2.0";
+ version = "1.2.1";
disabled = isPyPy; # hangs at [translation:info]
src = fetchPypi {
inherit pname version;
- sha256 = "3296c9d49b7dcb894b20db5d7d1c1a443912b4d82358e03f836575e8398e0d60";
+ sha256 = "12e3cfda982576b0b9b597d297aaf3172efa765a20fbed6f3c066aa0c48ee817";
};
# similar to Gsl, glpk, fftw there is also a dsdp interface
diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix
index 15a13b2ff71..ed576bcc02b 100644
--- a/pkgs/development/python-modules/dask-image/default.nix
+++ b/pkgs/development/python-modules/dask-image/default.nix
@@ -10,12 +10,12 @@
}:
buildPythonPackage rec {
- version = "0.1.1";
+ version = "0.1.2";
pname = "dask-image";
src = fetchPypi {
inherit pname version;
- sha256 = "e6294ac577a8fc0abec2b97a2c42d404f599feac61d6899bdf1bf2b7cfb0e015";
+ sha256 = "401e2c345a582eb2859a4a2a4a6fcfbc85beece59705f3ead9b6708a0cd183e7";
};
checkInputs = [ pytest scikitimage ];
diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix
new file mode 100644
index 00000000000..2fb9e9e990b
--- /dev/null
+++ b/pkgs/development/python-modules/ddt/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "ddt";
+ version = "1.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "e24ecb7e2cf0bf43fa9d4255d3ae2bd0b7ce30b1d1b89ace7aa68aca1152f37a";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Data-Driven/Decorated Tests, a library to multiply test cases";
+ homepage = https://github.com/txels/ddt;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix
index 10e0d79dddf..600fe888751 100644
--- a/pkgs/development/python-modules/deprecation/default.nix
+++ b/pkgs/development/python-modules/deprecation/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "deprecation";
- version = "2.0.5";
+ version = "2.0.6";
src = fetchPypi {
inherit pname version;
- sha256 = "cbe7d15006bc339709be5e02b14884ecc479639c1a3714a908de3a8ca13b5ca9";
+ sha256 = "68071e5ae7cd7e9da6c7dffd750922be4825c7c3a6780d29314076009cc39c35";
};
propagatedBuildInputs = [ packaging ];
diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix
new file mode 100644
index 00000000000..05fa3aa835a
--- /dev/null
+++ b/pkgs/development/python-modules/deskcon/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, buildPythonPackage
+, pyopenssl
+, pkgs
+, isPy3k
+, python
+}:
+
+buildPythonPackage rec {
+ name = "deskcon-0.3";
+ disabled = isPy3k;
+
+ src = pkgs.fetchFromGitHub {
+ owner= "screenfreeze";
+ repo = "deskcon-desktop";
+ rev = "267804122188fa79c37f2b21f54fe05c898610e6";
+ sha256 ="0i1dd85ls6n14m9q7lkympms1w3x0pqyaxvalq82s4xnjdv585j3";
+ };
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ pythonPath = [ pyopenssl pkgs.gtk3 ];
+
+ installPhase = ''
+ substituteInPlace server/deskcon-server --replace "python2" "python"
+
+ mkdir -p $out/bin
+ mkdir -p $out/lib/${python.libPrefix}/site-packages
+ cp -r "server/"* $out/lib/${python.libPrefix}/site-packages
+ mv $out/lib/${python.libPrefix}/site-packages/deskcon-server $out/bin/deskcon-server
+
+ wrapPythonProgramsIn $out/bin "$out $pythonPath"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Integrates an Android device into a desktop";
+ homepage = https://github.com/screenfreeze/deskcon-desktop;
+ license = licenses.gpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 694bc2ce4f9..65d0b1ab77f 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -26,12 +26,12 @@
buildPythonPackage rec {
pname = "distributed";
- version = "1.23.1";
+ version = "1.23.3";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
- sha256 = "9d4693442efe40e05e4304fe6d8174989c6eb4bad1afe70480c98263ef8e1cdb";
+ sha256 = "2d48a4de280fd7243ca76f9b12db5fe2486fc89dcdb510c77fa51f51733a04cc";
};
checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix
new file mode 100644
index 00000000000..52b3b41b02b
--- /dev/null
+++ b/pkgs/development/python-modules/distutils_extra/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+}:
+
+buildPythonPackage rec {
+ pname = "distutils-extra";
+ version = "2.39";
+
+ src = fetchurl {
+ url = "http://launchpad.net/python-distutils-extra/trunk/${version}/+download/python-${pname}-${version}.tar.gz";
+ sha256 = "1bv3h2p9ffbzyddhi5sccsfwrm3i6yxzn0m06fdxkj2zsvs28gvj";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://launchpad.net/python-distutils-extra;
+ description = "Enhancements to Python's distutils";
+ license = licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix
new file mode 100644
index 00000000000..e87a9cbad02
--- /dev/null
+++ b/pkgs/development/python-modules/django/1_8.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ name = "Django-${version}";
+ version = "1.8.18";
+ disabled = pythonOlder "2.7";
+
+ src = fetchurl {
+ url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
+ sha256 = "1ishvbihr9pain0486qafb18dnb7v2ppq34nnx1s8f95bvfiqqf7";
+ };
+
+ # too complicated to setup
+ doCheck = false;
+
+ # patch only $out/bin to avoid problems with starter templates (see #3134)
+ postFixup = ''
+ wrapPythonProgramsIn $out/bin "$out $pythonPath"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A high-level Python Web framework";
+ homepage = https://www.djangoproject.com/;
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix
new file mode 100644
index 00000000000..022709bacbe
--- /dev/null
+++ b/pkgs/development/python-modules/django_classytags/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, django
+}:
+
+buildPythonPackage rec {
+ pname = "django-classy-tags";
+ version = "0.6.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0";
+ };
+
+ propagatedBuildInputs = [ django ];
+
+ # tests appear to be broken on 0.6.1 at least
+ doCheck = ( version != "0.6.1" );
+
+ meta = with stdenv.lib; {
+ description = "Class based template tags for Django";
+ homepage = https://github.com/ojii/django-classy-tags;
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django_colorful/default.nix
new file mode 100644
index 00000000000..7da878880da
--- /dev/null
+++ b/pkgs/development/python-modules/django_colorful/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, django
+}:
+
+buildPythonPackage rec {
+ pname = "django-colorful";
+ version = "1.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0y34hzvfrm1xbxrd8frybc9yzgqvz4c07frafipjikw7kfjsw8az";
+ };
+
+ # Tests aren't run
+ doCheck = false;
+
+ # Requires Django >= 1.8
+ buildInputs = [ django ];
+
+ meta = with stdenv.lib; {
+ description = "Django extension that provides database and form color fields";
+ homepage = https://github.com/charettes/django-colorful;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix
new file mode 100644
index 00000000000..f850350ee16
--- /dev/null
+++ b/pkgs/development/python-modules/django_contrib_comments/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, django
+}:
+
+buildPythonPackage rec {
+ pname = "django-contrib-comments";
+ version = "1.9.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "689f3f80ff7ea8ab9f712ae5fe17ffa2ee8babbf8d75229ee8acc7bad461dfef";
+ };
+
+ propagatedBuildInputs = [ django ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/django/django-contrib-comments;
+ description = "The code formerly known as django.contrib.comments";
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix
new file mode 100644
index 00000000000..15eafa6dd85
--- /dev/null
+++ b/pkgs/development/python-modules/django_environ/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, django
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "django-environ";
+ version = "0.4.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0i32vsgk1xmwpi7i6f6v5hg653y9dl0fsz5qmv94skz6hwgm5kvh";
+ };
+
+ # The testsuite fails to modify the base environment
+ doCheck = false;
+ propagatedBuildInputs = [ django six ];
+
+ meta = with stdenv.lib; {
+ description = "Utilize environment variables to configure your Django application";
+ homepage = https://github.com/joke2k/django-environ/;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix
new file mode 100644
index 00000000000..92ed3d572a1
--- /dev/null
+++ b/pkgs/development/python-modules/django_evolution/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, django
+}:
+
+buildPythonPackage rec {
+ pname = "django_evolution";
+ version = "0.7.5";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1qbcx54hq8iy3n2n6cki3bka1m9rp39np4hqddrm9knc954fb7nv";
+ };
+
+ propagatedBuildInputs = [ django ];
+
+ meta = with stdenv.lib; {
+ description = "A database schema evolution tool for the Django web framework";
+ homepage = http://code.google.com/p/django-evolution/;
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix
new file mode 100644
index 00000000000..3a2aad16ba5
--- /dev/null
+++ b/pkgs/development/python-modules/django_modelcluster/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytz
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "django-modelcluster";
+ version = "0.6.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1plsdi44dvsj2sfx79lsrccjfg0ymajcsf5n0mln4cwd4qi5mwpx";
+ };
+
+ doCheck = false;
+
+ propagatedBuildInputs = [ pytz six ];
+
+ meta = with stdenv.lib; {
+ description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database";
+ homepage = https://github.com/torchbox/django-modelcluster/;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ desiderius ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix
new file mode 100644
index 00000000000..9d16ee343d6
--- /dev/null
+++ b/pkgs/development/python-modules/django_nose/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, django
+}:
+
+buildPythonPackage rec {
+ pname = "django-nose";
+ version = "1.4.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1fm47fkza2lk0xgc6qpi9vs78zg7q8cgl6mdan69sbycgy909ff0";
+ };
+
+ # vast dependency list
+ doCheck = false;
+
+ propagatedBuildInputs = [ django nose ];
+
+ meta = with stdenv.lib; {
+ description = "Provides all the goodness of nose in your Django tests";
+ homepage = https://github.com/django-nose/django-nose;
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix
new file mode 100644
index 00000000000..038a3d439fa
--- /dev/null
+++ b/pkgs/development/python-modules/django_reversion/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, django
+}:
+
+buildPythonPackage rec {
+ pname = "django-reversion";
+ version = "1.10.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "01iv8w6lmmq98qjhxmnp8ddjxifmhxcmp612ijd91wc8nv8lk12w";
+ };
+
+ propagatedBuildInputs = [ django ];
+
+ meta = with stdenv.lib; {
+ description = "An extension to the Django web framework that provides comprehensive version control facilities";
+ homepage = https://github.com/etianen/django-reversion;
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix
new file mode 100644
index 00000000000..ad8d0bee7f4
--- /dev/null
+++ b/pkgs/development/python-modules/django_silk/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, django
+, pygments
+, simplejson
+, dateutil
+, requests
+, sqlparse
+, jinja2
+, autopep8
+, pytz
+, pillow
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "django-silk";
+ version = "0.5.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "845abc688738858ce06e993c4b7dbbcfcecf33029e828f143463ff96f9a78947";
+ };
+
+ doCheck = false;
+
+ buildInputs = [ mock ];
+ propagatedBuildInputs = [ django pygments simplejson dateutil requests sqlparse jinja2 autopep8 pytz pillow ];
+
+ meta = with stdenv.lib; {
+ description = "Silky smooth profiling for the Django Framework";
+ homepage = https://github.com/mtford90/silk;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix
new file mode 100644
index 00000000000..276097802e7
--- /dev/null
+++ b/pkgs/development/python-modules/django_taggit/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "django-taggit";
+ version = "0.17.0";
+ disabled = pythonOlder "2.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1xy4mm1y6z6bpakw907859wz7fiw7jfm586dj89w0ggdqlb0767b";
+ };
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "django-taggit is a reusable Django application for simple tagging";
+ homepage = https://github.com/alex/django-taggit/tree/master/;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ desiderius ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix
new file mode 100644
index 00000000000..5c45b18be64
--- /dev/null
+++ b/pkgs/development/python-modules/django_treebeard/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, django
+}:
+
+buildPythonPackage rec {
+ pname = "django-treebeard";
+ version = "4.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c21db06a8d4943bf2a28d9d7a119058698fb76116df2679ecbf15a46a501de42";
+ };
+
+ buildInputs = [ pytest ];
+ propagatedBuildInputs = [ django ];
+
+ # tests fail "AppRegistryNotReady("Apps aren't loaded yet.")"
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Efficient tree implementations for Django 1.6+";
+ homepage = https://tabo.pe/projects/django-treebeard/;
+ maintainers = with maintainers; [ desiderius ];
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix
index 86b3271990d..4e918968f44 100644
--- a/pkgs/development/python-modules/dominate/default.nix
+++ b/pkgs/development/python-modules/dominate/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dominate";
- version = "2.3.1";
+ version = "2.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "0s9s9j9xmhkzw7apqx170fyvc0f800fd4a5jfn8xvj9k6vryd32b";
+ sha256 = "8dfcca2bde3937a2d03db6e55efcb0c0dea0d4ab0923dc983d794b19e9247328";
};
doCheck = !isPy3k;
diff --git a/pkgs/development/python-modules/dtopt/default.nix b/pkgs/development/python-modules/dtopt/default.nix
new file mode 100644
index 00000000000..601ebf6d9a9
--- /dev/null
+++ b/pkgs/development/python-modules/dtopt/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "dtopt";
+ version = "0.1";
+ # Test contain Python 2 print
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "06ae07a12294a7ba708abaa63f838017d1a2faf6147a1e7a14ca4fa28f86da7f";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Add options to doctest examples while they are running";
+ homepage = https://pypi.python.org/pypi/dtopt;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix
new file mode 100644
index 00000000000..8d8fbf7a7ce
--- /dev/null
+++ b/pkgs/development/python-modules/dynd/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPyPy
+, isPy3k
+, cython
+, numpy
+, pkgs
+}:
+
+buildPythonPackage rec {
+ version = "0.7.2";
+ pname = "dynd";
+ disabled = isPyPy || !isPy3k; # tests fail on python2, 2018-04-11
+
+ src = pkgs.fetchFromGitHub {
+ owner = "libdynd";
+ repo = "dynd-python";
+ rev = "v${version}";
+ sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh";
+ };
+
+ # setup.py invokes git on build but we're fetching a tarball, so
+ # can't retrieve git version. We hardcode:
+ preConfigure = ''
+ substituteInPlace setup.py --replace "ver = check_output(['git', 'describe', '--dirty'," "ver = '${version}'"
+ substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
+ '';
+
+ # Python 3 works but has a broken import test that I couldn't
+ # figure out.
+ doCheck = !isPy3k;
+ buildInputs = [ pkgs.cmake pkgs.libdynd.dev cython ];
+ propagatedBuildInputs = [ numpy pkgs.libdynd ];
+
+ meta = with stdenv.lib; {
+ homepage = http://libdynd.org;
+ license = licenses.bsd2;
+ description = "Python exposure of dynd";
+ maintainers = with maintainers; [ teh ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix
new file mode 100644
index 00000000000..e9fdc71cd64
--- /dev/null
+++ b/pkgs/development/python-modules/ecdsa/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "ecdsa";
+ version = "0.13";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
+ };
+
+ # Only needed for tests
+ buildInputs = [ pkgs.openssl ];
+
+ meta = with stdenv.lib; {
+ description = "ECDSA cryptographic signature library";
+ homepage = "https://github.com/warner/python-ecdsa";
+ license = licenses.mit;
+ maintainers = with maintainers; [ aszlig ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix
new file mode 100644
index 00000000000..97e486a0532
--- /dev/null
+++ b/pkgs/development/python-modules/editorconfig/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, cmake
+}:
+
+buildPythonPackage rec {
+ pname = "EditorConfig";
+ version = "0.12.1";
+
+ # fetchgit used to ensure test submodule is available
+ src = fetchgit {
+ url = "https://github.com/editorconfig/editorconfig-core-py";
+ rev = "refs/tags/v${version}";
+ sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl";
+ };
+
+ buildInputs = [ cmake ];
+ checkPhase = ''
+ cmake .
+ # utf_8_char fails with python3
+ ctest -E "utf_8_char" .
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://editorconfig.org;
+ description = "EditorConfig File Locator and Interpreter for Python";
+ license = licenses.psfl;
+ };
+
+}
diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix
new file mode 100644
index 00000000000..79ec94a2c82
--- /dev/null
+++ b/pkgs/development/python-modules/elpy/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, rope
+, flake8
+, autopep8
+, jedi
+, importmagic
+, isPy27
+}:
+
+buildPythonPackage rec {
+ pname = "elpy";
+ version = "1.9.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0";
+ };
+
+ propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ]
+ ++ stdenv.lib.optionals isPy27 [ rope ];
+
+ doCheck = false; # there are no tests
+
+ meta = with stdenv.lib; {
+ description = "Backend for the elpy Emacs mode";
+ homepage = "https://github.com/jorgenschaefer/elpy";
+ license = licenses.gpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index 019c29d79cd..082958fcce1 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0gmdcdvh21v33ldg8kbxi7lph7znl2zdz1ic45100z4hx65w1sd9";
+ sha256 = "a9e9c08be9907c0042212c86dfbea0f61f78e9897d4df41a1d6307017763ad3e";
};
checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix
new file mode 100644
index 00000000000..70462e5f403
--- /dev/null
+++ b/pkgs/development/python-modules/enum/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, isPyPy
+}:
+
+buildPythonPackage rec {
+ pname = "enum";
+ version = "0.4.4";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff";
+ };
+
+ doCheck = !isPyPy;
+
+ meta = with stdenv.lib; {
+ homepage = https://pypi.python.org/pypi/enum/;
+ description = "Robust enumerated type support in Python";
+ license = licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix
new file mode 100644
index 00000000000..a5175eba49d
--- /dev/null
+++ b/pkgs/development/python-modules/enum34/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonAtLeast
+, python
+}:
+
+if pythonAtLeast "3.4" then null else buildPythonPackage rec {
+ pname = "enum34";
+ version = "1.1.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1";
+ };
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://pypi.python.org/pypi/enum34;
+ description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4";
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix
new file mode 100644
index 00000000000..621f450f2eb
--- /dev/null
+++ b/pkgs/development/python-modules/epc/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, sexpdata
+}:
+
+buildPythonPackage rec {
+ pname = "epc";
+ version = "0.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "30b594bd4a4acbd5bda0d3fa3d25b4e8117f2ff8f24d2d1e3e36c90374f3c55e";
+ };
+
+ propagatedBuildInputs = [ sexpdata ];
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "EPC (RPC stack for Emacs Lisp) implementation in Python";
+ homepage = "https://github.com/tkf/python-epc";
+ license = licenses.gpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix
new file mode 100644
index 00000000000..619b0e0c77c
--- /dev/null
+++ b/pkgs/development/python-modules/et_xmlfile/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, lxml
+, pytest
+}:
+
+buildPythonPackage rec {
+ version = "1.0.1";
+ pname = "et_xmlfile";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1";
+ };
+
+ buildInputs = [ lxml pytest ];
+ checkPhase = ''
+ py.test $out
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An implementation of lxml.xmlfile for the standard library";
+ longDescription = ''
+ et_xmlfile is a low memory library for creating large XML files.
+
+ It is based upon the xmlfile module from lxml with the aim of
+ allowing code to be developed that will work with both
+ libraries. It was developed initially for the openpyxl project
+ but is now a standalone module.
+
+ The code was written by Elias Rabel as part of the Python
+ Düsseldorf openpyxl sprint in September 2014.
+ '';
+ homepage = "https://pypi.python.org/pypi/et_xmlfile";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sjourdois ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix
new file mode 100644
index 00000000000..1e6e1e70944
--- /dev/null
+++ b/pkgs/development/python-modules/etcd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, simplejson
+, pytz
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "etcd";
+ version = "2.0.8";
+
+ # PyPI package is incomplete
+ src = fetchurl {
+ url = "https://github.com/dsoprea/PythonEtcdClient/archive/${version}.tar.gz";
+ sha256 = "0fi6rxa1yxvz7nwrc7dw6fax3041d6bj3iyhywjgbkg7nadi9i8v";
+ };
+
+ patchPhase = ''
+ sed -i -e '13,14d;37d' setup.py
+ '';
+
+ propagatedBuildInputs = [ simplejson pytz requests ];
+
+ # No proper tests are available
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A Python etcd client that just works";
+ homepage = https://github.com/dsoprea/PythonEtcdClient;
+ license = licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index b145f1b2e2b..4d85add4e3e 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "Eve";
- version = "0.8";
+ version = "0.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9f926c715f88c7a92dc2b950ccc09cccd91f72fe0e93cde806b85d25b947df2f";
+ sha256 = "88105080e8a2567a1a8d50a5cded0d7d95e95f704b310c8107ef2ff7696f5316";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
new file mode 100644
index 00000000000..afc880b2ba2
--- /dev/null
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, httplib2
+, pyopenssl
+, greenlet
+, enum-compat
+, isPyPy
+}:
+
+buildPythonPackage rec {
+ pname = "eventlet";
+ version = "0.20.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "15bq5ybbigxnp5xwkps53zyhlg15lmcnq3ny2dppj0r0bylcs5rf";
+ };
+
+ buildInputs = [ nose httplib2 pyopenssl ];
+
+ doCheck = false; # too much transient errors to bother
+
+ propagatedBuildInputs = [ enum-compat ]
+ ++ stdenv.lib.optionals (!isPyPy) [ greenlet ];
+
+ meta = with stdenv.lib; {
+ homepage = https://pypi.python.org/pypi/eventlet/;
+ description = "A concurrent networking library for Python";
+ };
+
+}
diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix
new file mode 100644
index 00000000000..147e18d45f4
--- /dev/null
+++ b/pkgs/development/python-modules/eventlib/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, isPy3k
+, fetchdarcs
+, greenlet
+}:
+
+buildPythonPackage rec {
+ pname = "python-eventlib";
+ version = "0.2.2";
+ # Judging from SyntaxError
+ disabled = isPy3k;
+
+ src = fetchdarcs {
+ url = "http://devel.ag-projects.com/repositories/${pname}";
+ rev = "release-${version}";
+ sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8";
+ };
+
+ propagatedBuildInputs = [ greenlet ];
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Eventlib bindings for python";
+ homepage = "http://ag-projects.com/";
+ license = licenses.lgpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
new file mode 100644
index 00000000000..8c2ff6d82f4
--- /dev/null
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, setuptools_scm
+, apipkg
+}:
+
+buildPythonPackage rec {
+ pname = "execnet";
+ version = "1.4.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn";
+ };
+
+ buildInputs = [ pytest setuptools_scm ];
+ propagatedBuildInputs = [ apipkg ];
+
+ # remove vbox tests
+ postPatch = ''
+ rm -v testing/test_termination.py
+ rm -v testing/test_channel.py
+ rm -v testing/test_xspec.py
+ rm -v testing/test_gateway.py
+ '';
+
+ checkPhase = ''
+ py.test testing
+ '';
+
+ __darwinAllowLocalNetworking = true;
+
+ meta = with stdenv.lib; {
+ description = "Rapid multi-Python deployment";
+ license = licenses.gpl2;
+ homepage = "http://codespeak.net/execnet";
+ maintainers = with maintainers; [ nand0p ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix
new file mode 100644
index 00000000000..61593b625f7
--- /dev/null
+++ b/pkgs/development/python-modules/exifread/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "ExifRead";
+ version = "2.1.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1b90jf6m9vxh9nanhpyvqdq7hmfx5iggw1l8kq10jrs6xgr49qkr";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Easy to use Python module to extract Exif metadata from tiff and jpeg files";
+ homepage = "https://github.com/ianare/exif-py";
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ vozz ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix
new file mode 100644
index 00000000000..e42d7956dd5
--- /dev/null
+++ b/pkgs/development/python-modules/eyed3/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, paver
+, python
+, isPyPy
+}:
+
+buildPythonPackage rec {
+ version = "0.7.8";
+ pname = "eyeD3";
+ disabled = isPyPy;
+
+ src = fetchurl {
+ url = "http://eyed3.nicfit.net/releases/${pname}-${version}.tar.gz";
+ sha256 = "1nv7nhfn1d0qm7rgkzksbccgqisng8klf97np0nwaqwd5dbmdf86";
+ };
+
+ buildInputs = [ paver ];
+
+ postInstall = ''
+ for prog in "$out/bin/"*; do
+ wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" \
+ --prefix PATH : ${python}/bin
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Python module and command line program for processing ID3 tags";
+ homepage = http://eyed3.nicfit.net/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ lovek323 ];
+ platforms = platforms.unix;
+ longDescription = ''
+ eyeD3 is a Python module and command line program for processing ID3
+ tags. Information about mp3 files (i.e bit rate, sample frequency, play
+ time, etc.) is also provided. The formats supported are ID3 v1.0/v1.1
+ and v2.3/v2.4.
+ '';
+ };
+
+}
diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix
new file mode 100644
index 00000000000..1e5da699894
--- /dev/null
+++ b/pkgs/development/python-modules/factory_boy/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, fake_factory
+}:
+
+buildPythonPackage rec {
+ pname = "factory_boy";
+ version = "2.6.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0a21f8kq917fj8xgmyp6gy8vcrlzzgwn80qas0d76h3vjbdy0bdq";
+ };
+
+ propagatedBuildInputs = [ fake_factory ];
+
+ meta = with stdenv.lib; {
+ description = "A Python package to create factories for complex objects";
+ homepage = https://github.com/rbarrois/factory_boy;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix
new file mode 100644
index 00000000000..26dd14b73ad
--- /dev/null
+++ b/pkgs/development/python-modules/fake_factory/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+, six
+, dateutil
+, ipaddress
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "fake-factory";
+ version = "0.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "09sgk0kylsshs64a1xsz3qr187sbnqrbf4z8k3dgsy32lsgyffv2";
+ };
+
+ propagatedBuildInputs = [ six dateutil ipaddress mock ];
+ checkPhase = ''
+ ${python.interpreter} -m unittest faker.tests
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Python package that generates fake data for you";
+ homepage = https://pypi.python.org/pypi/fake-factory;
+ license = licenses.mit;
+ maintainers = with maintainers; [ lovek323 ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix
new file mode 100644
index 00000000000..1bca7eddde0
--- /dev/null
+++ b/pkgs/development/python-modules/falcon/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, coverage
+, ddt
+, nose
+, pyyaml
+, requests
+, testtools
+, six
+, python_mimeparse
+}:
+
+buildPythonPackage rec {
+ pname = "falcon";
+ version = "1.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ddce23a2dd0abba6d19775e9bf7ba64e184b15a0e7163e65f62af63354193f63";
+ };
+
+ checkInputs = [coverage ddt nose pyyaml requests testtools];
+ propagatedBuildInputs = [ six python_mimeparse ];
+
+ # The travis build fails since the migration from multiprocessing to threading for hosting the API under test.
+ # OSError: [Errno 98] Address already in use
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "An unladen web framework for building APIs and app backends";
+ homepage = http://falconframework.org;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ desiderius ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/fdroidserver/default.nix b/pkgs/development/python-modules/fdroidserver/default.nix
new file mode 100644
index 00000000000..b9b936ae83e
--- /dev/null
+++ b/pkgs/development/python-modules/fdroidserver/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitLab
+, libcloud
+, pyyaml
+, paramiko
+, pyasn1
+, pyasn1-modules
+, pillow
+, mwclient
+, GitPython
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ version = "2016-05-31";
+ pname = "fdroidserver-git";
+ disabled = ! isPy3k;
+
+ src = fetchFromGitLab {
+ owner = "fdroid";
+ repo = "fdroidserver";
+ rev = "401649e0365e6e365fc48ae8a3af94768af865f3";
+ sha256 = "1mmi2ffpym1qw694yj938kc7b4xhq0blri7wkjaqddcyykjyr94d";
+ };
+
+ propagatedBuildInputs = [ libcloud pyyaml paramiko pyasn1 pyasn1-modules pillow mwclient GitPython ];
+
+ meta = with stdenv.lib; {
+ homepage = https://f-droid.org;
+ description = "Server and tools for F-Droid, the Free Software repository system for Android";
+ license = licenses.agpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix
new file mode 100644
index 00000000000..ac91fe51d89
--- /dev/null
+++ b/pkgs/development/python-modules/feedparser/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "feedparser";
+ version = "5.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx";
+ };
+
+ # lots of networking failures
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://code.google.com/p/feedparser/;
+ description = "Universal feed parser";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix
new file mode 100644
index 00000000000..8e95d1e413e
--- /dev/null
+++ b/pkgs/development/python-modules/filebrowser_safe/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, django
+}:
+
+buildPythonPackage rec {
+ version = "0.5.0";
+ pname = "filebrowser_safe";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "5dcd31dd79684025139b43841f6515af1da5a4bb0de15bc4d88003db1970648e";
+ };
+
+ buildInputs = [ django ];
+
+ # There is no test embedded
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A snapshot of django-filebrowser for the Mezzanine CMS";
+ longDescription = ''
+ filebrowser_safe was created to provide a snapshot of the
+ FileBrowser asset manager for Django, to be referenced as a
+ dependency for the Mezzanine CMS for Django.
+
+ At the time of filebrowser_safe's creation, FileBrowser was
+ incorrectly packaged on PyPI, and had also dropped compatibility
+ with Django 1.1 - filebrowser_safe was therefore created to
+ address these specific issues.
+ '';
+ homepage = https://github.com/stephenmcd/filebrowser-safe;
+ downloadPage = https://pypi.python.org/pypi/filebrowser_safe/;
+ license = licenses.free;
+ maintainers = with maintainers; [ prikhi ];
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix
new file mode 100644
index 00000000000..3dbcbe59442
--- /dev/null
+++ b/pkgs/development/python-modules/filebytes/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "filebytes";
+ version = "0.9.12";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "6cd1c4ca823f6541c963a317e55382609789802dedad08209f4d038369e3f0ac";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://scoding.de/filebytes-introduction";
+ license = licenses.gpl2;
+ description = "Scripts to parse ELF, PE, Mach-O and OAT (Android Runtime)";
+ maintainers = with maintainers; [ bennofs ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index cfa0e1be74f..80e3429b644 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "filelock";
- version = "3.0.6";
+ version = "3.0.9";
src = fetchPypi {
inherit pname version;
- sha256 = "59ccab92fe118da7e5ce5a9fcd95506ade58d9d5f606db4922192524edfac820";
+ sha256 = "97694f181bdf58f213cca0a7cb556dc7bf90e2f8eb9aa3151260adac56701afb";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix
new file mode 100644
index 00000000000..192b4829a41
--- /dev/null
+++ b/pkgs/development/python-modules/flaky/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "flaky";
+ version = "3.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1x9ixika7wqjj52x8wnsh1vk7jadkdqpx01plj7mlh8slwyq4s41";
+ };
+
+ buildInputs = [ mock pytest ];
+
+ # waiting for feedback https://github.com/box/flaky/issues/97
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/box/flaky;
+ description = "Plugin for nose or py.test that automatically reruns flaky tests";
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index 0c353a34c38..afd3db60ffc 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "Flask-AutoIndex";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0v87sa073hmj64f47sazbiw08kyxsxay100bd5084jwq7c1y92d7";
+ sha256 = "af2cdb34eefe6edbf43ce19200880829e8c2df3598000e75dc63c9b7e3478706";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix
new file mode 100644
index 00000000000..1f2984990bb
--- /dev/null
+++ b/pkgs/development/python-modules/flowlogs_reader/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, botocore
+, boto3
+, docutils
+, unittest2
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "flowlogs_reader";
+ version = "1.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0158aki6m3pkf98hpd60088qyhrfxkmybdf8hv3qfl8nb61vaiwf";
+ };
+
+ propagatedBuildInputs = [ botocore boto3 docutils ];
+ buildInputs = [ unittest2 mock ];
+
+ meta = with stdenv.lib; {
+ description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier";
+ homepage = "https://github.com/obsrvbl/flowlogs-reader";
+ maintainers = with maintainers; [ cransom ];
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python-modules/flup/default.nix
new file mode 100644
index 00000000000..8256f5a1063
--- /dev/null
+++ b/pkgs/development/python-modules/flup/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "flup";
+ version = "1.0.3";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "5eb09f26eb0751f8380d8ac43d1dfb20e1d42eca0fa45ea9289fa532a79cd159";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "http://trac.saddi.com/flup";
+ description = "FastCGI Python module set";
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 4759e9d3c83..ed0b508a8ac 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "fonttools";
- version = "3.29.0";
+ version = "3.29.1";
src = fetchPypi {
inherit pname version;
- sha256 = "aab38c8c131670684321437d4857dcb4de1c775efd152a9ca9c4d81f1cb97fe7";
+ sha256 = "a687ca070daddb7ee25e3472b631acd0e53dbf11ecdf8e76248ee556472ede9d";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix
new file mode 100644
index 00000000000..94b90a25d13
--- /dev/null
+++ b/pkgs/development/python-modules/foolscap/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+, twisted
+, pyopenssl
+, service-identity
+}:
+
+buildPythonPackage rec {
+ pname = "foolscap";
+ version = "0.12.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1bpmqq6485mmr5jza9q2c55l9m1bfsvsbd9drsip7p5qcsi22jrz";
+ };
+
+ propagatedBuildInputs = [ mock twisted pyopenssl service-identity ];
+
+ checkPhase = ''
+ # Either uncomment this, or remove this custom check phase entirely, if
+ # you wish to do battle with the foolscap tests. ~ C.
+ # trial foolscap
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://foolscap.lothar.com/;
+ description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model";
+ longDescription = ''
+ "Foolscap" is the name for the next-generation RPC protocol,
+ intended to replace Perspective Broker (part of Twisted).
+ Foolscap is a protocol to implement a distributed
+ object-capabilities model in Python.
+ '';
+ # See http://foolscap.lothar.com/trac/browser/LICENSE.
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix
new file mode 100644
index 00000000000..4d2f656b36a
--- /dev/null
+++ b/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "0.1.0";
+ pname = "forbiddenfruit";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0xra2kw6m8ag29ifwmhi5zqksh4cr0yy1waqd488rm59kcr3zl79";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Patch python built-in objects";
+ homepage = https://pypi.python.org/pypi/forbiddenfruit;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
new file mode 100644
index 00000000000..9d5de0c73ea
--- /dev/null
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -0,0 +1,53 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, six
+, nose
+, appdirs
+, scandir
+, backports_os
+, typing
+, pytz
+, enum34
+, pyftpdlib
+, psutil
+, mock
+, pythonAtLeast
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "fs";
+ version = "2.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b20a4aeac9079b194f0160957d4265bb6c99ce68f1b12e980b0fb96f74aafb70";
+ };
+
+ buildInputs = [ pkgs.glibcLocales ];
+ checkInputs = [ nose pyftpdlib mock psutil ];
+ propagatedBuildInputs = [ six appdirs pytz ]
+ ++ pkgs.lib.optionals (!isPy3k) [ backports_os ]
+ ++ pkgs.lib.optionals (!pythonAtLeast "3.6") [ typing ]
+ ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ scandir ]
+ ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ enum34 ];
+
+ postPatch = ''
+ # required for installation
+ touch LICENSE
+ # tests modify home directory results in (4 tests failing) / 1600
+ rm tests/test_appfs.py tests/test_opener.py
+ '';
+
+ LC_ALL="en_US.utf-8";
+
+ meta = with pkgs.lib; {
+ description = "Filesystem abstraction";
+ homepage = https://github.com/PyFilesystem/pyfilesystem2;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ lovek323 ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix
new file mode 100644
index 00000000000..0f6d10c3c52
--- /dev/null
+++ b/pkgs/development/python-modules/fudge/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, nosejs
+, sphinx
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "fudge";
+ version = "1.1.0";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "eba59a926fa1df1ab6dddd69a7a8af21865b16cad800cb4d1af75070b0f52afb";
+ };
+
+ buildInputs = [ nose nosejs ];
+ propagatedBuildInputs = [ sphinx ];
+
+ checkPhase = ''
+ nosetests -v
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/fudge-py/fudge;
+ description = "Replace real objects with fakes (mocks, stubs, etc) while testing";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix
new file mode 100644
index 00000000000..6c3f5f6d018
--- /dev/null
+++ b/pkgs/development/python-modules/funcparserlib/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "funcparserlib";
+ version = "0.3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d";
+ };
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover
+ '';
+
+ # Tests are Python 2.x only judging from SyntaxError
+ doCheck = !(isPy3k);
+
+ meta = with stdenv.lib; {
+ description = "Recursive descent parsing library based on functional combinators";
+ homepage = https://code.google.com/p/funcparserlib/;
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/functools32/default.nix b/pkgs/development/python-modules/functools32/default.nix
new file mode 100644
index 00000000000..fea79db3d05
--- /dev/null
+++ b/pkgs/development/python-modules/functools32/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+if isPy3k then null else buildPythonPackage rec {
+ pname = "functools32";
+ version = "3.2.3-2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn";
+ };
+
+ meta = with stdenv.lib; {
+ description = "This is a backport of the functools standard library module from";
+ homepage = "https://github.com/MiCHiLU/python-functools32";
+ license = licenses.psfl;
+ };
+
+}
diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix
new file mode 100644
index 00000000000..74ab0fc01a6
--- /dev/null
+++ b/pkgs/development/python-modules/fusepy/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "fusepy";
+ version = "2.0.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h";
+ };
+
+ propagatedBuildInputs = [ pkgs.fuse ];
+
+ # No tests included
+ doCheck = false;
+
+ patchPhase = ''
+ substituteInPlace fuse.py --replace \
+ "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Simple ctypes bindings for FUSE";
+ longDescription = ''
+ Python module that provides a simple interface to FUSE and MacFUSE.
+ It's just one file and is implemented using ctypes.
+ '';
+ homepage = https://github.com/terencehonles/fusepy;
+ license = licenses.isc;
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix
new file mode 100644
index 00000000000..136c089ee4b
--- /dev/null
+++ b/pkgs/development/python-modules/gateone/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, tornado
+, futures
+, html5lib
+, pkgs
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ name = "gateone-1.2-0d57c3";
+ disabled = isPy3k;
+
+ src = pkgs.fetchFromGitHub {
+ rev = "1d0e8037fbfb7c270f3710ce24154e24b7031bea";
+ owner= "liftoff";
+ repo = "GateOne";
+ sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv";
+ };
+
+ propagatedBuildInputs = [tornado futures html5lib pkgs.openssl pkgs.cacert pkgs.openssh];
+
+ postInstall=''
+ cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://liftoffsoftware.com/;
+ description = "GateOne is a web-based terminal emulator and SSH client";
+ maintainers = with maintainers; [ tomberek ];
+ license = licenses.gpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix
new file mode 100644
index 00000000000..4812744bfa8
--- /dev/null
+++ b/pkgs/development/python-modules/gcovr/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "gcovr";
+ version = "2.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "2c878e03c2eff2282e64035bec0a30532b2b1173aadf08486401883b79e4dab1";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A Python script for summarizing gcov data";
+ license = licenses.bsd0;
+ homepage = http://gcovr.com/;
+ };
+
+}
diff --git a/pkgs/development/python-modules/gcutil/default.nix b/pkgs/development/python-modules/gcutil/default.nix
new file mode 100644
index 00000000000..85c0fbb4d60
--- /dev/null
+++ b/pkgs/development/python-modules/gcutil/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, gflags
+, iso8601
+, ipaddr
+, httplib2
+, google_apputils
+, google_api_python_client
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ name = "gcutil-1.16.1";
+ disabled = isPy3k;
+
+ src = fetchurl {
+ url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz;
+ sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x";
+ };
+
+ propagatedBuildInputs = [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ];
+
+ prePatch = ''
+ sed -i -e "s|google-apputils==0.4.0|google-apputils==0.4.1|g" setup.py
+ substituteInPlace setup.py \
+ --replace "httplib2==0.8" "httplib2" \
+ --replace "iso8601==0.1.4" "iso8601" \
+ --replace "ipaddr==2.1.10" "ipaddr" \
+ --replace "google-api-python-client==1.2" "google-api-python-client" \
+ --replace "python-gflags==2.0" "python-gflags"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Command-line tool for interacting with Google Compute Engine";
+ homepage = "https://cloud.google.com/compute/docs/gcutil/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ phreedom ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix
new file mode 100644
index 00000000000..7cbf09fa49f
--- /dev/null
+++ b/pkgs/development/python-modules/gdrivefs/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, isPy3k
+, gipc
+, greenlet
+, httplib2
+, six
+, dateutil
+, fusepy
+, google_api_python_client
+}:
+
+buildPythonPackage rec {
+ version = "0.14.9";
+ pname = "gdrivefs";
+ disabled = isPy3k;
+
+ src = fetchurl {
+ url = "https://github.com/dsoprea/GDriveFS/archive/${version}.tar.gz";
+ sha256 = "1mc2r35nf5k8vzwdcdhi0l9rb97amqd5xb53lhydj8v8f4rndk7a";
+ };
+
+ buildInputs = [ gipc greenlet httplib2 six ];
+ propagatedBuildInputs = [ dateutil fusepy google_api_python_client ];
+
+ patchPhase = ''
+ substituteInPlace gdrivefs/resources/requirements.txt \
+ --replace "==" ">="
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Mount Google Drive as a local file system";
+ longDescription = ''
+ GDriveFS is a FUSE wrapper for Google Drive developed. Design goals:
+ - Thread for monitoring changes via "changes" functionality of API.
+ - Complete stat() implementation.
+ - Seamlessly work around duplicate-file allowances in Google Drive.
+ - Seamlessly manage file-type versatility in Google Drive
+ (Google Doc files do not have a particular format).
+ - Allow for the same file at multiple paths.
+ '';
+ homepage = https://github.com/dsoprea/GDriveFS;
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix
index bcc462e7237..45906c3c434 100644
--- a/pkgs/development/python-modules/genanki/default.nix
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "genanki";
- version = "0.6.0";
+ version = "0.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0xj8yd3acl8h457sh42balvcd0z4mg5idd4q63f7qlfzc5wgbb74";
+ sha256 = "2408f7d9955c8963fd9b1ecbb873f5d18dee786e060dcb083aef5dd86c736773";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix
new file mode 100644
index 00000000000..ad6f4ee1b21
--- /dev/null
+++ b/pkgs/development/python-modules/genshi/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools
+}:
+
+buildPythonPackage rec {
+ pname = "Genshi";
+ version = "0.7.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0d87ae62cf2ed92133f35725da51e02d09f79bb4cb986f0d948408a0279dd3f8";
+ };
+
+ # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)
+ # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase)
+ doCheck = false;
+
+ buildInputs = [ setuptools ];
+
+ meta = with stdenv.lib; {
+ description = "Python components for parsing HTML, XML and other textual content";
+ longDescription = ''
+ Python library that provides an integrated set of components for
+ parsing, generating, and processing HTML, XML or other textual
+ content for output generation on the web.
+ '';
+ homepage = https://genshi.edgewall.org/;
+ license = licenses.bsd0;
+ };
+}
diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix
new file mode 100644
index 00000000000..87ca3aaeff4
--- /dev/null
+++ b/pkgs/development/python-modules/genzshcomp/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools
+}:
+
+buildPythonPackage rec {
+ pname = "genzshcomp";
+ version = "0.5.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42";
+ };
+
+ buildInputs = [ setuptools ];
+
+ meta = with stdenv.lib; {
+ description = "Automatically generated zsh completion function for Python's option parser modules";
+ homepage = http://bitbucket.org/hhatto/genzshcomp/;
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix
new file mode 100644
index 00000000000..e95519a346c
--- /dev/null
+++ b/pkgs/development/python-modules/gevent-socketio/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, versiontools
+, gevent-websocket
+, mock
+, pytest
+, gevent
+}:
+
+buildPythonPackage rec {
+ pname = "gevent-socketio";
+ version = "0.3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1zra86hg2l1jcpl9nsnqagy3nl3akws8bvrbpgdxk15x7ywllfak";
+ };
+
+ buildInputs = [ versiontools gevent-websocket mock pytest ];
+ propagatedBuildInputs = [ gevent ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/abourget/gevent-socketio;
+ description = "SocketIO server based on the Gevent pywsgi server, a Python network library";
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix
new file mode 100644
index 00000000000..28dab3a257f
--- /dev/null
+++ b/pkgs/development/python-modules/gevent-websocket/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, gevent
+}:
+
+buildPythonPackage rec {
+ pname = "gevent-websocket";
+ version = "0.9.3";
+ # SyntaxError in tests.
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "07rqwfpbv13mk6gg8mf0bmvcf6siyffjpgai1xd8ky7r801j4xb4";
+ };
+
+ propagatedBuildInputs = [ gevent ];
+
+ meta = with stdenv.lib; {
+ homepage = https://www.gitlab.com/noppo/gevent-websocket;
+ description = "Websocket handler for the gevent pywsgi server, a Python network library";
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix
new file mode 100644
index 00000000000..6a78d60544d
--- /dev/null
+++ b/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, gevent
+, certifi
+, six
+, backports_ssl_match_hostname
+}:
+
+buildPythonPackage rec {
+ pname = "geventhttpclient";
+ version = "1.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bd87af8854f5fb05738916c8973671f7035568aec69b7c842887d6faf9c0a01d";
+ };
+
+ buildInputs = [ pytest ];
+ propagatedBuildInputs = [ gevent certifi six backports_ssl_match_hostname ];
+
+ # Several tests fail that require network
+ doCheck = false;
+ checkPhase = ''
+ py.test $out
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/gwik/geventhttpclient;
+ description = "HTTP client library for gevent";
+ license = licenses.mit;
+ maintainers = with maintainers; [ koral ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix
new file mode 100644
index 00000000000..9780b46fa5a
--- /dev/null
+++ b/pkgs/development/python-modules/gipc/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, gevent
+}:
+
+buildPythonPackage rec {
+ pname = "gipc";
+ version = "0.5.0";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "08c35xzv7nr12d9xwlywlbyzzz2igy0yy6y52q2nrkmh5d4slbpc";
+ };
+
+ propagatedBuildInputs = [ gevent ];
+
+ meta = with stdenv.lib; {
+ description = "gevent-cooperative child processes and IPC";
+ longDescription = ''
+ Usage of Python's multiprocessing package in a gevent-powered
+ application may raise problems and most likely breaks the application
+ in various subtle ways. gipc (pronunciation "gipsy") is developed with
+ the motivation to solve many of these issues transparently. With gipc,
+ multiprocessing. Process-based child processes can safely be created
+ anywhere within your gevent-powered application.
+ '';
+ homepage = http://gehrcke.de/gipc;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix
new file mode 100644
index 00000000000..e2182892e85
--- /dev/null
+++ b/pkgs/development/python-modules/git-sweep/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, GitPython
+}:
+
+buildPythonPackage rec {
+ pname = "git-sweep";
+ version = "0.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1csp0zd049d643d409rfivbswwzrayb4i6gkypp5mc27fb1z2afd";
+ };
+
+ propagatedBuildInputs = [ GitPython ];
+
+ meta = with stdenv.lib; {
+ description = "A command-line tool that helps you clean up Git branches";
+ homepage = https://github.com/arc90/git-sweep;
+ license = licenses.mit;
+ maintainers = with maintainers; [ pSub ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/github-webhook/default.nix b/pkgs/development/python-modules/github-webhook/default.nix
new file mode 100644
index 00000000000..99af2830167
--- /dev/null
+++ b/pkgs/development/python-modules/github-webhook/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, flask
+}:
+
+buildPythonPackage rec {
+ pname = "github-webhook";
+ version = "unstable-2016-03-11";
+
+ # There is a PyPI package but an older one.
+ src = fetchgit {
+ url = "https://github.com/bloomberg/python-github-webhook.git";
+ rev = "ca1855479ee59c4373da5425dbdce08567605d49";
+ sha256 = "0mqwig9281iyzbphp1d21a4pqdrf98vs9k8lqpqx6spzgqaczx5f";
+ };
+
+ propagatedBuildInputs = [ flask ];
+ # No tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A framework for writing webhooks for GitHub";
+ license = licenses.mit;
+ homepage = https://github.com/bloomberg/python-github-webhook;
+ };
+
+}
diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix
new file mode 100644
index 00000000000..8968585d9cd
--- /dev/null
+++ b/pkgs/development/python-modules/github3_py/default.nix
@@ -0,0 +1,45 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, unittest2
+, pytest
+, mock
+, betamax
+, betamax-matchers
+, dateutil
+, requests
+, pyopenssl
+, uritemplate_py
+, ndg-httpsclient
+, requests_toolbelt
+, pyasn1
+}:
+
+buildPythonPackage rec {
+ pname = "github3.py";
+ version = "1.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1cxaqdqmz9w2afc0cw2jyv783fp0grydbik0frzj79azzkhyg4gf";
+ };
+
+ buildInputs = [ unittest2 pytest mock betamax betamax-matchers dateutil ];
+ propagatedBuildInputs = [ requests pyopenssl uritemplate_py ndg-httpsclient requests_toolbelt pyasn1 ];
+
+ postPatch = ''
+ sed -i -e 's/mock ==1.0.1/mock>=1.0.1/' setup.py
+ sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py
+ '';
+
+ # TODO: only disable the tests that require network
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://github3py.readthedocs.org/en/master/;
+ description = "A wrapper for the GitHub API written in python";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ pSub ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix
new file mode 100644
index 00000000000..f96e94a34a0
--- /dev/null
+++ b/pkgs/development/python-modules/gmusicapi/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, validictory
+, decorator
+, mutagen
+, protobuf
+, setuptools
+, requests
+, dateutil
+, proboscis
+, mock
+, appdirs
+, oauth2client
+, pyopenssl
+, gpsoauth
+, MechanicalSoup
+, future
+}:
+
+buildPythonPackage rec {
+ pname = "gmusicapi";
+ version = "10.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0smlrafh1bjzrcjzl7im8pf8f04gcnx92lf3g5qr7yzgq8k20xa2";
+ };
+
+ propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
+
+ meta = with stdenv.lib; {
+ description = "An unofficial API for Google Play Music";
+ homepage = https://pypi.python.org/pypi/gmusicapi/;
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix
new file mode 100644
index 00000000000..2feab78f6a8
--- /dev/null
+++ b/pkgs/development/python-modules/gnureadline/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPyPy
+, pkgs
+}:
+
+buildPythonPackage rec {
+ version = "6.3.3";
+ pname = "gnureadline";
+ disabled = isPyPy;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1ghck2zz4xbqa3wz73brgjhrqj55p9hc1fq6c9zb09dnyhwb0nd2";
+ };
+
+ buildInputs = [ pkgs.ncurses ];
+ patchPhase = ''
+ substituteInPlace setup.py --replace "/bin/bash" "${pkgs.bash}/bin/bash"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The standard Python readline extension statically linked against the GNU readline library";
+ homepage = http://github.com/ludwigschwardt/python-gnureadline;
+ license = licenses.gpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix
new file mode 100644
index 00000000000..a58177e7544
--- /dev/null
+++ b/pkgs/development/python-modules/gnutls/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "python-gnutls";
+ version = "3.0.0";
+
+ # https://github.com/AGProjects/python-gnutls/issues/2
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc";
+ };
+
+ propagatedBuildInputs = [ pkgs.gnutls ];
+ patchPhase = ''
+ substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls.out}/lib"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Python wrapper for the GnuTLS library";
+ homepage = https://github.com/AGProjects/python-gnutls;
+ license = licenses.lgpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix
new file mode 100644
index 00000000000..91a99103af5
--- /dev/null
+++ b/pkgs/development/python-modules/goobook/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, oauth2client
+, gdata
+, simplejson
+, httplib2
+, keyring
+, six
+, rsa
+}:
+
+buildPythonPackage rec {
+ pname = "goobook";
+ version = "1.9";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "02xmq8sjavza17av44ks510934wrshxnsm6lvhvazs45s92b671i";
+ };
+
+ propagatedBuildInputs = [ oauth2client gdata simplejson httplib2 keyring six rsa ];
+
+ preConfigure = ''
+ sed -i '/distribute/d' setup.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Search your google contacts from the command-line or mutt";
+ homepage = https://pypi.python.org/pypi/goobook;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ lovek323 hbunke ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/google_apputils/default.nix b/pkgs/development/python-modules/google_apputils/default.nix
new file mode 100644
index 00000000000..66bad999dfb
--- /dev/null
+++ b/pkgs/development/python-modules/google_apputils/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytz
+, gflags
+, dateutil
+, mox
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "google-apputils";
+ version = "0.4.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1sxsm5q9vr44qzynj8l7p3l7ffb0zl1jdqhmmzmalkx941nbnj1b";
+ };
+
+ preConfigure = ''
+ sed -i '/ez_setup/d' setup.py
+ '';
+
+ propagatedBuildInputs = [ pytz gflags dateutil mox ];
+
+ checkPhase = ''
+ ${python.executable} setup.py google_test
+ '';
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Google Application Utilities for Python";
+ homepage = http://code.google.com/p/google-apputils-python;
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix
index da3bbcf28db..13ba4f934e8 100644
--- a/pkgs/development/python-modules/gpapi/default.nix
+++ b/pkgs/development/python-modules/gpapi/default.nix
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, requests, protobuf, pycryptodome }:
buildPythonPackage rec {
- version = "0.4.2";
+ version = "0.4.3";
pname = "gpapi";
src = fetchPypi {
inherit version pname;
- sha256 = "1fv2y3xbwn512fjxrdwgq6cz0xjd7mh54nq1f18wyz8w40vcznns";
+ sha256 = "9fd1351eb29c4da92d3a0ed2cd4e3c1634ea16afddbca133f6acc54766d61b02";
};
propagatedBuildInputs = [ requests protobuf pycryptodome ];
diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix
new file mode 100644
index 00000000000..68dce423390
--- /dev/null
+++ b/pkgs/development/python-modules/gpsoauth/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, cffi
+, cryptography
+, enum34
+, idna
+, ipaddress
+, ndg-httpsclient
+, pyopenssl
+, pyasn1
+, pycparser
+, pycryptodome
+, requests
+, six
+}:
+
+buildPythonPackage rec {
+ version = "0.2.0";
+ pname = "gpsoauth";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "01zxw8rhml8xfwda7ba8983890bzwkfa55ijd6qf8qrdy6ja1ncn";
+ };
+
+ propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodome requests six ];
+
+ meta = with stdenv.lib; {
+ description = "A python client library for Google Play Services OAuth";
+ homepage = "https://github.com/simon-weber/gpsoauth";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jgillich ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index 72415879b41..0b9717b3fee 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "GPy";
- version = "1.9.2";
+ version = "1.9.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "372e43d41df5c90e0958d3073070994b351a7409c2e5fbd349cffe13bc24c10a";
+ sha256 = "97519bea69e7d7a703d9575c31d68a7c6f974ae125ee9d4a3e1fb510eadfb97e";
};
# running tests produces "ImportError: cannot import name 'linalg_cython'"
diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix
index 791eb1b8cf0..51a7fd9b5d2 100644
--- a/pkgs/development/python-modules/graphite-web/default.nix
+++ b/pkgs/development/python-modules/graphite-web/default.nix
@@ -6,13 +6,13 @@ if django.version != "1.8.18"
then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3"
else buildPythonPackage rec {
pname = "graphite-web";
- version = "1.1.3";
+ version = "1.1.4";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0nvyq1859abdch2l90avsjk9vb03s7wgxgrjsqvjhf2b9c1ncsfh";
+ sha256 = "4430929f954998d77aa0a61246c62d64a00a2f9464320f9a462294dd3448e522";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix
new file mode 100644
index 00000000000..42a69890681
--- /dev/null
+++ b/pkgs/development/python-modules/graphviz/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "graphviz";
+ version = "0.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6";
+ };
+
+ propagatedBuildInputs = [ pkgs.graphviz ];
+
+ meta = with stdenv.lib; {
+ description = "Simple Python interface for Graphviz";
+ homepage = https://github.com/xflr6/graphviz;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix
new file mode 100644
index 00000000000..bbba074b3f5
--- /dev/null
+++ b/pkgs/development/python-modules/grappelli_safe/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "0.5.1";
+ pname = "grappelli_safe";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "27660faa628186d74258781edfa03ef812555d49b4925cfe19c05bcd3da85e40";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A snapshot of django-grappelli for the Mezzanine CMS";
+ longDescription = ''
+ grappelli_safe was created to provide a snapshot of the
+ Grappelli admin skin for Django, to be referenced as a
+ dependency for the Mezzanine CMS for Django.
+
+ At the time of grappelli_safe's creation, Grappelli was
+ incorrectly packaged on PyPI, and had also dropped compatibility
+ with Django 1.1 - grappelli_safe was therefore created to
+ address these specific issues.
+ '';
+ homepage = https://github.com/stephenmcd/grappelli-safe;
+ downloadPage = http://pypi.python.org/pypi/grappelli_safe/;
+ license = licenses.free;
+ maintainers = with maintainers; [ prikhi ];
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index 58b240297cf..3754f08c28b 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "greenlet";
- version = "0.4.14";
+ version = "0.4.15";
disabled = isPyPy; # builtin for pypy
src = fetchPypi {
inherit pname version;
- sha256 = "f1cc268a15ade58d9a0c04569fe6613e19b8b0345b64453064e2c3c6d79051af";
+ sha256 = "9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index c111e5f75a7..7c58c866f52 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
- version = "1.14.1";
+ version = "1.14.2";
src = fetchPypi {
inherit pname version;
- sha256 = "4ce5aa660d7884f23aac1eafa93b97a4c3e2b512edff871e91fdb6ee86ebd5ea";
+ sha256 = "b3fd64a5b8c1d981f6d68a331449109633710a346051c44e0f0cca1812e2b4b0";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
new file mode 100644
index 00000000000..1a07e7ecfc0
--- /dev/null
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "0.2.3";
+ pname = "gspread";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "dba45ef9e652dcd8cf561ae65569bd6ecd18fcc77b991521490698fb2d847106";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Google Spreadsheets client library";
+ homepage = "https://github.com/burnash/gspread";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix
new file mode 100644
index 00000000000..40115f398c6
--- /dev/null
+++ b/pkgs/development/python-modules/gtimelog/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, pkgs
+, python
+, pygobject3
+}:
+
+buildPythonPackage rec {
+ pname = "gtimelog";
+ version = "0.9.1";
+
+ src = pkgs.fetchurl {
+ url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz";
+ sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj";
+ };
+
+ buildInputs = [ pkgs.glibcLocales ];
+
+ LC_ALL="en_US.UTF-8";
+
+ # TODO: AppIndicator
+ propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ];
+
+ checkPhase = ''
+ substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
+ ./runtests
+ '';
+
+ preFixup = ''
+ wrapProgram $out/bin/gtimelog \
+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+ --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3.out}/lib" \
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";
+ homepage = https://mg.pov.lt/gtimelog/;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ ocharles ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix
new file mode 100644
index 00000000000..46b0dde636a
--- /dev/null
+++ b/pkgs/development/python-modules/gyp/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "gyp";
+ version = "2015-06-11";
+ disabled = isPy3k;
+
+ src = fetchgit {
+ url = "https://chromium.googlesource.com/external/gyp.git";
+ rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043";
+ sha256 = "1imgxsl4mr1662vsj2mlnpvvrbz71yk00w8p85vi5bkgmc6awgiz";
+ };
+
+ prePatch = stdenv.lib.optionals stdenv.isDarwin ''
+ sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' pylib/gyp/xcode_emulation.py
+ '';
+
+ patches = stdenv.lib.optionals stdenv.isDarwin [
+ ./no-darwin-cflags.patch
+ ./no-xcode.patch
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A tool to generate native build files";
+ homepage = https://chromium.googlesource.com/external/gyp/+/master/README.md;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ codyopel ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix
new file mode 100644
index 00000000000..46e49ba6b88
--- /dev/null
+++ b/pkgs/development/python-modules/hawkauthlib/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, requests
+, webob
+}:
+
+buildPythonPackage rec {
+ pname = "hawkauthlib";
+ version = "0.1.1";
+
+ src = fetchgit {
+ url = https://github.com/mozilla-services/hawkauthlib.git;
+ rev = "refs/tags/v${version}";
+ sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi";
+ };
+
+ propagatedBuildInputs = [ requests webob ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/mozilla-services/hawkauthlib;
+ description = "Hawk Access Authentication protocol";
+ license = licenses.mpl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix
index 3c86563adac..27d83d9c6c2 100644
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "hdbscan";
- version = "0.8.15";
+ version = "0.8.18";
src = fetchPypi {
inherit pname version;
- sha256 = "446f98e1ea622a39c1f396d839fa2b1c35db98234e373336de61c3bd6ffaec78";
+ sha256 = "4d6782f08872f4c54983873a41759daae680d6247b0db363f3510cb001108f02";
};
checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix
index 15dadd0bf11..8aa6e1e921f 100644
--- a/pkgs/development/python-modules/helper/default.nix
+++ b/pkgs/development/python-modules/helper/default.nix
@@ -1,21 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }:
-
+
buildPythonPackage rec {
pname = "helper";
version = "2.4.2";
- name = "${pname}-${version}";
-
+
src = fetchPypi {
inherit pname version;
sha256 = "0p56dvjpaz9wnr0ik2wmvgqjf9ji180bhjky7q272l5dan94lgd6";
};
-
- buildInputs = [ mock ];
+
+ checkInputs = [ mock ];
propagatedBuildInputs = [ pyyaml ];
-
+
# No tests in the pypi tarball
doCheck = false;
-
+
meta = with stdenv.lib; {
description = "Development library for quickly writing configurable applications and daemons";
homepage = https://helper.readthedocs.org/;
diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix
new file mode 100644
index 00000000000..ccf4e1a5ba7
--- /dev/null
+++ b/pkgs/development/python-modules/hetzner/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "hetzner";
+ version = "0.8.1";
+
+ src = fetchFromGitHub {
+ repo = "hetzner";
+ owner = "aszlig";
+ rev = "v${version}";
+ sha256 = "1xd1klvjskv0pg8ginih597jkk491a55b8dq80dsm61m5sbsx3vq";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/RedMoonStudios/hetzner";
+ description = "High-level Python API for accessing the Hetzner robot";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ aszlig ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix
new file mode 100644
index 00000000000..2b32afc2f82
--- /dev/null
+++ b/pkgs/development/python-modules/hg-git/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, dulwich
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "hg-git";
+ version = "0.8.11";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "08kw1sj3sq1q1571hwkc51w20ks9ysmlg93pcnmd6gr66bz02dyn";
+ };
+
+ propagatedBuildInputs = [ dulwich ];
+
+ meta = with stdenv.lib; {
+ description = "Push and pull from a Git server using Mercurial";
+ homepage = http://hg-git.github.com/;
+ maintainers = with maintainers; [ koral ];
+ license = stdenv.lib.licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix
new file mode 100644
index 00000000000..3a159e6d349
--- /dev/null
+++ b/pkgs/development/python-modules/hkdf/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "hkdf";
+ version = "0.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2";
+ };
+
+ buildInputs = [ nose ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ meta = with stdenv.lib; {
+ description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)";
+ homepage = "https://github.com/casebeer/python-hkdf";
+ license = licenses.bsd2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/hovercraft/default.nix b/pkgs/development/python-modules/hovercraft/default.nix
new file mode 100644
index 00000000000..e598fd41bab
--- /dev/null
+++ b/pkgs/development/python-modules/hovercraft/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, docutils
+, lxml
+, manuel
+, pygments
+, svg-path
+, watchdog
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "hovercraft";
+ version = "2.0";
+ disabled = ! isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0lqxr816lymgnywln8bbv9nrmkyahjjcjkm9kjyny9bflayz4f1g";
+ };
+
+ propagatedBuildInputs = [ docutils lxml manuel pygments svg-path watchdog ];
+
+ # one test assumes we have docutils 0.12
+ # TODO: enable tests after upgrading docutils to 0.12
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A tool to make impress.js presentations from reStructuredText";
+ homepage = https://github.com/regebro/hovercraft;
+ license = licenses.mit;
+ maintainers = with maintainers; [ goibhniu ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix
new file mode 100644
index 00000000000..5e85dd51e76
--- /dev/null
+++ b/pkgs/development/python-modules/hpack/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "hpack";
+ version = "2.3.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1ad0fx4d7a52zf441qzhjc7vwy9v3qdrk1zyf06ikz8y2nl9mgai";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Pure-Python HPACK header compression";
+ homepage = "http://hyper.rtfd.org";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/hsaudiotag/default.nix b/pkgs/development/python-modules/hsaudiotag/default.nix
new file mode 100644
index 00000000000..d08d9e06b71
--- /dev/null
+++ b/pkgs/development/python-modules/hsaudiotag/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "hsaudiotag";
+ version = "1.1.1";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "15hgm128p8nysfi0jb127awga3vlj0iw82l50swjpvdh01m7rda8";
+ };
+
+ # no tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A pure Python library that lets one to read metadata from media files";
+ homepage = http://hg.hardcoded.net/hsaudiotag/;
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix
new file mode 100644
index 00000000000..06f89f73333
--- /dev/null
+++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "hsaudiotag3k";
+ version = "1.1.3";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0bv5k5594byr2bmhh77xv10fkdpckcmxg3w380yp30aqf83rcsx3";
+ };
+
+ # no tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A pure Python library that lets one to read metadata from media files";
+ homepage = http://hg.hardcoded.net/hsaudiotag/;
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix
new file mode 100644
index 00000000000..787163d477e
--- /dev/null
+++ b/pkgs/development/python-modules/htmllaundry/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi, nose
+, six
+, lxml
+}:
+
+buildPythonPackage rec {
+ pname = "htmllaundry";
+ version = "2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "e428cba78d5a965e959f5dac2eb7d5f7d627dd889990d5efa8d4e03f3dd768d9";
+ };
+
+ buildInputs = [ nose ];
+ propagatedBuildInputs = [ six lxml ];
+
+ # some tests fail, probably because of changes in lxml
+ # not relevant for me, if releavnt for you, fix it...
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Simple HTML cleanup utilities";
+ license = licenses.bsd3;
+ homepage = https://pypi.org/project/htmllaundry/;
+ };
+
+}
diff --git a/pkgs/development/python-modules/http_signature/default.nix b/pkgs/development/python-modules/http_signature/default.nix
new file mode 100644
index 00000000000..48f06db1ba5
--- /dev/null
+++ b/pkgs/development/python-modules/http_signature/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, pycrypto
+}:
+
+buildPythonPackage rec {
+ pname = "http_signature";
+ version = "0.1.4";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "14acc192ef20459d5e11b4e800dd3a4542f6bd2ab191bf5717c696bf30936c62";
+ };
+
+ propagatedBuildInputs = [ pycrypto ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/atl/py-http-signature;
+ description = "Simple secure signing for HTTP requests using http-signature";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix
new file mode 100644
index 00000000000..f1afd41ebed
--- /dev/null
+++ b/pkgs/development/python-modules/httpauth/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "0.3";
+ pname = "httpauth";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0qas7876igyz978pgldp5r7n7pis8n4vf0v87gxr9l7p7if5lr3l";
+ };
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "WSGI HTTP Digest Authentication middleware";
+ homepage = https://github.com/jonashaag/httpauth;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
new file mode 100644
index 00000000000..1f135255bc0
--- /dev/null
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, tornado
+, requests
+, httplib2
+, sure
+, nose
+, coverage
+, certifi
+, urllib3
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "httpretty";
+ version = "0.8.10";
+ doCheck = false;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1nmdk6d89z14x3wg4yxywlxjdip16zc8bqnfb471z1365mr74jj7";
+ };
+
+ buildInputs = [ tornado requests httplib2 sure nose coverage certifi ];
+ propagatedBuildInputs = [ urllib3 ];
+
+ postPatch = ''
+ sed -i -e 's/==.*$//' *requirements.txt
+ # XXX: Drop this after version 0.8.4 is released.
+ patch httpretty/core.py <=/' setup.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A CLI client and Python API library for the MailChimp email platform";
+ homepage = "http://apidocs.mailchimp.com/api/2.0/";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix
new file mode 100644
index 00000000000..1030ee21556
--- /dev/null
+++ b/pkgs/development/python-modules/manuel/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, six
+, zope_testing
+}:
+
+buildPythonPackage rec {
+ pname = "manuel";
+ version = "1.8.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1diyj6a8bvz2cdf9m0g2bbx9z2yjjnn3ylbg1zinpcjj6vldfx59";
+ };
+
+ propagatedBuildInputs = [ six zope_testing ];
+
+ meta = with stdenv.lib; {
+ description = "A documentation builder";
+ homepage = https://pypi.python.org/pypi/manuel;
+ license = licenses.zpl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix
new file mode 100644
index 00000000000..861f3069bb0
--- /dev/null
+++ b/pkgs/development/python-modules/mapsplotlib/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, matplotlib
+, scipy
+, pandas
+, requests
+, pillow
+}:
+
+buildPythonPackage rec {
+ pname = "mapsplotlib";
+ version = "1.0.6";
+
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "09gpws3x0jd88n636baxx5izjffrpjy4j6jl8l7vj29yzvrdr2bp";
+ };
+
+ propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ];
+
+ meta = with stdenv.lib; {
+ description = "Custom Python plots on a Google Maps background";
+ homepage = https://github.com/tcassou/mapsplotlib;
+ license = licenses.mit;
+ maintainers = [ maintainers.rob ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix
new file mode 100644
index 00000000000..98dce913046
--- /dev/null
+++ b/pkgs/development/python-modules/markdown-macros/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, markdown
+}:
+
+buildPythonPackage rec {
+ pname = "markdown-macros";
+ version = "0.1.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1lzvrb7nci22yp21ab2qqc9p0fhkazqj29vw0wln2r4ckb2nbawv";
+ };
+
+ patches = [
+ # Fixes a bug with markdown>2.4
+ (fetchpatch {
+ url = "https://github.com/wnielson/markdown-macros/pull/1.patch";
+ sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0";
+ })
+ ];
+
+ prePatch = ''
+ substituteInPlace setup.py --replace "distribute" "setuptools"
+ '';
+
+ propagatedBuildInputs = [ markdown ];
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "An extension for python-markdown that makes writing trac-like macros easy";
+ homepage = https://github.com/wnielson/markdown-macros;
+ license = licenses.mit;
+ maintainers = [ maintainers.abigailbuccaneer ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix
index f49b2630b6c..a07e0b14fdc 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/pkgs/development/python-modules/markdown2/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "markdown2";
- version = "2.3.5";
+ version = "2.3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "8bb9a24eb2aa02f1427aabe46483f0f0215ab18c8a345315ae8e2ee3c3a09c03";
+ sha256 = "08a124043aa0ad36ba2136239547d5011a2b770278abb11a5609611e0040ea05";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
new file mode 100644
index 00000000000..069b71de00d
--- /dev/null
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "MarkupSafe";
+ version = "1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Implements a XML/HTML/XHTML Markup safe string";
+ homepage = http://dev.pocoo.org;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ domenkozar garbas ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index 20543faeb16..cd4e86d4687 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "marshmallow";
- version = "2.15.4";
+ version = "2.15.6";
meta = {
homepage = "https://github.com/marshmallow-code/marshmallow";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0f3776aa5b5405f6000c9304841abe6d4d708bb08207fc89a5ecd86622ec9e54";
+ sha256 = "485ac6ed0dff5e1af6ea1e3a54425a448968f581b065424c89a5375e4d4866fd";
};
propagatedBuildInputs = [ dateutil simplejson ];
diff --git a/pkgs/development/python-modules/mathics/default.nix b/pkgs/development/python-modules/mathics/default.nix
new file mode 100644
index 00000000000..b20cc070909
--- /dev/null
+++ b/pkgs/development/python-modules/mathics/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, django
+, python
+, cython
+, sympy
+, ply
+, mpmath
+, dateutil
+, colorama
+, six
+, pexpect
+}:
+
+if (stdenv.lib.versionOlder django.version "1.8") ||
+ (stdenv.lib.versionAtLeast django.version "1.9")
+ then throw "mathics only supports django-1.8.x"
+ else buildPythonPackage rec {
+ pname = "mathics";
+ version = "0.9";
+
+ src = fetchFromGitHub {
+ owner = "mathics";
+ repo = "Mathics";
+ rev = "v${version}";
+ sha256 = "0xzz7j8xskj5y6as178mjmm0i2xbhd4q4mwmdnvghpd2aqq3qx1c";
+ };
+
+ buildInputs = [ pexpect ];
+
+ prePatch = ''
+ substituteInPlace setup.py --replace "sympy==0.7.6" "sympy"
+ '';
+
+ postFixup = ''
+ wrapPythonProgramsIn $out/bin $out
+ patchPythonScript $out/${python.sitePackages}/mathics/manage.py
+ '';
+
+ propagatedBuildInputs = [ cython sympy django ply mpmath dateutil colorama six ];
+
+ meta = with stdenv.lib; {
+ description = "A general-purpose computer algebra system";
+ homepage = http://www.mathics.org;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.benley ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix
new file mode 100644
index 00000000000..d797190cb89
--- /dev/null
+++ b/pkgs/development/python-modules/mechanize/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, html5lib
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "mechanize";
+ version = "0.3.5";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl";
+ };
+
+ propagatedBuildInputs = [ html5lib ];
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Stateful programmatic web browsing in Python";
+ homepage = http://wwwsearch.sourceforge.net/;
+ license = "BSD-style";
+ };
+
+}
diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix
new file mode 100644
index 00000000000..12b518484bc
--- /dev/null
+++ b/pkgs/development/python-modules/meld3/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "meld3";
+ version = "1.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "57b41eebbb5a82d4a928608962616442e239ec6d611fe6f46343e765e36f0b2b";
+ };
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "An HTML/XML templating engine used by supervisor";
+ homepage = https://github.com/supervisor/meld3;
+ license = licenses.free;
+ };
+
+}
diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix
new file mode 100644
index 00000000000..854f7440daa
--- /dev/null
+++ b/pkgs/development/python-modules/memcached/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "memcached-1.51";
+ version = "1.51";
+
+ src = if isPy3k then fetchPypi {
+ inherit pname version;
+ sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw";
+ } else fetchurl {
+ url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${pname}-${version}.tar.gz";
+ sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Python API for communicating with the memcached distributed memory object cache daemon";
+ homepage = http://www.tummy.com/Community/software/python-memcached/;
+ license = licenses.psfl;
+ };
+
+}
diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix
new file mode 100644
index 00000000000..5f40ce0f1aa
--- /dev/null
+++ b/pkgs/development/python-modules/memory_profiler/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "memory_profiler";
+ version = "0.41";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "dce6e931c281662a500b142595517d095267216472c2926e5ec8edab89898d10";
+ };
+
+ # Tests don't import profile
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A module for monitoring memory usage of a python program";
+ homepage = https://pypi.python.org/pypi/memory_profiler;
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
new file mode 100644
index 00000000000..1a7478b266a
--- /dev/null
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -0,0 +1,70 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPyPy
+, pyflakes
+, pep8
+, django
+, django_contrib_comments
+, filebrowser_safe
+, grappelli_safe
+, bleach
+, tzlocal
+, beautifulsoup4
+, requests
+, requests_oauthlib
+, future
+, pillow
+, chardet
+}:
+
+buildPythonPackage rec {
+ version = "4.3.1";
+ pname = "Mezzanine";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3";
+ };
+
+ disabled = isPyPy;
+
+ buildInputs = [ pyflakes pep8 ];
+ propagatedBuildInputs = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ];
+
+ # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+
+ doCheck = false;
+ # sed calls will be unecessary in v3.1.11+
+ preConfigure = ''
+ sed -i 's/==/>=/' setup.py
+ '';
+
+ LC_ALL="en_US.UTF-8";
+
+ meta = with stdenv.lib; {
+ description = ''
+ A content management platform built using the Django framework
+ '';
+ longDescription = ''
+ Mezzanine is a powerful, consistent, and flexible content
+ management platform. Built using the Django framework, Mezzanine
+ provides a simple yet highly extensible architecture that
+ encourages diving in and hacking on the code. Mezzanine is BSD
+ licensed and supported by a diverse and active community.
+
+ In some ways, Mezzanine resembles tools such as Wordpress that
+ provide an intuitive interface for managing pages, blog posts,
+ form data, store products, and other types of content. But
+ Mezzanine is also different. Unlike many other platforms that
+ make extensive use of modules or reusable applications,
+ Mezzanine provides most of its functionality by default. This
+ approach yields a more integrated and efficient platform.
+ '';
+ homepage = http://mezzanine.jupo.org/;
+ downloadPage = https://github.com/stephenmcd/mezzanine/releases;
+ license = licenses.free;
+ maintainers = with maintainers; [ prikhi ];
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mezzanine/writable_settings.patch b/pkgs/development/python-modules/mezzanine/writable_settings.patch
deleted file mode 100644
index 4b5be7b5950..00000000000
--- a/pkgs/development/python-modules/mezzanine/writable_settings.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur mezzanine-3.1.10/mezzanine/bin/mezzanine_project.py mezzanine-3.1.10-patched/mezzanine/bin/mezzanine_project.py
---- mezzanine-3.1.10/mezzanine/bin/mezzanine_project.py 2014-08-30 07:12:19.000000000 +0200
-+++ mezzanine-3.1.10-patched/mezzanine/bin/mezzanine_project.py 2016-10-31 14:47:30.982401818 +0100
-@@ -5,6 +5,7 @@
- from distutils.dir_util import copy_tree
- from optparse import OptionParser
- import os
-+import stat
- from shutil import move
- from uuid import uuid4
-
-@@ -61,6 +62,9 @@
- copy_tree(os.path.join(package_path, "project_template"), project_path)
- move(local_settings_path + ".template", local_settings_path)
-
-+ os.chmod(local_settings_path,
-+ os.stat(local_settings_path).st_mode | stat.S_IWRITE)
-+
- # Generate a unique SECRET_KEY for the project's setttings module.
- with open(local_settings_path, "r") as f:
- data = f.read()
diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix
index 5e3afe05ea7..3425440390d 100644
--- a/pkgs/development/python-modules/micawber/default.nix
+++ b/pkgs/development/python-modules/micawber/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "micawber";
- version = "0.3.5";
+ version = "0.3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "0pnq6j8f144virhri0drgf0058x6qcxfd5yrb0ynbwr8djh326yn";
+ sha256 = "2e128db870cf3a351f5c680b6d1ae7e097a7ff6c70c8ba78c7d3be8e3d3c20bd";
};
propagatedBuildInputs = [ beautifulsoup4 ];
diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix
new file mode 100644
index 00000000000..209ecf998cc
--- /dev/null
+++ b/pkgs/development/python-modules/minidb/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "minidb";
+ version = "2.0.2";
+
+ src = fetchurl {
+ url = "https://github.com/thp/minidb/archive/${version}.tar.gz";
+ sha256 = "17rvkpq8v7infvbgsi48vnxamhxb3f635nqn0sln7yyvh4i9k8a0";
+ };
+
+ checkInputs = [ nose ];
+
+ checkPhase = ''
+ nosetests test
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A simple SQLite3-based store for Python objects";
+ homepage = https://thp.io/2010/minidb/;
+ license = stdenv.lib.licenses.isc;
+ maintainers = [ stdenv.lib.maintainers.tv ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix
new file mode 100644
index 00000000000..71409785b77
--- /dev/null
+++ b/pkgs/development/python-modules/minimock/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, nose
+}:
+
+buildPythonPackage rec {
+ version = "1.2.8";
+ pname = "minimock";
+
+ src = fetchurl {
+ url = "https://bitbucket.org/jab/minimock/get/${version}.zip";
+ sha256 = "c88fa8a7120623f23990a7f086a9657f6ced09025a55e3be8649a30b4945441a";
+ };
+
+ buildInputs = [ nose ];
+
+ checkPhase = "./test";
+
+ meta = with stdenv.lib; {
+ description = "A minimalistic mocking library for python";
+ homepage = https://pypi.python.org/pypi/MiniMock;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix
new file mode 100644
index 00000000000..6a99913c6c8
--- /dev/null
+++ b/pkgs/development/python-modules/mixpanel/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchzip
+, pytest
+, mock
+, six
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ version = "4.0.2";
+ pname = "mixpanel";
+ disabled = isPy3k;
+
+ src = fetchzip {
+ url = "https://github.com/mixpanel/mixpanel-python/archive/${version}.zip";
+ sha256 = "0yq1bcsjzsz7yz4rp69izsdn47rvkld4wki2xmapp8gg2s9i8709";
+ };
+
+ buildInputs = [ pytest mock ];
+ propagatedBuildInputs = [ six ];
+ checkPhase = "py.test tests.py";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/mixpanel/mixpanel-python;
+ description = ''This is the official Mixpanel Python library'';
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix
new file mode 100644
index 00000000000..142383b8db7
--- /dev/null
+++ b/pkgs/development/python-modules/mock/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, unittest2
+, funcsigs
+, six
+, pbr
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "mock";
+ version = "2.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i";
+ };
+
+ buildInputs = [ unittest2 ];
+ propagatedBuildInputs = [ funcsigs six pbr ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Mock objects for Python";
+ homepage = http://python-mock.sourceforge.net/;
+ license = stdenv.lib.licenses.bsd2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix
new file mode 100644
index 00000000000..f0918e4bdb6
--- /dev/null
+++ b/pkgs/development/python-modules/modestmaps/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pillow
+, isPy27
+}:
+
+buildPythonPackage rec {
+ pname = "ModestMaps";
+ version = "1.4.6";
+ disabled = !isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0vyi1m9q4pc34i6rq5agb4x3qicx5sjlbxwmxfk70k2l5mnbjca3";
+ };
+
+ propagatedBuildInputs = [ pillow ];
+
+ meta = with stdenv.lib; {
+ description = "A library for building interactive maps";
+ homepage = http://modestmaps.com;
+ license = stdenv.lib.licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix
new file mode 100644
index 00000000000..b736301e5ef
--- /dev/null
+++ b/pkgs/development/python-modules/monotonic/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "monotonic";
+ version = "1.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "06vw7jwq96106plhlc5vz1v1xvjismdgw9wjyzvzf0ylglnrwiib";
+ };
+
+ __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib";
+
+ patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+ substituteInPlace monotonic.py --replace \
+ "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An implementation of time.monotonic() for Python 2 & < 3.3";
+ homepage = https://github.com/atdt/monotonic;
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index f9d1fee8973..4a32c5e3e37 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "moto";
- version = "1.3.5";
+ version = "1.3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "52426f2567e51ba73fdc7c7d617236b7e7918dca2421caabe13e5290942b53d8";
+ sha256 = "58fe0a0d55cbd9a001c02c146c15790cfcebf010c6648cb9990e6c3204709cbb";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
new file mode 100644
index 00000000000..63613b51686
--- /dev/null
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+, decorator
+, imageio
+, tqdm
+}:
+
+buildPythonPackage rec {
+ pname = "moviepy";
+ version = "0.2.2.11";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "d937d817e534efc54eaee2fc4c0e70b48fcd81e1528cd6425f22178704681dc3";
+ };
+
+ # No tests
+ doCheck = false;
+ propagatedBuildInputs = [ numpy decorator imageio tqdm ];
+
+ meta = with stdenv.lib; {
+ description = "Video editing with Python";
+ homepage = http://zulko.github.io/moviepy/;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mox/default.nix b/pkgs/development/python-modules/mox/default.nix
new file mode 100644
index 00000000000..d9b5a5aa111
--- /dev/null
+++ b/pkgs/development/python-modules/mox/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+}:
+
+buildPythonPackage rec {
+ pname = "mox";
+ version = "0.5.3";
+
+ src = fetchurl {
+ url = "http://pymox.googlecode.com/files/${pname}-${version}.tar.gz";
+ sha256 = "4d18a4577d14da13d032be21cbdfceed302171c275b72adaa4c5997d589a5030";
+ };
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://code.google.com/p/pymox/;
+ description = "A mock object framework for Python";
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix
new file mode 100644
index 00000000000..b7fed9e6ad9
--- /dev/null
+++ b/pkgs/development/python-modules/mozsvc/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, fetchurl
+, pyramid
+, simplejson
+, konfig
+}:
+
+buildPythonPackage rec {
+ pname = "mozsvc";
+ version = "0.8";
+
+ src = fetchgit {
+ url = https://github.com/mozilla-services/mozservices.git;
+ rev = "refs/tags/${version}";
+ sha256 = "1zci2ikk83mf7va88c83dr6snfh4ddjqw0lsg3y29qk5nxf80vx2";
+ };
+
+ patches = stdenv.lib.singleton (fetchurl {
+ url = https://github.com/nbp/mozservices/commit/f86c0b0b870cd8f80ce90accde9e16ecb2e88863.diff;
+ sha256 = "1lnghx821f6dqp3pa382ka07cncdz7hq0mkrh44d0q3grvrlrp9n";
+ });
+
+ doCheck = false; # lazy packager
+ propagatedBuildInputs = [ pyramid simplejson konfig ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/mozilla-services/mozservices;
+ description = "Various utilities for Mozilla apps";
+ license = licenses.mpl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mpd/default.nix b/pkgs/development/python-modules/mpd/default.nix
new file mode 100644
index 00000000000..48693293458
--- /dev/null
+++ b/pkgs/development/python-modules/mpd/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "python-mpd";
+ version = "0.3.0";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "02812eba1d2e0f46e37457f5a6fa23ba203622e4bcab0a19b265e66b08cd21b4";
+ };
+
+ meta = with stdenv.lib; {
+ description = "An MPD (Music Player Daemon) client library written in pure Python";
+ homepage = http://jatreuman.indefero.net/p/python-mpd/;
+ license = licenses.gpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix
new file mode 100644
index 00000000000..3669b8dddbf
--- /dev/null
+++ b/pkgs/development/python-modules/mpd2/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "mpd2";
+ version = "0.5.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
+ };
+
+ buildInputs = [ mock ];
+ patchPhase = ''
+ sed -i -e '/tests_require/d' \
+ -e 's/cmdclass.*/test_suite="mpd_test",/' setup.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Python client module for the Music Player Daemon";
+ homepage = "https://github.com/Mic92/python-mpd2";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ rvl mic92 ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix
new file mode 100644
index 00000000000..50e68352e78
--- /dev/null
+++ b/pkgs/development/python-modules/mpmath/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "mpmath";
+ version = "0.19";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "08ijsr4ifrqv3cjc26mkw0dbvyygsa99in376hr4b96ddm1gdpb8";
+ };
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://mpmath.googlecode.com;
+ description = "A pure-Python library for multiprecision floating arithmetic";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ lovek323 ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix
new file mode 100644
index 00000000000..cd9ca9451b8
--- /dev/null
+++ b/pkgs/development/python-modules/mpv/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "mpv";
+ version = "0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0b9kd70mshdr713f3l1lbnz1q0vlg2y76h5d8liy1bzqm7hjcgfw";
+ };
+
+ buildInputs = [ pkgs.mpv ];
+ patchPhase = "substituteInPlace mpv.py --replace libmpv.so ${pkgs.mpv}/lib/libmpv.so";
+
+ meta = with stdenv.lib; {
+ description = "A python interface to the mpv media player";
+ homepage = "https://github.com/jaseg/python-mpv";
+ license = licenses.agpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix
index e04e9d1e802..06063fd8b99 100644
--- a/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msgpack-numpy";
- version = "0.4.3.1";
+ version = "0.4.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "31fd5dd009bbee7f8b107db8c859e3a0a2793acc196f25ffbbae1e71b4c63ca5";
+ sha256 = "ac15d3a7b9e29d3e10a2683dc00ea495891b9b4cbb502ab0b0d2e516bd0b2eab";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix
new file mode 100644
index 00000000000..32a759a6a49
--- /dev/null
+++ b/pkgs/development/python-modules/msrplib/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchdarcs
+, eventlib
+, application
+, gnutls
+}:
+
+buildPythonPackage rec {
+ pname = "python-msrplib";
+ version = "0.19";
+
+ src = fetchdarcs {
+ url = "http://devel.ag-projects.com/repositories/${pname}";
+ rev = "release-${version}";
+ sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd";
+ };
+
+ propagatedBuildInputs = [ eventlib application gnutls ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/AGProjects/python-msrplib;
+ description = "Client library for MSRP protocol and its relay extension (RFC 4975 and RFC4976)";
+ license = licenses.lgpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/multi_key_dict/default.nix b/pkgs/development/python-modules/multi_key_dict/default.nix
new file mode 100644
index 00000000000..a094b373f8f
--- /dev/null
+++ b/pkgs/development/python-modules/multi_key_dict/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "multi_key_dict";
+ version = "2.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy";
+ };
+
+ meta = with stdenv.lib; {
+ description = "multi_key_dict";
+ homepage = "https://github.com/formiaczek/multi_key_dict";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix
new file mode 100644
index 00000000000..490ff9033ed
--- /dev/null
+++ b/pkgs/development/python-modules/munch/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "munch";
+ version = "2.0.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1420683a94f3a2ffc77935ddd28aa9ccb540dd02b75e02ed7ea863db437ab8b2";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A dot-accessible dictionary (a la JavaScript objects)";
+ license = licenses.mit;
+ homepage = https://github.com/Infinidat/munch;
+ };
+
+}
diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix
new file mode 100644
index 00000000000..af69834dd6f
--- /dev/null
+++ b/pkgs/development/python-modules/munkres/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "munkres";
+ version = "1.0.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c78f803b9b776bfb20a25c9c7bb44adbf0f9202c2024d51aa5969d21e560208d";
+ };
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://bmc.github.com/munkres/;
+ description = "Munkres algorithm for the Assignment Problem";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix
new file mode 100644
index 00000000000..fd8cd516a92
--- /dev/null
+++ b/pkgs/development/python-modules/musicbrainzngs/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "musicbrainzngs";
+ version = "0.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "281388ab750d2996e9feca4580fd4215d616a698e02cd6719cb9b8562945c489";
+ };
+
+ buildInputs = [ pkgs.glibcLocales ];
+
+ LC_ALL="en_US.UTF-8";
+
+ meta = with stdenv.lib; {
+ homepage = http://alastair/python-musicbrainz-ngs;
+ description = "Python bindings for musicbrainz NGS webservice";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix
new file mode 100644
index 00000000000..3fbb36a3718
--- /dev/null
+++ b/pkgs/development/python-modules/mutag/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, isPy3k
+, pyparsing
+}:
+
+buildPythonPackage rec {
+ name = "mutag-0.0.2-2ffa0258ca";
+ disabled = ! isPy3k;
+
+ src = fetchgit {
+ url = "https://github.com/aroig/mutag.git";
+ sha256 = "0axdnwdypfd74a9dnw0g25m16xx1yygyl828xy0kpj8gyqdc6gb1";
+ rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2";
+ };
+
+ propagatedBuildInputs = [ pyparsing ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/aroig/mutag;
+ description = "A script to change email tags in a mu indexed maildir";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix
new file mode 100644
index 00000000000..904284e5b33
--- /dev/null
+++ b/pkgs/development/python-modules/muttils/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "muttils";
+ version = "1.3";
+ disabled = isPy3k;
+
+ src = fetchurl {
+ url = https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2;
+ sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6";
+ };
+
+ # Tests don't work
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Utilities for use with console mail clients, like mutt";
+ homepage = https://www.blacktrash.org/hg/muttils;
+ license = licenses.gpl2Plus;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
index 186bc26f002..3544bd631a5 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -23,8 +23,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Python client library to the MediaWiki API";
- maintainers = with maintainers; [ ];
license = licenses.mit;
homepage = https://github.com/mwclient/mwclient;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/mwlib-ext/default.nix b/pkgs/development/python-modules/mwlib-ext/default.nix
new file mode 100644
index 00000000000..cfcbdc2d0ac
--- /dev/null
+++ b/pkgs/development/python-modules/mwlib-ext/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ version = "0.13.2";
+ pname = "mwlib.ext";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "9229193ee719568d482192d9d913b3c4bb96af7c589d6c31ed4a62caf5054278";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Dependencies for mwlib markup";
+ homepage = "http://pediapress.com/code/";
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mwlib-rl/default.nix b/pkgs/development/python-modules/mwlib-rl/default.nix
new file mode 100644
index 00000000000..21820d95c7f
--- /dev/null
+++ b/pkgs/development/python-modules/mwlib-rl/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mwlib
+, mwlib-ext
+, pygments
+}:
+
+buildPythonPackage rec {
+ version = "0.14.5";
+ pname = "mwlib.rl";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "dddf9603ea0ca5aa87890217709eb5a5b16baeca547db3daad43c3ace73b6bc1";
+ };
+
+ buildInputs = [ mwlib mwlib-ext pygments ];
+
+ meta = with stdenv.lib; {
+ description = "Generate pdfs from mediawiki markup";
+ homepage = "http://pediapress.com/code/";
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/mwlib/default.nix b/pkgs/development/python-modules/mwlib/default.nix
new file mode 100644
index 00000000000..55a19e1a6da
--- /dev/null
+++ b/pkgs/development/python-modules/mwlib/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, apipkg
+, bottle
+, gevent
+, lxml
+, odfpy
+, pillow
+, py
+, pyPdf
+, pyparsing
+, qserve
+, roman
+, simplejson
+, sqlite3dbm
+, timelib
+, pytest
+}:
+
+buildPythonPackage rec {
+ version = "0.16.1";
+ pname = "mwlib";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1dnmnkc21zdfaypskbpvkwl0wpkpn0nagj1fc338w64mbxrk8ny7";
+ };
+
+ propagatedBuildInputs = [ apipkg bottle gevent lxml odfpy pillow py pyPdf pyparsing qserve roman simplejson sqlite3dbm timelib ];
+
+ checkInputs = [ pytest ];
+
+ postPatch = ''
+ sed -i "s/odfpy>=0.9, <0.10/odfpy/" setup.py
+ sed -i "s/pyparsing>=1.4.11,<1.6/pyparsing/" setup.py
+ '';
+
+ checkPhase = ''
+ py.test
+ '';
+
+ # Tests are in build directory but we need extension modules that are in $out
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Library for parsing MediaWiki articles and converting them to different output formats";
+ homepage = "http://pediapress.com/code/";
+ license = licenses.bsd3;
+ # broken = true; # Requires different versions of packages
+ };
+
+}
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
new file mode 100644
index 00000000000..317f79ebe08
--- /dev/null
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, pkgs
+, requests
+, numpy
+, graphviz
+, python
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ inherit (pkgs.mxnet) name version src meta;
+
+ buildInputs = [ pkgs.mxnet ];
+ propagatedBuildInputs = [ requests numpy graphviz ];
+
+ LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ pkgs.mxnet ];
+
+ doCheck = !isPy3k;
+
+ postPatch = ''
+ substituteInPlace python/setup.py \
+ --replace "graphviz<0.9.0" "graphviz<0.10.0" \
+ --replace "numpy<=1.15.0" "numpy<1.16.0" \
+ --replace "requests<2.19.0" "requests<2.20.0"
+ '';
+
+ preConfigure = ''
+ cd python
+ '';
+
+ postInstall = ''
+ rm -rf $out/mxnet
+ ln -s ${pkgs.mxnet}/lib/libmxnet.so $out/${python.sitePackages}/mxnet
+ '';
+
+}
diff --git a/pkgs/development/python-modules/mysql_python/default.nix b/pkgs/development/python-modules/mysql_python/default.nix
new file mode 100644
index 00000000000..a38f7e02e1c
--- /dev/null
+++ b/pkgs/development/python-modules/mysql_python/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, nose
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "MySQL-python";
+ version = "1.2.5";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
+ };
+
+ buildInputs = [ nose ];
+ propagatedBuildInputs = [ pkgs.mysql.connector-c ];
+
+ # plenty of failing tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "MySQL database binding for Python";
+ homepage = https://sourceforge.net/projects/mysql-python;
+ license = licenses.gpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/namebench/default.nix b/pkgs/development/python-modules/namebench/default.nix
new file mode 100644
index 00000000000..a930f250d80
--- /dev/null
+++ b/pkgs/development/python-modules/namebench/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, buildPythonPackage
+, isPy3k
+, isPyPy
+, fetchurl
+, tkinter
+}:
+
+buildPythonPackage rec {
+ pname = "namebench";
+ version = "1.3.1";
+ disabled = isPy3k || isPyPy;
+
+ src = fetchurl {
+ url = "http://namebench.googlecode.com/files/${pname}-${version}-source.tgz";
+ sha256 = "09clbcd6wxgk4r6qw7hb78h818mvca7lijigy1mlq5y1f3lgkk1h";
+ };
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ propagatedBuildInputs = [ tkinter ];
+
+ # namebench expects to be run from its own source tree (it uses relative
+ # paths to various resources), make it work.
+ postInstall = ''
+ sed -i "s|import os|import os; os.chdir(\"$out/namebench\")|" "$out/bin/namebench.py"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://namebench.googlecode.com/;
+ description = "Find fastest DNS servers available";
+ license = with licenses; [
+ asl20
+ # third-party program licenses (embedded in the sources)
+ "LGPL" # Crystal_Clear
+ free # dns
+ asl20 # graphy
+ "BSD" # jinja2
+ ];
+ longDescription = ''
+ It hunts down the fastest DNS servers available for your computer to
+ use. namebench runs a fair and thorough benchmark using your web
+ browser history, tcpdump output, or standardized datasets in order
+ to provide an individualized recommendation. namebench is completely
+ free and does not modify your system in any way.
+ '';
+ };
+
+}
diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix
new file mode 100644
index 00000000000..a3e67fa7b98
--- /dev/null
+++ b/pkgs/development/python-modules/nameparser/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "nameparser";
+ version = "0.3.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A simple Python module for parsing human names into their individual components";
+ homepage = https://github.com/derek73/python-nameparser;
+ license = licenses.lgpl21Plus;
+ };
+
+}
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 9933e849d0b..24016ef8b10 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "ncclient";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "6616828f9c5d318906dae22378a78342bbfa5983f1775c1af8bfecc779434c38";
+ sha256 = "3ab58ee0d71069cb5b0e2f29a4e605d1d8417bd10af45b73ee3e817fe389fadc";
};
checkInputs = [ nose rednose ];
diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix
new file mode 100644
index 00000000000..780f2c33086
--- /dev/null
+++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pyopenssl
+}:
+
+buildPythonPackage rec {
+ version = "0.4.2";
+ pname = "ndg-httpsclient";
+
+ propagatedBuildInputs = [ pyopenssl ];
+
+ src = fetchFromGitHub {
+ owner = "cedadev";
+ repo = "ndg_httpsclient";
+ rev = version;
+ sha256 = "1kk4knv029j0cicfiv23c1rayc1n3f1j3rhl0527gxiv0qv4jw8h";
+ };
+
+ # uses networking
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/cedadev/ndg_httpsclient/;
+ description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix
new file mode 100644
index 00000000000..eed3d758054
--- /dev/null
+++ b/pkgs/development/python-modules/netaddr/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "netaddr";
+ version = "0.7.19";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd";
+ };
+
+ LC_ALL = "en_US.UTF-8";
+ buildInputs = [ pkgs.glibcLocales pytest ];
+
+ checkPhase = ''
+ py.test netaddr/tests
+ '';
+
+ patches = [
+ (pkgs.fetchpatch {
+ url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch;
+ sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39";
+ })
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/drkjam/netaddr/;
+ description = "A network address manipulation library for Python";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix
new file mode 100644
index 00000000000..8f762fb0c3d
--- /dev/null
+++ b/pkgs/development/python-modules/netifaces/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "0.10.6";
+ pname = "netifaces";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1q7bi5k2r955rlcpspx4salvkkpk28jky67fjbpz2dkdycisak8c";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://alastairs-place.net/projects/netifaces/;
+ description = "Portable access to network interfaces from Python";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/pkgs/development/python-modules/neuronpy/default.nix
new file mode 100644
index 00000000000..1d258effda7
--- /dev/null
+++ b/pkgs/development/python-modules/neuronpy/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+, matplotlib
+, scipy
+, isPy27
+}:
+
+buildPythonPackage rec {
+ pname = "neuronpy";
+ version = "0.1.6";
+ disabled = !isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1clhc2b5fy2l8nfrji4dagmj9419nj6kam090yqxhq5c28sngk25";
+ };
+
+ propagatedBuildInputs = [ numpy matplotlib scipy ];
+
+ #No tests included
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Interfaces and utilities for the NEURON simulator and analysis of neural data";
+ maintainers = [ maintainers.nico202 ];
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/nine/default.nix b/pkgs/development/python-modules/nine/default.nix
new file mode 100644
index 00000000000..a6b163ed456
--- /dev/null
+++ b/pkgs/development/python-modules/nine/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "nine";
+ version = "0.3.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1zrsbm0hajfvklkhgysp81hy632a3bdakp31m0lcpd9xbp5265zy";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Let's write Python 3 right now!";
+ homepage = "https://github.com/nandoflorestan/nine";
+ license = licenses.free;
+ };
+
+}
diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix
new file mode 100644
index 00000000000..8ff7bbe2416
--- /dev/null
+++ b/pkgs/development/python-modules/nipy/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, nose
+, matplotlib
+, nibabel
+, numpy
+, scipy
+, sympy
+, python
+}:
+
+buildPythonPackage rec {
+ version = "0.4.0";
+ pname = "nipy";
+ disabled = pythonOlder "2.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1hnbn2i4fjxflaaz082s2c57hfp59jfra1zayz1iras5p2dy21nr";
+ };
+
+ buildInputs = stdenv.lib.optional doCheck [ nose ];
+ propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ];
+
+ checkPhase = '' # wants to be run in a different directory
+ mkdir nosetests
+ cd nosetests
+ ${python.interpreter} -c "import nipy; nipy.test()"
+ rm -rf .
+ '';
+
+ # failing test:
+ # nipy.algorithms.statistics.models.tests.test_olsR.test_results(11.593139639404727, 11.593140144880794, 6) # disagrees by 1 at 6th decimal place
+ # erroring tests:
+ # nipy.modalities.fmri.fmristat.tests.test_FIAC.test_altprotocol
+ # nipy.modalities.fmri.fmristat.tests.test_FIAC.test_agreement
+ # nipy.tests.test_scripts.test_nipy_4d_realign # because `nipy_4d_realign` script isn't found at test time; works from nix-shell, so could be patched
+ # nipy.tests.test_scripts.test_nipy_3_4d # ditto re.: `nipy_3_4d` script
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://nipy.org/nipy/;
+ description = "Software for structural and functional neuroimaging analysis";
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index a092123da82..3d8258aeb7b 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -36,11 +36,11 @@ assert !isPy3k -> configparser != null;
buildPythonPackage rec {
pname = "nipype";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "f2fe29bf863cb643bd5c8d2bdeaaf488308c293c9fb9913bc7a9504dc3bf8db6";
+ sha256 = "c14856f3d4823aa5d63d0c19e8f04d70c74e156361ce607d86694046bab06806";
};
# see https://github.com/nipy/nipype/issues/2240
diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix
new file mode 100644
index 00000000000..71c142436d9
--- /dev/null
+++ b/pkgs/development/python-modules/nixpkgs/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pbr
+, pythonix
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+ pname = "nixpkgs";
+ version = "0.2.2";
+ disabled = ! pythonAtLeast "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
+ };
+
+ buildInputs = [ pbr ];
+ propagatedBuildInputs = [ pythonix ];
+
+ meta = with stdenv.lib; {
+ description = "Allows to `from nixpkgs import` stuff in interactive Python sessions";
+ homepage = http://github.com/t184256/nixpkgs-python-importer;
+ license = licenses.mit;
+ maintainers = with maintainers; [ t184256 ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix
new file mode 100644
index 00000000000..273c0ab042f
--- /dev/null
+++ b/pkgs/development/python-modules/nose-cover3/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "nose-cover3";
+ version = "0.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1";
+ };
+
+ propagatedBuildInputs = [ nose ];
+
+ # No tests included
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Coverage 3.x support for Nose";
+ homepage = https://github.com/ask/nosecover3;
+ license = licenses.lgpl21;
+ };
+
+}
diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix
new file mode 100644
index 00000000000..efafd6333db
--- /dev/null
+++ b/pkgs/development/python-modules/nose-cprof/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+
+buildPythonPackage rec {
+ pname = "nose-cprof";
+ version = "0.1.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0ayy5mbjly9aa9dkgpz0l06flspnxmnj6wxdl6zr59byrrr8fqhw";
+ };
+
+ buildInputs = [ nose ];
+
+ meta = with stdenv.lib; {
+ description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler";
+ homepage = https://github.com/msherry/nose-cprof;
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix
new file mode 100644
index 00000000000..bec5156d22e
--- /dev/null
+++ b/pkgs/development/python-modules/nose/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+, coverage
+}:
+
+buildPythonPackage rec {
+ version = "1.3.7";
+ pname = "nose";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98";
+ };
+
+ propagatedBuildInputs = [ coverage ];
+
+ doCheck = false; # lot's of transient errors, too much hassle
+ checkPhase = if python.is_py3k or false then ''
+ ${python}/bin/${python.executable} setup.py build_tests
+ '' else "" + ''
+ rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062
+ ${python}/bin/${python.executable} selftest.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A unittest-based testing framework for python that makes writing and running tests easier";
+ homepage = http://readthedocs.org/docs/nose/;
+ license = licenses.lgpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix
new file mode 100644
index 00000000000..9d5c1675359
--- /dev/null
+++ b/pkgs/development/python-modules/nose2/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "nose2";
+ version = "0.5.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr";
+ };
+
+ propagatedBuildInputs = [ six ];
+ # AttributeError: 'module' object has no attribute 'collector'
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "nose2 is the next generation of nicer testing for Python";
+ homepage = https://github.com/nose-devs/nose2;
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix
new file mode 100644
index 00000000000..82c01e8643f
--- /dev/null
+++ b/pkgs/development/python-modules/nosejs/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "NoseJS";
+ version = "0.9.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy";
+ };
+
+ buildInputs = [ nose ];
+
+ checkPhase = ''
+ nosetests -v
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://pypi.org/project/NoseJS/;
+ description = "A Nose plugin for integrating JavaScript tests into a Python test suite";
+ license = licenses.free;
+ };
+
+}
diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix
new file mode 100644
index 00000000000..aa238bce79a
--- /dev/null
+++ b/pkgs/development/python-modules/nosexcover/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, coverage
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "nosexcover";
+ version = "1.0.10";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "f5b3a7c936c4f703f15418c1f325775098184b69fa572f868edb8a99f8f144a8";
+ };
+
+ propagatedBuildInputs = [ coverage nose ];
+
+ meta = with stdenv.lib; {
+ description = "Extends nose.plugins.cover to add Cobertura-style XML reports";
+ homepage = https://github.com/cmheisel/nose-xcover/;
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix
new file mode 100644
index 00000000000..f87424b439c
--- /dev/null
+++ b/pkgs/development/python-modules/notify/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchurl
+, python
+, pygobject2
+, pygtk
+, pkgs
+}:
+
+stdenv.mkDerivation rec {
+ name = "python-notify-${version}";
+ version = "0.1.1";
+
+ src = fetchurl {
+ url = http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2;
+ sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx";
+ };
+
+ patches = stdenv.lib.singleton (fetchurl {
+ name = "libnotify07.patch";
+ url = "http://src.fedoraproject.org/cgit/notify-python.git/plain/"
+ + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c";
+ sha256 = "1lqdli13mfb59xxbq4rbq1f0znh6xr17ljjhwmzqb79jl3dig12z";
+ });
+
+ postPatch = ''
+ sed -i -e '/^PYGTK_CODEGEN/s|=.*|="${pygtk}/bin/pygtk-codegen-2.0"|' \
+ configure
+ '';
+
+ nativeBuildInputs = [ pkgs.pkgconfig ];
+ buildInputs = [ python pygobject2 pygtk pkgs.libnotify pkgs.glib pkgs.gtk2 pkgs.dbus-glib ];
+
+ postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
+
+ meta = with stdenv.lib; {
+ description = "Python bindings for libnotify";
+ homepage = http://www.galago-project.org/;
+ license = licenses.lgpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix
new file mode 100644
index 00000000000..207e59b8501
--- /dev/null
+++ b/pkgs/development/python-modules/notmuch/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, pkgs
+, python
+}:
+
+buildPythonPackage rec {
+ name = "python-${pkgs.notmuch.name}";
+
+ src = pkgs.notmuch.src;
+
+ sourceRoot = pkgs.notmuch.pythonSourceRoot;
+
+ buildInputs = [ python pkgs.notmuch ];
+
+ postPatch = ''
+ sed -i -e '/CDLL/s@"libnotmuch\.@"${pkgs.notmuch}/lib/libnotmuch.@' \
+ notmuch/globals.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Python wrapper around notmuch";
+ homepage = https://notmuchmail.org/;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ garbas ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/ntfy/default.nix b/pkgs/development/python-modules/ntfy/default.nix
new file mode 100644
index 00000000000..5d54b0928b6
--- /dev/null
+++ b/pkgs/development/python-modules/ntfy/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, appdirs
+, pyyaml
+, requests
+, dbus-python
+, emoji
+, sleekxmpp
+, mock
+}:
+
+buildPythonPackage rec {
+ version = "1.2.0";
+ pname = "ntfy";
+
+ src = fetchFromGitHub {
+ owner = "dschep";
+ repo = "ntfy";
+ rev = "v${version}";
+ sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc";
+ };
+
+ propagatedBuildInputs = [ appdirs pyyaml requests dbus-python emoji sleekxmpp mock ];
+
+ meta = with stdenv.lib; {
+ description = "A utility for sending notifications, on demand and when commands finish";
+ homepage = http://ntfy.rtfd.org/;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ kamilchm ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix
new file mode 100644
index 00000000000..d6506ae4b4a
--- /dev/null
+++ b/pkgs/development/python-modules/ntplib/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "ntplib";
+ version = "0.3.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede";
+ };
+
+ # Require networking
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Python NTP library";
+ homepage = http://code.google.com/p/ntplib/;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
new file mode 100644
index 00000000000..55eb4e7c97e
--- /dev/null
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, vmprof
+, pyqt4
+, scons
+, isPyPy
+, pkgs
+}:
+
+let
+ # scons is needed but using it requires Python 2.7
+ # Therefore we create a separate env for it.
+ scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]);
+in buildPythonPackage rec {
+ version = "0.5.25";
+ pname = "Nuitka";
+
+ # Latest version is not yet on PyPi
+ src = fetchurl {
+ url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz";
+ sha256 = "11psz0pyj56adv4b3f47hl8jakvp2mc2c85s092a5rsv1la1a0aa";
+ };
+
+ buildInputs = stdenv.lib.optionals doCheck [ vmprof pyqt4 ];
+
+ propagatedBuildInputs = [ scons ];
+
+ postPatch = ''
+ patchShebangs tests/run-tests
+ '' + stdenv.lib.optionalString stdenv.isLinux ''
+ substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.utillinux.out}/lib/libuuid.so"'
+ '';
+
+ # We do not want any wrappers here.
+ postFixup = '''';
+
+ checkPhase = ''
+ tests/run-tests
+ '';
+
+ # Problem with a subprocess (parts)
+ doCheck = false;
+
+ # Requires CPython
+ disabled = isPyPy;
+
+ meta = with stdenv.lib; {
+ description = "Python compiler with full language support and CPython compatibility";
+ license = licenses.asl20;
+ homepage = http://nuitka.net/;
+ };
+
+}
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index c66650c0abf..87428f4563d 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "numpy";
- version = "1.15.1";
+ version = "1.15.2";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "7b9e37f194f8bcdca8e9e6af92e2cbad79e360542effc2dd6b98d63955d8d8a3";
+ sha256 = "27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1";
};
disabled = isPyPy;
diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix
new file mode 100644
index 00000000000..c9b523a266b
--- /dev/null
+++ b/pkgs/development/python-modules/nxt-python/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, isPy3k
+, pyusb
+, pybluez
+, pyfantom
+, git
+}:
+
+buildPythonPackage rec {
+ version = "unstable-20160819";
+ pname = "nxt-python";
+ disabled = isPy3k;
+
+ src = fetchgit {
+ url = "http://github.com/Eelviny/nxt-python";
+ rev = "479e20b7491b28567035f4cee294c4a2af629297";
+ sha256 = "0mcsajhgm2wy4iy2lhmyi3xibgmbixbchanzmlhsxk6qyjccn9r9";
+ branchName= "pyusb";
+ };
+
+ propagatedBuildInputs = [ pyusb pybluez pyfantom git ];
+
+ # Tests fail on Mac dependency
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Python driver/interface for Lego Mindstorms NXT robot";
+ homepage = https://github.com/Eelviny/nxt-python;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ leenaars ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/oauth/default.nix b/pkgs/development/python-modules/oauth/default.nix
new file mode 100644
index 00000000000..a8e5c8bf53d
--- /dev/null
+++ b/pkgs/development/python-modules/oauth/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "oauth";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0pdgi35hczsslil4890xqawnbpdazkgf2v1443847h5hy2gq2sg7";
+ };
+
+ # No tests included in archive
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://code.google.com/p/oauth;
+ description = "Library for OAuth version 1.0a";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix
new file mode 100644
index 00000000000..e01ef7c902d
--- /dev/null
+++ b/pkgs/development/python-modules/oauth2/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, httplib2
+, mock
+, coverage
+}:
+
+buildPythonPackage rec {
+ pname = "oauth2";
+ version = "1.9.0.post1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c006a85e7c60107c7cc6da1b184b5c719f6dd7202098196dfa6e55df669b59bf";
+ };
+
+ propagatedBuildInputs = [ httplib2 ];
+ buildInputs = [ mock coverage ];
+
+ # ServerNotFoundError: Unable to find the server at oauth-sandbox.sevengoslings.net
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/simplegeo/python-oauth2";
+ description = "Library for OAuth version 1.0";
+ license = licenses.mit;
+ maintainers = with maintainers; [ garbas ];
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix
index 81742a99da8..8500b53b244 100644
--- a/pkgs/development/python-modules/oauth2client/default.nix
+++ b/pkgs/development/python-modules/oauth2client/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "oauth2client";
- version = "4.1.2";
+ version = "4.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "bd3062c06f8b10c6ef7a890b22c2740e5f87d61b6e1f4b1c90d069cdfc9dadb5";
+ sha256 = "d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6";
};
propagatedBuildInputs = [ six httplib2 pyasn1-modules rsa ];
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
new file mode 100644
index 00000000000..61259764bec
--- /dev/null
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, mock
+, nose
+, unittest2
+, cryptography
+, blinker
+, pyjwt
+}:
+
+buildPythonPackage rec {
+ version = "2.0.0";
+ pname = "oauthlib";
+
+ src = fetchurl {
+ url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz";
+ sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf";
+ };
+
+ buildInputs = [ mock nose unittest2 ];
+ propagatedBuildInputs = [ cryptography blinker pyjwt ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/idan/oauthlib;
+ downloadPage = https://github.com/idan/oauthlib/releases;
+ description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
+ maintainers = with maintainers; [ prikhi ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix
new file mode 100644
index 00000000000..2f435201d21
--- /dev/null
+++ b/pkgs/development/python-modules/obfsproxy/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, pyptlib
+, argparse
+, twisted
+, pycrypto
+, pyyaml
+}:
+
+buildPythonPackage rec {
+ pname = "obfsproxy";
+ version = "0.2.13";
+
+ src = fetchgit {
+ url = meta.repositories.git;
+ rev = "refs/tags/${pname}-${version}";
+ sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'"
+ substituteInPlace setup.py --replace "argparse" ""
+ '';
+
+ propagatedBuildInputs = [ pyptlib argparse twisted pycrypto pyyaml ];
+
+ # No tests in archive
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A pluggable transport proxy";
+ homepage = https://www.torproject.org/projects/obfsproxy;
+ repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git;
+ maintainers = with maintainers; [ phreedom thoughtpolice ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix
new file mode 100644
index 00000000000..6d26d71141d
--- /dev/null
+++ b/pkgs/development/python-modules/objgraph/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+, isPyPy
+}:
+
+buildPythonPackage rec {
+ pname = "objgraph";
+ version = "2.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a";
+ };
+
+ # Tests fail with PyPy.
+ disabled = isPyPy;
+
+ propagatedBuildInputs = [pkgs.graphviz];
+
+ meta = with stdenv.lib; {
+ description = "Draws Python object reference graphs with graphviz";
+ homepage = https://mg.pov.lt/objgraph/;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/offtrac/default.nix b/pkgs/development/python-modules/offtrac/default.nix
new file mode 100644
index 00000000000..e098ecc8c31
--- /dev/null
+++ b/pkgs/development/python-modules/offtrac/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "offtrac";
+ version = "0.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "06vd010pa1z7lyfj1na30iqzffr4kzj2k2sba09spik7drlvvl56";
+ };
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://fedorahosted.org/offtrac;
+ description = "Trac xmlrpc library";
+ license = licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix
new file mode 100644
index 00000000000..9b88a71c5cc
--- /dev/null
+++ b/pkgs/development/python-modules/openant/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pyusb
+}:
+
+buildPythonPackage rec {
+ pname = "openant-unstable";
+ version = "2017-02-11";
+
+ src = fetchFromGitHub {
+ owner = "Tigge";
+ repo = "openant";
+ rev = "ed89281e37f65d768641e87356cef38877952397";
+ sha256 = "1g81l9arqdy09ijswn3sp4d6i3z18d44lzyb78bwnvdb14q22k19";
+ };
+
+ # Removes some setup.py hacks intended to install udev rules.
+ # We do the job ourselves in postInstall below.
+ postPatch = ''
+ sed -i -e '/cmdclass=.*/d' setup.py
+ '';
+
+ postInstall = ''
+ install -dm755 "$out/etc/udev/rules.d"
+ install -m644 resources/ant-usb-sticks.rules "$out/etc/udev/rules.d/99-ant-usb-sticks.rules"
+ '';
+
+ propagatedBuildInputs = [ pyusb ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/Tigge/openant";
+ description = "ANT and ANT-FS Python Library";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index 6445201c40b..034fa8e6791 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "openpyxl";
- version = "2.5.6";
+ version = "2.5.8";
src = fetchPypi {
inherit pname version;
- sha256 = "04091e034911a0afc531c3a15e5ae0b1b6a43654dbf63c187f47d20cdfefac1c";
+ sha256 = "22904d7bdfaaab33d65d50a0915a65eeb2f29c85d9ec53081563850678a29927";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix
index 4044ad3f2fd..233a4d44c43 100644
--- a/pkgs/development/python-modules/ordered-set/default.nix
+++ b/pkgs/development/python-modules/ordered-set/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "ordered-set";
- version = "3.0.1";
+ version = "3.0.2";
buildInputs = [ pytest pytestrunner ];
src = fetchPypi {
inherit pname version;
- sha256 = "0yyfkkfzpwlx4jlfqzb7p1xpzmn2jyzq2qlakqx62pxizfzxfvrx";
+ sha256 = "7d292b866fa44f339ac6e624e3d338accfb415ce0a8431595d51990fbdf61d3b";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/ordereddict/default.nix b/pkgs/development/python-modules/ordereddict/default.nix
new file mode 100644
index 00000000000..27bdd728bbe
--- /dev/null
+++ b/pkgs/development/python-modules/ordereddict/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "ordereddict";
+ version = "1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "07qvy11nvgxpzarrni3wrww3vpc9yafgi2bch4j2vvvc42nb8d8w";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ garbas ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix
new file mode 100644
index 00000000000..87bd6ee258c
--- /dev/null
+++ b/pkgs/development/python-modules/osc/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, pkgs
+, urlgrabber
+, m2crypto
+, pyyaml
+, lxml
+}:
+
+buildPythonPackage {
+ pname = "osc";
+ version = "0.162.0-55-gb730f88";
+ disabled = isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "openSUSE";
+ repo = "osc";
+ rev = "b730f880cfe85a8547f569355a21706f27ebfa78";
+ sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh";
+ };
+
+ buildInputs = [ pkgs.bashInteractive ]; # needed for bash-completion helper
+ propagatedBuildInputs = [ urlgrabber m2crypto pyyaml lxml ];
+
+ postInstall = ''
+ ln -s $out/bin/osc-wrapper.py $out/bin/osc
+ install -D -m444 osc.fish $out/etc/fish/completions/osc.fish
+ install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper
+ mkdir -p $out/share/bash-completion/completions
+ cat >>$out/share/bash-completion/completions/osc </dev/null 2>&1 || return
+ complete -r _nullcommand >/dev/null 2>&1 || return
+ complete -o default -C $out/share/bash-completion/helpers/osc-helper osc
+ EOF
+ '';
+
+ meta = with stdenv.lib; {
+ description = "opensuse-commander with svn like handling";
+ maintainers = [ maintainers.peti ];
+ license = licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix
new file mode 100644
index 00000000000..05254e4fd43
--- /dev/null
+++ b/pkgs/development/python-modules/pamela/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "pamela";
+ version = "0.3.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y";
+ };
+
+ postUnpack = ''
+ substituteInPlace $sourceRoot/pamela.py --replace \
+ 'find_library("pam")' \
+ '"${stdenv.lib.getLib pkgs.pam}/lib/libpam.so"'
+ '';
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "PAM interface using ctypes";
+ homepage = "https://github.com/minrk/pamela";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
new file mode 100644
index 00000000000..e41ec9689d2
--- /dev/null
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -0,0 +1,48 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, cryptography
+, bcrypt
+, pynacl
+, pyasn1
+, python
+, pytest
+, pytest-relaxed
+, mock
+, isPyPy
+, isPy33
+}:
+
+buildPythonPackage rec {
+ pname = "paramiko";
+ version = "2.4.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a8975a7df3560c9f1e2b43dc54ebd40fd00a7017392ca5445ce7df409f900fcb";
+ };
+
+ checkInputs = [ pytest mock pytest-relaxed ];
+ propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ];
+
+ __darwinAllowLocalNetworking = true;
+
+ # 2 sftp tests fail (skip for now)
+ checkPhase = ''
+ pytest tests --ignore=tests/test_sftp.py
+ '';
+
+ meta = with pkgs.lib; {
+ homepage = "https://github.com/paramiko/paramiko/";
+ description = "Native Python SSHv2 protocol library";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ aszlig ];
+
+ longDescription = ''
+ This is a library for making SSH2 connections (client or server).
+ Emphasis is on using SSH2 as an alternative to SSL for making secure
+ connections between python scripts. All major ciphers and hash methods
+ are supported. SFTP client and server mode are both supported too.
+ '';
+ };
+}
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 718393b5e1e..f537b8d8e31 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "paramz";
- version = "0.9.2";
+ version = "0.9.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "7b38c2487602c423ac402214c3b3fa6bbe22b294e2f9e5f9f3842182e1541599";
+ sha256 = "179ca77a965e6e724217257793e3c8c022285ea2190a85e0826ac98dea316219";
};
propagatedBuildInputs = [ numpy scipy six decorator ];
diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix
new file mode 100644
index 00000000000..55d7afd9fa4
--- /dev/null
+++ b/pkgs/development/python-modules/path-and-address/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+}:
+
+buildPythonPackage rec {
+ version = "2.0.1";
+ pname = "path-and-address";
+
+ src = fetchFromGitHub {
+ owner = "joeyespo";
+ repo = "path-and-address";
+ rev = "v${version}";
+ sha256 = "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6";
+ };
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Functions for server CLI applications used by humans";
+ homepage = https://github.com/joeyespo/path-and-address;
+ license = licenses.mit;
+ maintainers = with maintainers; [ koral];
+ };
+
+}
diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index 412186e6075..c85b29eac85 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -8,7 +8,7 @@
, mock
}:
-if !(pythonOlder "3.4") then null else buildPythonPackage rec {
+buildPythonPackage rec {
pname = "pathlib2";
version = "2.3.2";
diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix
index 15ff1b32241..39a2789a360 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "pathspec";
- version = "0.5.7";
+ version = "0.5.9";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "69ac7869c9ce308cfe631e29c09f9da60fae02baf31418885bbbb0c75adcd8c5";
+ sha256 = "54a5eab895d89f342b52ba2bffe70930ef9f8d96e398cccf530d21fa0516a873";
};
meta = {
diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix
new file mode 100644
index 00000000000..8709662e6a1
--- /dev/null
+++ b/pkgs/development/python-modules/pathtools/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "pathtools";
+ version = "0.1.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Pattern matching and various utilities for file systems paths";
+ homepage = https://github.com/gorakhargosh/pathtools;
+ license = licenses.mit;
+ maintainers = with maintainers; [ goibhniu ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix
new file mode 100644
index 00000000000..acdb68c0281
--- /dev/null
+++ b/pkgs/development/python-modules/paver/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, cogapp
+, mock
+, virtualenv
+}:
+
+buildPythonPackage rec {
+ version = "1.2.2";
+ pname = "Paver";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0lix9d33ndb3yk56sm1zlj80fbmxp0w60yk0d9pr2xqxiwi88sqy";
+ };
+
+ buildInputs = [ cogapp mock virtualenv ];
+
+ propagatedBuildInputs = [ nose ];
+
+ # the tests do not pass
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A Python-based build/distribution/deployment scripting tool";
+ homepage = https://github.com/paver/paver;
+ maintainers = with maintainers; [ lovek323 ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix
new file mode 100644
index 00000000000..5a07fc217a9
--- /dev/null
+++ b/pkgs/development/python-modules/peppercorn/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "peppercorn";
+ version = "0.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "921cba5d51fa211e6da0fbd2120b9a98d663422a80f5bb669ad81ffb0909774b";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A library for converting a token stream into a data structure for use in web form posts";
+ homepage = https://docs.pylonsproject.org/projects/peppercorn/en/latest/;
+ maintainers = with maintainers; [ garbas domenkozar ];
+ platforms = platforms.all;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
new file mode 100644
index 00000000000..f7efec5c70e
--- /dev/null
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "pex";
+ version = "1.2.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1m0gx9182w1dybkyjwwjyd6i87x2dzv252ks2fj8yn6avlcp5z4q";
+ };
+
+ prePatch = ''
+ substituteInPlace setup.py --replace 'SETUPTOOLS_REQUIREMENT,' '"setuptools"'
+ '';
+
+ # A few more dependencies I don't want to handle right now...
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A library and tool for generating .pex (Python EXecutable) files";
+ homepage = "https://github.com/pantsbuild/pex";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ copumpkin ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index a6ca8fae7cb..01c387928f5 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.9.12";
+ version = "8.9.15";
src = fetchPypi {
inherit pname version;
- sha256 = "39cd0c67a17a9ca4c2851ab8fad5272948d811ccd2a8e52ddcc8d275a802af70";
+ sha256 = "8e9664ce0a838c81f4fb3e4d271c76859d26bde57242d64fe1632ab636f5319f";
};
meta = {
diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix
new file mode 100644
index 00000000000..e32051bc26f
--- /dev/null
+++ b/pkgs/development/python-modules/pillowfight/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pillow
+}:
+
+buildPythonPackage rec {
+ pname = "pillowfight";
+ version = "0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1mh1nhcjjgv7x134sv0krri59ng8bp2w6cwsxc698rixba9f3g0m";
+ };
+
+ propagatedBuildInputs = [ pillow ];
+
+ meta = with stdenv.lib; {
+ description = "Pillow Fight";
+ homepage = "https://github.com/beanbaginc/pillowfight";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
new file mode 100644
index 00000000000..74b6dd78bb3
--- /dev/null
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "pint";
+ version = "0.7.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1bbp5s34gcb9il2wyz4spznshahwbjvwi5bhjm7bnxk358spvf9q";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Physical quantities module";
+ license = licenses.bsd3;
+ homepage = "https://github.com/hgrecco/pint/";
+ };
+
+}
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index f5732d2cb95..7fc5adee7fb 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pip";
- version = "18.0";
+ version = "18.1";
src = fetchPypi {
inherit pname version;
- sha256 = "a0e11645ee37c90b40c46d607070c4fd583e2cd46231b1c06e389c5e814eed76";
+ sha256 = "c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1";
};
# pip detects that we already have bootstrapped_pip "installed", so we need
diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix
new file mode 100644
index 00000000000..21561fab035
--- /dev/null
+++ b/pkgs/development/python-modules/plyvel/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+, pytest
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "plyvel";
+ version = "0.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1scq75qyks9vmjd19bx57f2y60mkdr44ajvb12p3cjg439l96zaq";
+ };
+
+ buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest;
+
+ # no tests for python2
+ doCheck = isPy3k;
+
+ meta = with stdenv.lib; {
+ description = "Fast and feature-rich Python interface to LevelDB";
+ homepage = https://github.com/wbolster/plyvel;
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pocket/default.nix b/pkgs/development/python-modules/pocket/default.nix
new file mode 100644
index 00000000000..e351d26ca48
--- /dev/null
+++ b/pkgs/development/python-modules/pocket/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "pocket";
+ version = "0.3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1fc9vc5nyzf1kzmnrs18dmns7nn8wjfrg7br1w4c5sgs35mg2ywh";
+ };
+
+ buildInputs = [ requests ];
+
+ meta = with stdenv.lib; {
+ description = "Wrapper for the pocket API";
+ homepage = "https://github.com/tapanpandita/pocket";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ ericsagnes ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/poezio/fix_gnupg_import.patch b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch
deleted file mode 100644
index d75e09b722b..00000000000
--- a/pkgs/development/python-modules/poezio/fix_gnupg_import.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur poezio-0.10.orig/plugins/gpg/__init__.py poezio-0.10/plugins/gpg/__init__.py
---- poezio-0.10.orig/plugins/gpg/__init__.py 2016-07-27 19:02:41.000000000 +0200
-+++ poezio-0.10/plugins/gpg/__init__.py 2016-11-16 14:17:06.011128631 +0100
-@@ -105,7 +105,7 @@
- .. _XEP-0027: http://xmpp.org/extensions/xep-0027.html
-
- """
--from gpg import gnupg
-+import slixmpp.thirdparty.gnupg as gnupg
- from slixmpp.xmlstream.stanzabase import JID
-
- from xml.etree import cElementTree as ET
diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix
new file mode 100644
index 00000000000..5a05f2dcafa
--- /dev/null
+++ b/pkgs/development/python-modules/poyo/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "0.4.0";
+ pname = "poyo";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1f48ffl0j1f2lmgabajps7v8w90ppxbp5168gh8kh27bjd8xk5ca";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/hackebrot/poyo;
+ description = "A lightweight YAML Parser for Python";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix
new file mode 100644
index 00000000000..0c76974e5d9
--- /dev/null
+++ b/pkgs/development/python-modules/pudb/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pygments
+, urwid
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "pudb";
+ version = "2016.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0njhi49d9fxbwh5p8yjx8m3jlfyzfm00b5aff6bz473pn7vxfn79";
+ };
+
+ propagatedBuildInputs = [ pygments urwid ];
+
+ # Tests fail on python 3 due to writes to the read-only home directory
+ doCheck = !isPy3k;
+
+ meta = with stdenv.lib; {
+ description = "A full-screen, console-based Python debugger";
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 296b20fac4a..34134546f56 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pvlib";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1897v9qq97nk5n0hfm9089yz8pffd42795mnhcyq48g9bsyap1xi";
+ sha256 = "1j2p6w41hv7k604jbcpxvs5f04y8dsfdvd3d202l60ks0fc0agyj";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index 7f9cbf9518e..9f4f6627e2c 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -1,12 +1,12 @@
{ buildPythonPackage, stdenv, lxml, click, fetchPypi }:
buildPythonPackage rec {
- version = "0.3.10";
+ version = "0.3.11";
pname = "pyaxmlparser";
src = fetchPypi {
inherit pname version;
- sha256 = "5c1f569f4dc2232d7f146eb190bc513373ff6555f97ae904740f966f0fb2dd77";
+ sha256 = "dbe5ca9ddcf2f5041f6e5e3acc81d2940c696db89de4f840535a256e78f5e489";
};
propagatedBuildInputs = [ lxml click ];
diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix
new file mode 100644
index 00000000000..6ceca20fdd1
--- /dev/null
+++ b/pkgs/development/python-modules/pybluez/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pkgs
+}:
+
+buildPythonPackage rec {
+ version = "unstable-20160819";
+ pname = "pybluez";
+
+ propagatedBuildInputs = [ pkgs.bluez ];
+
+ src = fetchFromGitHub {
+ owner = "karulis";
+ repo = "${pname}";
+ rev = "a0b226a61b166e170d48539778525b31e47a4731";
+ sha256 = "104dm5ngfhqisv1aszdlr3szcav2g3bhsgzmg4qfs09b3i5zj047";
+ };
+
+ # the tests do not pass
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Bluetooth Python extension module";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ leenaars ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix
new file mode 100644
index 00000000000..9a6a3f4be2e
--- /dev/null
+++ b/pkgs/development/python-modules/pycallgraph/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "pycallgraph";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0w8yr43scnckqcv5nbyd2dq4kpv74ai856lsdsf8iniik07jn9mi";
+ };
+
+ buildInputs = [ pytest ];
+
+ # Tests do not work due to this bug: https://github.com/gak/pycallgraph/issues/118
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://pycallgraph.slowchop.com;
+ description = "Call graph visualizations for Python applications";
+ maintainers = with maintainers; [ auntie ];
+ license = licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix
new file mode 100644
index 00000000000..bf863fae57b
--- /dev/null
+++ b/pkgs/development/python-modules/pycares/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "pycares";
+ version = "1.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a18341ea030e2cc0743acdf4aa72302bdf6b820938b36ce4bd76e43faa2276a3";
+ };
+
+ propagatedBuildInputs = [ pkgs.c-ares ];
+
+ # No tests included
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/saghul/pycares;
+ description = "Interface for c-ares";
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix
new file mode 100644
index 00000000000..90d573aaaa7
--- /dev/null
+++ b/pkgs/development/python-modules/pycountry/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+,
+}:
+
+buildPythonPackage rec {
+ pname = "pycountry";
+ version = "1.17";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1qvhq0c9xsh6d4apcvjphfzl6xnwhnk4jvhr8x2fdfnmb034lc26";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://bitbucket.org/flyingcircus/pycountry;
+ description = "ISO country, subdivision, language, currency and script definitions and their translations";
+ license = licenses.lgpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index 2d1da5339af..5f58101a8b5 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -22,11 +22,11 @@ let
in
buildPythonPackage rec {
pname = "pycuda";
- version = "2018.1";
+ version = "2018.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7079f7738e83ee79ae26f0827ada29fe55921fec9760201199cc2bfb69446c92";
+ sha256 = "49d575fca3fd3c95467c3b0fb51967ad17d0c4cc18e078a6748309af4de36a8d";
};
preConfigure = ''
diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix
new file mode 100644
index 00000000000..a5caca40650
--- /dev/null
+++ b/pkgs/development/python-modules/pyfribidi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, isPyPy
+}:
+
+buildPythonPackage rec {
+ version = "0.11.0";
+ pname = "pyfribidi";
+ disabled = isPy3k || isPyPy;
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "6f7d83c09eae0cb98a40b85ba3dedc31af4dbff8fc4425f244c1e9f44392fded";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A simple wrapper around fribidi";
+ homepage = https://github.com/pediapress/pyfribidi;
+ license = stdenv.lib.licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix
new file mode 100644
index 00000000000..b8f483d3a1d
--- /dev/null
+++ b/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+, psutil
+, pyopenssl
+, pysendfile
+, python
+}:
+
+buildPythonPackage rec {
+ version = "1.5.4";
+ pname = "pyftpdlib";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "e5fca613978743d41c3bfc68e25a811d646a3b8a9eee9eb07021daca89646a0f";
+ };
+
+ checkInputs = [ mock psutil ];
+ propagatedBuildInputs = [ pyopenssl pysendfile ];
+
+ checkPhase = ''
+ ${python.interpreter} pyftpdlib/test/runner.py
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/giampaolo/pyftpdlib/;
+ description = "Very fast asynchronous FTP server library";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
new file mode 100644
index 00000000000..d1a25caabbe
--- /dev/null
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPyPy
+, flask
+, pyquery
+, pytest
+, cairosvg
+, tinycss
+, cssselect
+, lxml
+}:
+
+buildPythonPackage rec {
+ pname = "pygal";
+ version = "2.3.1";
+
+ doCheck = !isPyPy; # one check fails with pypy
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "7ba5a191233d0c2d8bf4b4d26b06e42bd77483a59ba7d3e5b884d81d1a870667";
+ };
+
+ buildInputs = [ flask pyquery pytest ];
+ propagatedBuildInputs = [ cairosvg tinycss cssselect ]
+ ++ stdenv.lib.optionals (!isPyPy) [ lxml ];
+
+ meta = with stdenv.lib; {
+ description = "Sexy and simple python charting";
+ homepage = http://www.pygal.org;
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ sjourdois ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix
new file mode 100644
index 00000000000..e776749dd7e
--- /dev/null
+++ b/pkgs/development/python-modules/pyhepmc/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, fetchurl
+, pkgs
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "pyhepmc";
+ version = "0.5.0";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1rbi8gqgclfvaibv9kzhfis11gw101x8amc93qf9y08ny4jfyr1d";
+ };
+
+ patches = [
+ # merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff
+ ./pyhepmc_export_edges.patch
+ # add bindings to Flow class
+ ./pyhepmc_export_flow.patch
+ ];
+
+ # regenerate python wrapper
+ preConfigure = ''
+ rm hepmc/hepmcwrap.py
+ swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i
+ '';
+
+ buildInputs = [ pkgs.swig pkgs.hepmc ];
+
+ HEPMCPATH = pkgs.hepmc;
+
+ checkPhase = ''
+ ${python.interpreter} test/test1.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A simple wrapper on the main classes of the HepMC event simulation representation, making it possible to create, read and manipulate HepMC events from Python code";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ veprbl ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyhepmc_export_edges.patch b/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch
similarity index 100%
rename from pkgs/development/python-modules/pyhepmc_export_edges.patch
rename to pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch
diff --git a/pkgs/development/python-modules/pyhepmc_export_flow.patch b/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch
similarity index 100%
rename from pkgs/development/python-modules/pyhepmc_export_flow.patch
rename to pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index cd10edd2b64..95dc4798357 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pyhomematic";
- version = "0.1.47";
+ version = "0.1.50";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "bdac91dc6810b3d9f53d26daf6e6f26480c556fc3b43890e376aa23c17afd60b";
+ sha256 = "d1b13b2786784b197e279e82fb0fbdb11cb55df91b48c12160d85de435fd4046";
};
# PyPI tarball does not include tests/ directory
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 523e7f80806..1365cc4aeb6 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pymatgen";
- version = "2018.9.1";
+ version = "2018.9.30";
src = fetchPypi {
inherit pname version;
- sha256 = "dee5dbd8008081de9f27759c20c550d09a07136eeebfe941e3d05fd88ccace18";
+ sha256 = "08c8da84beec153c0ad7acc47e67245e2d6598169e9803b82bd53131a67293be";
};
nativeBuildInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix
new file mode 100644
index 00000000000..1a3eb047510
--- /dev/null
+++ b/pkgs/development/python-modules/pympler/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "Pympler";
+ version = "0.4.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0mhyxqlkha98y8mi5zqcjg23r30mgdjdzs05lghbmqfdyvzjh1a3";
+ };
+
+ # Remove test asizeof.flatsize(), broken and can be missed as
+ # test is only useful on python 2.5, see https://github.com/pympler/pympler/issues/22
+ patchPhase = ''
+ substituteInPlace ./test/asizeof/test_asizeof.py --replace "n, e = test_flatsize" "#n, e = test_flatsize"
+ substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(n," "#self.assert_(n,"
+ substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e"
+ '';
+
+ doCheck = stdenv.hostPlatform.isLinux;
+
+ meta = with stdenv.lib; {
+ description = "Tool to measure, monitor and analyze memory behavior";
+ homepage = https://pythonhosted.org/Pympler/;
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix
new file mode 100644
index 00000000000..0167fe00ea7
--- /dev/null
+++ b/pkgs/development/python-modules/pymysqlsa/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pymysql
+, sqlalchemy
+}:
+
+buildPythonPackage rec {
+ pname = "pymysqlsa";
+ version = "1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a2676bce514a29b2d6ab418812259b0c2f7564150ac53455420a20bd7935314a";
+ };
+
+ propagatedBuildInputs = [ pymysql sqlalchemy ];
+
+ meta = with stdenv.lib; {
+ description = "PyMySQL dialect for SQL Alchemy";
+ homepage = https://pypi.python.org/pypi/pymysql_sa;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
index 51500281abb..5861288926f 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "pyparsing";
- version = "2.2.0";
+ version = "2.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
+ sha256 = "bc6c7146b91af3f567cf6daeaec360bc07d45ffec4cf5353f4d7a208ce7ca30a";
};
# Not everything necessary to run the tests is included in the distribution
diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix
index 0b073799254..76260331521 100644
--- a/pkgs/development/python-modules/pyperclip/default.nix
+++ b/pkgs/development/python-modules/pyperclip/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
- version = "1.6.4";
+ version = "1.6.5";
pname = "pyperclip";
src = fetchPypi {
inherit pname version;
- sha256 = "f70e83d27c445795b6bf98c2bc826bbf2d0d63d4c7f83091c8064439042ba0dc";
+ sha256 = "406bc020d4b8e60d8673876271b815befc4c02fd8d919e4aacc667d69fab99ea";
};
doCheck = false;
diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix
new file mode 100644
index 00000000000..ccda4f2631d
--- /dev/null
+++ b/pkgs/development/python-modules/pypoppler/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, pycairo
+, pygobject2
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "pypoppler";
+ version = "0.12.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "47e6ac99e5b114b9abf2d1dd1bca06f22c028d025432512989f659142470810f";
+ };
+
+ NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
+ nativeBuildInputs = [ pkgs.pkgconfig ];
+ buildInputs = [ pkgs.poppler.dev ];
+ propagatedBuildInputs = [ pycairo pygobject2 ];
+
+ patches = [
+ ./pypoppler-0.39.0.patch
+ ./pypoppler-poppler.c.patch
+ ];
+
+ # Not supported.
+ disabled = isPy3k;
+
+ # No tests in archive
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://code.launchpad.net/~mriedesel/poppler-python/main;
+ description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies";
+ license = licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pypoppler-0.39.0.patch b/pkgs/development/python-modules/pypoppler/pypoppler-0.39.0.patch
similarity index 100%
rename from pkgs/development/python-modules/pypoppler-0.39.0.patch
rename to pkgs/development/python-modules/pypoppler/pypoppler-0.39.0.patch
diff --git a/pkgs/development/python-modules/pypoppler-poppler.c.patch b/pkgs/development/python-modules/pypoppler/pypoppler-poppler.c.patch
similarity index 100%
rename from pkgs/development/python-modules/pypoppler-poppler.c.patch
rename to pkgs/development/python-modules/pypoppler/pypoppler-poppler.c.patch
diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
new file mode 100644
index 00000000000..060b6b77f87
--- /dev/null
+++ b/pkgs/development/python-modules/pyramid/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, docutils
+, virtualenv
+, webtest
+, zope_component
+, hupper
+, PasteDeploy
+, plaster
+, plaster-pastedeploy
+, repoze_lru
+, repoze_sphinx_autointerface
+, translationstring
+, venusian
+, webob
+, zope_deprecation
+, zope_interface
+, isPy35
+}:
+
+buildPythonPackage rec {
+ pname = "pyramid";
+ version = "1.9.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0dhbzc4q0vsnv3aihy728aczg56xs6h9s1rmvr096q4lb6yln3w4";
+ };
+
+ checkInputs = [ docutils virtualenv webtest zope_component ];
+
+ propagatedBuildInputs = [ hupper PasteDeploy plaster plaster-pastedeploy repoze_lru repoze_sphinx_autointerface translationstring venusian webob zope_deprecation zope_interface ];
+
+ # Failing tests
+ # https://github.com/Pylons/pyramid/issues/1899
+ doCheck = !isPy35;
+
+ meta = with stdenv.lib; {
+ description = "The Pyramid Web Framework, a Pylons project";
+ homepage = https://trypyramid.com/;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ garbas domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix
new file mode 100644
index 00000000000..257be31f32d
--- /dev/null
+++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, chameleon
+, pyramid
+, zope_interface
+, setuptools
+}:
+
+buildPythonPackage rec {
+ pname = "pyramid_chameleon";
+ version = "0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "d176792a50eb015d7865b44bd9b24a7bd0489fa9a5cebbd17b9e05048cef9017";
+ };
+
+ propagatedBuildInputs = [ chameleon pyramid zope_interface setuptools ];
+
+ meta = with stdenv.lib; {
+ description = "Chameleon template compiler for pyramid";
+ homepage = https://github.com/Pylons/pyramid_chameleon;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix
new file mode 100644
index 00000000000..dfdea42b02c
--- /dev/null
+++ b/pkgs/development/python-modules/pyramid_exclog/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyramid
+}:
+
+buildPythonPackage rec {
+ pname = "pyramid_exclog";
+ version = "0.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a58c82866c3e1a350684e6b83b440d5dc5e92ca5d23794b56d53aac06fb65a2c";
+ };
+
+ propagatedBuildInputs = [ pyramid ];
+
+ meta = with stdenv.lib; {
+ description = "A package which logs to a Python logger when an exception is raised by a Pyramid application";
+ homepage = http://docs.pylonsproject.org/;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ garbas domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix
new file mode 100644
index 00000000000..a2723255057
--- /dev/null
+++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, pyramid
+, hawkauthlib
+, tokenlib
+, webtest
+}:
+
+buildPythonPackage rec {
+ pname = "pyramidhawkauth";
+ version = "0.1.0";
+
+ src = fetchgit {
+ url = https://github.com/mozilla-services/pyramid_hawkauth.git;
+ rev = "refs/tags/v${version}";
+ sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h";
+ };
+
+ propagatedBuildInputs = [ pyramid hawkauthlib tokenlib ];
+ buildInputs = [ webtest ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/mozilla-services/pyramid_hawkauth;
+ description = "A Pyramid authentication plugin for HAWK";
+ license = licenses.mpl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix
new file mode 100644
index 00000000000..d211b9daf33
--- /dev/null
+++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, webtest
+, jinja2
+, pyramid
+}:
+
+buildPythonPackage rec {
+ pname = "pyramid_jinja2";
+ version = "2.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "93c86e3103b454301f4d66640191aba047f2ab85ba75647aa18667b7448396bd";
+ };
+
+ buildInputs = [ webtest ];
+ propagatedBuildInputs = [ jinja2 pyramid ];
+
+ meta = with stdenv.lib; {
+ description = "Jinja2 template bindings for the Pyramid web framework";
+ homepage = https://github.com/Pylons/pyramid_jinja2;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix
new file mode 100644
index 00000000000..2752ba7641e
--- /dev/null
+++ b/pkgs/development/python-modules/pyramid_mako/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, webtest
+, pyramid
+, Mako
+}:
+
+buildPythonPackage rec {
+ pname = "pyramid_mako";
+ version = "0.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "00811djmsc4rz20kpy2paam05fbx6dmrv2i5jf90f6xp6zw4isy6";
+ };
+
+ buildInputs = [ webtest ];
+ propagatedBuildInputs = [ pyramid Mako ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/Pylons/pyramid_mako;
+ description = "Mako template bindings for the Pyramid web framework";
+ license = licenses.bsd0;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix
new file mode 100644
index 00000000000..7130e8b499f
--- /dev/null
+++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyramid
+}:
+
+buildPythonPackage rec {
+ pname = "pyramid_multiauth";
+ version = "0.8.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1lq292qakrm4ixi4vaif8dqywzj08pn6qy0wi4gw28blh39p0msk";
+ };
+
+ propagatedBuildInputs = [ pyramid ];
+
+ meta = with stdenv.lib; {
+ description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies";
+ homepage = https://github.com/mozilla-services/pyramid_multiauth;
+ license = licenses.mpl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix
new file mode 100644
index 00000000000..ddc47dfc295
--- /dev/null
+++ b/pkgs/development/python-modules/pyrfc3339/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytz
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "pyRFC3339";
+ version = "0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1pp648xsjaw9h1xq2mgwzda5wis2ypjmzxlksc1a8grnrdmzy155";
+ };
+
+ propagatedBuildInputs = [ pytz ];
+ buildInputs = [ nose ];
+
+ meta = with stdenv.lib; {
+ description = "Generate and parse RFC 3339 timestamps";
+ homepage = https://github.com/kurtraschke/pyRFC3339;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index e9c48cbb8b4..16805ac58c0 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyroute2";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchPypi {
inherit pname version;
- sha256 = "42bf74495d95a0196a74dd171357f660175aba2bfc23f9b5f63e3830ccbef9ac";
+ sha256 = "79f7b4286be773c46914df0201dabaf92717a9c06e341e0c420603b2dd31c6bf";
};
# requires root priviledges
diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index b333ca27143..29dd344a34c 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyspark";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "52d77a7ef43088b0235742cfcafc83435d0d98c5fdded1d8c600f1887e9e0213";
+ sha256 = "7fb3b4fe47edb0fb78cecec37e0f2a728590f17ef6a49eae55141a7a374c07c8";
};
# pypandoc is broken with pandoc2, so we just lose docs.
diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix
index 90dfc1f5604..dc6c09f7b70 100644
--- a/pkgs/development/python-modules/pysrim/default.nix
+++ b/pkgs/development/python-modules/pysrim/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pysrim";
- version = "0.5.8";
+ version = "0.5.9";
src = fetchPypi {
inherit pname version;
- sha256 = "6c297b4ea6f037946c72e94ddd9a7624cf2fd97c488acbee9409001c970754f1";
+ sha256 = "071c5be48e58fa019f7848588f88ce0a09bfe6493c9ff5987829d162c0f4a497";
};
buildInputs = [ pytestrunner ];
diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix
index 758a2f194b2..23cd7667992 100644
--- a/pkgs/development/python-modules/pytest-isort/default.nix
+++ b/pkgs/development/python-modules/pytest-isort/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytest-isort";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "d4d195ecfe33d81e258d251b2679b32216bad84131fb41984da22d9d0328a6fe";
+ sha256 = "c70d0f900f4647bb714f0843dd82d7f7b759904006de31254efdb72ce88e0c0e";
};
propagatedBuildInputs = [ pytestcache pytest isort ];
diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix
new file mode 100644
index 00000000000..bd92577d5ba
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-relaxed/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, six
+, decorator
+}:
+
+buildPythonPackage rec {
+ version = "1.1.4";
+ pname = "pytest-relaxed";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "511ac473252baa67d5451f7864516e2e8f1acedf0cef71f79d2ed916ee04e146";
+ };
+
+ propagatedBuildInputs = [ pytest six decorator ];
+
+ patchPhase = ''
+ sed -i "s/pytest>=3,<3.3/pytest/g" setup.py
+ '';
+
+ # skip tests due to dir requirements
+ doCheck = false;
+
+ checkPhase = ''
+ pytest tests
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://pytest-relaxed.readthedocs.io/;
+ description = "Relaxed test discovery/organization for pytest";
+ license = licenses.bsd0;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 46d505b3801..71d4df4a0c5 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytest-xdist";
- version = "1.23.0";
+ version = "1.23.2";
src = fetchPypi {
inherit pname version;
- sha256 = "28e25e79698b2662b648319d3971c0f9ae0e6500f88258ccb9b153c31110ba9b";
+ sha256 = "1ef0d05c905cfa0c5442c90e9e350e65c6ada120e33a00a066ca51c89f5f869a";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index deb9cbdb7d0..cdfdb8a64c9 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py
+{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
, atomicwrites, mock, writeText, pathlib2
}:
@@ -19,7 +19,8 @@ buildPythonPackage rec {
checkInputs = [ hypothesis mock ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
- ++ stdenv.lib.optionals (!isPy3k) [ funcsigs pathlib2 ];
+ ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
+ ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
checkPhase = ''
runHook preCheck
diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix
new file mode 100644
index 00000000000..3ba81cacfd4
--- /dev/null
+++ b/pkgs/development/python-modules/python-ldap-test/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, py4j }:
+
+buildPythonPackage rec {
+ pname = "python-ldap-test";
+ version = "0.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1qh9x3lncaldnw79fgpqbayichs8pbz8abr6pxb5qxbs7zrnyrwf";
+ };
+
+ propagatedBuildInputs = [ py4j ];
+
+ # Tests needs java to be present in path
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Tool for testing code speaking with LDAP server";
+ homepage = https://github.com/zoldar/python-ldap-test;
+ license = licenses.mit;
+ maintainers = with maintainers; [ psyanticy ];
+ };
+}
+
diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix
new file mode 100644
index 00000000000..7a16621da0a
--- /dev/null
+++ b/pkgs/development/python-modules/python-levenshtein/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "python-Levenshtein";
+ version = "0.12.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1c9ybqcja31nghfcc8xxbbz9h60s9qi12b9hr4jyl69xbvg12fh3";
+ };
+
+ # No tests included in archive
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Functions for fast computation of Levenshtein distance and string similarity";
+ homepage = "https://github.com/ztane/python-Levenshtein";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ aske ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
new file mode 100644
index 00000000000..692bbe4bcd8
--- /dev/null
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -0,0 +1,58 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPyPy
+, python
+, pkgs
+, pillow
+, pycairo
+}:
+
+buildPythonPackage rec {
+ pname = "python-mapnik";
+ version = "3.0.16";
+
+ src = pkgs.fetchFromGitHub {
+ owner = "mapnik";
+ repo = "python-mapnik";
+ rev = "v${version}";
+ sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc";
+ };
+
+ disabled = isPyPy;
+ doCheck = false; # doesn't find needed test data files
+ preBuild = let
+ pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
+ in ''
+ export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
+ export BOOST_THREAD_LIB="boost_thread"
+ export BOOST_SYSTEM_LIB="boost_system"
+ '';
+ buildInputs = with pkgs; [
+ (boost.override {
+ enablePython = true;
+ inherit python;
+ })
+ (mapnik.override {
+ inherit python;
+ boost = (boost.override { enablePython = true; inherit python; });
+ })
+ cairo
+ harfbuzz
+ icu
+ libjpeg
+ libpng
+ libtiff
+ libwebp
+ proj
+ zlib
+ ];
+ propagatedBuildInputs = [ pillow pycairo ];
+
+ meta = with stdenv.lib; {
+ description = "Python bindings for Mapnik";
+ homepage = http://mapnik.org;
+ license = licenses.lgpl21;
+ };
+
+}
diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix
new file mode 100644
index 00000000000..2b08bbffa45
--- /dev/null
+++ b/pkgs/development/python-modules/python-otr/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, zope_interface
+, cryptography
+, application
+, gmpy2
+}:
+
+buildPythonPackage rec {
+ pname = "python-otr";
+ version = "1.2.0";
+ disabled = isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "AGProjects";
+ repo = pname;
+ rev = "release-${version}";
+ sha256 = "0p3b1n8jlxwd65gbk2k5007fkhdyjwcvr4982s42hncivxvabzzy";
+ };
+
+ propagatedBuildInputs = [ zope_interface cryptography application gmpy2 ];
+
+ meta = with stdenv.lib; {
+ description = "A pure python implementation of OTR";
+ homepage = https://github.com/AGProjects/otr;
+ license = licenses.lgpl21Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix
new file mode 100644
index 00000000000..3f0c1f8138f
--- /dev/null
+++ b/pkgs/development/python-modules/python-packer/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, sh }:
+
+buildPythonPackage rec {
+ pname = "python-packer";
+ version = "0.1.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "fd363dae9bd2efd447739bbf7a4f29c1e4741596ae7b02d252fe525b2b4176e7";
+ };
+
+ propagatedBuildInputs = [ sh ];
+
+ # Tests requires network connections
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "An interface for packer.io";
+ homepage = https://github.com/nir0s/python-packer;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ psyanticy ];
+ };
+}
+
diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix
index 9c8cc68af3d..b3e3de0285a 100644
--- a/pkgs/development/python-modules/python-slugify/default.nix
+++ b/pkgs/development/python-modules/python-slugify/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-slugify";
- version = "1.2.5";
+ version = "1.2.6";
src = fetchPypi {
inherit pname version;
- sha256 = "5dbb360b882b2dabe0471a1a92f604504d83c2a73c71f2098d004ab62e695534";
+ sha256 = "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245";
};
doCheck = !isPy3k;
# (only) on python3 unittest loader (loadTestsFromModule) fails
diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/pkgs/development/python-modules/python2-pythondialog/default.nix
new file mode 100644
index 00000000000..33e63460d87
--- /dev/null
+++ b/pkgs/development/python-modules/python2-pythondialog/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "python2-pythondialog";
+ version = "3.3.0";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1yhkagsh99bfi592ymczf8rnw8rk6n9hdqy3dd98m3yrx8zmjvry";
+ };
+
+ patchPhase = ''
+ substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Python interface to the UNIX dialog utility and mostly-compatible programs (Python 2 backport)";
+ homepage = "http://pythondialog.sourceforge.net/";
+ license = licenses.lgpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix
index e04915a503d..a7973501bf7 100644
--- a/pkgs/development/python-modules/python_openzwave/default.nix
+++ b/pkgs/development/python-modules/python_openzwave/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "python_openzwave";
- version = "0.4.9";
+ version = "0.4.10";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "97ddd104f52e3a4d7115c3de5d2136631d1f66627fc9b45d56956c3f2b6e0cdb";
+ sha256 = "4bde7afd6c97637b59ee37a1c432c285daf179e535eb9a0d5dd95a65600b0cc8";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix
new file mode 100644
index 00000000000..35873d301be
--- /dev/null
+++ b/pkgs/development/python-modules/pythonirclib/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, paver
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "irclib";
+ version = "0.4.8";
+ disabled = isPy3k;
+
+ src = fetchurl {
+ url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz";
+ sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
+ };
+
+ patches = [(fetchurl {
+ url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw";
+ name = "irclib.py.diff";
+ sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e";
+ })];
+
+ patchFlags = "irclib.py";
+
+ propagatedBuildInputs = [ paver ];
+
+ meta = with stdenv.lib; {
+ description = "Python IRC library";
+ homepage = https://bitbucket.org/jaraco/irc;
+ license = with licenses; [ lgpl21 ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix
new file mode 100644
index 00000000000..32e3b683e41
--- /dev/null
+++ b/pkgs/development/python-modules/pytun/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "pytun";
+ version = "2.2.1";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "montag451";
+ repo = "pytun";
+ sha256 = "1bxk0z0v8m0b01xg94f039j3bsclkshb7girvjqfzk5whbd2nryh";
+ };
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/montag451/pytun;
+ description = "Linux TUN/TAP wrapper for Python";
+ license = licenses.mit;
+ maintainers = with maintainers; [ montag451 ];
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix
new file mode 100644
index 00000000000..31b2ff4e988
--- /dev/null
+++ b/pkgs/development/python-modules/pyxdg/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "pyxdg";
+ version = "0.25";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "81e883e0b9517d624e8b0499eb267b82a815c0b7146d5269f364988ae031279d";
+ };
+
+ # error: invalid command 'test'
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://freedesktop.org/wiki/Software/pyxdg;
+ description = "Contains implementations of freedesktop.org standards";
+ license = licenses.lgpl2;
+ maintainers = with maintainers; [ domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix
new file mode 100644
index 00000000000..53c0c148eea
--- /dev/null
+++ b/pkgs/development/python-modules/rainbowstream/default.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+, pkgs
+, pillow
+, twitter
+, pyfiglet
+, requests
+, arrow
+, dateutil
+, pysocks
+, pocket
+}:
+
+buildPythonPackage rec {
+ pname = "rainbowstream";
+ version = "1.3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0zpi1x3b535pwx8rkq57nnrb5d5ma65vvlalar9vi6ilp124x1w2";
+ };
+
+ patches = [ ./image.patch ];
+
+ postPatch = ''
+ clib=$out/${python.sitePackages}/rainbowstream/image.so
+ substituteInPlace rainbowstream/c_image.py \
+ --replace @CLIB@ $clib
+ sed -i 's/requests.*"/requests"/' setup.py
+ '';
+
+ LC_ALL="en_US.UTF-8";
+
+ postInstall = ''
+ mkdir -p $out/lib
+ cc -fPIC -shared -o $clib rainbowstream/image.c
+ for prog in "$out/bin/"*; do
+ wrapProgram "$prog" \
+ --prefix PYTHONPATH : "$PYTHONPATH"
+ done
+ '';
+
+ buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow dateutil pysocks pocket ];
+
+ meta = with stdenv.lib; {
+ description = "Streaming command-line twitter client";
+ homepage = "http://www.rainbowstream.org/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ thoughtpolice ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/random2/default.nix b/pkgs/development/python-modules/random2/default.nix
new file mode 100644
index 00000000000..ecc049b34f4
--- /dev/null
+++ b/pkgs/development/python-modules/random2/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPyPy
+}:
+
+buildPythonPackage rec {
+ pname = "random2";
+ version = "1.0.1";
+ doCheck = !isPyPy;
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = http://pypi.python.org/pypi/random2;
+ description = "Python 3 compatible Python 2 `random` Module";
+ license = licenses.psfl;
+ };
+
+}
diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
index 760ca0056ff..2e828a2a8e8 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "reikna";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0afc5d502cc9ba0dadd88c15d72e2fdaa09fee31faaae5064889732de7940953";
+ sha256 = "c52f5ae13e35284feda8f6b67c0d6223c02c0292b1495969cf7a42f547b3fc18";
};
checkInputs = [ sphinx pytestcov pytest ];
diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index dbc28263b06..e9f4b8e2bd6 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -2,10 +2,10 @@
buildPythonPackage rec {
pname = "relatorio";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "bddf85d029c5c85a0f976d73907e14e4c3093065fe8527170c91abf0218546d9";
+ sha256 = "149a1c4c2a35d9b9e634fe80cac405bc9b4c03a42f818302362183515e7e835d";
};
propagatedBuildInputs = [
genshi
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index e2f2a7814aa..82d2889364f 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
in buildPythonPackage rec {
pname = "reportlab";
- version = "3.5.6";
+ version = "3.5.9";
src = fetchPypi {
inherit pname version;
- sha256 = "3836a49e7ea7bce458f437cbc094633c7fd4ac027180565875c18ecc726f261e";
+ sha256 = "f92f81314807cd860f29fe07a1a4100b03910ae6bbfca20a07e02c3b460f4f20";
};
checkInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/repoze_lru/default.nix b/pkgs/development/python-modules/repoze_lru/default.nix
new file mode 100644
index 00000000000..c08120d2412
--- /dev/null
+++ b/pkgs/development/python-modules/repoze_lru/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "repoze.lru";
+ version = "0.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0f7a323bf716d3cb6cb3910cd4fccbee0b3d3793322738566ecce163b01bbd31";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A tiny LRU cache implementation and decorator";
+ homepage = http://www.repoze.org/;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ garbas domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
new file mode 100644
index 00000000000..96a893edd7c
--- /dev/null
+++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, zope_interface
+, sphinx
+}:
+
+buildPythonPackage rec {
+ pname = "repoze.sphinx.autointerface";
+ version = "0.7.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "97ef5fac0ab0a96f1578017f04aea448651fa9f063fc43393a8253bff8d8d504";
+ };
+
+ propagatedBuildInputs = [ zope_interface sphinx ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/repoze/repoze.sphinx.autointerface;
+ description = "Auto-generate Sphinx API docs from Zope interfaces";
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ domenkozar ];
+ };
+}
diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix
new file mode 100644
index 00000000000..f6d816d37c0
--- /dev/null
+++ b/pkgs/development/python-modules/rethinkdb/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "rethinkdb";
+ version = "2.3.0.post6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "05qwkmq6kn437ywyjs02jxbry720gw39q4z4jdb0cnbbi76lwddm";
+ };
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Python driver library for the RethinkDB database server";
+ homepage = "https://pypi.python.org/pypi/rethinkdb";
+ license = licenses.agpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index 150234a3dd2..d9b55c85219 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "rlp";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "040fb5172fa23d27953a886c40cac989fc031d0629db934b5a9edcd2fb28df1e";
+ sha256 = "b0ad3f3173dedf416565299f684717d4ae7620207d562d3ef94b818a40a48781";
};
checkInputs = [ pytest hypothesis ];
diff --git a/pkgs/development/python-modules/roman/default.nix b/pkgs/development/python-modules/roman/default.nix
new file mode 100644
index 00000000000..52d45d72875
--- /dev/null
+++ b/pkgs/development/python-modules/roman/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "2.0.0";
+ pname = "roman";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Integer to Roman numerals converter";
+ homepage = "https://pypi.python.org/pypi/roman";
+ license = licenses.psfl;
+ };
+
+}
diff --git a/pkgs/development/python-modules/safe/default.nix b/pkgs/development/python-modules/safe/default.nix
new file mode 100644
index 00000000000..f7f6f7eabf9
--- /dev/null
+++ b/pkgs/development/python-modules/safe/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+ version = "0.4";
+ pname = "Safe";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a2fdac9fe8a9dcf02b438201d6ce0b7be78f85dc6492d03edfb89be2adf489de";
+ };
+
+ buildInputs = [ nose ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/lepture/safe";
+ license = licenses.bsd3;
+ description = "Check password strength";
+ };
+
+}
diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix
new file mode 100644
index 00000000000..432e2194b09
--- /dev/null
+++ b/pkgs/development/python-modules/samplerate/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, numpy
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "scikits.samplerate";
+ version = "0.3.3";
+
+ src = pkgs.fetchgit {
+ url = https://github.com/cournape/samplerate;
+ rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210";
+ sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg";
+ };
+
+ buildInputs = [ pkgs.libsamplerate ];
+ propagatedBuildInputs = [ numpy ];
+
+ preConfigure = ''
+ cat > site.cfg << END
+ [samplerate]
+ library_dirs=${pkgs.libsamplerate.out}/lib
+ include_dirs=${pkgs.libsamplerate.dev}/include
+ END
+ '';
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/cournape/samplerate;
+ description = "High quality sampling rate convertion from audio data in numpy arrays";
+ license = licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix
new file mode 100644
index 00000000000..79ad778e048
--- /dev/null
+++ b/pkgs/development/python-modules/schedule/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "schedule";
+ version = "0.3.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1h0waw4jd5ql68y5kxb9irwapkbkwfs1w0asvbl24fq5f8czdijm";
+ };
+
+ buildInputs = [ mock ];
+
+ meta = with stdenv.lib; {
+ description = "Python job scheduling for humans";
+ homepage = https://github.com/dbader/schedule;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 1a07e001cae..5d8399d6267 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "scikit-image";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchPypi {
inherit pname version;
- sha256 = "325f75eb80fbc5371136e37f323445309ca9f65b6c6f718d0d0e2189e5de1224";
+ sha256 = "86a9b3b4f74f231e0a6bcfd3235dcf3f0118df25dac21201da5e064d681e2c50";
};
buildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix
index dfca0a5fa2e..5aa34a44205 100644
--- a/pkgs/development/python-modules/seekpath/default.nix
+++ b/pkgs/development/python-modules/seekpath/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "seekpath";
- version = "1.8.2";
+ version = "1.8.4";
src = fetchPypi {
inherit pname version;
- sha256 = "8fb22231ed6fc6aa12e2f2cc6c8ca67b82648e16c1c85ddac2e2237ac4553d83";
+ sha256 = "b61dadba82acc0838402981b7944155adc092b114ca81f53f61b1d498a512e3a";
};
LC_ALL = "en_US.utf-8";
diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix
new file mode 100644
index 00000000000..c68ba10a320
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools-git/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "setuptools-git";
+ version = "1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831";
+ };
+
+ propagatedBuildInputs = [ pkgs.git ];
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Setuptools revision control system plugin for Git";
+ homepage = https://pypi.python.org/pypi/setuptools-git;
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix
index ac035061692..ffb221ffdc5 100644
--- a/pkgs/development/python-modules/shippai/default.nix
+++ b/pkgs/development/python-modules/shippai/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "shippai";
# Please make sure that vdirsyncer still builds if you update this package.
- version = "0.2.3";
+ version = "0.2.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1ppwywzg4d12h658682ssmingm6ls6a96p4ak26i2w9d4lf8pfsc";
+ sha256 = "87cc9899212d917031853becd7cb14808181289c3c329b1418e9b4b6aae93c80";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix
index 37ecc8bbb1c..426019fc8a9 100644
--- a/pkgs/development/python-modules/sleekxmpp/default.nix
+++ b/pkgs/development/python-modules/sleekxmpp/default.nix
@@ -20,4 +20,5 @@ buildPythonPackage rec {
license = licenses.mit;
homepage = "http://sleekxmpp.com/";
};
+
}
diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix
new file mode 100644
index 00000000000..88c43bce297
--- /dev/null
+++ b/pkgs/development/python-modules/slixmpp/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, fetchurl, aiodns, pyasn1, pyasn1-modules, gnupg }:
+
+buildPythonPackage rec {
+ pname = "slixmpp";
+ version = "1.4.0";
+
+ disabled = pythonOlder "3.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "155qxx4xlkkjb4hphc09nsi2mi4xi3m2akg0z7064kj3nbzkwjn2";
+ };
+
+ patchPhase = ''
+ substituteInPlace slixmpp/thirdparty/gnupg.py \
+ --replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'"
+ '';
+
+ propagatedBuildInputs = [ aiodns pyasn1 pyasn1-modules gnupg ];
+
+ meta = {
+ description = "Elegant Python library for XMPP";
+ license = lib.licenses.mit;
+ homepage = https://dev.louiz.org/projects/slixmpp;
+ };
+}
diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix
new file mode 100644
index 00000000000..b80e5655ff9
--- /dev/null
+++ b/pkgs/development/python-modules/sortedcollections/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, sortedcontainers
+}:
+
+buildPythonPackage rec {
+ pname = "sortedcollections";
+ version = "0.4.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "12dlzln9gyv8smsy2k6d6dmr0ywrpwyrr1cjy649ia5h1g7xdvwa";
+ };
+
+ buildInputs = [ sortedcontainers ];
+
+ # wants to test all python versions with tox:
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Python Sorted Collections";
+ homepage = http://www.grantjenks.com/docs/sortedcollections/;
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix
index 1252c676646..5362e0b0037 100644
--- a/pkgs/development/python-modules/sortedcontainers/default.nix
+++ b/pkgs/development/python-modules/sortedcontainers/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "sortedcontainers";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchPypi {
inherit pname version;
- sha256 = "607294c6e291a270948420f7ffa1fb3ed47384a4c08db6d1e9c92d08a6981982";
+ sha256 = "b74f2756fb5e23512572cc76f0fe0832fd86310f77dfee54335a35fb33f6b950";
};
# pypi tarball does not come with tests
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index 5b8c4a46b2b..bdb003467f5 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "sounddevice";
- version = "0.3.11";
+ version = "0.3.12";
src = fetchPypi {
inherit pname version;
- sha256 = "0pfcbgbl77nggchxb2i5rb78m7hpgn65aqpz99yfx1fgfbmy9yg1";
+ sha256 = "f59ae4e2ec12cb1e5940f06f08804ecca855d959de25ca45a3938de45d0f81a2";
};
propagatedBuildInputs = [ cffi numpy portaudio ];
diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix
new file mode 100644
index 00000000000..44f16fbdfc6
--- /dev/null
+++ b/pkgs/development/python-modules/sparqlwrapper/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, six
+, isodate
+, pyparsing
+, html5lib
+, keepalive
+}:
+
+buildPythonPackage rec {
+ pname = "SPARQLWrapper";
+ version = "1.7.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1y12hpsfjd779yi29bhvl6g4vszadjvd8jw38z5rg77b034vxjnw";
+ };
+
+ # break circular dependency loop
+ patchPhase = ''
+ sed -i '/rdflib/d' requirements.txt
+ '';
+
+ # Doesn't actually run tests
+ doCheck = false;
+
+ propagatedBuildInputs = [ six isodate pyparsing html5lib keepalive ];
+
+ meta = with stdenv.lib; {
+ description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format";
+ homepage = "http://rdflib.github.io/sparqlwrapper";
+ license = licenses.w3c;
+ };
+}
diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix
new file mode 100644
index 00000000000..f2c38a3414b
--- /dev/null
+++ b/pkgs/development/python-modules/speedtest-cli/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+# cannot be built as pythonApplication because the library functions are
+# required for home-assistant
+buildPythonPackage rec {
+ pname = "speedtest-cli";
+ version = "2.0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "2f3d5aa1086d9b367c03b99db6e3207525af174772d877c6b982289b8d2bdefe";
+ };
+
+ # tests require working internet connection
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Command line interface for testing internet bandwidth using speedtest.net";
+ homepage = https://github.com/sivel/speedtest-cli;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ makefu domenkozar ndowens ];
+ };
+}
diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix
index 8ee4ce76069..3309f1e9978 100644
--- a/pkgs/development/python-modules/sphfile/default.nix
+++ b/pkgs/development/python-modules/sphfile/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "sphfile";
- version = "1.0.0";
+ version = "1.0.1";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/s/sphfile/${name}.tar.gz";
- sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd";
+ sha256 = "422b0704107b02ef3ca10e55ccdc80b0bb5ad8e2613b6442f8e2ea372c7cf5d8";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 9e71766065c..e4e9bfaba1c 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -26,10 +26,10 @@
buildPythonPackage rec {
pname = "Sphinx";
- version = "1.7.8";
+ version = "1.7.9";
src = fetchPypi {
inherit pname version;
- sha256 = "a07050845cc9a2f4026a6035cc8ed795a5ce7be6528bbc82032385c10807dfe7";
+ sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 2f755869d79..e1c576f9427 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
- version = "1.2.11";
+ version = "1.2.12";
src = fetchPypi {
inherit pname version;
- sha256 = "ef6569ad403520ee13e180e1bfd6ed71a0254192a934ec1dbd3dbf48f4aa9524";
+ sha256 = "c5951d9ef1d5404ed04bae5a16b60a0779087378928f997a294d1229c6ca4d3e";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 5713d7591dc..2aeaa068a43 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "sqlmap";
- version = "1.2.8";
+ version = "1.2.10";
src = fetchPypi {
inherit pname version;
- sha256 = "d261d93e7abed20543c261327d30b9f9936f0bed3c1a595f39218eeb66094526";
+ sha256 = "e64efce7f3b50cab02c8da968e00c1b456f59aff193d3dae2446d7c117723d53";
};
# No tests in archive
diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix
new file mode 100644
index 00000000000..f06138b4c25
--- /dev/null
+++ b/pkgs/development/python-modules/ssdeep/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+, cffi
+, six
+, pytest
+, pytestrunner
+}:
+
+buildPythonPackage rec {
+ pname = "ssdeep";
+ version = "3.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "255de1f034652b3ed21920221017e70e570b1644f9436fea120ae416175f4ef5";
+ };
+
+ buildInputs = [ pkgs.ssdeep pytestrunner ];
+ checkInputs = [ pytest ];
+ propagatedBuildInputs = [ cffi six ];
+
+ # tests repository does not include required files
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://github.com/DinoTools/python-ssdeep;
+ description = "Python wrapper for the ssdeep library";
+ license = licenses.lgpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix
new file mode 100644
index 00000000000..6d5d9df0a6f
--- /dev/null
+++ b/pkgs/development/python-modules/statsd/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "statsd";
+ version = "3.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "3fa92bf0192af926f7a0d9be031fe3fd0fbaa1992d42cf2f07e68f76ac18288e";
+ };
+
+ buildInputs = [ nose mock ];
+
+ patchPhase = ''
+ # Failing test: ERROR: statsd.tests.test_ipv6_resolution_udp
+ sed -i 's/test_ipv6_resolution_udp/noop/' statsd/tests.py
+ # well this is a noop, but so it was before
+ sed -i 's/assert_called_once()/called/' statsd/tests.py
+ '';
+
+ meta = with stdenv.lib; {
+ maintainers = with maintainers; [ domenkozar ];
+ description = "A simple statsd client";
+ license = licenses.mit;
+ homepage = https://github.com/jsocol/pystatsd;
+ };
+
+}
diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix
index a80657dc4b4..9e408f2cb16 100644
--- a/pkgs/development/python-modules/toml/default.nix
+++ b/pkgs/development/python-modules/toml/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "toml";
- version = "0.9.4";
+ version = "0.9.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf";
+ sha256 = "380178cde50a6a79f9d2cf6f42a62a5174febe5eea4126fe4038785f1d888d42";
};
# This package has a test script (built for Travis) that involves a)
diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix
new file mode 100644
index 00000000000..89edc8f184c
--- /dev/null
+++ b/pkgs/development/python-modules/uncompyle6/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, spark_parser
+, xdis
+}:
+
+buildPythonPackage rec {
+ pname = "uncompyle6";
+ version = "2.8.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0hx5sji6qjvnq1p0zhvyk5hgracpv2w6iar1j59qwllxv115ffi1";
+ };
+
+ propagatedBuildInputs = [ spark_parser xdis ];
+
+ meta = with stdenv.lib; {
+ description = "Python cross-version byte-code deparser";
+ homepage = https://github.com/rocky/python-uncompyle6/;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix
new file mode 100644
index 00000000000..10808bffaab
--- /dev/null
+++ b/pkgs/development/python-modules/validictory/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "validictory";
+ version = "1.0.0a2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c02388a70f5b854e71e2e09bd6d762a2d8c2a017557562e866d8ffafb0934b07";
+ };
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Validate dicts against a schema";
+ homepage = https://github.com/sunlightlabs/validictory;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix
new file mode 100644
index 00000000000..14d678be892
--- /dev/null
+++ b/pkgs/development/python-modules/venusian/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "venusian";
+ version = "1.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "9902e492c71a89a241a18b2f9950bea7e41d025cc8f3af1ea8d8201346f8577d";
+ };
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ pytest
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A library for deferring decorator actions";
+ homepage = http://pylonsproject.org/;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ garbas domenkozar ];
+ };
+}
diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix
new file mode 100644
index 00000000000..0f75be8be17
--- /dev/null
+++ b/pkgs/development/python-modules/warlock/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, six
+, jsonpatch
+, jsonschema
+, jsonpointer
+}:
+
+buildPythonPackage rec {
+ pname = "warlock";
+ version = "1.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0npgi4ks0nww2d6ci791iayab0j6kz6dx3jr7bhpgkql3s4if3bw";
+ };
+
+ propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/bcwaldon/warlock;
+ description = "Python object model built on JSON schema and JSON patch";
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
new file mode 100644
index 00000000000..1e5e5653b9d
--- /dev/null
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, argh
+, pathtools
+, pyyaml
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "watchdog";
+ version = "0.8.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0qj1vqszxwfx6d1s66s96jmfmy2j94bywxiqdydh6ikpvcm8hrby";
+ };
+
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin
+ [ pkgs.darwin.apple_sdk.frameworks.CoreServices pkgs.darwin.cf-private ];
+ propagatedBuildInputs = [ argh pathtools pyyaml ];
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Python API and shell utilities to monitor file system events";
+ homepage = https://github.com/gorakhargosh/watchdog;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ goibhniu ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix
index 4d48b63da54..1fb9dd6da16 100644
--- a/pkgs/development/python-modules/whisper/default.nix
+++ b/pkgs/development/python-modules/whisper/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "whisper";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1ahzsxk52ws8k3kdq52qbsbsx2r9z350j8gg9adw4x5fjwksz4r8";
+ sha256 = "ee9128873b5f9c97d258d35d0a32ef8e62c9da473fbbd056982df1f36f0b37aa";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index db992c7b932..ab2bd9c4eb1 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "widgetsnbextension";
- version = "3.4.0";
+ version = "3.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "c9d6e426a1d79d132b57b93b368feba2c66eb7b0fd34bdb901716b4b88e94497";
+ sha256 = "fa618be8435447a017fd1bf2c7ae922d0428056cfc7449f7a8641edf76b48265";
};
propagatedBuildInputs = [ notebook ];
diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix
new file mode 100644
index 00000000000..40f0b655451
--- /dev/null
+++ b/pkgs/development/python-modules/wtforms/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, Babel
+}:
+
+buildPythonPackage rec {
+ version = "2.1";
+ pname = "wtforms";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz";
+ };
+
+ # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet."
+ # This is fixed in master I believe but not yet in 2.1;
+ doCheck = false;
+
+ propagatedBuildInputs = [ Babel ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/wtforms/wtforms;
+ description = "A flexible forms validation and rendering library for Python";
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index c443c8fc880..7a54b1f33ed 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "xarray";
- version = "0.10.8";
+ version = "0.10.9";
src = fetchPypi {
inherit pname version;
- sha256 = "6a1f2c5dc5f639f8343f70ed08d0afbb477a3867298ef38f0d9bf4aafa0fb750";
+ sha256 = "cb3028ba157e1953fd279bbe17c07bb5faa459ddf555bbe687c927e4cdfeecc3";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
new file mode 100644
index 00000000000..5973414f8dc
--- /dev/null
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "xdis";
+ version = "3.2.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk";
+ };
+
+ propagatedBuildInputs = [ nose six ];
+
+ meta = with stdenv.lib; {
+ description = "Python cross-version byte-code disassembler and marshal routines";
+ homepage = https://github.com/rocky/python-xdis/;
+ license = licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index 291b981bf47..1338de7e67c 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "xml2rfc";
- version = "2.10.0";
+ version = "2.10.3";
src = fetchPypi {
inherit pname version;
- sha256 = "dc62e1d2fea896855ee0681f02bcb7596e3b6b5aa559348b8520a4eb0c793282";
+ sha256 = "ace45039e9d71713b4bb09ea199644797a7d884fbdd940e4c02559b4bccb01a1";
};
propagatedBuildInputs = [ intervaltree pyflakes requests lxml ];
diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix
index f648df6c570..a474bf84d0f 100644
--- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix
+++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version pname;
- sha256 = "0cgihyjb9rg6r2ddpzbjm31y0901vyc8m9h3v0zrhxydx1w9x50c";
+ sha256 = "0c949e78e8cd77983fd803a68a98df0124e0c3a872fddb9ac8e6e5b4a487f131";
};
# no tests implemented
diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
index d411119bbfa..3424c8fcf6f 100644
--- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version pname;
- sha256 = "0449rkjcksq49yjyyszz9v11wa4nmvvfw0mynayah8248yxlifnn";
+ sha256 = "d6ba48bb474420a8bcb2be02eef6ae96281ec24eff6befa54f04ebc9e4cc8910";
};
# no tests implemented
diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix
index 4410525a3d4..bbfcce54d89 100644
--- a/pkgs/development/python-modules/xstatic/default.nix
+++ b/pkgs/development/python-modules/xstatic/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version pname;
- sha256 = "1a13i9b62qfmqz04gpa6kcwwy2x8fm9wcr1x6kjdxrmw6zz8vdw0";
+ sha256 = "80b78dfe37bce6dee4343d64c65375a80bcf399b46dd47c0c7d56161568a23a8";
};
# no tests implemented
diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix
new file mode 100644
index 00000000000..143f609d833
--- /dev/null
+++ b/pkgs/development/python-modules/zake/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, kazoo
+, six
+, testtools
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "zake";
+ version = "0.2.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1rp4xxy7qp0s0wnq3ig4ji8xsl31g901qkdp339ndxn466cqal2s";
+ };
+
+ propagatedBuildInputs = [ kazoo six ];
+ buildInputs = [ testtools ];
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover zake/tests
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/yahoo/Zake";
+ description = "A python package that works to provide a nice set of testing utilities for the kazoo library";
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix
index 8fc15c5da6f..99d05a35963 100644
--- a/pkgs/development/python-modules/zetup/default.nix
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "zetup";
- version = "0.2.43";
+ version = "0.2.45";
src = fetchPypi {
inherit pname version;
- sha256 = "ee92ba93a03336962525536f237ae0decf99a9b5d484ba34a3cf06ef017dae8e";
+ sha256 = "f1cde33d0ef3bedaf697e432201fa86da698dadd3445c0efd2a114753853c675";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix
new file mode 100644
index 00000000000..ddc486918fb
--- /dev/null
+++ b/pkgs/development/python-modules/zope_deprecation/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, zope_testing
+}:
+
+buildPythonPackage rec {
+ pname = "zope.deprecation";
+ version = "4.1.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "fed622b51ffc600c13cc5a5b6916b8514c115f34f7ea2730409f30c061eb0b78";
+ };
+
+ buildInputs = [ zope_testing ];
+
+ meta = with stdenv.lib; {
+ homepage = http://github.com/zopefoundation/zope.deprecation;
+ description = "Zope Deprecation Infrastructure";
+ license = licenses.zpl20;
+ maintainers = with maintainers; [ garbas domenkozar ];
+ };
+
+}
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 7f89d1ffa87..65cde981502 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
- version = "1.16.3";
- source.sha256 = "0spddjiq6yscl4sywwcj5zrjk3lq02zacigrz2fh78yfdzyi34fq";
+ version = "1.16.4";
+ source.sha256 = "15zrxqv817w4vawc23lx3miigir36ba59wkykkr6l1nkf0iy013d";
dontPatchShebangs = true;
postFixup = ''
diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix
index 07bcd57a121..defc39a9f74 100644
--- a/pkgs/development/tools/analysis/egypt/default.nix
+++ b/pkgs/development/tools/analysis/egypt/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPerlPackage }:
+{ stdenv, fetchurl, perlPackages }:
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "egypt-${version}";
version = "1.10";
diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 659d6a94f5e..25c6d6d5879 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -8,7 +8,7 @@
, python3 }:
let
- version = "1.7.1";
+ version = "1.7.2";
in
stdenv.mkDerivation rec {
name = "radare2-cutter-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
- sha256 = "0dfi6f016jnh3swppvks5qkvmk0j2hvggh9sd1f40kg9pg5p08hy";
+ sha256 = "09cqfz66r3830jkz1rwyfqw1xl1jfj6xg4pcccd2ml456kddh9dn";
};
postUnpack = "export sourceRoot=$sourceRoot/src";
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index f10b820a73e..2f0878da8c6 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -2,6 +2,7 @@
, callPackage
, ninja, meson , pkgconfig
, libusb, readline, libewf, perl, zlib, openssl
+, libuv
, gtk2 ? null, vte ? null, gtkdialog ? null
, python ? null
, ruby ? null
@@ -62,12 +63,15 @@ let
"-Dr2_gittip=${gittip}"
# 2.8.0 expects this, but later it becomes an option with default=false.
"-Dcapstone_in_builddir=true"
+
+ "-Duse_sys_openssl=true"
+ "-Duse_sys_zlib=true"
];
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ninja meson ];
- buildInputs = [ readline libusb libewf perl zlib openssl]
+ buildInputs = [ readline libusb libewf perl zlib openssl libuv ]
++ optional useX11 [gtkdialog vte gtk2]
++ optional rubyBindings [ruby]
++ optional pythonBindings [python]
@@ -86,24 +90,24 @@ in {
#
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
- version_commit = "19349";
- gittap = "2.9.0";
- gittip = "d5e9539ec8068ca2ab4759dc3b0697781ded4cc8";
- rev = "2.9.0";
- version = "2.9.0";
- sha256 = "0zz6337p9095picfvjrcnqaxdi2a2b68h9my523ilnw8ynwfhdzw";
- cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
- cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
+ version_commit = "19720";
+ gittap = "3.0.0";
+ gittip = "13e3ebd2aa6653eb5b6bdd65a93dcddf3550fcfa";
+ rev = "3.0.0";
+ version = "3.0.0";
+ sha256 = "0awbk9v7qjkarscaqzyly310f04dxgndxvxwxbjrsswqlp206b40";
+ cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
+ cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
};
r2-for-cutter = generic {
- version_commit = "19349";
- gittap = "2.8.0-189-gf82b28982";
- gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
- rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
- version = "2018-08-14";
- sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1";
- cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
- cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
+ version_commit = "19720";
+ gittap = "2.9.0-310-gcb62c376b";
+ gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
+ rev = "cb62c376bef6c7427019a7c28910c33c364436dd";
+ version = "2018-10-07";
+ sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l";
+ cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
+ cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
};
#
}
diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py
index 45920fd1e4b..684d70bc0bc 100755
--- a/pkgs/development/tools/analysis/radare2/update.py
+++ b/pkgs/development/tools/analysis/radare2/update.py
@@ -38,10 +38,9 @@ def get_radare2_rev() -> str:
def get_cutter_version() -> str:
version_expr = """
-(with import {}; (builtins.parseDrvName (qt5.callPackage ./cutter.nix {}).name).version)
+(with import {}; (builtins.parseDrvName (qt5.callPackage {}).name).version)
"""
- with SCRIPT_DIR:
- return sh("nix", "eval", "--raw", version_expr.strip())
+ return sh("nix", "eval", "--raw", version_expr.strip(), "-I", "radare2={0}".format(SCRIPT_DIR))
def get_r2_cutter_rev() -> str:
@@ -109,7 +108,7 @@ def main() -> None:
"https://github.com/radare/radare2",
".",
)
- nix_file = str(Path(__file__).parent.joinpath("default.nix"))
+ nix_file = str(SCRIPT_DIR.joinpath("default.nix"))
radare2_info = get_repo_info(dirname, radare2_rev)
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index e9f005f7991..19836b412c0 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -13,8 +13,8 @@
let
srcDeps = lib.singleton (
fetchurl {
- url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip";
- sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b";
+ url = "https://github.com/google/desugar_jdk_libs/archive/fd937f4180c1b557805219af4482f1a27eb0ff2b.zip";
+ sha256 = "04hs399340xfwcdajbbcpywnb2syp6z5ydwg966if3hqdb2zrf23";
}
);
@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
- version = "0.17.1";
+ version = "0.18.0";
meta = with lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -42,19 +42,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "081z40vsxvw6ndiinik4pn09gxmv140k6l9zv93dgjr86qf2ir13";
+ sha256 = "0mbi4n4wp1x73l8qksg4vyh2sba52xh9hfl2m518gv41g0pnvs6h";
};
sourceRoot = ".";
patches =
- lib.optional enableNixHacks ./nix-hacks.patch
- # patch perl out of the bash completions
- # should land in 0.18
- ++ [(fetchpatch {
- url = "https://github.com/bazelbuild/bazel/commit/27be70979b54d7510bf401d9581fb4075737ef34.patch";
- sha256 = "04rip46lnibrsdyzjpi29wf444b49cbwb1xjcbrr3kdqsdj4d8h5";
- })];
+ lib.optional enableNixHacks ./nix-hacks.patch;
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
@@ -137,10 +131,10 @@ stdenv.mkDerivation rec {
echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc
echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc
echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc
- sed -i -e "362 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
- sed -i -e "362 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
- sed -i -e "362 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
- sed -i -e "362 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+ sed -i -e "378 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+ sed -i -e "378 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+ sed -i -e "378 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+ sed -i -e "378 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
# --experimental_strict_action_env (which will soon become the
# default, see bazelbuild/bazel#2574) hardcodes the default
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 60f342db12a..dce19a1d839 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
- version = "1.2.4";
+ version = "1.2.6";
src = fetchurl {
urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
"https://cocl.us/sbt-${version}.tgz"
];
- sha256 = "06zv1mm4rhl0h6qa7m4w5lbwjcyqp43r183q36q9zlyip965mnrn";
+ sha256 = "1nv8r3j2vhp38qbb123n86wfhb6mvwz7vgrrsjp344zg211psncn";
};
patchPhase = ''
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index 67180b08f02..a9f451d31e7 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gettext, perl, perlXMLParser }:
+{ stdenv, fetchurl, fetchpatch, gettext, perlPackages }:
stdenv.mkDerivation rec {
name = "intltool-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45";
})];
- propagatedBuildInputs = [ gettext perl perlXMLParser ];
+ propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]);
meta = with stdenv.lib; {
description = "Translation helper tool";
diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix
index 9cd1a56e68f..df793866cbb 100644
--- a/pkgs/development/tools/misc/ninka/default.nix
+++ b/pkgs/development/tools/misc/ninka/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, perl, perlPackages, buildPerlPackage }:
+{ stdenv, fetchFromGitHub, perl, perlPackages }:
assert stdenv ? glibc;
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "ninka-${version}";
version = "2.0-pre";
@@ -12,7 +12,7 @@ buildPerlPackage rec {
rev = "b89b59ecd057dfc939d0c75acaddebb58fcd8cba";
sha256 = "1grlis1kycbcjvjgqvn7aw81q1qx49ahvxg2k7cgyr79mvgpgi9m";
};
-
+
buildInputs = with perlPackages; [ perl TestOutput DBDSQLite DBI TestPod TestPodCoverage SpreadsheetParseExcel ];
doCheck = false; # hangs
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 0f95fa9aaf7..5563e7836cc 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gzdoom-${version}";
- version = "3.5.1";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "coelckers";
repo = "gzdoom";
rev = "g${version}";
- sha256 = "109qmjkafr1xghpn0k1a8a0zgladc8r6hyw99v8r51ryjf5qf9sd";
+ sha256 = "03yklhdppncaswy6l3fcvy8l8v1icfnm9f0jlszvibcm5ba7z0j1";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 6fba977e008..bccc55914fe 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
stdenv.mkDerivation rec {
- version = "6.2.4";
+ version = "6.2.5";
name = "seafile-shared-${version}";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile";
rev = "v${version}";
- sha256 = "0v6wvw8x3zfcapi0lk71mg89gy3gw2qmdiq6mhw6qbbrzvqprlmr";
+ sha256 = "1s8cqh5wfll81d060f4zknxhmwwqckci6dadmslbvbvx55lgyspa";
};
nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 37e7af95a91..0c144b56741 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "adapta-gtk-theme-${version}";
- version = "3.94.0.149";
+ version = "3.95.0.1";
src = fetchFromGitHub {
owner = "adapta-project";
repo = "adapta-gtk-theme";
rev = version;
- sha256 = "1rb07yv4iz4yp6cnigzy690mw3w6fcf7szlcbbna6wnjaf1rbf2i";
+ sha256 = "0hc3ar55wjg51qf8c7h0nix0lyqs16mk1d4hhxyv102zq4l5fz97";
};
preferLocalBuild = true;
diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
index 61f7d1debcc..571639a9901 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "theme-obsidian2-${version}";
- version = "2.6";
+ version = "2.7";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "theme-obsidian-2";
rev = "v${version}";
- sha256 = "1bb629y11j79h0rxi36iszki6m6l59iwlcraygr472gf44a2xp11";
+ sha256 = "0my3q7xvi6m257x489wync0y5n8n1kig4xg5gfrb905avhxj5frs";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index f58ab5c95cc..b4df3b7b33e 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,13 +1,13 @@
{ stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.18.2018.09.21";
+ version = "4.18.2018.10.12";
modDirVersion = "4.18.0";
src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs.git";
- rev = "2fe17e38d355271a8212a8123a9281e2f9df811f";
- sha256 = "1p35qf7fdwpr8sz4alblmbq6rmhd87rwrrwk6xpgxsfkkhmf36d6";
+ rev = "d7f6da1d60ec24266301231538ff6f09716537ed";
+ sha256 = "05d7dh41nc35www8vmrn47wlf2mr2b8i4rm15vq3zgm32d0xv3lk";
};
extraConfig = "BCACHEFS_FS m";
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 15c3e10e119..8882ffdd45e 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -26,32 +26,44 @@ buildPhase() {
fi
}
-
+
installPhase() {
# Install libGL and friends.
+
+ # since version 391, 32bit libraries are bundled in the 32/ sub-directory
+ if [ "$i686bundled" = "1" ]; then
+ mkdir -p "$lib32/lib"
+ cp -prd 32/*.so.* 32/tls "$lib32/lib/"
+ fi
+
mkdir -p "$out/lib"
cp -prd *.so.* tls "$out/lib/"
- rm $out/lib/lib{glx,nvidia-wfb}.so.* # handled separately
- rm -f $out/lib/libnvidia-gtk* # built from source
- if [ "$useGLVND" = "1" ]; then
- # Pre-built libglvnd
- rm $out/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
- fi
- # Use ocl-icd instead
- rm $out/lib/libOpenCL.so*
- # Move VDPAU libraries to their place
- mkdir $out/lib/vdpau
- mv $out/lib/libvdpau* $out/lib/vdpau
- # Install ICDs.
- install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd
- if [ -e nvidia_icd.json.template ]; then
- sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
- install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json
- fi
- if [ "$useGLVND" = "1" ]; then
- install -Dm644 10_nvidia.json $out/share/glvnd/egl_vendor.d/nvidia.json
- fi
+ for i in $lib32 $out; do
+ rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately
+ rm -f $i/lib/libnvidia-gtk* # built from source
+ if [ "$useGLVND" = "1" ]; then
+ # Pre-built libglvnd
+ rm $i/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
+ fi
+ # Use ocl-icd instead
+ rm -f $i/lib/libOpenCL.so*
+ # Move VDPAU libraries to their place
+ mkdir $i/lib/vdpau
+ mv $i/lib/libvdpau* $i/lib/vdpau
+
+ # Install ICDs.
+ install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd
+ if [ -e nvidia_icd.json.template ]; then
+ sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
+ install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json
+ fi
+ if [ "$useGLVND" = "1" ]; then
+ install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json
+ fi
+
+ done
+
if [ -n "$bin" ]; then
# Install the X drivers.
@@ -60,7 +72,7 @@ installPhase() {
mkdir -p $bin/lib/xorg/modules/drivers
cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers
mkdir -p $bin/lib/xorg/modules/extensions
- cp -p libglx.so.* $bin/lib/xorg/modules/extensions
+ cp -p libglx*.so* $bin/lib/xorg/modules/extensions
# Install the kernel module.
mkdir -p $bin/lib/modules/$kernelVersion/misc
@@ -78,7 +90,7 @@ installPhase() {
fi
# All libs except GUI-only are installed now, so fixup them.
- for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'`
+ for libname in $(find "$out/lib/" $(test -n "$lib32" && echo "$lib32/lib/") $(test -n "$bin" && echo "$bin/lib/") -name '*.so.*')
do
# I'm lazy to differentiate needed libs per-library, as the closure is the same.
# Unfortunately --shrink-rpath would strip too much.
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index d9ff157e142..492b268610f 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -26,8 +26,12 @@ rec {
patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
};
- beta = stable; # not enough interest to maintain beta ATM
-
+ beta = generic {
+ version = "410.57";
+ sha256_64bit = "08534rv3wcmzslbwq11kd3s7cxm72p48dia6540c0586xwgjwg2w";
+ settingsSha256 = "1phhhzlc8n3rqdhrn757mnlqmsp616d079a6h1qjpa6jba9z9915";
+ persistencedSha256 = "1z7c1ff0y486yp9i5w0siwh9dnprml22x2avarbjfgqwm4f652lw";
+ };
legacy_340 = generic {
version = "340.104";
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 090fce3a485..a40a6434493 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -1,5 +1,5 @@
{ version
-, sha256_32bit
+, sha256_32bit ? null
, sha256_64bit
, settingsSha256
, persistencedSha256
@@ -22,11 +22,15 @@
with stdenv.lib;
-assert (!libsOnly) -> kernel != null;
+assert !libsOnly -> kernel != null;
+assert versionOlder version "391" -> sha256_32bit != null;
+assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-linux";
let
nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
+ i686bundled = versionAtLeast version "391";
+
self = stdenv.mkDerivation {
name = "nvidia-x11-${version}${nameSuffix}";
@@ -34,24 +38,27 @@ let
builder = ./builder.sh;
src =
- if stdenv.hostPlatform.system == "i686-linux" then
- fetchurl {
- url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
- sha256 = sha256_32bit;
- }
- else if stdenv.hostPlatform.system == "x86_64-linux" then
+ if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
sha256 = sha256_64bit;
}
+ else if stdenv.hostPlatform.system == "i686-linux" then
+ fetchurl {
+ url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
+ sha256 = sha256_32bit;
+ }
else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";
patches = if libsOnly then null else patches;
inherit prePatch;
inherit version useGLVND useProfiles;
inherit (stdenv.hostPlatform) system;
+ inherit i686bundled;
- outputs = [ "out" ] ++ optional (!libsOnly) "bin";
+ outputs = [ "out" ]
+ ++ optional i686bundled "lib32"
+ ++ optional (!libsOnly) "bin";
outputDev = if libsOnly then null else "bin";
kernel = if libsOnly then null else kernel.dev;
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a67de2dab1a..c1b35946d68 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -998,7 +998,7 @@
"sensor.sochain" = ps: with ps; [ ];
"sensor.socialblade" = ps: with ps; [ ];
"sensor.sonarr" = ps: with ps; [ ];
- "sensor.speedtest" = ps: with ps; [ ];
+ "sensor.speedtest" = ps: with ps; [ speedtest-cli ];
"sensor.spotcrime" = ps: with ps; [ ];
"sensor.sql" = ps: with ps; [ sqlalchemy ];
"sensor.startca" = ps: with ps; [ xmltodict ];
diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix
index 3d48e952781..82199938060 100644
--- a/pkgs/servers/mail/postfix/pflogsumm.nix
+++ b/pkgs/servers/mail/postfix/pflogsumm.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, buildPerlPackage, perlPackages
-}:
+{ stdenv, fetchurl, perlPackages }:
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "pflogsumm-${version}";
version = "1.1.3";
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index acbc50fd42b..d3295721013 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, buildPerlPackage, perl, perlPackages, HTMLParser, NetDNS, NetAddrIP, DBFile
+{ stdenv, fetchurl, perl, perlPackages, HTMLParser, NetDNS, NetAddrIP, DBFile
, HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1
}:
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "SpamAssassin-3.4.1";
src = fetchurl {
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix
index d9e8ccf1454..33725cb6283 100644
--- a/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/pkgs/servers/monitoring/fusion-inventory/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
+{ stdenv, lib, fetchurl, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
, fetchFromGitHub, makeWrapper
}:
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "FusionInventory-Agent-${version}";
version = "2.3.21";
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index e795d74fe98..b3a31d2d1ba 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
- version = "5.2.4";
+ version = "5.3.1";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";
@@ -9,12 +9,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "15w935i22ddx6ff32ynypjh3q670vnrj74qw0vdkxdmrlwk3q7wc";
+ sha256 = "0k4jsqgk0wbp1xc159vrs855d42kcdc4d38v498imp6a90idniyp";
};
srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "187dqjahz1z1gkcx9pxnf2hri6g3b5j3ppadwfahz0rwsqj4v2lf";
+ sha256 = "133ckn5f4l6vqy65y1z3mzhzhy8xcyq65nqb34mwn2zsi7pzvssz";
};
postPatch = ''
diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix
index ccfbbd60903..2b1000d0d85 100644
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildPerlPackage, fetchgit, perl, openssl, perlPackages, gettext, python3Packages
+{ stdenv, fetchgit, perl, openssl, perlPackages, gettext, python3Packages
# TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere.
, extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }:
-buildPerlPackage {
+perlPackages.buildPerlPackage {
name = "openxpki-git20150807";
src = fetchgit {
diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index cf0fddd6699..fe14f0f33c8 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, buildPerlPackage, fetchurl, fetchpatch, makeWrapper
+{ stdenv, fetchurl, fetchpatch, makeWrapper
, perl, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }:
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "slimserver-${version}";
version = "7.9.1";
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index b7793c1ac56..d2a4406a973 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -180,11 +180,11 @@ everything = stdenv.mkDerivation (common // {
connector-c = stdenv.mkDerivation rec {
name = "mariadb-connector-c-${version}";
- version = "2.3.6";
+ version = "2.3.7";
src = fetchurl {
url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/";
- sha256 = "15iy5iqp0njbwbn086x2dq8qnbkaci7ydvi84cf5z8fxvljis9vb";
+ sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl";
name = "mariadb-connector-c-${version}-src.tar.gz";
};
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 87d0a0ee455..52866784faa 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openssl, sqlite, pkgconfig, systemd
+{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd
, tlsSupport ? false }:
assert tlsSupport -> openssl != null;
@@ -7,9 +7,11 @@ stdenv.mkDerivation rec {
name = "uhub-${version}";
version = "0.5.0";
- src = fetchurl {
- url = "https://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2";
- sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5";
+ src = fetchFromGitHub {
+ owner = "janvidar";
+ repo = "uhub";
+ rev = version;
+ sha256 = "0zdbxfvw7apmfhqgsfkfp4pn9iflzwdn0zwvzymm5inswfc00pxg";
};
nativeBuildInputs = [ pkgconfig ];
@@ -20,6 +22,7 @@ stdenv.mkDerivation rec {
"mod_welcome"
"mod_logging"
"mod_auth_simple"
+ "mod_auth_sqlite"
"mod_chat_history"
"mod_chat_only"
"mod_topic"
@@ -28,9 +31,14 @@ stdenv.mkDerivation rec {
patches = [
./plugin-dir.patch
+ # fix aarch64 build: https://github.com/janvidar/uhub/issues/46
+ (fetchpatch {
+ url = "https://github.com/janvidar/uhub/pull/47.patch";
+ sha256 = "07yik6za89ar5bxm7m2183i7f6hfbawbxvd4vs02n1zr2fgfxmiq";
+ })
# Fixed compilation on systemd > 210
- (fetchurl {
+ (fetchpatch {
url = "https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.diff";
sha256 = "1jp8fvw6f9jh0sdjml9mahkk6p6b96p6rzg2y601mnnbcdj8y8xp";
})
diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch
index 01cbcbb31cf..d29d600425f 100644
--- a/pkgs/servers/uhub/plugin-dir.patch
+++ b/pkgs/servers/uhub/plugin-dir.patch
@@ -7,7 +7,7 @@
- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_history_sqlite mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL )
- install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL )
+
-+ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
++ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
+
+ foreach( PLUGIN ${PLUGINS} )
+ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL )
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index ae7dd980577..fd1787d4c99 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -49,13 +49,9 @@ in rec {
};
unifiStable = generic {
- version = "5.8.30";
- sha256 = "051cx1y51xmhvd3s8zbmknrcjdi46mj4yf1rlnngzr77rj77sqvi";
- };
-
- unifiTesting = generic {
version = "5.9.29";
- suffix = "-04b5d20997";
sha256 = "0djdjh7lwaa5nvhvz2yh6dn07iad5nq4jpab7rc909sljl6wvwvx";
};
+
+ unifiTesting = unifiStable;
}
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 2dc6d8ffd78..6dc785621b5 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -1,35 +1,49 @@
-{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg, coreutils }:
+{ stdenv, fetchFromGitHub,
+ openssl, zlib, libjpeg, xorg, coreutils, libvncserver,
+ autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec {
- name = "x11vnc-0.9.13";
+ name = "x11vnc-${version}";
+ version = "0.9.15";
- src = fetchurl {
- url = "mirror://sourceforge/libvncserver/${name}.tar.gz";
- sha256 = "0fzib5xb1vbs8kdprr4z94v0fshj2c5hhaz69llaarwnc8p9z0pn";
+ src = fetchFromGitHub {
+ owner = "LibVNC";
+ repo = "x11vnc";
+ rev = version;
+ sha256 = "1a1b65k1hsy4nhg2sx1yrpaz3vx6s7rmrx8nwygpaam8wpdlkh8p";
};
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
buildInputs =
[ xorg.libXfixes xorg.fixesproto openssl xorg.libXdamage
xorg.damageproto zlib xorg.libX11 xorg.xproto libjpeg
xorg.libXtst xorg.libXinerama xorg.xineramaproto xorg.libXrandr
xorg.randrproto xorg.libXext xorg.xextproto xorg.inputproto
xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto
+ libvncserver
];
- preConfigure = ''
- configureFlags="--mandir=$out/share/man"
-
- substituteInPlace x11vnc/unixpw.c \
+ postPatch = ''
+ substituteInPlace src/unixpw.c \
--replace '"/bin/su"' '"/run/wrappers/bin/su"' \
--replace '"/bin/true"' '"${coreutils}/bin/true"'
- sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' x11vnc/ssltools.h
+ sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h
+
+ # Xdummy script is currently broken, so we avoid building it. This removes everything Xdummy-related from the affected Makefile
+ sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am
+ '';
+
+ preConfigure = ''
+ configureFlags="--mandir=$out/share/man"
'';
meta = with stdenv.lib; {
description = "A VNC server connected to a real X11 screen";
- homepage = http://www.karlrunge.com/x11vnc/;
+ homepage = https://github.com/LibVNC/x11vnc/;
platforms = platforms.linux;
license = licenses.gpl2;
+ maintainers = with maintainers; [ OPNA2608 ];
};
}
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 3e4d49108b7..7f1552f9197 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchurl, callPackage, python2Packages, pkgconfig
-, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
-, makeWrapper, xorgserver, getopt, xauth, utillinux, which
+{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig
+, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk
+, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
, ffmpeg, x264, libvpx, libwebp
, libfakeXinerama
, gst_all_1, pulseaudio, gobjectIntrospection
@@ -9,7 +9,7 @@
with lib;
let
- inherit (python2Packages) cython buildPythonApplication;
+ inherit (python3.pkgs) cython buildPythonApplication;
xf86videodummy = callPackage ./xf86videodummy { };
in buildPythonApplication rec {
@@ -21,7 +21,14 @@ in buildPythonApplication rec {
sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija";
};
- nativeBuildInputs = [ pkgconfig ];
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit (xorg) xkeyboardconfig;
+ })
+ ];
+
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection wrapGAppsHook ];
buildInputs = [
cython
@@ -30,11 +37,10 @@ in buildPythonApplication rec {
xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
xorg.libXrandr xorg.libxkbfile
- pango cairo gdk_pixbuf atk gtk2 glib
+ pango cairo gdk_pixbuf atk gtk3 glib
ffmpeg libvpx x264 libwebp
- gobjectIntrospection
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
@@ -42,38 +48,34 @@ in buildPythonApplication rec {
gst_all_1.gst-libav
pam
-
- makeWrapper
];
- propagatedBuildInputs = with python2Packages; [
- pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python
- netifaces numpy websockify pygobject3 gst-python pam
+ propagatedBuildInputs = with python3.pkgs; [
+ pillow rencode pycrypto cryptography pycups lz4 dbus-python
+ netifaces numpy websockify pygobject3 pycairo gst-python pam
];
- preBuild = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
- substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
- substituteInPlace xpra/x11/bindings/keyboard_bindings.pyx --replace "/usr/share/X11/xkb" "${xorg.xkeyboardconfig}/share/X11/xkb"
- '';
- setupPyBuildFlags = ["--with-Xdummy" "--without-strict"];
+ NIX_CFLAGS_COMPILE = [
+ # error: 'import_cairo' defined but not used
+ "-Wno-error=unused-function"
+ ];
- postInstall = ''
- wrapProgram $out/bin/xpra \
- --set XPRA_INSTALL_PREFIX "$out" \
- --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
- --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \
- --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
+ setupPyBuildFlags = [
+ "--with-Xdummy"
+ "--without-strict"
+ "--with-gtk3"
+ "--without-gtk2"
+ ];
+
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --set XPRA_INSTALL_PREFIX "$out"
+ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
--prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
+ )
'';
- preCheck = "exit 0";
-
- #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
- #postFixup = ''
- # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
- # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
- #'';
+ doCheck = false;
passthru = { inherit xf86videodummy; };
diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch
new file mode 100644
index 00000000000..c50ec28c35e
--- /dev/null
+++ b/pkgs/tools/X11/xpra/fix-paths.patch
@@ -0,0 +1,33 @@
+--- a/setup.py
++++ b/setup.py
+@@ -1885,7 +1885,7 @@
+ if OSX:
+ pycairo = "py3cairo"
+ else:
+- pycairo = "pycairo"
++ pycairo = "py3cairo"
+ cython_add(Extension("xpra.client.gtk3.cairo_workaround",
+ ["xpra/client/gtk3/cairo_workaround.pyx"],
+ **pkgconfig(pycairo)
+--- a/xpra/client/gtk3/cairo_workaround.pyx
++++ b/xpra/client/gtk3/cairo_workaround.pyx
+@@ -65,7 +65,7 @@
+ void cairo_surface_flush (cairo_surface_t *surface)
+ void cairo_surface_mark_dirty (cairo_surface_t *surface)
+
+-cdef extern from "pycairo/pycairo.h":
++cdef extern from "py3cairo.h":
+ ctypedef struct Pycairo_CAPI_t:
+ pass
+ ctypedef struct PycairoSurface:
+--- a/xpra/x11/bindings/keyboard_bindings.pyx
++++ b/xpra/x11/bindings/keyboard_bindings.pyx
+@@ -19,7 +19,7 @@
+
+ DEF PATH_MAX = 1024
+ DEF DFLT_XKB_RULES_FILE = "base"
+-DEF DFLT_XKB_CONFIG_ROOT = "/usr/share/X11/xkb"
++DEF DFLT_XKB_CONFIG_ROOT = "@xkeyboardconfig@/share/X11/xkb"
+
+ ###################################
+ # Headers, python magic
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
deleted file mode 100644
index ceba4269e80..00000000000
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ stdenv, fetchurl, buildPythonApplication
-, python, cython, pkgconfig
-, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection
-, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf
-, ffmpeg, x264, libvpx, libwebp
-, libfakeXinerama, pam }:
-
-buildPythonApplication rec {
- name = "xpra-${version}";
- version = "2.2.5";
-
- src = fetchurl {
- url = "https://xpra.org/src/${name}.tar.xz";
- sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
- };
-
- patchPhase = ''
- substituteInPlace setup.py --replace 'pycairo' 'py3cairo'
- substituteInPlace xpra/client/gtk3/cairo_workaround.pyx --replace 'pycairo/pycairo.h' 'py3cairo.h'
- '';
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
- xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
- xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
- xorg.libXrandr xorg.libxkbfile
-
- pango cairo gdk_pixbuf atk gtk3 glib gobjectIntrospection
-
- ffmpeg libvpx x264 libwebp
-
- makeWrapper
-
- pam
- ];
-
- propagatedBuildInputs = [
- pygobject3 pycairo cython
- ];
-
- preBuild = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)"
- substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
- '';
- setupPyBuildFlags = [ "--without-strict" "--with-gtk3" "--without-gtk2" "--with-Xdummy" ];
-
- preInstall = ''
- # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
- ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
- sed -i '/ = data_files/d' setup.py
- '';
-
- postInstall = ''
- wrapProgram $out/bin/xpra \
- --set FONTCONFIG_FILE "${fontsConf}" \
- --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
- --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}
- '';
-
- preCheck = "exit 0";
- doInstallCheck = false;
-
- #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
- #postFixup = ''
- # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
- # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
- #'';
-
-
- meta = with stdenv.lib; {
- homepage = http://xpra.org/;
- downloadPage = "https://xpra.org/src/";
- downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
- description = "Persistent remote applications for X";
- platforms = platforms.linux;
- license = licenses.gpl2;
- };
-}
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 023d03f0414..5d3050108b8 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, pkgconfig, which, freetype, pango }:
+{ stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }:
stdenv.mkDerivation rec {
name = "abcm2ps-${version}";
- version = "8.13.24";
+ version = "8.14.0";
src = fetchFromGitHub {
owner = "leesavide";
repo = "abcm2ps";
rev = "v${version}";
- sha256 = "0xb0gdxbagy6bzrh61s667svab43r06d6yi20gw52dh022mj99ag";
+ sha256 = "1nlvq2cfdy5pghll3aprws7yx5p14gcrhz10q9fa6myrd8ad4if1";
};
prePatch = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"CC=${stdenv.cc}/bin/cc"
];
- nativeBuildInputs = [ which pkgconfig ];
+ nativeBuildInputs = [ which pkgconfig docutils ];
buildInputs = [ freetype pango ];
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index ee1ee2e6178..75737e2da7f 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -2,12 +2,12 @@
, liburcu, zlib, libaio, zstd, lz4 }:
stdenv.mkDerivation rec {
- name = "bcachefs-tools-unstable-2018-08-22";
+ name = "bcachefs-tools-unstable-2018-10-12";
src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs-tools.git";
- rev = "ebf97e8e01a8e76ff4bec23f29106430852c3081";
- sha256 = "0f2ycin0gmi1a4fm7qln0c10zn451gljfbc2piy1fm768xqqrmld";
+ rev = "55fbb25501330038e1714905b9ddeb25d875c11c";
+ sha256 = "0cwzbyf133jc0fkc8nmjcvv3wmglqhyxda1hh10hgxrbq5vm39wx";
};
enableParallelBuilding = true;
diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix
index fef5c657a7a..4ff769eadf5 100644
--- a/pkgs/tools/graphics/feedgnuplot/default.nix
+++ b/pkgs/tools/graphics/feedgnuplot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPerlPackage, makeWrapper, gawk
+{ stdenv, fetchFromGitHub, makeWrapper, gawk
, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages
}:
@@ -8,7 +8,7 @@ let
in
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "feedgnuplot-${version}";
version = "1.51";
diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix
index 9b4c4677962..c21fc02753e 100644
--- a/pkgs/tools/graphics/graph-easy/default.nix
+++ b/pkgs/tools/graphics/graph-easy/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPerlPackage, fetchurl }:
+{ stdenv, perlPackages, fetchurl }:
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "Graph-Easy-${version}";
version = "0.76";
src = fetchurl {
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index abb0b4edc17..fe574b4f8d4 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "esptool";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "espressif";
repo = "esptool";
rev = "v${version}";
- sha256 = "0cvxapcln1xcz8hy0hidw6g8q61s5j3q03j3wrviagbh0zip8jdx";
+ sha256 = "19l3b1fqg1n3ch484dcibbi5a3nbmjq086has5pwqn348h4k57mh";
};
checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ];
diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix
index 3f2a66bf4c8..89f76bb9b1b 100644
--- a/pkgs/tools/misc/rename/default.nix
+++ b/pkgs/tools/misc/rename/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, buildPerlPackage }:
+{ stdenv, fetchFromGitHub, perlPackages }:
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "rename-${version}";
version = "1.9";
outputs = [ "out" ];
diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index 93828c10d13..14de1fea479 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPerlPackage, fetchurl, perlPackages, iproute }:
+{ stdenv, fetchurl, perlPackages, iproute }:
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "ddclient-${version}";
version = "3.8.3";
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
deleted file mode 100644
index eedea841356..00000000000
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
-
-python3Packages.buildPythonApplication rec {
- name = "speedtest-cli-${version}";
- version = "2.0.2";
-
- src = fetchFromGitHub {
- owner = "sivel";
- repo = "speedtest-cli";
- rev = "v${version}";
- sha256 = "0vv2z37g2kgm2dzkfa4bhri92hs0d1acxi8z66gznsl5148q7sdi";
- };
-
- meta = with stdenv.lib; {
- homepage = https://github.com/sivel/speedtest-cli;
- description = "Command line interface for testing internet bandwidth using speedtest.net";
- platforms = platforms.all;
- license = licenses.asl20;
- maintainers = with maintainers; [ domenkozar ndowens ];
- };
-}
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index 8e236aa426f..e744b897f46 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -134,7 +134,8 @@ buildFHSUserEnv {
if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then
# is type-1 appimage
- ${libarchive}/bin/bsdtar -x -C "$SQUASHFS_ROOT" -f "$APPIMAGE"
+ mkdir "$APPDIR"
+ ${libarchive}/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE"
else
# is type-2 appimage
"$APPIMAGE" --appimage-extract 2>/dev/null
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index f4def72b728..228695878dc 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -1,27 +1,44 @@
{ stdenv, fetchurl, makeWrapper
, perl, libassuan, libgcrypt
, perlPackages, lockfileProgs, gnupg
+# For the tests:
+, bash, openssh, which, socat, cpio, hexdump
}:
stdenv.mkDerivation rec {
name = "monkeysphere-${version}";
- version = "0.41";
+ version = "0.42";
src = fetchurl {
url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz";
- sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li";
+ sha256 = "1haqgjxm8v2xnhc652lx79p2cqggb9gxgaf19w9l9akar2qmdjf1";
};
patches = [ ./monkeysphere.patch ];
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ perl libassuan libgcrypt ];
+ buildInputs = [ perl libassuan libgcrypt ]
+ ++ stdenv.lib.optional doCheck
+ ([ gnupg openssh which socat cpio hexdump ] ++
+ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ]));
makeFlags = ''
PREFIX=/
DESTDIR=$(out)
'';
+ # Not all checks pass yet (NixOS specific problems) and the tests "drain"
+ # entropy (apparently GnuPG still uses /dev/random).
+ doCheck = false;
+ preCheck = ''
+ patchShebangs tests/keytrans
+ patchShebangs src/share/keytrans
+ patchShebangs src/share/checkperms
+ sed -i "s,/usr/bin/env\ bash,${bash}/bin/bash," tests/basic
+ sed -i "s,/usr/sbin/sshd,${openssh}/bin/sshd," tests/basic
+ sed -i "s/<(hd/<(hexdump/" tests/keytrans
+ '';
+
postFixup =
let wrapperArgs = runtimeDeps:
"--prefix PERL5LIB : "
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 41016dc49fa..c0210127d9f 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "fio-${version}";
- version = "3.10";
+ version = "3.11";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
- sha256 = "0cg6knaja32g46j1vlf0qw4q8yng7hrnnvh6b768pbjdxpn3wvi0";
+ sha256 = "0k5hja50qmz6qwm8h7z00zdgxhf1vg1g168jinqzn1521fihvlvz";
};
buildInputs = [ python zlib ]
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix
index 12852265c40..c4fb74cf1a1 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, buildPerlPackage, perlPackages, makeWrapper}:
+{ stdenv, fetchFromGitHub, perlPackages, makeWrapper}:
-buildPerlPackage rec {
+perlPackages.buildPerlPackage rec {
name = "linode-cli-${version}";
version = "1.4.7";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8fcf0baba02..0f243df540d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -54,6 +54,7 @@ mapAliases ({
buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11
buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11
buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11
+ buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
bundler_HEAD = bundler; # added 2015-11-15
cantarell_fonts = cantarell-fonts; # added 2018-03-03
checkbashism = checkbashisms; # added 2016-08-16
@@ -209,6 +210,8 @@ mapAliases ({
p11_kit = p11-kit; # added 2018-02-25
parquet-cpp = arrow-cpp; # added 2018-09-08
pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
+ perlXMLParser = perlPackages.XMLParser; # added 2018-10-12
+ perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12
pgp-tools = signing-party; # added 2017-03-26
pidgin-with-plugins = pidgin; # added 2016-06
pidginlatex = pidgin-latex; # added 2018-01-08
@@ -316,6 +319,7 @@ mapAliases ({
xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
xlibs = xorg; # added 2015-09
+ xpraGtk3 = xpra; # added 2018-09-13
youtubeDL = youtube-dl; # added 2014-10-26
# added 2017-05-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2197b19a804..af8fded2d4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5036,9 +5036,7 @@ with pkgs;
gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas;
};
- rename = callPackage ../tools/misc/rename {
- inherit (perlPackages) buildPerlPackage;
- };
+ rename = callPackage ../tools/misc/rename { };
renameutils = callPackage ../tools/misc/renameutils { };
@@ -6970,14 +6968,12 @@ with pkgs;
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
- jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
- jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
+ jdk10 = openjdk10 // { outputs = [ "out" ]; };
+ jre10 = lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
(openjdk10.jre // { outputs = [ "jre" ]; }));
jre10_headless =
- if stdenv.isAarch32 || stdenv.isAarch64 then
- oraclejre10
- else if stdenv.isDarwin then
+ if stdenv.isDarwin then
jre10
else
lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"
@@ -8851,7 +8847,7 @@ with pkgs;
sparse = callPackage ../development/tools/analysis/sparse { };
- speedtest-cli = callPackage ../tools/networking/speedtest-cli { };
+ speedtest-cli = with python3Packages; toPythonApplication speedtest-cli;
spin = callPackage ../development/tools/analysis/spin { };
@@ -12964,14 +12960,10 @@ with pkgs;
});
perlPackages = perl528Packages;
- inherit (perlPackages) perl buildPerlPackage;
-
- perlXMLParser = perlPackages.XMLParser;
+ inherit (perlPackages) perl;
ack = perlPackages.ack;
- perlArchiveCpio = perlPackages.ArchiveCpio;
-
perlcritic = perlPackages.PerlCritic;
sqitchPg = callPackage ../development/tools/misc/sqitch {
@@ -15826,9 +15818,7 @@ with pkgs;
bristol = callPackage ../applications/audio/bristol { };
- bs1770gain = callPackage ../applications/audio/bs1770gain {
- ffmpeg = ffmpeg_2;
- };
+ bs1770gain = callPackage ../applications/audio/bs1770gain { };
bspwm = callPackage ../applications/window-managers/bspwm { };
@@ -19793,8 +19783,6 @@ with pkgs;
xpra = callPackage ../tools/X11/xpra { };
libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
- #TODO: 'pil' is not available for python3, yet
- xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; };
xrectsel = callPackage ../tools/X11/xrectsel { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ff7d672da36..e5f8186ea37 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8011,7 +8011,7 @@ let
sha256 = "0nlgdzy40q26z8qhwngsd461glyai8dpwaccyhiljmrkaqwdjxz2";
};
# Do not abort cross-compilation on failure to load native JSON module into host perl
- preConfigure = ''
+ preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Makefile.PL --replace "exit 0;" ""
'';
buildInputs = [ TestPod ];
@@ -8854,6 +8854,10 @@ let
sha256 = "dda2578d7b32152c4afce834761a61d117de286c705a9f7972c7ac6032ca5953";
};
propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ];
+ # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module)
+ postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+ substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #'
+ '';
meta = with stdenv.lib; {
description = "The World-Wide Web library for Perl";
license = with licenses; [ artistic1 gpl1Plus ];
@@ -11107,7 +11111,7 @@ let
url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz";
sha256 = "8391696db9e96c374b72984c0bad9c7d1c9f3b4efe68f9ddf429a77548e0e269";
};
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.buildPackages.pkgconfig ];
buildInputs = [ pkgs.dbus TestPod TestPodCoverage ];
propagatedBuildInputs = [ XMLTwig ];
meta = {
@@ -17596,9 +17600,11 @@ let
url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz;
sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s";
};
- patchPhase = if stdenv.isCygwin then ''
+ patchPhase = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+ substituteInPlace Expat/Makefile.PL --replace 'use English;' '#'
+ '' + stdenv.lib.optionalString stdenv.isCygwin ''
sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm
- '' else null;
+ '';
makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include";
propagatedBuildInputs = [ LWP ];
};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 981b3146a07..56fa061f8a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -577,6 +577,8 @@ in {
python-lz4 = callPackage ../development/python-modules/python-lz4 { };
+ python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
+
python-igraph = callPackage ../development/python-modules/python-igraph {
pkgconfig = pkgs.pkgconfig;
igraph = pkgs.igraph;
@@ -584,6 +586,8 @@ in {
python3-openid = callPackage ../development/python-modules/python3-openid { };
+ python-packer = callPackage ../development/python-modules/python-packer { };
+
python-periphery = callPackage ../development/python-modules/python-periphery { };
python-prctl = callPackage ../development/python-modules/python-prctl { };
@@ -827,6 +831,8 @@ in {
backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { };
+ backports_os = callPackage ../development/python-modules/backports_os { };
+
backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { };
backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else
@@ -864,99 +870,19 @@ in {
bibtexparser = callPackage ../development/python-modules/bibtexparser { };
- binwalk_fun = { visualizationSupport ? false, pyqtgraph ? null }:
- assert visualizationSupport -> pyqtgraph != null;
+ binwalk = callPackage ../development/python-modules/binwalk { };
- buildPythonPackage rec {
- name = "binwalk-${version}";
- version = "2.1.1";
-
- src = pkgs.fetchFromGitHub {
- owner = "devttys0";
- repo = "binwalk";
- rev = "291a03595d17f848c73b74cb6ca508da782cd8f7";
- sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw";
- };
-
- propagatedBuildInputs = with stdenv.lib; with pkgs; [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma self.pycrypto ]
- ++ optional visualizationSupport pyqtgraph;
-
- meta = with stdenv.lib; {
- homepage = "http://binwalk.org";
- description = "A tool for searching a given binary image for embedded files";
- platforms = platforms.all;
- maintainers = [ maintainers.koral ];
- };
- };
-
- binwalk = self.binwalk_fun { };
- binwalk-full = self.binwalk_fun { visualizationSupport = true; pyqtgraph = self.pyqtgraph; };
+ binwalk-full = appendToName "full" (self.binwalk.override {
+ pyqtgraph = self.pyqtgraph;
+ });
bitmath = callPackage ../development/python-modules/bitmath { };
- caldavclientlibrary-asynk = buildPythonPackage rec {
- version = "asynkdev";
- name = "caldavclientlibrary-asynk-${version}";
-
- src = pkgs.fetchgit {
- url = "https://github.com/skarra/CalDAVClientLibrary.git";
- rev = "06699b08190d50cc2636b921a654d67db0a967d1";
- sha256 = "157q32251ac9x3gdshgrjwsy48nq74vrzviswvph56h9wa8ksnnk";
- };
-
- disabled = isPy3k;
-
- meta = {
- description = "A Python library and tool for CalDAV";
-
- longDescription = ''
- CalDAVCLientLibrary is a Python library and tool for CalDAV.
-
- This package is the unofficial CalDAVCLientLibrary Python
- library maintained by the author of Asynk and is needed for
- that package.
- '';
-
- homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/;
- maintainers = with maintainers; [ pjones ];
- broken = true; # 2018-04-11
- };
- };
+ caldavclientlibrary-asynk = callPackage ../development/python-modules/caldavclientlibrary-asynk { };
biopython = callPackage ../development/python-modules/biopython { };
- bedup = buildPythonPackage rec {
- version = "0.10.1";
- name = "bedup-${version}";
-
- src = pkgs.fetchFromGitHub {
- owner = "g2p";
- repo = "bedup";
- rev = "v${version}";
- sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6";
- };
-
- buildInputs = with self; [ pkgs.btrfs-progs ];
- propagatedBuildInputs = with self; [ contextlib2 pyxdg pycparser alembic ]
- ++ optionals (!isPyPy) [ cffi ];
-
- disabled = pythonOlder "3.3";
-
- meta = {
- description = "Deduplication for Btrfs";
- longDescription = ''
- Deduplication for Btrfs. bedup looks for new and changed files, making sure that multiple
- copies of identical files share space on disk. It integrates deeply with btrfs so that scans
- are incremental and low-impact.
- '';
- homepage = https://github.com/g2p/bedup;
- license = licenses.gpl2;
-
- platforms = platforms.linux;
-
- maintainers = with maintainers; [ bluescreen303 ];
- };
- };
+ bedup = callPackage ../development/python-modules/bedup { };
blessed = callPackage ../development/python-modules/blessed {};
@@ -979,33 +905,7 @@ in {
numpy = self.numpy;
};
- capstone = buildPythonPackage rec {
- name = "capstone-3.0.4";
- src = pkgs.fetchurl {
- url = "mirror://pypi/c/capstone/${name}.tar.gz";
- sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225";
- };
- patches = [
- (pkgs.fetchpatch {
- stripLen = 2;
- url = "https://patch-diff.githubusercontent.com/raw/aquynh/capstone/pull/783/commits/23fe9f36622573c747e2bab6119ff245437bf276.patch";
- sha256 = "0yizqrdlxqxn16873593kdx2vrr7gvvilhgcf9xy6hr0603d3m5r";
- })
- ];
- postPatch = ''
- patchShebangs src/make.sh
- '';
- propagatedBuildInputs = [ ];
- preCheck = ''
- mv src/libcapstone.so capstone
- '';
- meta = with pkgs.stdenv.lib; {
- homepage = "http://www.capstone-engine.org/";
- license = licenses.bsdOriginal;
- description = "Capstone disassembly engine";
- maintainers = with maintainers; [ bennofs ];
- };
- };
+ capstone = callPackage ../development/python-modules/capstone { };
cement = callPackage ../development/python-modules/cement {};
@@ -1033,19 +933,7 @@ in {
constantly = callPackage ../development/python-modules/constantly { };
- cornice = buildPythonPackage rec {
- name = "cornice-${version}";
- version = "1.2.1";
- src = pkgs.fetchgit {
- url = https://github.com/mozilla-services/cornice.git;
- rev = "refs/tags/${version}";
- sha256 = "0688vrkl324jmpi8jkjh1s8nsyjinw149g3x8qlis8vz6j6a01wv";
- };
-
- propagatedBuildInputs = with self; [ pyramid simplejson ];
-
- doCheck = false; # lazy packager
- };
+ cornice = callPackage ../development/python-modules/cornice { };
cram = callPackage ../development/python-modules/cram { };
@@ -1129,35 +1017,7 @@ in {
bpython = callPackage ../development/python-modules/bpython {};
- bsddb3 = buildPythonPackage rec {
- name = "bsddb3-${version}";
- version = "6.1.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/b/bsddb3/${name}.tar.gz";
- sha256 = "6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3";
- };
-
- buildInputs = [ pkgs.db ];
-
- # Judging from SyntaxError in test
-# disabled = isPy3k;
- doCheck = false; # test suite breaks python3 compatibility
-
- # Path to database need to be set.
- # Somehow the setup.py flag is not propagated.
- #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ];
- # We can also use a variable
- preConfigure = ''
- export BERKELEYDB_DIR=${pkgs.db.dev};
- '';
-
- meta = {
- description = "Python bindings for Oracle Berkeley DB";
- homepage = https://www.jcea.es/programacion/pybsddb.htm;
- license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
- };
- };
+ bsddb3 = callPackage ../development/python-modules/bsddb3 { };
bkcharts = callPackage ../development/python-modules/bkcharts { };
@@ -1171,53 +1031,13 @@ in {
bottle = callPackage ../development/python-modules/bottle { };
- box2d = buildPythonPackage rec {
- name = "box2d-${version}";
- version = "2.3b0";
- disabled = (!isPy27);
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/B/Box2D/Box2D-2.3b0.zip";
- sha256 = "4519842c650b0153550eb0c9864da46b5a4ec8555c68b70f5cd2952a21c788b0";
- };
-
- patches = [ ../development/python-modules/box2d/disable-test.patch ];
-
- propagatedBuildInputs = [ pkgs.swig2 pkgs.box2d ];
-
- meta = {
- homepage = https://code.google.com/p/pybox2d/;
- description = ''
- A 2D game physics library for Python under
- the very liberal zlib license
- '';
- license = licenses.zlib;
- platforms = platforms.all;
- maintainers = with maintainers; [ sepi ];
- };
- };
+ box2d = callPackage ../development/python-modules/box2d { pkgs-box2d = pkgs.box2d; };
branca = callPackage ../development/python-modules/branca { };
bugwarrior = callPackage ../development/python-modules/bugwarrior { };
- # bugz = buildPythonPackage (rec {
- # name = "bugz-0.9.3";
- #
- # src = pkgs.fetchgit {
- # url = "https://github.com/williamh/pybugz.git";
- # rev = "refs/tags/0.9.3";
- # };
- #
- # propagatedBuildInputs = with self; [ self.argparse ];
- #
- # doCheck = false;
- #
- # meta = {
- # homepage = http://www.liquidx.net/pybugz/;
- # description = "Command line interface for Bugzilla";
- # };
- # });
+ bugz = callPackage ../development/python-modules/bugz { };
bugzilla = callPackage ../development/python-modules/bugzilla { };
@@ -1254,87 +1074,13 @@ in {
case = callPackage ../development/python-modules/case {};
- cassandra-driver = buildPythonPackage rec {
- name = "cassandra-driver-3.6.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/c/cassandra-driver/${name}.tar.gz";
- sha256 = "1aqmy3psn12lxgp659d0zsxkirxzy5lnbnzxf9xjq1a93s3qm704";
- };
-
- buildInputs = with self; [ pkgs.libev cython ];
-
- propagatedBuildInputs = with self; [ futures six ];
-
- postPatch = ''
- sed -i "s/<=1.0.1//" setup.py
- '';
-
- checkPhase = ''
- ${python.interpreter} setup.py gevent_nosetests
- ${python.interpreter} setup.py eventlet_nosetests
- '';
-
- checkInputs = [ scales eventlet twisted mock gevent nose pytz pyyaml sure ];
-
- # Could not get tests running
- doCheck = false;
-
- meta = {
- homepage = http://datastax.github.io/python-driver/;
- description = "A Python client driver for Apache Cassandra";
- license = licenses.asl20;
- };
- };
+ cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };
cccolutils = callPackage ../development/python-modules/cccolutils {};
- CDDB = buildPythonPackage rec {
- name = "CDDB-1.4";
+ CDDB = callPackage ../development/python-modules/cddb { };
- disabled = !isPy27;
-
- buildInputs = optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
-
- src = pkgs.fetchurl {
- url = "http://cddb-py.sourceforge.net/${name}.tar.gz";
- sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
- };
-
- meta = {
- homepage = http://cddb-py.sourceforge.net/;
- description = "CDDB and FreeDB audio CD track info access";
- license = licenses.gpl2Plus;
- };
- };
-
- cntk = buildPythonPackage rec {
- inherit (pkgs.cntk) name version src meta;
-
- buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ];
- propagatedBuildInputs = with self; [ numpy scipy enum34 protobuf pip ];
-
- CNTK_LIB_PATH = "${pkgs.cntk}/lib";
- CNTK_COMPONENT_VERSION = pkgs.cntk.version;
-
- postPatch = ''
- cd bindings/python
- sed -i 's,"libmpi.so.12","${pkgs.openmpi}/lib/libmpi.so",g' cntk/train/distributed.py
- '';
-
- postInstall = ''
- rm -rf $out/${python.sitePackages}/cntk/libs
- ln -s ${pkgs.cntk}/lib $out/${python.sitePackages}/cntk/libs
- # It's not installed for some reason.
- cp cntk/cntk_py.py $out/${python.sitePackages}/cntk
- '';
-
- # Actual tests are broken.
- checkPhase = ''
- cd $NIX_BUILD_TOP
- ${python.interpreter} -c "import cntk"
- '';
- };
+ cntk = callPackage ../development/python-modules/cntk { };
celery = callPackage ../development/python-modules/celery { };
@@ -1372,29 +1118,7 @@ in {
cligj = callPackage ../development/python-modules/cligj { };
- /* There is a project called "closure-linter" on PyPI that is the
- same as this, but it does not appear to be owned by Google.
- So we're pulling from Google's GitHub repo instead. */
- closure-linter = buildPythonPackage rec {
- name = "closure-linter-${version}";
- version = "2.3.19";
-
- /* This project has no Python 3 support, as noted by
- https://github.com/google/closure-linter/issues/81 */
- disabled = isPy3k;
-
- propagatedBuildInputs = with self; [ gflags ];
- src = pkgs.fetchgit {
- url = "https://github.com/google/closure-linter";
- rev = "5c27529075bb88bdc45e73008f496dec8438d658";
- sha256 = "076c7q7pr7akfvq5y8lxr1ab81wwps07gw00igdkcxnc5k9dzxwc";
- };
- meta = {
- description = "Checks JavaScript files against Google's style guide.";
- homepage = "https://developers.google.com/closure/utilities/";
- license = with licenses; [ asl20 ];
- };
- };
+ closure-linter = callPackage ../development/python-modules/closure-linter { };
cloudpickle = callPackage ../development/python-modules/cloudpickle { };
@@ -1425,31 +1149,7 @@ in {
# Backported version of the ConfigParser library of Python 3.3
configparser = callPackage ../development/python-modules/configparser { };
- ColanderAlchemy = buildPythonPackage rec {
- name = "ColanderAlchemy-${version}";
- version = "0.3.3";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/C/ColanderAlchemy/${name}.tar.gz";
- sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw";
- };
-
- patches = [
- (pkgs.fetchpatch {
- url = "https://github.com/stefanofontanelli/ColanderAlchemy/commit/b45fe35f2936a5ccb705e9344075191e550af6c9.patch";
- sha256 = "1kf278wjq49zd6fhpp55vdcawzdd107767shzfck522sv8gr6qvx";
- })
- ];
-
- buildInputs = with self; [ unittest2 ];
- propagatedBuildInputs = with self; [ colander sqlalchemy ];
-
- meta = {
- description = "Autogenerate Colander schemas based on SQLAlchemy models";
- homepage = https://github.com/stefanofontanelli/ColanderAlchemy;
- license = licenses.mit;
- };
- };
+ ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { };
conda = callPackage ../development/python-modules/conda { };
@@ -1517,36 +1217,7 @@ in {
wakeonlan = callPackage ../development/python-modules/wakeonlan { };
- openant = buildPythonPackage rec {
- name = "openant-unstable-2017-02-11";
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/Tigge/openant";
- description = "ANT and ANT-FS Python Library";
- license = licenses.mit;
- platforms = platforms.linux;
- };
-
- src = pkgs.fetchFromGitHub {
- owner = "Tigge";
- repo = "openant";
- rev = "ed89281e37f65d768641e87356cef38877952397";
- sha256 = "1g81l9arqdy09ijswn3sp4d6i3z18d44lzyb78bwnvdb14q22k19";
- };
-
- # Removes some setup.py hacks intended to install udev rules.
- # We do the job ourselves in postInstall below.
- postPatch = ''
- sed -i -e '/cmdclass=.*/d' setup.py
- '';
-
- postInstall = ''
- install -dm755 "$out/etc/udev/rules.d"
- install -m644 resources/ant-usb-sticks.rules "$out/etc/udev/rules.d/99-ant-usb-sticks.rules"
- '';
-
- propagatedBuildInputs = with self; [ pyusb ];
- };
+ openant = callPackage ../development/python-modules/openant { };
opencv = toPythonModule (pkgs.opencv.override {
enablePython = true;
@@ -1566,74 +1237,15 @@ in {
MDP = callPackage ../development/python-modules/mdp {};
- minidb = buildPythonPackage rec {
- name = "minidb-2.0.1";
-
- src = pkgs.fetchurl {
- url = "https://thp.io/2010/minidb/${name}.tar.gz";
- sha256 = "1x958zr9jc26vaqij451qb9m2l7apcpz34ir9fwfjg4fwv24z2dy";
- };
-
- meta = {
- description = "A simple SQLite3-based store for Python objects";
- homepage = https://thp.io/2010/minidb/;
- license = stdenv.lib.licenses.isc;
- maintainers = [ stdenv.lib.maintainers.tv ];
- };
- };
+ minidb = callPackage ../development/python-modules/minidb { };
miniupnpc = callPackage ../development/python-modules/miniupnpc {};
- mixpanel = buildPythonPackage rec {
- version = "4.0.2";
- name = "mixpanel-${version}";
- disabled = isPy3k;
-
- src = pkgs.fetchzip {
- url = "https://github.com/mixpanel/mixpanel-python/archive/${version}.zip";
- sha256 = "0yq1bcsjzsz7yz4rp69izsdn47rvkld4wki2xmapp8gg2s9i8709";
- };
-
- buildInputs = with self; [ pytest mock ];
- propagatedBuildInputs = with self; [ six ];
- checkPhase = "py.test tests.py";
-
- meta = {
- homepage = https://github.com/mixpanel/mixpanel-python;
- description = "This is the official Mixpanel Python library. This library
- allows for server-side integration of Mixpanel.";
- license = stdenv.lib.licenses.asl20;
- };
- };
+ mixpanel = callPackage ../development/python-modules/mixpanel { };
mpyq = callPackage ../development/python-modules/mpyq { };
- mxnet = buildPythonPackage rec {
- inherit (pkgs.mxnet) name version src meta;
-
- buildInputs = [ pkgs.mxnet ];
- propagatedBuildInputs = with self; [ requests numpy graphviz ];
-
- LD_LIBRARY_PATH = makeLibraryPath [ pkgs.mxnet ];
-
- doCheck = !isPy3k;
-
- postPatch = ''
- substituteInPlace python/setup.py \
- --replace "graphviz<0.9.0" "graphviz<0.10.0" \
- --replace "numpy<=1.15.0" "numpy<1.16.0" \
- --replace "requests<2.19.0" "requests<2.20.0"
- '';
-
- preConfigure = ''
- cd python
- '';
-
- postInstall = ''
- rm -rf $out/mxnet
- ln -s ${pkgs.mxnet}/lib/libmxnet.so $out/${python.sitePackages}/mxnet
- '';
- };
+ mxnet = callPackage ../development/python-modules/mxnet { };
parsy = callPackage ../development/python-modules/parsy { };
@@ -1671,40 +1283,7 @@ in {
python-ly = callPackage ../development/python-modules/python-ly {};
- pyhepmc = buildPythonPackage rec {
- name = "pyhepmc-${version}";
- version = "0.5.0";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyhepmc/${name}.tar.gz";
- sha256 = "1rbi8gqgclfvaibv9kzhfis11gw101x8amc93qf9y08ny4jfyr1d";
- };
-
- patches = [
- # merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff
- ../development/python-modules/pyhepmc_export_edges.patch
- # add bindings to Flow class
- ../development/python-modules/pyhepmc_export_flow.patch
- ];
-
- # regenerate python wrapper
- preConfigure = ''
- rm hepmc/hepmcwrap.py
- swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i
- '';
-
- buildInputs = with pkgs; [ swig hepmc ];
-
- HEPMCPATH = pkgs.hepmc;
-
- meta = {
- description = "A simple wrapper on the main classes of the HepMC event simulation representation, making it possible to create, read and manipulate HepMC events from Python code";
- license = licenses.gpl2;
- maintainers = with maintainers; [ veprbl ];
- platforms = platforms.all;
- };
- };
+ pyhepmc = callPackage ../development/python-modules/pyhepmc { };
pytest = self.pytest_37;
@@ -1743,6 +1322,8 @@ in {
pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { };
+ pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { };
+
pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { };
pytestflakes = callPackage ../development/python-modules/pytest-flakes { };
@@ -1870,39 +1451,7 @@ in {
derpconf = callPackage ../development/python-modules/derpconf { };
- deskcon = self.buildPythonPackage rec {
- name = "deskcon-0.3";
- disabled = !isPy27;
-
- src = pkgs.fetchFromGitHub {
- owner= "screenfreeze";
- repo = "deskcon-desktop";
- rev = "267804122188fa79c37f2b21f54fe05c898610e6";
- sha256 ="0i1dd85ls6n14m9q7lkympms1w3x0pqyaxvalq82s4xnjdv585j3";
- };
-
- phases = [ "unpackPhase" "installPhase" ];
-
- pythonPath = [ self.pyopenssl pkgs.gtk3 ];
-
- installPhase = ''
- substituteInPlace server/deskcon-server --replace "python2" "python"
-
- mkdir -p $out/bin
- mkdir -p $out/lib/${python.libPrefix}/site-packages
- cp -r "server/"* $out/lib/${python.libPrefix}/site-packages
- mv $out/lib/${python.libPrefix}/site-packages/deskcon-server $out/bin/deskcon-server
-
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
-
- meta = {
- description = "Integrates an Android device into a desktop";
- homepage = https://github.com/screenfreeze/deskcon-desktop;
- license = licenses.gpl3;
- };
- };
-
+ deskcon = callPackage ../development/python-modules/deskcon { };
dill = callPackage ../development/python-modules/dill { };
@@ -1955,30 +1504,7 @@ in {
pythonPackages = self;
}));
- EditorConfig = buildPythonPackage rec {
- name = "EditorConfig-${version}";
- version = "0.12.0";
-
- # fetchgit used to ensure test submodule is available
- src = pkgs.fetchgit {
- url = "https://github.com/editorconfig/editorconfig-core-py";
- rev = "refs/tags/v${version}";
- sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl";
- };
-
- buildInputs = [ pkgs.cmake ];
- checkPhase = ''
- cmake .
- # utf_8_char fails with python3
- ctest -E "utf_8_char" .
- '';
-
- meta = {
- homepage = https://editorconfig.org;
- description = "EditorConfig File Locator and Interpreter for Python";
- license = stdenv.lib.licenses.psfl;
- };
- };
+ EditorConfig = callPackage ../development/python-modules/editorconfig { };
edward = callPackage ../development/python-modules/edward { };
@@ -1996,127 +1522,19 @@ in {
escapism = callPackage ../development/python-modules/escapism { };
- etcd = buildPythonPackage rec {
- name = "etcd-${version}";
- version = "2.0.8";
-
- # PyPI package is incomplete
- src = pkgs.fetchurl {
- url = "https://github.com/dsoprea/PythonEtcdClient/archive/${version}.tar.gz";
- sha256 = "0fi6rxa1yxvz7nwrc7dw6fax3041d6bj3iyhywjgbkg7nadi9i8v";
- };
-
- patchPhase = ''
- sed -i -e '13,14d;37d' setup.py
- '';
-
- propagatedBuildInputs = with self; [ simplejson pytz requests ];
-
- # No proper tests are available
- doCheck = false;
-
- meta = {
- description = "A Python etcd client that just works";
- homepage = https://github.com/dsoprea/PythonEtcdClient;
- license = licenses.gpl2;
- };
- };
+ etcd = callPackage ../development/python-modules/etcd { };
evdev = callPackage ../development/python-modules/evdev {};
eve = callPackage ../development/python-modules/eve {};
- eventlib = buildPythonPackage rec {
- pname = "python-eventlib";
- name = "${pname}-${version}";
- version = "0.2.2";
-
- # Judging from SyntaxError
- disabled = isPy3k;
-
- src = pkgs.fetchdarcs {
- url = "http://devel.ag-projects.com/repositories/${pname}";
- rev = "release-${version}";
- sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8";
- };
-
- propagatedBuildInputs = with self; [ greenlet ];
-
- doCheck = false;
-
- meta = {
- description = "Eventlib bindings for python";
- homepage = "http://ag-projects.com/";
- license = licenses.lgpl2;
- platforms = platforms.all;
- };
- };
+ eventlib = callPackage ../development/python-modules/eventlib { };
events = callPackage ../development/python-modules/events { };
- eyeD3 = buildPythonPackage rec {
- version = "0.7.8";
- name = "eyeD3-${version}";
- disabled = isPyPy;
+ eyeD3 = callPackage ../development/python-modules/eyed3 { };
- src = pkgs.fetchurl {
- url = "http://eyed3.nicfit.net/releases/${name}.tar.gz";
- sha256 = "1nv7nhfn1d0qm7rgkzksbccgqisng8klf97np0nwaqwd5dbmdf86";
- };
-
- buildInputs = with self; [ paver ];
-
- postInstall = ''
- for prog in "$out/bin/"*; do
- wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" \
- --prefix PATH : ${python}/bin
- done
- '';
-
- meta = {
- description = "A Python module and command line program for processing ID3 tags";
- homepage = http://eyed3.nicfit.net/;
- license = licenses.gpl2;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.unix;
-
- longDescription = ''
- eyeD3 is a Python module and command line program for processing ID3
- tags. Information about mp3 files (i.e bit rate, sample frequency, play
- time, etc.) is also provided. The formats supported are ID3 v1.0/v1.1
- and v2.3/v2.4.
- '';
- };
- };
-
- execnet = buildPythonPackage rec {
- name = "${pname}-${version}";
- pname = "execnet";
- version = "1.4.1";
- src = pkgs.fetchurl {
- url = "mirror://pypi/e/${pname}/${name}.tar.gz";
- sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn";
- };
- buildInputs = with self; [ pytest setuptools_scm ];
- propagatedBuildInputs = with self; [ apipkg ];
- # remove vbox tests
- postPatch = ''
- rm -v testing/test_termination.py
- rm -v testing/test_channel.py
- rm -v testing/test_xspec.py
- rm -v testing/test_gateway.py
- '';
- checkPhase = ''
- py.test testing
- '';
- __darwinAllowLocalNetworking = true;
- meta = {
- description = "Rapid multi-Python deployment";
- license = licenses.gpl2;
- homepage = "http://codespeak.net/execnet";
- maintainers = with maintainers; [ nand0p ];
- };
- };
+ execnet = callPackage ../development/python-modules/execnet { };
ezdxf = callPackage ../development/python-modules/ezdxf {};
@@ -2128,64 +1546,11 @@ in {
faker = callPackage ../development/python-modules/faker { };
- fake_factory = buildPythonPackage rec {
- name = "fake-factory-${version}";
- version = "0.6.0";
+ fake_factory = callPackage ../development/python-modules/fake_factory { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/fake-factory/${name}.tar.gz";
- sha256 = "09sgk0kylsshs64a1xsz3qr187sbnqrbf4z8k3dgsy32lsgyffv2";
- };
+ factory_boy = callPackage ../development/python-modules/factory_boy { };
- propagatedBuildInputs = with self; [ six dateutil ipaddress mock ];
- checkPhase = ''
- ${python.interpreter} -m unittest faker.tests
- '';
-
- meta = {
- description = "A Python package that generates fake data for you";
- homepage = https://pypi.python.org/pypi/fake-factory;
- license = licenses.mit;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.unix;
- };
- };
-
- factory_boy = buildPythonPackage rec {
- name = "factory_boy-${version}";
- version = "2.6.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/factory_boy/${name}.tar.gz";
- sha256 = "0a21f8kq917fj8xgmyp6gy8vcrlzzgwn80qas0d76h3vjbdy0bdq";
- };
-
- propagatedBuildInputs = with self; [ fake_factory ];
-
- meta = {
- description = "A Python package to create factories for complex objects";
- homepage = https://github.com/rbarrois/factory_boy;
- license = licenses.mit;
- };
- };
-
- Fabric = buildPythonPackage rec {
- name = "Fabric-${version}";
- version = "1.13.2";
- src = pkgs.fetchurl {
- url = "mirror://pypi/F/Fabric/${name}.tar.gz";
- sha256 = "0k944dxr41whw7ib6380q9x15wyskx7fqni656icdn8rzshn9bwq";
- };
- disabled = isPy3k;
- doCheck = (!isPyPy); # https://github.com/fabric/fabric/issues/11891
- propagatedBuildInputs = with self; [ paramiko pycrypto ];
- buildInputs = with self; [ fudge_9 nose ];
- meta = {
- description = "Pythonic remote execution";
- homepage = https://www.fabfile.org/;
- license = licenses.bsd2;
- };
- };
+ Fabric = callPackage ../development/python-modules/Fabric { };
faulthandler = if ! isPy3k
then callPackage ../development/python-modules/faulthandler {}
@@ -2195,28 +1560,7 @@ in {
flit = callPackage ../development/python-modules/flit { };
- flowlogs_reader = buildPythonPackage rec {
- name = "flowlogs_reader-1.0.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/flowlogs_reader/${name}.tar.gz";
- sha256 = "0158aki6m3pkf98hpd60088qyhrfxkmybdf8hv3qfl8nb61vaiwf";
- };
-
- propagatedBuildInputs = with self; [
- botocore boto3 docutils
- ];
- buildInputs = with self; [
- unittest2 mock
- ];
-
- meta = with pkgs.stdenv.lib; {
- description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier";
- homepage = "https://github.com/obsrvbl/flowlogs-reader";
- maintainers = with maintainers; [ cransom ];
- license = licenses.asl20;
- };
- };
+ flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { };
fluent-logger = callPackage ../development/python-modules/fluent-logger {};
@@ -2232,125 +1576,27 @@ in {
ftputil = callPackage ../development/python-modules/ftputil { };
- fudge = buildPythonPackage rec {
- name = "fudge-1.1.0";
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/fudge/${name}.tar.gz";
- sha256 = "eba59a926fa1df1ab6dddd69a7a8af21865b16cad800cb4d1af75070b0f52afb";
- };
- buildInputs = with self; [ nose nosejs ];
- propagatedBuildInputs = with self; [ sphinx ];
+ fudge = callPackage ../development/python-modules/fudge { };
- disabled = isPy3k;
+ fudge_9 = self.fudge.overridePythonAttrs (old: rec {
+ version = "0.9.6";
- checkPhase = ''
- nosetests -v
- '';
- };
-
- fudge_9 = self.fudge.override rec {
- name = "fudge-0.9.6";
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/fudge/${name}.tar.gz";
+ src = fetchPypi {
+ pname = "fudge";
+ inherit version;
sha256 = "34690c4692e8717f4d6a2ab7d841070c93c8d0ea0d2615b47064e291f750b1a0";
};
- };
+ });
-
- funcparserlib = buildPythonPackage rec {
- name = "funcparserlib-0.3.6";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/funcparserlib/${name}.tar.gz";
- sha256 = "b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d";
- };
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
-
- # Tests are Python 2.x only judging from SyntaxError
- doCheck = !(isPy3k);
-
- meta = {
- description = "Recursive descent parsing library based on functional combinators";
- homepage = https://code.google.com/p/funcparserlib/;
- license = licenses.mit;
- platforms = platforms.unix;
- };
- };
+ funcparserlib = callPackage ../development/python-modules/funcparserlib { };
fastcache = callPackage ../development/python-modules/fastcache { };
- functools32 = if isPy3k then null else buildPythonPackage rec {
- name = "functools32-${version}";
- version = "3.2.3-2";
+ functools32 = callPackage ../development/python-modules/functools32 { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/functools32/functools32-${version}.tar.gz";
- sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn";
- };
+ gateone = callPackage ../development/python-modules/gateone { };
-
- meta = with stdenv.lib; {
- description = "This is a backport of the functools standard library module from";
- homepage = "https://github.com/MiCHiLU/python-functools32";
- };
- };
-
- gateone = buildPythonPackage rec {
- name = "gateone-1.2-0d57c3";
- disabled = ! isPy27;
- src = pkgs.fetchFromGitHub {
- rev = "1d0e8037fbfb7c270f3710ce24154e24b7031bea";
- owner= "liftoff";
- repo = "GateOne";
- sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv";
- };
- propagatedBuildInputs = with self; [tornado futures html5lib pkgs.openssl pkgs.cacert pkgs.openssh];
- meta = {
- homepage = https://liftoffsoftware.com/;
- description = "GateOne is a web-based terminal emulator and SSH client";
- maintainers = with maintainers; [ tomberek ];
-
- };
- postInstall=''
- cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone
- '';
- };
-
- gcutil = buildPythonPackage rec {
- name = "gcutil-1.16.1";
-
- src = pkgs.fetchurl {
- url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz;
- sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x";
- };
-
- propagatedBuildInputs = with self; [
- gflags
- iso8601
- ipaddr
- httplib2
- google_apputils
- google_api_python_client
- ];
-
- prePatch = ''
- sed -i -e "s|google-apputils==0.4.0|google-apputils==0.4.1|g" setup.py
- substituteInPlace setup.py \
- --replace "httplib2==0.8" "httplib2" \
- --replace "iso8601==0.1.4" "iso8601"
- '';
-
- meta = {
- description = "Command-line tool for interacting with Google Compute Engine";
- homepage = "https://cloud.google.com/compute/docs/gcutil/";
- license = licenses.asl20;
- maintainers = with maintainers; [ phreedom ];
- broken = true;
- };
- };
+ gcutil = callPackage ../development/python-modules/gcutil { };
GeoIP = callPackage ../development/python-modules/GeoIP { };
@@ -2358,71 +1604,11 @@ in {
gmpy2 = callPackage ../development/python-modules/gmpy2 { };
- gmusicapi = with pkgs; buildPythonPackage rec {
- name = "gmusicapi-10.1.0";
+ gmusicapi = callPackage ../development/python-modules/gmusicapi { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/gmusicapi/gmusicapi-10.1.0.tar.gz";
- sha256 = "0smlrafh1bjzrcjzl7im8pf8f04gcnx92lf3g5qr7yzgq8k20xa2";
- };
+ gnureadline = callPackage ../development/python-modules/gnureadline { };
- propagatedBuildInputs = with self; [
- validictory
- decorator
- mutagen
- protobuf
- setuptools
- requests
- dateutil
- proboscis
- mock
- appdirs
- oauth2client
- pyopenssl
- gpsoauth
- MechanicalSoup
- future
- ];
-
- meta = {
- description = "An unofficial API for Google Play Music";
- homepage = https://pypi.python.org/pypi/gmusicapi/;
- license = licenses.bsd3;
- };
- };
-
- gnureadline = buildPythonPackage rec {
- version = "6.3.3";
- name = "gnureadline-${version}";
- disabled = isPyPy;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/gnureadline/${name}.tar.gz";
- sha256 = "1ghck2zz4xbqa3wz73brgjhrqj55p9hc1fq6c9zb09dnyhwb0nd2";
- };
-
- buildInputs = [ pkgs.ncurses ];
- patchPhase = ''
- substituteInPlace setup.py --replace "/bin/bash" "${pkgs.bash}/bin/bash"
- '';
- };
-
- gnutls = buildPythonPackage rec {
- pname = "python-gnutls";
- version = "3.0.0";
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/python-gnutls/${pname}-${version}.tar.gz";
- sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc";
- };
-
- # https://github.com/AGProjects/python-gnutls/issues/2
- disabled = isPy3k;
-
- propagatedBuildInputs = with self; [ pkgs.gnutls ];
- patchPhase = ''
- substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls.out}/lib"
- '';
- };
+ gnutls = callPackage ../development/python-modules/gnutls { };
gpy = callPackage ../development/python-modules/gpy { };
@@ -2444,37 +1630,7 @@ in {
gpapi = callPackage ../development/python-modules/gpapi { };
gplaycli = callPackage ../development/python-modules/gplaycli { };
- gpsoauth = buildPythonPackage rec {
- version = "0.2.0";
- name = "gpsoauth-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/gpsoauth/${name}.tar.gz";
- sha256 = "01zxw8rhml8xfwda7ba8983890bzwkfa55ijd6qf8qrdy6ja1ncn";
- };
-
- propagatedBuildInputs = with self; [
- cffi
- cryptography
- enum34
- idna
- ipaddress
- ndg-httpsclient
- pyopenssl
- pyasn1
- pycparser
- pycryptodome
- requests
- six
- ];
-
- meta = {
- description = "A python client library for Google Play Services OAuth";
- homepage = "https://github.com/simon-weber/gpsoauth";
- license = licenses.mit;
- maintainers = with maintainers; [ jgillich ];
- };
- };
+ gpsoauth = callPackage ../development/python-modules/gpsoauth { };
grip = callPackage ../development/python-modules/grip { };
@@ -2482,41 +1638,7 @@ in {
gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;
};
- gtimelog = buildPythonPackage rec {
- name = "gtimelog-${version}";
- version = "0.9.1";
-
- src = pkgs.fetchurl {
- url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz";
- sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj";
- };
-
- buildInputs = [ pkgs.glibcLocales ];
-
- LC_ALL="en_US.UTF-8";
-
- # TODO: AppIndicator
- propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ];
-
- checkPhase = ''
- substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
- ./runtests
- '';
-
- preFixup = ''
- wrapProgram $out/bin/gtimelog \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3.out}/lib" \
- '';
-
- meta = {
- description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";
- homepage = https://mg.pov.lt/gtimelog/;
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ ocharles ];
- platforms = platforms.unix;
- };
- };
+ gtimelog = callPackage ../development/python-modules/gtimelog { };
gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin"
then callPackage ../development/python-modules/gurobipy/darwin.nix {
@@ -2532,114 +1654,19 @@ in {
hglib = callPackage ../development/python-modules/hglib {};
- humanize = buildPythonPackage rec {
- version = "0.5.1";
- name = "humanize-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/humanize/${name}.tar.gz";
- sha256 = "a43f57115831ac7c70de098e6ac46ac13be00d69abbf60bdcac251344785bb19";
- };
-
- buildInputs = with self; [ mock ];
-
- doCheck = false;
-
- meta = {
- description = "Python humanize utilities";
- homepage = https://github.com/jmoiron/humanize;
- license = licenses.mit;
- maintainers = with maintainers; [ ];
- platforms = platforms.linux; # can only test on linux
- };
-
- };
+ humanize = callPackage ../development/python-modules/humanize { };
hupper = callPackage ../development/python-modules/hupper {};
- hovercraft = buildPythonPackage rec {
- disabled = ! isPy3k;
- name = "hovercraft-${version}";
- version = "2.0";
+ hovercraft = callPackage ../development/python-modules/hovercraft { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/hovercraft/${name}.tar.gz";
- sha256 = "0lqxr816lymgnywln8bbv9nrmkyahjjcjkm9kjyny9bflayz4f1g";
- };
-
- propagatedBuildInputs = with self; [ docutils lxml manuel pygments svg-path watchdog ];
-
- # one test assumes we have docutils 0.12
- # TODO: enable tests after upgrading docutils to 0.12
- doCheck = false;
-
- meta = {
- description = "A tool to make impress.js presentations from reStructuredText";
- homepage = https://github.com/regebro/hovercraft;
- license = licenses.mit;
- maintainers = with maintainers; [ goibhniu ];
- };
- };
-
- hsaudiotag = buildPythonPackage (rec {
- name = "hsaudiotag-1.1.1";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/hsaudiotag/${name}.tar.gz";
- sha256 = "15hgm128p8nysfi0jb127awga3vlj0iw82l50swjpvdh01m7rda8";
- };
-
- # no tests
- doCheck = false;
-
- meta = {
- description = "A pure Python library that lets one to read metadata from media files";
- homepage = http://hg.hardcoded.net/hsaudiotag/;
- license = licenses.bsd3;
- };
- });
-
- hsaudiotag3k = buildPythonPackage (rec {
- name = "hsaudiotag3k-1.1.3";
- disabled = !isPy3k;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/hsaudiotag3k/${name}.tar.gz";
- sha256 = "0bv5k5594byr2bmhh77xv10fkdpckcmxg3w380yp30aqf83rcsx3";
- };
-
- # no tests
- doCheck = false;
-
- meta = {
- description = "A pure Python library that lets one to read metadata from media files";
- homepage = http://hg.hardcoded.net/hsaudiotag/;
- license = licenses.bsd3;
- };
- });
+ hsaudiotag = callPackage ../development/python-modules/hsaudiotag { };
+ hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };
htmlmin = callPackage ../development/python-modules/htmlmin {};
- httpauth = buildPythonPackage rec {
- version = "0.3";
- name = "httpauth-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/httpauth/${name}.tar.gz";
- sha256 = "0qas7876igyz978pgldp5r7n7pis8n4vf0v87gxr9l7p7if5lr3l";
- };
-
- doCheck = false;
-
- meta = {
- description = "WSGI HTTP Digest Authentication middleware";
- homepage = https://github.com/jonashaag/httpauth;
- license = licenses.bsd2;
- maintainers = with maintainers; [ ];
- };
- };
+ httpauth = callPackage ../development/python-modules/httpauth { };
idna-ssl = callPackage ../development/python-modules/idna-ssl { };
@@ -2647,22 +1674,7 @@ in {
ijson = callPackage ../development/python-modules/ijson {};
- imagesize = buildPythonPackage rec {
- name = "imagesize-${version}";
- version = "0.7.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/i/imagesize/${name}.tar.gz";
- sha256 = "0msgz4ncp2nb5nbsxnf8kvxsl6nhwvc3b46ik097fvznl3y10gdv";
- };
-
- meta = {
- description = "Getting image size from png/jpeg/jpeg2000/gif file";
- homepage = https://github.com/shibukawa/imagesize_py;
- license = with licenses; [ mit ];
- };
-
- };
+ imagesize = callPackage ../development/python-modules/imagesize { };
image-match = callPackage ../development/python-modules/image-match { };
@@ -2670,115 +1682,17 @@ in {
immutables = callPackage ../development/python-modules/immutables {};
- imread = buildPythonPackage rec {
- name = "python-imread-${version}";
- version = "0.6";
-
- src = pkgs.fetchurl {
- url = "https://github.com/luispedro/imread/archive/release-${version}.tar.gz";
- sha256 = "0i14bc67200zhzxc41g5dfp2m0pr1zaa2gv59p2va1xw0ji2dc0f";
- };
-
- nativeBuildInputs = [ pkgs.pkgconfig ];
- buildInputs = with self; [
- nose
- pkgs.libjpeg
- pkgs.libpng
- pkgs.libtiff
- pkgs.libwebp
- ];
- propagatedBuildInputs = with self; [ numpy ];
-
- meta = with stdenv.lib; {
- description = "Python package to load images as numpy arrays";
- homepage = https://imread.readthedocs.io/en/latest/;
- maintainers = with maintainers; [ luispedro ];
- license = licenses.mit;
- platforms = platforms.linux;
- };
- };
+ imread = callPackage ../development/python-modules/imread { };
imaplib2 = callPackage ../development/python-modules/imaplib2 { };
- ipfsapi = buildPythonPackage rec {
- name = "ipfsapi-${version}";
- version = "0.4.2.post1";
- disabled = isPy27;
+ ipfsapi = callPackage ../development/python-modules/ipfsapi { };
- src = pkgs.fetchFromGitHub {
- owner = "ipfs";
- repo = "py-ipfs-api";
- rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61";
- sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn";
- };
+ itsdangerous = callPackage ../development/python-modules/itsdangerous { };
- propagatedBuildInputs = with self; [ six requests ];
+ iniparse = callPackage ../development/python-modules/iniparse { };
- meta = {
- description = "A python client library for the IPFS API";
- license = licenses.mit;
- maintainers = with maintainers; [ mguentner ];
- homepage = "https://pypi.python.org/pypi/ipfsapi";
- };
- };
-
- itsdangerous = buildPythonPackage rec {
- name = "itsdangerous-0.24";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/i/itsdangerous/${name}.tar.gz";
- sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb";
- };
-
- meta = {
- description = "Helpers to pass trusted data to untrusted environments and back";
- homepage = "https://pypi.python.org/pypi/itsdangerous/";
- };
- };
-
- iniparse = buildPythonPackage rec {
-
- name = "iniparse-${version}";
- version = "0.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/i/iniparse/iniparse-${version}.tar.gz";
- sha256 = "0m60k46vr03x68jckachzsipav0bwhhnqb8715hm1cngs89fxhdb";
- };
-
- checkPhase = ''
- ${python.interpreter} runtests.py
- '';
-
- # Does not install tests
- doCheck = false;
-
- meta = with stdenv.lib; {
- description = "Accessing and Modifying INI files";
- license = licenses.mit;
- maintainers = with maintainers; [ danbst ];
- };
- };
-
- i3-py = buildPythonPackage rec {
- version = "0.6.4";
- name = "i3-py-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/i/i3-py/i3-py-${version}.tar.gz";
- sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y";
- };
-
- # no tests in tarball
- doCheck = false;
-
- meta = {
- description = "Tools for i3 users and developers";
- homepage = "https://github.com/ziberna/i3-py";
- license = licenses.gpl3;
- platforms = platforms.linux;
- };
- };
+ i3-py = callPackage ../development/python-modules/i3-py { };
JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi {};
@@ -2802,52 +1716,13 @@ in {
jsonpickle = callPackage ../development/python-modules/jsonpickle { };
- jsonpointer = buildPythonPackage rec {
- name = "jsonpointer-1.9";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/j/jsonpointer/${name}.tar.gz";
- sha256 = "39403b47a71aa782de6d80db3b78f8a5f68ad8dfc9e674ca3bb5b32c15ec7308";
- };
-
- meta = {
- description = "Resolve JSON Pointers in Python";
- homepage = "https://github.com/stefankoegl/python-json-pointer";
- license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi"
- };
- };
+ jsonpointer = callPackage ../development/python-modules/jsonpointer { };
jsonrpclib = callPackage ../development/python-modules/jsonrpclib { };
jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {};
- jsonwatch = buildPythonPackage rec {
- name = "jsonwatch-0.2.0";
-
- disabled = isPyPy; # doesn't find setuptools
-
- src = pkgs.fetchurl {
- url = "https://github.com/dbohdan/jsonwatch/archive/v0.2.0.tar.gz";
- sha256 = "04b616ef97b9d8c3887004995420e52b72a4e0480a92dbf60aa6c50317261e06";
- };
-
- propagatedBuildInputs = with self; [ six ];
-
- meta = {
- description = "Like watch -d but for JSON";
- longDescription = ''
- jsonwatch is a command line utility with which you can track changes in
- JSON data delivered by a shell command or a web (HTTP/HTTPS) API.
- jsonwatch requests data from the designated source repeatedly at a set
- interval and displays the differences when the data changes. It is
- similar in its behavior to how watch(1) with the -d switch works
- for plain-text data.
- '';
- homepage = "https://github.com/dbohdan/jsonwatch";
- license = licenses.mit;
- platforms = platforms.all;
- };
- };
+ jsonwatch = callPackage ../development/python-modules/jsonwatch { };
latexcodec = callPackage ../development/python-modules/latexcodec {};
@@ -2857,107 +1732,13 @@ in {
libsoundtouch = callPackage ../development/python-modules/libsoundtouch { };
- libthumbor = buildPythonPackage rec {
- name = "libthumbor-${version}";
- version = "1.3.2";
+ libthumbor = callPackage ../development/python-modules/libthumbor { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/l/libthumbor/${name}.tar.gz";
- sha256 = "1vjhszsf8wl9k16wyg2rfjycjnawzl7z8j39bhiysbz5x4lqg91b";
- };
+ lightblue = callPackage ../development/python-modules/lightblue { };
- buildInputs = with self; [ django ];
+ lightning = callPackage ../development/python-modules/lightning { };
- propagatedBuildInputs = with self; [ six pycrypto ];
-
- doCheck = false;
-
- meta = {
- description = "libthumbor is the python extension to thumbor";
- homepage = https://github.com/heynemann/libthumbor;
- license = licenses.mit;
- };
- };
-
- lightblue = buildPythonPackage rec {
- pname = "lightblue";
- version = "0.4";
- name = "${pname}-${version}";
- disabled = isPy3k; # build fails, 2018-04-11
-
- src = pkgs.fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.gz";
- sha256 = "016h1mlhpqxjj25lcvl4fqc19k8ifmsv6df7rhr12fyfcrp5i14d";
- };
-
- buildInputs = [ pkgs.bluez pkgs.openobex ];
-
-
- meta = {
- homepage = http://lightblue.sourceforge.net;
- description = "Cross-platform Bluetooth API for Python";
- maintainers = with maintainers; [ leenaars ];
- license = licenses.gpl3;
- platforms = platforms.all;
- };
- };
-
-
- lightning = buildPythonPackage rec {
- version = "1.2.1";
- name = "lightning-python-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/l/lightning-python/${name}.tar.gz";
- sha256 = "3987d7d4a634bdb6db9bcf212cf4d2f72bab5bc039f4f6cbc02c9d01c4ade792";
- };
-
- buildInputs = with self; [ pytest ];
-
- propagatedBuildInputs = with self; [
- jinja2
- matplotlib
- numpy
- requests
- six
- ];
-
- meta = {
- description = "A Python client library for the Lightning data visualization server";
- homepage = http://lightning-viz.org;
- license = licenses.mit;
- };
- };
-
- jupyter = buildPythonPackage rec {
- version = "1.0.0";
- name = "jupyter-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/j/jupyter/${name}.tar.gz";
- sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f";
- };
-
- propagatedBuildInputs = with self; [
- notebook
- qtconsole
- jupyter_console
- nbconvert
- ipykernel
- ipywidgets
- ];
-
- # Meta-package, no tests
- doCheck = false;
-
- meta = {
- description = "Installs all the Jupyter components in one go";
- homepage = "http://jupyter.org/";
- license = licenses.bsd3;
- platforms = platforms.all;
- priority = 100; # This is a metapackage which is unimportant
- };
- };
+ jupyter = callPackage ../development/python-modules/jupyter { };
jupyter_console = callPackage ../development/python-modules/jupyter_console { };
@@ -2967,234 +1748,29 @@ in {
PyLTI = callPackage ../development/python-modules/pylti { };
- lmdb = buildPythonPackage rec {
- pname = "lmdb";
- version = "0.92";
- name = "${pname}-${version}";
+ lmdb = callPackage ../development/python-modules/lmdb { };
- src = self.fetchPypi {
- inherit pname version;
- sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx";
- };
+ logilab_astng = callPackage ../development/python-modules/logilab_astng { };
- # Some sort of mysterious failure with lmdb.tool
- doCheck = !isPy3k;
-
- meta = {
- description = "Universal Python binding for the LMDB 'Lightning' Database";
- homepage = "https://github.com/dw/py-lmdb";
- license = licenses.openldap;
- maintainers = with maintainers; [ copumpkin ];
- };
- };
-
- logilab_astng = buildPythonPackage rec {
- name = "logilab-astng-0.24.3";
-
- src = pkgs.fetchurl {
- url = "http://download.logilab.org/pub/astng/${name}.tar.gz";
- sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn";
- };
-
- propagatedBuildInputs = with self; [ logilab_common ];
- };
-
- lpod = buildPythonPackage rec {
- version = "1.1.7";
- name = "python-lpod-${version}";
- # lpod library currently does not support Python 3.x
- disabled = isPy3k;
-
- propagatedBuildInputs = with self; [ lxml docutils pillow ];
-
- src = pkgs.fetchFromGitHub {
- owner = "lpod";
- repo = "lpod-python";
- rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67";
- sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw";
- };
-
- meta = {
- homepage = https://github.com/lpod/lpod-python/;
- description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) ";
- license = licenses.gpl3;
- };
- };
+ lpod = callPackage ../development/python-modules/lpod { };
luftdaten = callPackage ../development/python-modules/luftdaten { };
m2r = callPackage ../development/python-modules/m2r { };
- mailchimp = buildPythonPackage rec {
- version = "2.0.9";
- name = "mailchimp-${version}";
+ mailchimp = callPackage ../development/python-modules/mailchimp { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/mailchimp/mailchimp-${version}.tar.gz";
- sha256 = "0351ai0jqv3dzx0xxm1138sa7mb42si6xfygl5ak8wnfc95ff770";
- };
-
- buildInputs = with self; [ docopt ];
- propagatedBuildInputs = with self; [ requests ];
- patchPhase = ''
- sed -i 's/==/>=/' setup.py
- '';
-
- meta = {
- description = "A CLI client and Python API library for the MailChimp email platform";
- homepage = "http://apidocs.mailchimp.com/api/2.0/";
- license = licenses.mit;
- };
- };
-
- python-mapnik = buildPythonPackage rec {
- name = "python-mapnik-${version}";
- version = "3.0.16";
-
- src = pkgs.fetchFromGitHub {
- owner = "mapnik";
- repo = "python-mapnik";
- rev = "v${version}";
- sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc";
- };
-
- disabled = isPyPy;
- doCheck = false; # doesn't find needed test data files
- preBuild = let
- pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
- in ''
- export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
- export BOOST_THREAD_LIB="boost_thread"
- export BOOST_SYSTEM_LIB="boost_system"
- '';
- buildInputs = with pkgs; [
- (boost.override {
- enablePython = true;
- inherit python;
- })
- (mapnik.override {
- inherit python;
- boost = (boost.override { enablePython = true; inherit python; });
- })
- cairo
- harfbuzz
- icu
- libjpeg
- libpng
- libtiff
- libwebp
- proj
- zlib
- ];
- propagatedBuildInputs = with self; [ pillow pycairo ];
-
- meta = with stdenv.lib; {
- description = "Python bindings for Mapnik";
- homepage = http://mapnik.org;
- license = licenses.lgpl21;
- };
- };
+ python-mapnik = callPackage ../development/python-modules/python-mapnik { };
misaka = callPackage ../development/python-modules/misaka {};
mt-940 = callPackage ../development/python-modules/mt-940 { };
- mwlib = let
- pyparsing = buildPythonPackage rec {
- name = "pyparsing-1.5.7";
- disabled = isPy3k;
+ mwlib = callPackage ../development/python-modules/mwlib { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyparsing/${name}.tar.gz";
- sha256 = "646e14f90b3689b005c19ac9b6b390c9a39bf976481849993e277d7380e6e79f";
- };
- meta = {
- homepage = http://pyparsing.wikispaces.com/;
- description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
- };
- };
- in buildPythonPackage rec {
- version = "0.15.15";
- name = "mwlib-${version}";
+ mwlib-ext = callPackage ../development/python-modules/mwlib-ext { };
- src = pkgs.fetchurl {
- url = "http://pypi.pediapress.com/packages/mirror/${name}.tar.gz";
- sha256 = "1dnmnkc21zdfaypskbpvkwl0wpkpn0nagj1fc338w64mbxrk8ny7";
- };
-
- propagatedBuildInputs = with self; [
- apipkg
- bottle
- gevent
- lxml
- odfpy
- pillow
- py
- pyPdf
- pyparsing
- qserve
- roman
- simplejson
- sqlite3dbm
- timelib
- ];
-
- checkInputs = with self; [ pytest ];
-
- checkPhase = ''
- py.test
- '';
-
- # Tests are in build directory but we need extension modules that are in $out
- doCheck = false;
-
- meta = {
- description = "Library for parsing MediaWiki articles and converting them to different output formats";
- homepage = "http://pediapress.com/code/";
- license = licenses.bsd3;
- broken = true; # Requires different versions of packages
- };
- };
-
- mwlib-ext = buildPythonPackage rec {
- version = "0.13.2";
- name = "mwlib.ext-${version}";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "http://pypi.pediapress.com/packages/mirror/${name}.zip";
- sha256 = "9229193ee719568d482192d9d913b3c4bb96af7c589d6c31ed4a62caf5054278";
- };
-
- meta = {
- description = "Dependencies for mwlib markup";
- homepage = "http://pediapress.com/code/";
- license = licenses.bsd3;
- };
- };
-
- mwlib-rl = buildPythonPackage rec {
- version = "0.14.6";
- name = "mwlib.rl-${version}";
-
- src = pkgs.fetchurl {
- url = "http://pypi.pediapress.com/packages/mirror/${name}.zip";
- sha256 = "7f596fd60eb24d8d3da3ab4880f095294028880eafb653810a7bdaabdb031238";
- };
-
- buildInputs = with self;
- [
- mwlib
- mwlib-ext
- pygments
- ];
-
- meta = {
- description = "Generate pdfs from mediawiki markup";
- homepage = "http://pediapress.com/code/";
- license = licenses.bsd3;
- };
- };
+ mwlib-rl = callPackage ../development/python-modules/mwlib-rl { };
natsort = callPackage ../development/python-modules/natsort { };
@@ -3202,29 +1778,7 @@ in {
logfury = callPackage ../development/python-modules/logfury { };
- ndg-httpsclient = buildPythonPackage rec {
- version = "0.4.2";
- name = "ndg-httpsclient-${version}";
-
- propagatedBuildInputs = with self; [ pyopenssl ];
-
- src = pkgs.fetchFromGitHub {
- owner = "cedadev";
- repo = "ndg_httpsclient";
- rev = version;
- sha256 = "1kk4knv029j0cicfiv23c1rayc1n3f1j3rhl0527gxiv0qv4jw8h";
- };
-
- # uses networking
- doCheck = false;
-
- meta = {
- homepage = https://github.com/cedadev/ndg_httpsclient/;
- description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL";
- license = licenses.bsd2;
- maintainers = with maintainers; [ ];
- };
- };
+ ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { };
netcdf4 = callPackage ../development/python-modules/netcdf4 { };
@@ -3232,60 +1786,13 @@ in {
Nikola = callPackage ../development/python-modules/Nikola { };
- nxt-python = buildPythonPackage rec {
- version = "unstable-20160819";
- pname = "nxt-python";
- name = "${pname}-${version}";
-
- propagatedBuildInputs = with self; [ pyusb pybluez pyfantom pkgs.git ];
- disabled = isPy3k;
-
- src = pkgs.fetchgit {
- url = "http://github.com/Eelviny/nxt-python";
- rev = "479e20b7491b28567035f4cee294c4a2af629297";
- sha256 = "0mcsajhgm2wy4iy2lhmyi3xibgmbixbchanzmlhsxk6qyjccn9r9";
- branchName= "pyusb";
- };
-
- # Tests fail on Mac dependency
- doCheck = false;
-
- meta = {
- description = "Python driver/interface for Lego Mindstorms NXT robot";
- homepage = https://github.com/Eelviny/nxt-python;
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ leenaars ];
- };
- };
+ nxt-python = callPackage ../development/python-modules/nxt-python { };
odfpy = callPackage ../development/python-modules/odfpy { };
oset = callPackage ../development/python-modules/oset { };
- pamela = buildPythonPackage rec {
- name = "pamela-${version}";
- version = "0.3.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pamela/${name}.tar.gz";
- sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y";
- };
-
- postUnpack = ''
- substituteInPlace $sourceRoot/pamela.py --replace \
- 'find_library("pam")' \
- '"${getLib pkgs.pam}/lib/libpam.so"'
- '';
-
- doCheck = false;
-
- meta = {
- description = "PAM interface using ctypes";
- homepage = "https://github.com/minrk/pamela";
- license = licenses.mit;
- };
- };
+ pamela = callPackage ../development/python-modules/pamela { };
# These used to be here but were moved to all-packages, but I'll leave them around for a while.
pants = pkgs.pants;
@@ -3298,112 +1805,17 @@ in {
pathspec = callPackage ../development/python-modules/pathspec { };
- pathtools = buildPythonPackage rec {
- name = "pathtools-${version}";
- version = "0.1.2";
+ pathtools = callPackage ../development/python-modules/pathtools { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pathtools/${name}.tar.gz";
- sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw";
- };
-
- meta = {
- description = "Pattern matching and various utilities for file systems paths";
- homepage = https://github.com/gorakhargosh/pathtools;
- license = licenses.mit;
- maintainers = with maintainers; [ goibhniu ];
- };
- };
-
- paver = buildPythonPackage rec {
- version = "1.2.2";
- name = "Paver-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/P/Paver/Paver-${version}.tar.gz";
- sha256 = "0lix9d33ndb3yk56sm1zlj80fbmxp0w60yk0d9pr2xqxiwi88sqy";
- };
-
- buildInputs = with self; [ cogapp mock virtualenv ];
-
- propagatedBuildInputs = with self; [ nose ];
-
- # the tests do not pass
- doCheck = false;
-
- meta = {
- description = "A Python-based build/distribution/deployment scripting tool";
- homepage = https://github.com/paver/paver;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.unix;
- };
- };
+ paver = callPackage ../development/python-modules/paver { };
passlib = callPackage ../development/python-modules/passlib { };
- path-and-address = buildPythonPackage rec {
- version = "2.0.1";
- name = "path-and-address-${version}";
+ path-and-address = callPackage ../development/python-modules/path-and-address { };
- buildInputs = with self; [ pytest ];
+ peppercorn = callPackage ../development/python-modules/peppercorn { };
- checkPhase = "py.test";
-
- src = pkgs.fetchFromGitHub {
- owner = "joeyespo";
- repo = "path-and-address";
- rev = "v${version}";
- sha256 = "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6";
- };
-
- meta = {
- description = "Functions for server CLI applications used by humans";
- homepage = https://github.com/joeyespo/path-and-address;
- license = licenses.mit;
- maintainers = with maintainers; [ koral];
- };
- };
-
- peewee = callPackage ../development/python-modules/peewee { };
-
- peppercorn = buildPythonPackage rec {
- name = "peppercorn-0.5";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/peppercorn/${name}.tar.gz";
- sha256 = "921cba5d51fa211e6da0fbd2120b9a98d663422a80f5bb669ad81ffb0909774b";
- };
-
- meta = {
- maintainers = with maintainers; [ garbas domenkozar ];
- platforms = platforms.all;
- };
- };
-
- pex = buildPythonPackage rec {
- name = "pex-${version}";
- version = "1.2.7";
-
- src = self.fetchPypi {
- pname = "pex";
- sha256 = "1m0gx9182w1dybkyjwwjyd6i87x2dzv252ks2fj8yn6avlcp5z4q";
- inherit version;
- };
-
- prePatch = ''
- substituteInPlace setup.py --replace 'SETUPTOOLS_REQUIREMENT,' '"setuptools"'
- '';
-
- # A few more dependencies I don't want to handle right now...
- doCheck = false;
-
- meta = {
- description = "A library and tool for generating .pex (Python EXecutable) files";
- homepage = "https://github.com/pantsbuild/pex";
- license = licenses.asl20;
- maintainers = with maintainers; [ copumpkin ];
- };
- };
+ pex = callPackage ../development/python-modules/pex { };
phe = callPackage ../development/python-modules/phe { };
@@ -3430,119 +1842,29 @@ in {
inherit (pkgs.libsForQt5) poppler;
};
- poyo = buildPythonPackage rec {
- version = "0.4.0";
- name = "poyo-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/poyo/${name}.tar.gz";
- sha256 = "1f48ffl0j1f2lmgabajps7v8w90ppxbp5168gh8kh27bjd8xk5ca";
- };
-
- meta = {
- homepage = https://github.com/hackebrot/poyo;
- description = "A lightweight YAML Parser for Python";
- license = licenses.mit;
- };
- };
+ poyo = callPackage ../development/python-modules/poyo { };
prov = callPackage ../development/python-modules/prov { };
- pudb = buildPythonPackage rec {
- name = "pudb-2016.2";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pudb/${name}.tar.gz";
- sha256 = "0njhi49d9fxbwh5p8yjx8m3jlfyzfm00b5aff6bz473pn7vxfn79";
- };
-
- propagatedBuildInputs = with self; [ pygments urwid ];
-
- # Tests fail on python 3 due to writes to the read-only home directory
- doCheck = !isPy3k;
-
- meta = {
- description = "A full-screen, console-based Python debugger";
- license = licenses.mit;
- platforms = platforms.all;
- };
- };
+ pudb = callPackage ../development/python-modules/pudb { };
pybtex = callPackage ../development/python-modules/pybtex {};
pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils {};
- pycallgraph = buildPythonPackage rec {
- name = "pycallgraph-${version}";
- version = "1.0.1";
-
- src = pkgs.fetchurl {
- url = mirror://pypi/p/pycallgraph/pycallgraph-1.0.1.tar.gz;
- sha256 = "0w8yr43scnckqcv5nbyd2dq4kpv74ai856lsdsf8iniik07jn9mi";
- };
-
- buildInputs = with self; [ pytest ];
-
- # Tests do not work due to this bug: https://github.com/gak/pycallgraph/issues/118
- doCheck = false;
-
- meta = {
- homepage = http://pycallgraph.slowchop.com;
- description = "Call graph visualizations for Python applications";
- maintainers = with maintainers; [ auntie ];
- license = licenses.gpl2;
- platforms = platforms.all;
- };
- };
+ pycallgraph = callPackage ../development/python-modules/pycallgraph { };
pycassa = callPackage ../development/python-modules/pycassa { };
+ lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override {
+ python3 = python;
+ }));
+
pyblake2 = callPackage ../development/python-modules/pyblake2 { };
- pybluez = buildPythonPackage rec {
- version = "unstable-20160819";
- pname = "pybluez";
- name = "${pname}-${version}";
+ pybluez = callPackage ../development/python-modules/pybluez { };
- propagatedBuildInputs = with self; [ pkgs.bluez ];
-
- src = pkgs.fetchFromGitHub {
- owner = "karulis";
- repo = "${pname}";
- rev = "a0b226a61b166e170d48539778525b31e47a4731";
- sha256 = "104dm5ngfhqisv1aszdlr3szcav2g3bhsgzmg4qfs09b3i5zj047";
- };
-
- # the tests do not pass
- doCheck = false;
-
- meta = {
- description = "Bluetooth Python extension module";
- license = licenses.gpl2;
- maintainers = with maintainers; [ leenaars ];
- };
- };
-
- pycares = buildPythonPackage rec {
- name = "pycares-${version}";
- version = "1.0.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pycares/${name}.tar.gz";
- sha256 = "a18341ea030e2cc0743acdf4aa72302bdf6b820938b36ce4bd76e43faa2276a3";
- };
-
- propagatedBuildInputs = [ pkgs.c-ares ];
-
- # No tests included
- doCheck = false;
-
- meta = {
- homepage = https://github.com/saghul/pycares;
- description = "Interface for c-ares";
- license = licenses.mit;
- };
- };
+ pycares = callPackage ../development/python-modules/pycares { };
pycuda = callPackage ../development/python-modules/pycuda rec {
cudatoolkit = pkgs.cudatoolkit_7_5;
@@ -3561,37 +1883,7 @@ in {
pyphen = callPackage ../development/python-modules/pyphen {};
- pypoppler = buildPythonPackage rec {
- name = "pypoppler-${version}";
- version = "0.12.2";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pypoppler/${name}.tar.gz";
- sha256 = "47e6ac99e5b114b9abf2d1dd1bca06f22c028d025432512989f659142470810f";
- };
-
- NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
- nativeBuildInputs = [ pkgs.pkgconfig ];
- buildInputs = [ pkgs.poppler.dev ];
- propagatedBuildInputs = with self; [ pycairo pygobject2 ];
-
- patches = [
- ../development/python-modules/pypoppler-0.39.0.patch
- ../development/python-modules/pypoppler-poppler.c.patch
- ];
-
- # Not supported.
- disabled = isPy3k;
-
- # No tests in archive
- doCheck = false;
-
- meta = {
- homepage = https://code.launchpad.net/~mriedesel/poppler-python/main;
- description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies";
- license = licenses.gpl2;
- };
- };
+ pypoppler = callPackage ../development/python-modules/pypoppler { };
pypillowfight = callPackage ../development/python-modules/pypillowfight { };
@@ -3603,149 +1895,17 @@ in {
pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { });
- pyramid = buildPythonPackage rec {
- pname = "pyramid";
- version = "1.9.1";
- name = "${pname}-${version}";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0dhbzc4q0vsnv3aihy728aczg56xs6h9s1rmvr096q4lb6yln3w4";
- };
-
- checkInputs = with self; [
- docutils
- virtualenv
- webtest
- zope_component
- ];
-
- propagatedBuildInputs = with self; [
- hupper
- PasteDeploy
- plaster
- plaster-pastedeploy
- repoze_lru
- repoze_sphinx_autointerface
- translationstring
- venusian
- webob
- zope_deprecation
- zope_interface
- ];
-
- meta = {
- maintainers = with maintainers; [ garbas domenkozar ];
- platforms = platforms.all;
- };
-
- # Failing tests
- # https://github.com/Pylons/pyramid/issues/1899
- doCheck = !isPy35;
-
- };
+ pyramid = callPackage ../development/python-modules/pyramid { };
pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { };
- pyramid_chameleon = buildPythonPackage rec {
- name = "pyramid_chameleon-0.3";
+ pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyramid_chameleon/${name}.tar.gz";
- sha256 = "d176792a50eb015d7865b44bd9b24a7bd0489fa9a5cebbd17b9e05048cef9017";
- };
+ pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { };
- propagatedBuildInputs = with self; [
- chameleon
- pyramid
- zope_interface
- setuptools
- ];
+ pyramid_mako = callPackage ../development/python-modules/pyramid_mako { };
- meta = {
- maintainers = with maintainers; [ domenkozar ];
- };
- };
-
-
- pyramid_jinja2 = buildPythonPackage rec {
- name = "pyramid_jinja2-${version}";
- version = "2.5";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyramid_jinja2/${name}.tar.gz";
- sha256 = "93c86e3103b454301f4d66640191aba047f2ab85ba75647aa18667b7448396bd";
- };
-
- buildInputs = with self; [ webtest ];
- propagatedBuildInputs = with self; [ jinja2 pyramid ];
-
- meta = {
- maintainers = with maintainers; [ domenkozar ];
- platforms = platforms.all;
- };
- };
-
-
- pyramid_mako = buildPythonPackage rec {
- name = "pyramid_mako-0.3.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyramid_mako/${name}.tar.gz";
- sha256 = "00811djmsc4rz20kpy2paam05fbx6dmrv2i5jf90f6xp6zw4isy6";
- };
-
- buildInputs = with self; [ webtest ];
- propagatedBuildInputs = with self; [ pyramid Mako ];
- };
-
-
- pyramid_exclog = buildPythonPackage rec {
- name = "pyramid_exclog-0.7";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyramid_exclog/${name}.tar.gz";
- sha256 = "a58c82866c3e1a350684e6b83b440d5dc5e92ca5d23794b56d53aac06fb65a2c";
- };
-
- propagatedBuildInputs = with self; [ pyramid ];
-
- meta = {
- maintainers = with maintainers; [ garbas domenkozar ];
- platforms = platforms.all;
- };
- };
-
-
- pyramid_multiauth = buildPythonPackage rec {
- name = "pyramid_multiauth-${version}";
- version = "0.8.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyramid_multiauth/${name}.tar.gz";
- sha256 = "1lq292qakrm4ixi4vaif8dqywzj08pn6qy0wi4gw28blh39p0msk";
- };
-
- propagatedBuildInputs = with self; [ pyramid ];
-
- meta = {
- description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies";
- homepage = https://github.com/mozilla-services/pyramid_multiauth;
- };
- };
-
- pyramid_hawkauth = buildPythonPackage rec {
- name = "pyramidhawkauth-${version}";
- version = "0.1.0";
- src = pkgs.fetchgit {
- url = https://github.com/mozilla-services/pyramid_hawkauth.git;
- rev = "refs/tags/v${version}";
- sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h";
- };
-
- propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib ];
- buildInputs = with self; [ webtest ];
- };
+ peewee = callPackage ../development/python-modules/peewee { };
pyroute2 = callPackage ../development/python-modules/pyroute2 { };
@@ -3757,29 +1917,6 @@ in {
pytools = callPackage ../development/python-modules/pytools { };
- pytun = buildPythonPackage rec {
- name = "pytun-${version}";
- version = "2.2.1";
- rev = "v${version}";
-
- src = pkgs.fetchFromGitHub {
- inherit rev;
- owner = "montag451";
- repo = "pytun";
- sha256 = "1bxk0z0v8m0b01xg94f039j3bsclkshb7girvjqfzk5whbd2nryh";
- };
-
- doCheck = false;
-
- meta = {
- homepage = https://github.com/montag451/pytun;
- description = "Linux TUN/TAP wrapper for Python";
- license = licenses.mit;
- maintainers = with maintainers; [ montag451 ];
- platforms = platforms.linux;
- };
- };
-
python-ctags3 = callPackage ../development/python-modules/python-ctags3 { };
junos-eznc = callPackage ../development/python-modules/junos-eznc {};
@@ -3788,111 +1925,8 @@ in {
rawkit = callPackage ../development/python-modules/rawkit { };
- rethinkdb = buildPythonPackage rec {
- name = "rethinkdb-${version}";
- version = "2.3.0.post6";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/r/rethinkdb/${name}.tar.gz";
- sha256 = "05qwkmq6kn437ywyjs02jxbry720gw39q4z4jdb0cnbbi76lwddm";
- };
-
- doCheck = false;
-
- meta = {
- description = "Python driver library for the RethinkDB database server";
- homepage = "https://pypi.python.org/pypi/rethinkdb";
- license = licenses.agpl3;
- };
- };
-
- roman = buildPythonPackage rec {
- version = "2.0.0";
- name = "roman-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/r/roman/${name}.zip";
- sha256 = "90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae";
- };
-
- buildInputs = with self; with pkgs; [ ];
-
- propagatedBuildInputs = with self; [ ];
-
- meta = {
- description = "Integer to Roman numerals converter";
- homepage = "https://pypi.python.org/pypi/roman";
- license = licenses.psfl;
- };
- };
-
-
-
- librosa = buildPythonPackage rec {
- pname = "librosa";
- name = "${pname}-${version}";
- version = "0.4.3";
- src = pkgs.fetchurl {
- url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "209626c53556ca3922e52d2fae767bf5b398948c867fcc8898f948695dacb247";
- };
-
- propagatedBuildInputs = with self; [ joblib matplotlib six scikitlearn
- decorator audioread resampy ];
-
- # No tests
- doCheck = false;
-
- meta = {
- description = "Python module for audio and music processing";
- homepage = http://librosa.github.io/;
- license = licenses.isc;
- };
- };
-
joblib = callPackage ../development/python-modules/joblib { };
- safe = buildPythonPackage rec {
- version = "0.4";
- name = "Safe-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/S/Safe/${name}.tar.gz";
- sha256 = "a2fdac9fe8a9dcf02b438201d6ce0b7be78f85dc6492d03edfb89be2adf489de";
- };
-
- buildInputs = with self; [ nose ];
- meta = {
- homepage = "https://github.com/lepture/safe";
- license = licenses.bsd3;
- description = "Check password strength";
- };
- };
-
- samplerate = buildPythonPackage rec {
- name = "scikits.samplerate-${version}";
- version = "0.3.3";
- src = pkgs.fetchgit {
- url = https://github.com/cournape/samplerate;
- rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210";
- sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg";
- };
-
- buildInputs = with self; [ pkgs.libsamplerate ];
-
- propagatedBuildInputs = with self; [ numpy ];
-
- preConfigure = ''
- cat > site.cfg << END
- [samplerate]
- library_dirs=${pkgs.libsamplerate.out}/lib
- include_dirs=${pkgs.libsamplerate.dev}/include
- END
- '';
-
- doCheck = false;
- };
-
sarge = callPackage ../development/python-modules/sarge { };
subliminal = callPackage ../development/python-modules/subliminal {};
@@ -3901,98 +1935,14 @@ in {
zope_copy = callPackage ../development/python-modules/zope_copy {};
- ssdeep = buildPythonPackage rec {
- name = "ssdeep-3.1.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/ssdeep/${name}.tar.gz";
- sha256 = "1p9dpykmnfb73cszdiic5wbz5bmbbmkiih08pb4dah5mwq4n7im6";
- };
-
- buildInputs = with pkgs; [ ssdeep ];
- propagatedBuildInputs = with self; [ cffi six ];
- meta.broken = true; # Tests fail, and no reverse-dependencies anyway
- };
-
s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { };
- statsd = buildPythonPackage rec {
- name = "statsd-${version}";
- version = "3.2.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/statsd/${name}.tar.gz";
- sha256 = "3fa92bf0192af926f7a0d9be031fe3fd0fbaa1992d42cf2f07e68f76ac18288e";
- };
-
- buildInputs = with self; [ nose mock ];
-
- meta = {
- maintainers = with maintainers; [ domenkozar ];
- description = "A simple statsd client";
- license = licenses.mit;
- homepage = https://github.com/jsocol/pystatsd;
- };
-
- patchPhase = ''
- # Failing test: ERROR: statsd.tests.test_ipv6_resolution_udp
- sed -i 's/test_ipv6_resolution_udp/noop/' statsd/tests.py
- # well this is a noop, but so it was before
- sed -i 's/assert_called_once()/called/' statsd/tests.py
- '';
-
- };
-
py3status = callPackage ../development/python-modules/py3status {};
- multi_key_dict = buildPythonPackage rec {
- name = "multi_key_dict-${version}";
- version = "2.0.3";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/multi_key_dict/multi_key_dict-${version}.tar.gz";
- sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy";
- };
-
- meta = with stdenv.lib; {
- description = "multi_key_dict";
- homepage = "https://github.com/formiaczek/multi_key_dict";
- };
- };
-
-
pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { };
- random2 = self.buildPythonPackage rec {
- name = "random2-1.0.1";
-
- doCheck = !isPyPy;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/r/random2/${name}.zip";
- sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007";
- };
- };
-
scandir = callPackage ../development/python-modules/scandir { };
- schedule = buildPythonPackage rec {
- name = "schedule-0.3.2";
-
- src = pkgs.fetchurl {
- url = "https://pypi.python.org/packages/10/96/d101fab391753ebc81fa3bb0e744df1ddcfb032c31b036d38083f8994db1/schedule-0.3.2.tar.gz";
- sha256 = "1h0waw4jd5ql68y5kxb9irwapkbkwfs1w0asvbl24fq5f8czdijm";
- };
-
- buildInputs = with self; [ mock ];
-
- meta = with stdenv.lib; {
- description = "Python job scheduling for humans";
- homepage = https://github.com/dbader/schedule;
- license = licenses.mit;
- };
- };
-
schema = callPackage ../development/python-modules/schema {};
simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server {};
@@ -4005,207 +1955,64 @@ in {
ratelimiter = callPackage ../development/python-modules/ratelimiter { };
- repoze_lru = buildPythonPackage rec {
- name = "repoze.lru-0.6";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/r/repoze.lru/${name}.tar.gz";
- sha256 = "0f7a323bf716d3cb6cb3910cd4fccbee0b3d3793322738566ecce163b01bbd31";
- };
-
- meta = {
- maintainers = with maintainers; [ garbas domenkozar ];
- platforms = platforms.all;
- };
- };
-
- repoze_sphinx_autointerface = buildPythonPackage rec {
- name = "repoze.sphinx.autointerface-0.7.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/r/repoze.sphinx.autointerface/${name}.tar.gz";
- sha256 = "97ef5fac0ab0a96f1578017f04aea448651fa9f063fc43393a8253bff8d8d504";
- };
-
- propagatedBuildInputs = with self; [ zope_interface sphinx ];
-
- meta = {
- maintainers = with maintainers; [ domenkozar ];
- platforms = platforms.all;
- };
- };
-
-
- setuptools-git = buildPythonPackage rec {
- name = "setuptools-git-${version}";
- version = "1.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/setuptools-git/${name}.tar.gz";
- sha256 = "047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831";
- };
-
- propagatedBuildInputs = [ pkgs.git ];
- doCheck = false;
-
- meta = {
- description = "Setuptools revision control system plugin for Git";
- homepage = https://pypi.python.org/pypi/setuptools-git;
- license = licenses.bsd3;
- };
- };
-
-
- watchdog = buildPythonPackage rec {
- name = "watchdog-${version}";
- version = "0.8.3";
-
- propagatedBuildInputs = with self; [ argh pathtools pyyaml ];
-
- buildInputs = stdenv.lib.optionals stdenv.isDarwin
- [ pkgs.darwin.apple_sdk.frameworks.CoreServices pkgs.darwin.cf-private ];
-
- doCheck = false;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/w/watchdog/${name}.tar.gz";
- sha256 = "0qj1vqszxwfx6d1s66s96jmfmy2j94bywxiqdydh6ikpvcm8hrby";
- };
-
- meta = {
- description = "Python API and shell utilities to monitor file system events";
- homepage = https://github.com/gorakhargosh/watchdog;
- license = licenses.asl20;
- maintainers = with maintainers; [ goibhniu ];
- };
- };
-
pywatchman = callPackage ../development/python-modules/pywatchman { };
pywavelets = callPackage ../development/python-modules/pywavelets { };
- zope_deprecation = buildPythonPackage rec {
- name = "zope.deprecation-4.1.2";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/z/zope.deprecation/${name}.tar.gz";
- sha256 = "fed622b51ffc600c13cc5a5b6916b8514c115f34f7ea2730409f30c061eb0b78";
- };
-
- buildInputs = with self; [ zope_testing ];
-
- meta = {
- maintainers = with maintainers; [ garbas domenkozar ];
- platforms = platforms.all;
- };
- };
-
- validictory = buildPythonPackage rec {
- name = "validictory-1.0.0a2";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/v/validictory/validictory-1.0.0a2.tar.gz";
- sha256 = "c02388a70f5b854e71e2e09bd6d762a2d8c2a017557562e866d8ffafb0934b07";
- };
-
- doCheck = false;
-
- meta = {
- description = "Validate dicts against a schema";
- homepage = https://github.com/sunlightlabs/validictory;
- license = licenses.mit;
- };
- };
-
vcrpy = callPackage ../development/python-modules/vcrpy { };
- venusian = buildPythonPackage rec {
- name = "venusian-1.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/v/venusian/${name}.tar.gz";
- sha256 = "1720cff2ca9c369c840c1d685a7c7a21da1afa687bfe62edd93cae4bf429ca5a";
- };
-
- # TODO: https://github.com/Pylons/venusian/issues/23
- doCheck = false;
-
- meta = {
- maintainers = with maintainers; [ garbas domenkozar ];
- platforms = platforms.all;
- };
- };
-
-
- chameleon = buildPythonPackage rec {
- name = "Chameleon-2.25";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/C/Chameleon/${name}.tar.gz";
- sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb";
- } ;
-
- meta = {
- maintainers = with maintainers; [ garbas domenkozar ];
- };
- };
-
- ddt = buildPythonPackage (rec {
- name = "ddt-1.0.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/ddt/${name}.tar.gz";
- sha256 = "e24ecb7e2cf0bf43fa9d4255d3ae2bd0b7ce30b1d1b89ace7aa68aca1152f37a";
- };
-
- meta = {
- description = "Data-Driven/Decorated Tests, a library to multiply test cases";
-
- homepage = https://github.com/txels/ddt;
-
- license = licenses.mit;
- };
- });
-
descartes = callPackage ../development/python-modules/descartes { };
- distutils_extra = buildPythonPackage rec {
- name = "distutils-extra-${version}";
- version = "2.39";
-
- src = pkgs.fetchurl {
- url = "http://launchpad.net/python-distutils-extra/trunk/${version}/+download/python-${name}.tar.gz";
- sha256 = "1bv3h2p9ffbzyddhi5sccsfwrm3i6yxzn0m06fdxkj2zsvs28gvj";
- };
-
- meta = {
- homepage = https://launchpad.net/python-distutils-extra;
- description = "Enhancements to Python's distutils";
- license = licenses.gpl2;
- };
- };
-
- pyxdg = buildPythonPackage rec {
- name = "pyxdg-0.25";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyxdg/${name}.tar.gz";
- sha256 = "81e883e0b9517d624e8b0499eb267b82a815c0b7146d5269f364988ae031279d";
- };
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = {
- homepage = http://freedesktop.org/wiki/Software/pyxdg;
- description = "Contains implementations of freedesktop.org standards";
- license = licenses.lgpl2;
- maintainers = with maintainers; [ domenkozar ];
- };
- };
-
chardet = callPackage ../development/python-modules/chardet { };
+ pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { };
+
+ pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { };
+
+ pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { };
+
+ pytun = callPackage ../development/python-modules/pytun { };
+
+ rethinkdb = callPackage ../development/python-modules/rethinkdb { };
+
+ roman = callPackage ../development/python-modules/roman { };
+
+ librosa = callPackage ../development/python-modules/librosa { };
+
+ samplerate = callPackage ../development/python-modules/samplerate { };
+
+ ssdeep = callPackage ../development/python-modules/ssdeep { };
+
+ statsd = callPackage ../development/python-modules/statsd { };
+
+ multi_key_dict = callPackage ../development/python-modules/multi_key_dict { };
+
+ random2 = callPackage ../development/python-modules/random2 { };
+
+ schedule = callPackage ../development/python-modules/schedule { };
+
+ repoze_lru = callPackage ../development/python-modules/repoze_lru { };
+
+ repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { };
+
+ setuptools-git = callPackage ../development/python-modules/setuptools-git { };
+
+ watchdog = callPackage ../development/python-modules/watchdog { };
+
+ zope_deprecation = callPackage ../development/python-modules/zope_deprecation { };
+
+ validictory = callPackage ../development/python-modules/validictory { };
+
+ venusian = callPackage ../development/python-modules/venusian { };
+
+ chameleon = callPackage ../development/python-modules/chameleon { };
+
+ ddt = callPackage ../development/python-modules/ddt { };
+
+ distutils_extra = callPackage ../development/python-modules/distutils_extra { };
+
+ pyxdg = callPackage ../development/python-modules/pyxdg { };
+
crayons = callPackage ../development/python-modules/crayons{ };
django = self.django_1_11;
@@ -4222,96 +2029,23 @@ in {
gdal = self.gdal;
};
- django_1_8 = buildPythonPackage rec {
- name = "Django-${version}";
- version = "1.8.18";
- disabled = pythonOlder "2.7";
-
- src = pkgs.fetchurl {
- url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
- sha256 = "1ishvbihr9pain0486qafb18dnb7v2ppq34nnx1s8f95bvfiqqf7";
- };
-
- # too complicated to setup
- doCheck = false;
-
- # patch only $out/bin to avoid problems with starter templates (see #3134)
- postFixup = ''
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
-
- meta = {
- description = "A high-level Python Web framework";
- homepage = https://www.djangoproject.com/;
- };
- };
+ django_1_8 = callPackage ../development/python-modules/django/1_8.nix { };
django-allauth = callPackage ../development/python-modules/django-allauth { };
django_appconf = callPackage ../development/python-modules/django_appconf { };
- django_colorful = buildPythonPackage rec {
- name = "django-colorful-${version}";
- version = "1.2";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-colorful/${name}.tar.gz";
- sha256 = "0y34hzvfrm1xbxrd8frybc9yzgqvz4c07frafipjikw7kfjsw8az";
- };
-
- # Tests aren't run
- doCheck = false;
-
- # Requires Django >= 1.8
- buildInputs = with self; [ django ];
-
- meta = {
- description = "Django extension that provides database and form color fields";
- homepage = https://github.com/charettes/django-colorful;
- license = licenses.mit;
- };
- };
+ django_colorful = callPackage ../development/python-modules/django_colorful { };
django_compressor = callPackage ../development/python-modules/django_compressor { };
django_compat = callPackage ../development/python-modules/django-compat { };
- django_environ = buildPythonPackage rec {
- name = "django-environ-${version}";
- version = "0.4.0";
+ django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-environ/${name}.tar.gz";
- sha256 = "0i32vsgk1xmwpi7i6f6v5hg653y9dl0fsz5qmv94skz6hwgm5kvh";
- };
+ django_environ = callPackage ../development/python-modules/django_environ { };
- # The testsuite fails to modify the base environment
- doCheck = false;
- propagatedBuildInputs = with self ; [ django six ];
-
- meta = {
- description = "Utilize environment variables to configure your Django application";
- homepage = https://github.com/joke2k/django-environ/;
- license = licenses.mit;
- };
- };
-
- django_evolution = buildPythonPackage rec {
- name = "django_evolution-0.7.5";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django_evolution/${name}.tar.gz";
- sha256 = "1qbcx54hq8iy3n2n6cki3bka1m9rp39np4hqddrm9knc954fb7nv";
- };
-
- propagatedBuildInputs = with self; [ django ];
-
- meta = {
- description = "A database schema evolution tool for the Django web framework";
- homepage = http://code.google.com/p/django-evolution/;
- };
- };
+ django_evolution = callPackage ../development/python-modules/django_evolution { };
django_extensions = callPackage ../development/python-modules/django-extensions { };
@@ -4351,26 +2085,7 @@ in {
propagatedBuildInputs = with self; [ django ];
});
- django_classytags = buildPythonPackage rec {
- name = "django-classy-tags-${version}";
- version = "0.6.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-classy-tags/${name}.tar.gz";
- sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0";
- };
-
- propagatedBuildInputs = with self; [ django ];
-
- # tests appear to be broken on 0.6.1 at least
- doCheck = ( version != "0.6.1" );
-
- meta = {
- description = "Class based template tags for Django";
- homepage = https://github.com/ojii/django-classy-tags;
- license = licenses.bsd3;
- };
- };
+ django_classytags = callPackage ../development/python-modules/django_classytags { };
# This package may need an older version of Django.
# Override the package set and set e.g. `django = super.django_1_9`.
@@ -4379,47 +2094,9 @@ in {
django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { };
- django_nose = buildPythonPackage rec {
- name = "django-nose-${version}";
- version = "1.4.4";
+ django_nose = callPackage ../development/python-modules/django_nose { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-nose/${name}.tar.gz";
- sha256 = "1fm47fkza2lk0xgc6qpi9vs78zg7q8cgl6mdan69sbycgy909ff0";
- };
-
- # vast dependency list
- doCheck = false;
-
- propagatedBuildInputs = with self; [ django nose ];
-
- meta = {
- description = "Provides all the goodness of nose in your Django tests";
- homepage = https://github.com/django-nose/django-nose;
- license = licenses.bsd3;
- };
- };
-
- django_modelcluster = buildPythonPackage rec {
- name = "django-modelcluster-${version}";
- version = "0.6.2";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-modelcluster/django-modelcluster-${version}.tar.gz";
- sha256 = "1plsdi44dvsj2sfx79lsrccjfg0ymajcsf5n0mln4cwd4qi5mwpx";
- };
-
- doCheck = false;
-
- propagatedBuildInputs = with self; [ pytz six ];
-
- meta = {
- description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database";
- homepage = https://github.com/torchbox/django-modelcluster/;
- license = licenses.bsd2;
- maintainers = with maintainers; [ desiderius ];
- };
- };
+ django_modelcluster = callPackage ../development/python-modules/django_modelcluster { };
djangorestframework = callPackage ../development/python-modules/djangorestframework { };
@@ -4427,96 +2104,13 @@ in {
django_redis = callPackage ../development/python-modules/django_redis { };
- django_reversion = buildPythonPackage rec {
- name = "django-reversion-${version}";
- version = "1.10.1";
+ django_reversion = callPackage ../development/python-modules/django_reversion { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-reversion/${name}.tar.gz";
- sha256 = "01iv8w6lmmq98qjhxmnp8ddjxifmhxcmp612ijd91wc8nv8lk12w";
- };
+ django_silk = callPackage ../development/python-modules/django_silk { };
- propagatedBuildInputs = with self; [ django ];
+ django_taggit = callPackage ../development/python-modules/django_taggit { };
- meta = {
- description = "An extension to the Django web framework that provides comprehensive version control facilities";
- homepage = https://github.com/etianen/django-reversion;
- license = licenses.bsd3;
- };
- };
-
- django_silk = buildPythonPackage rec {
- name = "django-silk-${version}";
- version = "0.5.6";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-silk/${name}.tar.gz";
- sha256 = "845abc688738858ce06e993c4b7dbbcfcecf33029e828f143463ff96f9a78947";
- };
-
- doCheck = false;
-
- buildInputs = [ self.mock ];
-
- propagatedBuildInputs = with self; [
- django
- pygments
- simplejson
- dateutil
- requests
- sqlparse
- jinja2
- autopep8
- pytz
- pillow
- ];
-
- meta = {
- description = "Silky smooth profiling for the Django Framework";
- homepage = https://github.com/mtford90/silk;
- license = licenses.mit;
- };
- };
-
- django_taggit = buildPythonPackage rec {
- name = "django-taggit-${version}";
- version = "0.17.0";
- disabled = pythonOlder "2.7";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-taggit/django-taggit-${version}.tar.gz";
- sha256 = "1xy4mm1y6z6bpakw907859wz7fiw7jfm586dj89w0ggdqlb0767b";
- };
-
- doCheck = false;
-
- meta = {
- description = "django-taggit is a reusable Django application for simple tagging";
- homepage = https://github.com/alex/django-taggit/tree/master/;
- license = licenses.bsd2;
- maintainers = with maintainers; [ desiderius ];
- };
- };
-
- django_treebeard = buildPythonPackage rec {
- name = "django-treebeard-${version}";
- version = "3.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-treebeard/${name}.tar.gz";
- sha256 = "10p9rb2m1zccszg7590fjd0in6rabzsh86f5m7qm369mapc3b6dc";
- };
-
- buildInputs = with self; [ pytest ];
- propagatedBuildInputs = with self; [ django ];
-
- meta = {
- description = "Efficient tree implementations for Django 1.6+";
- homepage = https://tabo.pe/projects/django-treebeard/;
- maintainers = with maintainers; [ desiderius ];
- license = licenses.asl20;
- };
- };
+ django_treebeard = callPackage ../development/python-modules/django_treebeard { };
django_pipeline = callPackage ../development/python-modules/django-pipeline { };
@@ -4524,304 +2118,43 @@ in {
djmail = callPackage ../development/python-modules/djmail { };
- pillowfight = buildPythonPackage rec {
- name = "pillowfight-${version}";
- version = "0.2";
+ pillowfight = callPackage ../development/python-modules/pillowfight { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pillowfight/pillowfight-${version}.tar.gz";
- sha256 = "1mh1nhcjjgv7x134sv0krri59ng8bp2w6cwsxc698rixba9f3g0m";
- };
+ kaptan = callPackage ../development/python-modules/kaptan { };
- propagatedBuildInputs = with self; [
- pillow
- ];
- meta = with stdenv.lib; {
- description = "Pillow Fight";
- homepage = "https://github.com/beanbaginc/pillowfight";
- };
- };
-
- kaptan = buildPythonPackage rec {
- name = "kaptan-${version}";
- version = "0.5.8";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/k/kaptan/${name}.tar.gz";
- sha256 = "1b8r86yyvdvyxd6f10mhkl6cr2jhxm80jjqr4zch96w9hs9rh5vq";
- };
-
- propagatedBuildInputs = with self; [ pyyaml ];
-
- meta = with stdenv.lib; {
- description = "Configuration manager for python applications";
- homepage = https://emre.github.io/kaptan/;
- license = licenses.bsd3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ jgeerds ];
- };
- };
-
- keepalive = buildPythonPackage rec {
- name = "keepalive-${version}";
- version = "0.5";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/k/keepalive/keepalive-${version}.tar.gz";
- sha256 = "3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1";
- };
-
- # No tests included
- doCheck = false;
-
- meta = with stdenv.lib; {
- description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive";
- homepage = "https://github.com/wikier/keepalive";
- };
- };
+ keepalive = callPackage ../development/python-modules/keepalive { };
keyrings-alt = callPackage ../development/python-modules/keyrings-alt {};
- SPARQLWrapper = buildPythonPackage rec {
- name = "SPARQLWrapper-${version}";
- version = "1.7.6";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-${version}.tar.gz";
- sha256 = "1y12hpsfjd779yi29bhvl6g4vszadjvd8jw38z5rg77b034vxjnw";
- };
-
- # break circular dependency loop
- patchPhase = ''
- sed -i '/rdflib/d' requirements.txt
- '';
-
- # Doesn't actually run tests
- doCheck = false;
-
- propagatedBuildInputs = with self; [
- six isodate pyparsing html5lib keepalive
- ];
-
- meta = with stdenv.lib; {
- description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format";
- homepage = "http://rdflib.github.io/sparqlwrapper";
- };
- };
+ SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { };
dulwich = callPackage ../development/python-modules/dulwich {
inherit (pkgs) git glibcLocales;
};
- hg-git = buildPythonPackage rec {
- name = "hg-git-${version}";
- version = "0.8.11";
- disabled = isPy3k;
+ hg-git = callPackage ../development/python-modules/hg-git { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/hg-git/${name}.tar.gz";
- sha256 = "08kw1sj3sq1q1571hwkc51w20ks9ysmlg93pcnmd6gr66bz02dyn";
- };
+ dtopt = callPackage ../development/python-modules/dtopt { };
- propagatedBuildInputs = with self; [ dulwich ];
-
- meta = {
- description = "Push and pull from a Git server using Mercurial";
- homepage = http://hg-git.github.com/;
- maintainers = with maintainers; [ koral ];
- license = stdenv.lib.licenses.gpl2;
- };
- };
-
- dtopt = buildPythonPackage rec {
- name = "dtopt-0.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/dtopt/${name}.tar.gz";
- sha256 = "06ae07a12294a7ba708abaa63f838017d1a2faf6147a1e7a14ca4fa28f86da7f";
- };
-
- meta = {
- description = "Add options to doctest examples while they are running";
- homepage = https://pypi.python.org/pypi/dtopt;
- };
- # Test contain Python 2 print
- disabled = isPy3k;
- };
-
-
- ecdsa = buildPythonPackage rec {
- name = "ecdsa-${version}";
- version = "0.13";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/e/ecdsa/${name}.tar.gz";
- sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
- };
-
- # Only needed for tests
- buildInputs = with self; [ pkgs.openssl ];
-
- meta = {
- description = "ECDSA cryptographic signature library";
- homepage = "https://github.com/warner/python-ecdsa";
- license = licenses.mit;
- maintainers = with maintainers; [ aszlig ];
- };
- };
+ ecdsa = callPackage ../development/python-modules/ecdsa { };
effect = callPackage ../development/python-modules/effect {};
- elpy = buildPythonPackage rec {
- name = "elpy-${version}";
- version = "1.9.0";
- src = pkgs.fetchurl {
- url = "mirror://pypi/e/elpy/${name}.tar.gz";
- sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0";
- };
- python2Deps = if isPy3k then [ ] else [ self.rope ];
- propagatedBuildInputs = with self; [ flake8 autopep8 jedi importmagic ] ++ python2Deps;
+ elpy = callPackage ../development/python-modules/elpy { };
- doCheck = false; # there are no tests
-
- meta = {
- description = "Backend for the elpy Emacs mode";
- homepage = "https://github.com/jorgenschaefer/elpy";
- };
- };
-
-
- enum = buildPythonPackage rec {
- name = "enum-0.4.4";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/e/enum/${name}.tar.gz";
- sha256 = "9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff";
- };
-
- doCheck = !isPyPy;
-
- buildInputs = with self; [ ];
-
- propagatedBuildInputs = with self; [ ];
-
- meta = {
- homepage = https://pypi.python.org/pypi/enum/;
- description = "Robust enumerated type support in Python";
- };
- };
+ enum = callPackage ../development/python-modules/enum { };
enum-compat = callPackage ../development/python-modules/enum-compat { };
- enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec {
- pname = "enum34";
- version = "1.1.6";
- name = "${pname}-${version}";
+ enum34 = callPackage ../development/python-modules/enum34 { };
- src = fetchPypi {
- inherit pname version;
- sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1";
- };
+ epc = callPackage ../development/python-modules/epc { };
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
+ et_xmlfile = callPackage ../development/python-modules/et_xmlfile { };
+ eventlet = callPackage ../development/python-modules/eventlet { };
- meta = {
- homepage = https://pypi.python.org/pypi/enum34;
- description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4";
- license = "BSD";
- };
- };
-
- epc = buildPythonPackage rec {
- name = "epc-0.0.3";
- src = pkgs.fetchurl {
- url = "mirror://pypi/e/epc/${name}.tar.gz";
- sha256 = "30b594bd4a4acbd5bda0d3fa3d25b4e8117f2ff8f24d2d1e3e36c90374f3c55e";
- };
-
- propagatedBuildInputs = with self; [ sexpdata ];
- doCheck = false;
-
- meta = {
- description = "EPC (RPC stack for Emacs Lisp) implementation in Python";
- homepage = "https://github.com/tkf/python-epc";
- };
- };
-
- et_xmlfile = buildPythonPackage rec {
- version = "1.0.1";
- name = "et_xmlfile-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/e/et_xmlfile/${name}.tar.gz";
- sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1";
- };
-
- buildInputs = with self; [ lxml pytest ];
- checkPhase = ''
- py.test $out
- '';
-
- meta = {
- description = "An implementation of lxml.xmlfile for the standard library";
- longDescription = ''
- et_xmlfile is a low memory library for creating large XML files.
-
- It is based upon the xmlfile module from lxml with the aim of allowing
- code to be developed that will work with both libraries. It was developed
- initially for the openpyxl project but is now a standalone module.
-
- The code was written by Elias Rabel as part of the Python Düsseldorf
- openpyxl sprint in September 2014.
- '';
- homepage = "https://pypi.python.org/pypi/et_xmlfile";
- license = licenses.mit;
- maintainers = with maintainers; [ sjourdois ];
- };
- };
-
- eventlet = buildPythonPackage rec {
- pname = "eventlet";
- version = "0.20.0";
- name = "${pname}-${version}";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "15bq5ybbigxnp5xwkps53zyhlg15lmcnq3ny2dppj0r0bylcs5rf";
- };
-
- buildInputs = with self; [ nose httplib2 pyopenssl ];
-
- doCheck = false; # too much transient errors to bother
-
- propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ] ++
- (with self; [ enum-compat ]) ;
-
- meta = {
- homepage = https://pypi.python.org/pypi/eventlet/;
- description = "A concurrent networking library for Python";
- };
- };
-
- exifread = buildPythonPackage rec {
- name = "ExifRead-2.1.2";
-
- meta = {
- description = "Easy to use Python module to extract Exif metadata from tiff and jpeg files";
- homepage = "https://github.com/ianare/exif-py";
- license = "BSD";
- maintainers = with maintainers; [ vozz ];
- };
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/E/ExifRead/${name}.tar.gz";
- sha256 = "1b90jf6m9vxh9nanhpyvqdq7hmfx5iggw1l8kq10jrs6xgr49qkr";
- };
- };
+ exifread = callPackage ../development/python-modules/exifread { };
fastimport = callPackage ../development/python-modules/fastimport { };
@@ -4835,117 +2168,21 @@ in {
inherit (pkgs) glibcLocales;
};
- feedparser = buildPythonPackage (rec {
- name = "feedparser-5.2.1";
+ feedparser = callPackage ../development/python-modules/feedparser { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/feedparser/${name}.tar.gz";
- sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx";
- };
-
- # lots of networking failures
- doCheck = false;
-
- meta = {
- homepage = http://code.google.com/p/feedparser/;
- description = "Universal feed parser";
- license = licenses.bsd2;
- maintainers = with maintainers; [ domenkozar ];
- };
- });
-
- pyfribidi = buildPythonPackage rec {
- version = "0.11.0";
- name = "pyfribidi-${version}";
- disabled = isPy3k || isPyPy;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyfribidi/${name}.zip";
- sha256 = "6f7d83c09eae0cb98a40b85ba3dedc31af4dbff8fc4425f244c1e9f44392fded";
- };
-
- meta = {
- description = "A simple wrapper around fribidi";
- homepage = https://github.com/pediapress/pyfribidi;
- license = stdenv.lib.licenses.gpl2;
- };
- };
+ pyfribidi = callPackage ../development/python-modules/pyfribidi { };
docker_compose = callPackage ../development/python-modules/docker_compose {};
- fdroidserver = buildPythonPackage rec {
- version = "2016-05-31";
- name = "fdroidserver-git-${version}";
+ pyftpdlib = callPackage ../development/python-modules/pyftpdlib { };
- disabled = ! isPy3k;
+ fdroidserver = callPackage ../development/python-modules/fdroidserver { };
- src = pkgs.fetchFromGitLab {
- owner = "fdroid";
- repo = "fdroidserver";
- rev = "401649e0365e6e365fc48ae8a3af94768af865f3";
- sha256 = "1mmi2ffpym1qw694yj938kc7b4xhq0blri7wkjaqddcyykjyr94d";
- };
-
- propagatedBuildInputs = with self; [ libcloud pyyaml paramiko pyasn1 pyasn1-modules pillow mwclient GitPython ];
-
- meta = {
- homepage = https://f-droid.org;
- description = "Server and tools for F-Droid, the Free Software repository system for Android";
- maintainers = with maintainers; [ ];
- license = licenses.agpl3;
- };
- };
-
- filebrowser_safe = buildPythonPackage rec {
- version = "0.3.6";
- name = "filebrowser_safe-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/filebrowser_safe/${name}.tar.gz";
- sha256 = "02bn60fdslvng2ckn65fms3hjbzgsa8qa5161a8lr720wbx8gpj2";
- };
-
- buildInputs = [ self.django ];
-
- # There is no test embedded
- doCheck = false;
-
- meta = {
- description = "A snapshot of django-filebrowser for the Mezzanine CMS";
- longDescription = ''
- filebrowser_safe was created to provide a snapshot of the FileBrowser
- asset manager for Django, to be referenced as a dependency for the
- Mezzanine CMS for Django.
-
- At the time of filebrowser_safe's creation, FileBrowser was incorrectly
- packaged on PyPI, and had also dropped compatibility with Django 1.1 -
- filebrowser_safe was therefore created to address these specific
- issues.
- '';
- homepage = https://github.com/stephenmcd/filebrowser-safe;
- downloadPage = https://pypi.python.org/pypi/filebrowser_safe/;
- license = licenses.free;
- maintainers = with maintainers; [ prikhi ];
- platforms = platforms.linux;
- };
- };
+ filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { };
pycodestyle = callPackage ../development/python-modules/pycodestyle { };
- filebytes = buildPythonPackage rec {
- name = "filebytes-0.9.12";
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/filebytes/${name}.tar.gz";
- sha256 = "6cd1c4ca823f6541c963a317e55382609789802dedad08209f4d038369e3f0ac";
- };
- propagatedBuildInputs = [ ];
- meta = with pkgs.stdenv.lib; {
- homepage = "https://scoding.de/filebytes-introduction";
- license = licenses.gpl2;
- description = "Scripts to parse ELF, PE, Mach-O and OAT (Android Runtime)";
- maintainers = with maintainers; [ bennofs ];
- };
- };
+ filebytes = callPackage ../development/python-modules/filebytes { };
filelock = callPackage ../development/python-modules/filelock {};
@@ -4961,26 +2198,7 @@ in {
flake8-import-order = callPackage ../development/python-modules/flake8-import-order { };
- flaky = buildPythonPackage rec {
- name = "flaky-${version}";
- version = "3.1.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/flaky/${name}.tar.gz";
- sha256 = "1x9ixika7wqjj52x8wnsh1vk7jadkdqpx01plj7mlh8slwyq4s41";
- };
-
- buildInputs = with self; [ mock pytest ];
-
- # waiting for feedback https://github.com/box/flaky/issues/97
- doCheck = false;
-
- meta = {
- homepage = https://github.com/box/flaky;
- description = "Plugin for nose or py.test that automatically reruns flaky tests";
- license = licenses.asl20;
- };
- };
+ flaky = callPackage ../development/python-modules/flaky { };
flask = callPackage ../development/python-modules/flask { };
@@ -5040,57 +2258,11 @@ in {
flask_wtf = callPackage ../development/python-modules/flask-wtf { };
- wtforms = buildPythonPackage rec {
- version = "2.1";
- name = "wtforms-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/W/WTForms/WTForms-${version}.zip";
- sha256 = "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz";
- };
-
- # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet."
- # This is fixed in master I believe but not yet in 2.1;
- doCheck = false;
-
- propagatedBuildInputs = with self; [ Babel ];
-
- meta = {
- homepage = https://github.com/wtforms/wtforms;
- description = "A flexible forms validation and rendering library for Python";
- license = licenses.bsd3;
- };
- };
+ wtforms = callPackage ../development/python-modules/wtforms { };
graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { };
- grappelli_safe = buildPythonPackage rec {
- version = "0.3.13";
- name = "grappelli_safe-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/grappelli_safe/${name}.tar.gz";
- sha256 = "8b21b4724bce449cc4f22dc74ed0be9b3e841d968f3271850bf4836864304eb6";
- };
-
- meta = {
- description = "A snapshot of django-grappelli for the Mezzanine CMS";
- longDescription = ''
- grappelli_safe was created to provide a snapshot of the Grappelli admin
- skin for Django, to be referenced as a dependency for the Mezzanine CMS
- for Django.
-
- At the time of grappelli_safe's creation, Grappelli was incorrectly
- packaged on PyPI, and had also dropped compatibility with Django 1.1 -
- grappelli_safe was therefore created to address these specific issues.
- '';
- homepage = https://github.com/stephenmcd/grappelli-safe;
- downloadPage = http://pypi.python.org/pypi/grappelli_safe/;
- license = licenses.free;
- maintainers = with maintainers; [ prikhi ];
- platforms = platforms.linux;
- };
- };
+ grappelli_safe = callPackage ../development/python-modules/grappelli_safe { };
pytorch = let
# Fails with CUDA 9.1 and GCC 6.4:
@@ -5116,37 +2288,9 @@ in {
cudaSupport = false;
};
- python2-pythondialog = buildPythonPackage rec {
- name = "python2-pythondialog-${version}";
- version = "3.3.0";
- disabled = !isPy27;
+ python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/python2-pythondialog/python2-pythondialog-${version}.tar.gz";
- sha256 = "1yhkagsh99bfi592ymczf8rnw8rk6n9hdqy3dd98m3yrx8zmjvry";
- };
-
- patchPhase = ''
- substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin"
- '';
-
- meta = with stdenv.lib; {
- homepage = "http://pythondialog.sourceforge.net/";
- };
- };
-
- pyRFC3339 = buildPythonPackage rec {
- name = "pyRFC3339-${version}";
- version = "0.2";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyRFC3339/pyRFC3339-${version}.tar.gz";
- sha256 = "1pp648xsjaw9h1xq2mgwzda5wis2ypjmzxlksc1a8grnrdmzy155";
- };
-
- propagatedBuildInputs = with self; [ pytz ];
- buildInputs = with self; [ nose ];
- };
+ pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { };
ConfigArgParse = callPackage ../development/python-modules/configargparse { };
@@ -5154,61 +2298,11 @@ in {
vcversioner = callPackage ../development/python-modules/vcversioner { };
- falcon = buildPythonPackage (rec {
- name = "falcon-1.0.0";
+ falcon = callPackage ../development/python-modules/falcon { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/falcon/${name}.tar.gz";
- sha256 = "ddce23a2dd0abba6d19775e9bf7ba64e184b15a0e7163e65f62af63354193f63";
- };
+ hug = callPackage ../development/python-modules/hug { };
- buildInputs = with self; stdenv.lib.optionals doCheck [coverage ddt nose pyyaml requests testtools];
- propagatedBuildInputs = with self; [ six python_mimeparse ];
-
- # The travis build fails since the migration from multiprocessing to threading for hosting the API under test.
- # OSError: [Errno 98] Address already in use
- doCheck = false;
-
- meta = {
- description = "An unladen web framework for building APIs and app backends";
- homepage = http://falconframework.org;
- license = licenses.asl20;
- maintainers = with maintainers; [ desiderius ];
- };
- });
- hug = buildPythonPackage rec {
- name = "hug-2.1.2";
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/hug/${name}.tar.gz";
- sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c";
- };
- disabled = !isPy3k;
-
- propagatedBuildInputs = with self; [ falcon requests ];
-
- # tests are not shipped in the tarball
- doCheck = false;
-
- meta = {
- description = "A Python framework that makes developing APIs as simple as possible, but no simpler";
- homepage = https://github.com/timothycrosley/hug;
- license = licenses.mit;
- };
- };
- flup = buildPythonPackage (rec {
- name = "flup-1.0.2";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
- sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab";
- };
-
- meta = {
- homepage = "http://trac.saddi.com/flup";
- description = "FastCGI Python module set";
- };
- });
+ flup = callPackage ../development/python-modules/flup { };
fn = callPackage ../development/python-modules/fn { };
@@ -5221,119 +2315,11 @@ in {
fonttools = callPackage ../development/python-modules/fonttools { };
- foolscap = buildPythonPackage (rec {
- name = "foolscap-${version}";
- version = "0.12.6";
+ foolscap = callPackage ../development/python-modules/foolscap { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/foolscap/${name}.tar.gz";
- sha256 = "1bpmqq6485mmr5jza9q2c55l9m1bfsvsbd9drsip7p5qcsi22jrz";
- };
+ forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { };
- propagatedBuildInputs = with self; [ mock twisted pyopenssl service-identity ];
-
- checkPhase = ''
- # Either uncomment this, or remove this custom check phase entirely, if
- # you wish to do battle with the foolscap tests. ~ C.
- # trial foolscap
- '';
-
- meta = {
- homepage = http://foolscap.lothar.com/;
-
- description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model";
-
- longDescription = ''
- "Foolscap" is the name for the next-generation RPC protocol,
- intended to replace Perspective Broker (part of Twisted).
- Foolscap is a protocol to implement a distributed
- object-capabilities model in Python.
- '';
-
- # See http://foolscap.lothar.com/trac/browser/LICENSE.
- license = licenses.mit;
-
- maintainers = [ ];
- };
- });
-
- forbiddenfruit = buildPythonPackage rec {
- version = "0.1.0";
- name = "forbiddenfruit-${version}";
-
- src = pkgs.fetchurl {
- url= "mirror://pypi/f/forbiddenfruit/${name}.tar.gz";
- sha256 = "0xra2kw6m8ag29ifwmhi5zqksh4cr0yy1waqd488rm59kcr3zl79";
- };
-
- meta = {
- description = "Patch python built-in objects";
- homepage = https://pypi.python.org/pypi/forbiddenfruit;
- license = licenses.mit;
- };
- };
-
- fs = buildPythonPackage rec {
- name = "fs-0.5.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/fs/${name}.tar.gz";
- sha256 = "ba2cca8773435a7c86059d57cb4b8ea30fda40f8610941f7822d1ce3ffd36197";
- };
-
- LC_ALL = "en_US.UTF-8";
- buildInputs = [ pkgs.glibcLocales ];
- propagatedBuildInputs = [ self.six ];
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
-
- # Because 2to3 is used the tests in $out need to be run.
- # Both when using unittest and pytest this resulted in many errors,
- # some Python byte/str errors, and others specific to resources tested.
- # Failing tests due to the latter is to be expected with this type of package.
- # Tests are therefore disabled.
- doCheck = false;
-
- meta = {
- description = "Filesystem abstraction";
- homepage = https://pypi.python.org/pypi/fs;
- license = licenses.bsd3;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.unix;
- };
- };
-
- fusepy = buildPythonPackage rec {
- name = "fusepy-2.0.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/fusepy/${name}.tar.gz";
- sha256 = "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h";
- };
-
- propagatedBuildInputs = [ pkgs.fuse ];
-
- # No tests included
- doCheck = false;
-
- patchPhase = ''
- substituteInPlace fuse.py --replace \
- "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'"
- '';
-
- meta = {
- description = "Simple ctypes bindings for FUSE";
- longDescription = ''
- Python module that provides a simple interface to FUSE and MacFUSE.
- It's just one file and is implemented using ctypes.
- '';
- homepage = https://github.com/terencehonles/fusepy;
- license = licenses.isc;
- platforms = platforms.unix;
- };
- };
+ fusepy = callPackage ../development/python-modules/fusepy { };
future = callPackage ../development/python-modules/future { };
future15 = self.future.overridePythonAttrs (old: rec {
@@ -5348,291 +2334,45 @@ in {
futures = callPackage ../development/python-modules/futures { };
- gcovr = buildPythonPackage rec {
- name = "gcovr-2.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/gcovr/${name}.tar.gz";
- sha256 = "2c878e03c2eff2282e64035bec0a30532b2b1173aadf08486401883b79e4dab1";
- };
-
- meta = {
- description = "A Python script for summarizing gcov data";
- license = "BSD";
- };
- };
+ gcovr = callPackage ../development/python-modules/gcovr { };
gdal = toPythonModule (pkgs.gdal.override {
pythonPackages = self;
});
- gdrivefs = buildPythonPackage rec {
- version = "0.14.9";
- name = "gdrivefs-${version}";
- namePrefix = "";
- disabled = !isPy27;
+ gdrivefs = callPackage ../development/python-modules/gdrivefs { };
- src = pkgs.fetchurl {
- url = "https://github.com/dsoprea/GDriveFS/archive/${version}.tar.gz";
- sha256 = "1mc2r35nf5k8vzwdcdhi0l9rb97amqd5xb53lhydj8v8f4rndk7a";
- };
-
- buildInputs = with self; [ gipc greenlet httplib2 six ];
- propagatedBuildInputs = with self; [ dateutil fusepy google_api_python_client ];
-
- patchPhase = ''
- substituteInPlace gdrivefs/resources/requirements.txt \
- --replace "==" ">="
- '';
-
- meta = {
- description = "Mount Google Drive as a local file system";
- longDescription = ''
- GDriveFS is a FUSE wrapper for Google Drive developed. Design goals:
- - Thread for monitoring changes via "changes" functionality of API.
- - Complete stat() implementation.
- - Seamlessly work around duplicate-file allowances in Google Drive.
- - Seamlessly manage file-type versatility in Google Drive
- (Google Doc files do not have a particular format).
- - Allow for the same file at multiple paths.
- '';
- homepage = https://github.com/dsoprea/GDriveFS;
- license = licenses.gpl2;
- platforms = platforms.unix;
- };
- };
-
- genshi = buildPythonPackage {
- name = "genshi-0.7";
-
- src = pkgs.fetchurl {
- url = http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz;
- sha256 = "0lkkbp6fbwzv0zda5iqc21rr7rdldkwh3hfabfjl9i4bwq14858x";
- };
-
- # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)
- # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase)
- doCheck = false;
-
- buildInputs = with self; [ setuptools ];
-
- meta = {
- description = "Python components for parsing HTML, XML and other textual content";
-
- longDescription = ''
- Python library that provides an integrated set of
- components for parsing, generating, and processing HTML, XML or other
- textual content for output generation on the web.
- '';
-
- license = "BSD";
- };
- };
+ genshi = callPackage ../development/python-modules/genshi { };
gevent = callPackage ../development/python-modules/gevent { };
- geventhttpclient = buildPythonPackage rec {
- name = "geventhttpclient-${version}";
- version = "1.3.1";
+ geventhttpclient = callPackage ../development/python-modules/geventhttpclient { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/geventhttpclient/${name}.tar.gz";
- sha256 = "bd87af8854f5fb05738916c8973671f7035568aec69b7c842887d6faf9c0a01d";
- };
-
- buildInputs = with self; [ pytest ];
- propagatedBuildInputs = with self; [ gevent certifi six backports_ssl_match_hostname ];
-
- # Several tests fail that require network
- doCheck = false;
- checkPhase = ''
- py.test $out
- '';
-
- meta = {
- homepage = https://github.com/gwik/geventhttpclient;
- description = "HTTP client library for gevent";
- license = licenses.mit;
- maintainers = with maintainers; [ koral ];
- };
- };
-
- gevent-socketio = buildPythonPackage rec {
- name = "gevent-socketio-0.3.6";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/gevent-socketio/${name}.tar.gz";
- sha256 = "1zra86hg2l1jcpl9nsnqagy3nl3akws8bvrbpgdxk15x7ywllfak";
- };
-
- buildInputs = with self; [ versiontools gevent-websocket mock pytest ];
- propagatedBuildInputs = with self; [ gevent ];
-
- };
+ gevent-socketio = callPackage ../development/python-modules/gevent-socketio { };
geopandas = callPackage ../development/python-modules/geopandas { };
geojson = callPackage ../development/python-modules/geojson { };
- gevent-websocket = buildPythonPackage rec {
- name = "gevent-websocket-0.9.3";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/gevent-websocket/${name}.tar.gz";
- sha256 = "07rqwfpbv13mk6gg8mf0bmvcf6siyffjpgai1xd8ky7r801j4xb4";
- };
-
- # SyntaxError in tests.
- disabled = isPy3k;
-
- propagatedBuildInputs = with self; [ gevent ];
-
- };
-
- genzshcomp = buildPythonPackage {
- name = "genzshcomp-0.5.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/genzshcomp/genzshcomp-0.5.1.tar.gz";
- sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42";
- };
-
- buildInputs = with self; [ setuptools ];
-
- meta = {
- description = "Automatically generated zsh completion function for Python's option parser modules";
- license = "BSD";
- };
- };
+ gevent-websocket = callPackage ../development/python-modules/gevent-websocket { };
+ genzshcomp = callPackage ../development/python-modules/genzshcomp { };
gflags = callPackage ../development/python-modules/gflags { };
ghdiff = callPackage ../development/python-modules/ghdiff { };
- gipc = buildPythonPackage rec {
- name = "gipc-0.5.0";
- disabled = !isPy27;
+ gipc = callPackage ../development/python-modules/gipc { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/gipc/${name}.zip";
- sha256 = "08c35xzv7nr12d9xwlywlbyzzz2igy0yy6y52q2nrkmh5d4slbpc";
- };
-
- propagatedBuildInputs = with self; [ gevent ];
-
- meta = {
- description = "gevent-cooperative child processes and IPC";
- longDescription = ''
- Usage of Python's multiprocessing package in a gevent-powered
- application may raise problems and most likely breaks the application
- in various subtle ways. gipc (pronunciation "gipsy") is developed with
- the motivation to solve many of these issues transparently. With gipc,
- multiprocessing. Process-based child processes can safely be created
- anywhere within your gevent-powered application.
- '';
- homepage = http://gehrcke.de/gipc;
- license = licenses.mit;
- };
- };
-
- git-sweep = buildPythonPackage rec {
- name = "git-sweep-0.1.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/git-sweep/${name}.tar.gz";
- sha256 = "1csp0zd049d643d409rfivbswwzrayb4i6gkypp5mc27fb1z2afd";
- };
-
- propagatedBuildInputs = with self; [ GitPython ];
-
- meta = {
- description = "A command-line tool that helps you clean up Git branches";
- homepage = https://github.com/arc90/git-sweep;
- license = licenses.mit;
- maintainers = with maintainers; [ pSub ];
- };
- };
+ git-sweep = callPackage ../development/python-modules/git-sweep { };
glances = callPackage ../development/python-modules/glances { };
- github3_py = buildPythonPackage rec {
- name = "github3.py-${version}";
- version = "1.1.0";
+ github3_py = callPackage ../development/python-modules/github3_py { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/github3.py/${name}.tar.gz";
- sha256 = "1cxaqdqmz9w2afc0cw2jyv783fp0grydbik0frzj79azzkhyg4gf";
- };
+ github-webhook = callPackage ../development/python-modules/github-webhook { };
- buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers dateutil ];
-
- propagatedBuildInputs = with self; [ requests pyopenssl uritemplate_py
- ndg-httpsclient requests_toolbelt pyasn1 ];
-
- postPatch = ''
- sed -i -e 's/mock ==1.0.1/mock>=1.0.1/' setup.py
- sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py
- '';
-
- # TODO: only disable the tests that require network
- doCheck = false;
-
- meta = with stdenv.lib; {
- homepage = http://github3py.readthedocs.org/en/master/;
- description = "A wrapper for the GitHub API written in python";
- license = licenses.bsd3;
- maintainers = with maintainers; [ pSub ];
- };
- };
-
- github-webhook = buildPythonPackage rec {
- name = "github-webhook-${version}";
- version = "unstable-2016-03-11";
-
- # There is a PyPI package but an older one.
- src = pkgs.fetchgit {
- url = "https://github.com/bloomberg/python-github-webhook.git";
- rev = "ca1855479ee59c4373da5425dbdce08567605d49";
- sha256 = "0mqwig9281iyzbphp1d21a4pqdrf98vs9k8lqpqx6spzgqaczx5f";
- };
-
- propagatedBuildInputs = with self; [ flask ];
- # No tests
- doCheck = false;
-
- meta = {
- description = "A framework for writing webhooks for GitHub";
- license = licenses.mit;
- homepage = https://github.com/bloomberg/python-github-webhook;
- };
- };
-
- goobook = buildPythonPackage rec {
- name = "goobook-1.9";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/goobook/${name}.tar.gz";
- sha256 = "02xmq8sjavza17av44ks510934wrshxnsm6lvhvazs45s92b671i";
- };
-
- buildInputs = with self; [ ];
-
- preConfigure = ''
- sed -i '/distribute/d' setup.py
- '';
-
- meta = {
- description = "Search your google contacts from the command-line or mutt";
- homepage = https://pypi.python.org/pypi/goobook;
- license = licenses.gpl3;
- maintainers = with maintainers; [ lovek323 hbunke ];
- platforms = platforms.unix;
- };
-
- propagatedBuildInputs = with self; [ oauth2client gdata simplejson httplib2 keyring six rsa ];
- };
+ goobook = callPackage ../development/python-modules/goobook { };
googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { };
@@ -5642,31 +2382,7 @@ in {
google_api_python_client = callPackage ../development/python-modules/google-api-python-client { };
- google_apputils = buildPythonPackage rec {
- name = "google-apputils-0.4.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/google-apputils/${name}.tar.gz";
- sha256 = "1sxsm5q9vr44qzynj8l7p3l7ffb0zl1jdqhmmzmalkx941nbnj1b";
- };
-
- preConfigure = ''
- sed -i '/ez_setup/d' setup.py
- '';
-
- propagatedBuildInputs = with self; [ pytz gflags dateutil mox ];
-
- checkPhase = ''
- ${python.executable} setup.py google_test
- '';
-
- doCheck = true;
-
- meta = {
- description = "Google Application Utilities for Python";
- homepage = http://code.google.com/p/google-apputils-python;
- };
- };
+ google_apputils = callPackage ../development/python-modules/google_apputils { };
google_auth = callPackage ../development/python-modules/google_auth { };
@@ -5694,51 +2410,9 @@ in {
grpcio-tools = callPackage ../development/python-modules/grpcio-tools { };
- gspread = buildPythonPackage rec {
- version = "0.2.3";
- name = "gspread-${version}";
+ gspread = callPackage ../development/python-modules/gspread { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/gspread/${name}.tar.gz";
- sha256 = "dba45ef9e652dcd8cf561ae65569bd6ecd18fcc77b991521490698fb2d847106";
- };
-
- meta = {
- description = "Google Spreadsheets client library";
- homepage = "https://github.com/burnash/gspread";
- license = licenses.mit;
- };
- };
-
- gyp = buildPythonPackage rec {
- name = "gyp-${version}";
- version = "2015-06-11";
-
- src = pkgs.fetchgit {
- url = "https://chromium.googlesource.com/external/gyp.git";
- rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043";
- sha256 = "1imgxsl4mr1662vsj2mlnpvvrbz71yk00w8p85vi5bkgmc6awgiz";
- };
-
- prePatch = optionals pkgs.stdenv.isDarwin ''
- sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' pylib/gyp/xcode_emulation.py
- '';
-
- patches = optionals pkgs.stdenv.isDarwin [
- ../development/python-modules/gyp/no-darwin-cflags.patch
- ../development/python-modules/gyp/no-xcode.patch
- ];
-
- disabled = isPy3k;
-
- meta = {
- description = "A tool to generate native build files";
- homepage = https://chromium.googlesource.com/external/gyp/+/master/README.md;
- license = licenses.bsd3;
- maintainers = with maintainers; [ codyopel ];
- platforms = platforms.all;
- };
- };
+ gyp = callPackage ../development/python-modules/gyp { };
guessit = callPackage ../development/python-modules/guessit { };
@@ -5746,17 +2420,7 @@ in {
gunicorn = callPackage ../development/python-modules/gunicorn { };
- hawkauthlib = buildPythonPackage rec {
- name = "hawkauthlib-${version}";
- version = "0.1.1";
- src = pkgs.fetchgit {
- url = https://github.com/mozilla-services/hawkauthlib.git;
- rev = "refs/tags/v${version}";
- sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi";
- };
-
- propagatedBuildInputs = with self; [ requests webob ];
- };
+ hawkauthlib = callPackage ../development/python-modules/hawkauthlib { };
hdbscan = callPackage ../development/python-modules/hdbscan { };
@@ -5764,67 +2428,13 @@ in {
hcs_utils = callPackage ../development/python-modules/hcs_utils { };
- hetzner = buildPythonPackage rec {
- name = "hetzner-${version}";
- version = "0.8.1";
-
- src = pkgs.fetchFromGitHub {
- repo = "hetzner";
- owner = "aszlig";
- rev = "v${version}";
- sha256 = "1xd1klvjskv0pg8ginih597jkk491a55b8dq80dsm61m5sbsx3vq";
- };
-
- meta = {
- homepage = "https://github.com/RedMoonStudios/hetzner";
- description = "High-level Python API for accessing the Hetzner robot";
- license = licenses.bsd3;
- maintainers = with maintainers; [ aszlig ];
- };
- };
-
-
- htmllaundry = buildPythonPackage rec {
- name = "htmllaundry-2.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/htmllaundry/${name}.tar.gz";
- sha256 = "e428cba78d5a965e959f5dac2eb7d5f7d627dd889990d5efa8d4e03f3dd768d9";
- };
-
- buildInputs = with self; [ nose ];
- propagatedBuildInputs = with self; [ six lxml ];
-
- # some tests fail, probably because of changes in lxml
- # not relevant for me, if releavnt for you, fix it...
- doCheck = false;
-
- meta = {
- description = "Simple HTML cleanup utilities";
- license = licenses.bsd3;
- };
- };
+ hetzner = callPackage ../development/python-modules/hetzner { };
+ htmllaundry = callPackage ../development/python-modules/htmllaundry { };
html5lib = callPackage ../development/python-modules/html5lib { };
- http_signature = buildPythonPackage (rec {
- name = "http_signature-0.1.4";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/http_signature/${name}.tar.gz";
- sha256 = "14acc192ef20459d5e11b4e800dd3a4542f6bd2ab191bf5717c696bf30936c62";
- };
-
- propagatedBuildInputs = with self; [pycrypto];
-
- meta = {
- homepage = https://github.com/atl/py-http-signature;
- description = "";
- license = licenses.mit;
- };
- });
+ http_signature = callPackage ../development/python-modules/http_signature { };
httpbin = callPackage ../development/python-modules/httpbin { };
@@ -5834,261 +2444,35 @@ in {
hypothesis = callPackage ../development/python-modules/hypothesis { };
- colored = buildPythonPackage rec {
- name = "colored-${version}";
- version = "1.1.5";
- src = pkgs.fetchurl {
- url = "mirror://pypi/c/colored/${name}.tar.gz";
- sha256 = "1r1vsypk8v7az82d66bidbxlndx1h7xd4m43hpg1a6hsjr30wrm3";
- };
+ colored = callPackage ../development/python-modules/colored { };
- # No proper test suite
- doCheck = false;
- };
+ xdis = callPackage ../development/python-modules/xdis { };
+ uncompyle6 = callPackage ../development/python-modules/uncompyle6 { };
- xdis = buildPythonPackage rec {
- name = "xdis-${version}";
- version = "3.2.4";
- src = pkgs.fetchurl {
- url = "mirror://pypi/x/xdis/${name}.tar.gz";
- sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk";
- };
- propagatedBuildInputs = with self; [ nose six ];
+ lsi = callPackage ../development/python-modules/lsi { };
- meta = {
- description = "Python cross-version byte-code disassembler and marshal routines";
- homepage = https://github.com/rocky/python-xdis/;
- license = licenses.mit;
- };
- };
+ hkdf = callPackage ../development/python-modules/hkdf { };
- uncompyle6 = buildPythonPackage rec {
- name = "uncompyle6-${version}";
- version = "2.8.3";
- src = pkgs.fetchurl {
- url = "mirror://pypi/u/uncompyle6/${name}.tar.gz";
- sha256 = "0hx5sji6qjvnq1p0zhvyk5hgracpv2w6iar1j59qwllxv115ffi1";
- };
- propagatedBuildInputs = with self; [ spark_parser xdis ];
- meta = {
- description = "Python cross-version byte-code deparser";
- homepage = https://github.com/rocky/python-uncompyle6/;
- license = licenses.mit;
- };
- };
+ httpretty = callPackage ../development/python-modules/httpretty { };
- lsi = buildPythonPackage rec {
- name = "lsi-${version}";
- version = "0.2.2";
- disabled = isPy3k;
- src = pkgs.fetchurl {
- url = "mirror://pypi/l/lsi/${name}.tar.gz";
- sha256 = "0429iilb06yhsmvj3xp6wyhfh1rp4ndxlhwrm80r97z0w7plrk94";
- };
- propagatedBuildInputs = [
- self.colored
- self.boto
- pkgs.openssh
- pkgs.which
- ];
- meta = {
- description = "CLI for querying and SSHing onto AWS EC2 instances";
- homepage = https://github.com/NarrativeScience/lsi;
- maintainers = [maintainers.adnelson];
- license = licenses.mit;
- };
- };
+ icalendar = callPackage ../development/python-modules/icalendar { };
- hkdf = buildPythonPackage rec {
- name = "hkdf-${version}";
- version = "0.0.3";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/hkdf/${name}.tar.gz";
- sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2";
- };
-
- buildInputs = with self; [ nose ];
-
- checkPhase = ''
- nosetests
- '';
-
- meta = {
- description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)";
- homepage = "https://github.com/casebeer/python-hkdf";
- license = licenses.bsd2;
- };
- };
-
- httpretty = buildPythonPackage rec {
- name = "httpretty-${version}";
- version = "0.8.10";
- doCheck = false;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/httpretty/${name}.tar.gz";
- sha256 = "1nmdk6d89z14x3wg4yxywlxjdip16zc8bqnfb471z1365mr74jj7";
- };
-
- buildInputs = with self; [ tornado requests httplib2 sure nose coverage certifi ];
-
- propagatedBuildInputs = with self; [ urllib3 ];
-
- postPatch = ''
- sed -i -e 's/==.*$//' *requirements.txt
- # XXX: Drop this after version 0.8.4 is released.
- patch httpretty/core.py <2.4
- (pkgs.fetchpatch {
- url = "https://github.com/wnielson/markdown-macros/pull/1.patch";
- sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0";
- })
- ];
-
- prePatch = ''
- substituteInPlace setup.py --replace "distribute" "setuptools"
- '';
-
- propagatedBuildInputs = with self; [ markdown ];
-
- doCheck = false;
-
- meta = {
- description = "An extension for python-markdown that makes writing trac-like macros easy";
- homepage = https://github.com/wnielson/markdown-macros;
- license = licenses.mit;
- maintainers = [ maintainers.abigailbuccaneer ];
- };
- };
-
- mathics = if (versionOlder self.django.version "1.8") ||
- (versionAtLeast self.django.version "1.9")
- then throw "mathics only supports django-1.8.x"
- else buildPythonPackage rec {
- name = "mathics-${version}";
- version = "0.9";
- src = pkgs.fetchFromGitHub {
- owner = "mathics";
- repo = "Mathics";
- rev = "v${version}";
- sha256 = "0xzz7j8xskj5y6as178mjmm0i2xbhd4q4mwmdnvghpd2aqq3qx1c";
- };
-
- buildInputs = with self; [ pexpect ];
-
- prePatch = ''
- substituteInPlace setup.py --replace "sympy==0.7.6" "sympy"
- '';
-
- postFixup = ''
- wrapPythonProgramsIn $out/bin $out
- patchPythonScript $out/${python.sitePackages}/mathics/manage.py
- '';
-
- propagatedBuildInputs = with self; [
- cython
- sympy
- django
- ply
- mpmath
- dateutil
- colorama
- six
- ];
-
- meta = {
- description = "A general-purpose computer algebra system";
- homepage = http://www.mathics.org;
- license = licenses.gpl3;
- maintainers = [ maintainers.benley ];
- };
- };
+ markdown-macros = callPackage ../development/python-modules/markdown-macros { };
+ mathics = callPackage ../development/python-modules/mathics { };
matplotlib = callPackage ../development/python-modules/matplotlib {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
@@ -6831,186 +2716,31 @@ in {
mccabe = callPackage ../development/python-modules/mccabe { };
- mechanize = buildPythonPackage (rec {
- name = "mechanize-0.3.5";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/mechanize/${name}.tar.gz";
- sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl";
- };
-
- propagatedBuildInputs = with self; [ html5lib ];
-
- doCheck = false;
-
- meta = {
- description = "Stateful programmatic web browsing in Python";
-
- homepage = http://wwwsearch.sourceforge.net/;
-
- license = "BSD-style";
- };
- });
+ mechanize = callPackage ../development/python-modules/mechanize { };
MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup { };
- meld3 = buildPythonPackage rec {
- name = "meld3-1.0.0";
-
- src = pkgs.fetchurl {
- url = mirror://pypi/m/meld3/meld3-1.0.0.tar.gz;
- sha256 = "57b41eebbb5a82d4a928608962616442e239ec6d611fe6f46343e765e36f0b2b";
- };
-
- doCheck = false;
-
- meta = {
- description = "An HTML/XML templating engine used by supervisor";
- homepage = https://github.com/supervisor/meld3;
- license = licenses.free;
- };
- };
+ meld3 = callPackage ../development/python-modules/meld3 { };
meliae = callPackage ../development/python-modules/meliae {};
meinheld = callPackage ../development/python-modules/meinheld { };
- memcached = buildPythonPackage rec {
- name = "memcached-1.51";
+ memcached = callPackage ../development/python-modules/memcached { };
- src = if isPy3k then pkgs.fetchurl {
- url = "mirror://pypi/p/python3-memcached/python3-${name}.tar.gz";
- sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw";
- } else pkgs.fetchurl {
- url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${name}.tar.gz";
- sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192";
- };
-
- meta = {
- description = "Python API for communicating with the memcached distributed memory object cache daemon";
- homepage = http://www.tummy.com/Community/software/python-memcached/;
- };
- };
-
-
- memory_profiler = buildPythonPackage rec {
- name = "memory_profiler-${version}";
- version = "0.41";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/memory_profiler/${name}.tar.gz";
- sha256 = "dce6e931c281662a500b142595517d095267216472c2926e5ec8edab89898d10";
- };
-
- # Tests don't import profile
- doCheck = false;
-
- meta = {
- description = "A module for monitoring memory usage of a python program";
- homepage = https://pypi.python.org/pypi/memory_profiler;
- license = licenses.bsd3;
- };
- };
+ memory_profiler = callPackage ../development/python-modules/memory_profiler { };
metaphone = callPackage ../development/python-modules/metaphone { };
- mezzanine = buildPythonPackage rec {
- version = "3.1.10";
- name = "mezzanine-${version}";
-
- src = pkgs.fetchurl {
- url = "https://github.com/stephenmcd/mezzanine/archive/${version}.tar.gz";
- sha256 = "1cd7d3dji8q4mvcnf9asxn8j109pd5g5d5shr6xvn0iwr35qprgi";
- };
- patches = [ ../development/python-modules/mezzanine/writable_settings.patch ];
-
- disabled = isPyPy;
-
- buildInputs = with self; [ pyflakes pep8 ];
- propagatedBuildInputs = with self; [
- django filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4
- requests requests_oauthlib future pillow
- ];
-
- # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+
- doCheck = false;
- # sed calls will be unecessary in v3.1.11+
- preConfigure = ''
- sed -i 's/==/>=/' setup.py
- '';
-
- LC_ALL="en_US.UTF-8";
-
- meta = {
- description = ''
- A content management platform built using the Django framework
- '';
- longDescription = ''
- Mezzanine is a powerful, consistent, and flexible content management
- platform. Built using the Django framework, Mezzanine provides a
- simple yet highly extensible architecture that encourages diving in and
- hacking on the code. Mezzanine is BSD licensed and supported by a
- diverse and active community.
-
- In some ways, Mezzanine resembles tools such as Wordpress that provide
- an intuitive interface for managing pages, blog posts, form data, store
- products, and other types of content. But Mezzanine is also different.
- Unlike many other platforms that make extensive use of modules or
- reusable applications, Mezzanine provides most of its functionality by
- default. This approach yields a more integrated and efficient platform.
- '';
- homepage = http://mezzanine.jupo.org/;
- downloadPage = https://github.com/stephenmcd/mezzanine/releases;
- license = licenses.free;
- maintainers = with maintainers; [ prikhi ];
- platforms = platforms.linux;
- broken = true; # broken dependency of django within filebrowser_safe
- };
- };
+ mezzanine = callPackage ../development/python-modules/mezzanine { };
micawber = callPackage ../development/python-modules/micawber { };
milksnake = callPackage ../development/python-modules/milksnake { };
- minimock = buildPythonPackage rec {
- version = "1.2.8";
- name = "minimock-${version}";
+ minimock = callPackage ../development/python-modules/minimock { };
- src = pkgs.fetchurl {
- url = "https://bitbucket.org/jab/minimock/get/${version}.zip";
- sha256 = "c88fa8a7120623f23990a7f086a9657f6ced09025a55e3be8649a30b4945441a";
- };
-
- buildInputs = with self; [ nose ];
-
- checkPhase = "./test";
-
- meta = {
- description = "A minimalistic mocking library for python";
- homepage = https://pypi.python.org/pypi/MiniMock;
- };
- };
-
- moviepy = buildPythonPackage rec {
- name = "moviepy-${version}";
- version = "0.2.2.11";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/moviepy/${name}.tar.gz";
- sha256 = "d937d817e534efc54eaee2fc4c0e70b48fcd81e1528cd6425f22178704681dc3";
- };
-
- # No tests
- doCheck = false;
- propagatedBuildInputs = with self; [ numpy decorator imageio tqdm ];
-
- meta = {
- description = "Video editing with Python";
- homepage = http://zulko.github.io/moviepy/;
- license = licenses.mit;
- };
- };
+ moviepy = callPackage ../development/python-modules/moviepy { };
mozterm = callPackage ../development/python-modules/mozterm { };
@@ -7018,177 +2748,33 @@ in {
multidict = callPackage ../development/python-modules/multidict { };
- munch = buildPythonPackage rec {
- name = "munch-${version}";
- version = "2.0.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/munch/${name}.tar.gz";
- sha256 = "1420683a94f3a2ffc77935ddd28aa9ccb540dd02b75e02ed7ea863db437ab8b2";
- };
-
- meta = {
- description = "A dot-accessible dictionary (a la JavaScript objects)";
- license = licenses.mit;
- homepage = https://github.com/Infinidat/munch;
- };
- };
+ munch = callPackage ../development/python-modules/munch { };
nototools = callPackage ../data/fonts/noto-fonts/tools.nix { };
- rainbowstream = buildPythonPackage rec {
- name = "rainbowstream-${version}";
- version = "1.3.7";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/r/rainbowstream/${name}.tar.gz";
- sha256 = "0zpi1x3b535pwx8rkq57nnrb5d5ma65vvlalar9vi6ilp124x1w2";
- };
-
- patches = [
- ../development/python-modules/rainbowstream/image.patch
- ];
-
- postPatch = ''
- clib=$out/${python.sitePackages}/rainbowstream/image.so
- substituteInPlace rainbowstream/c_image.py \
- --replace @CLIB@ $clib
- sed -i 's/requests.*"/requests"/' setup.py
- '';
-
- LC_ALL="en_US.UTF-8";
-
- postInstall = ''
- mkdir -p $out/lib
- cc -fPIC -shared -o $clib rainbowstream/image.c
- for prog in "$out/bin/"*; do
- wrapProgram "$prog" \
- --prefix PYTHONPATH : "$PYTHONPATH"
- done
- '';
-
- buildInputs = with self; [
- pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales
- pillow twitter pyfiglet requests arrow dateutil pysocks
- pocket
- ];
-
- meta = {
- description = "Streaming command-line twitter client";
- homepage = "http://www.rainbowstream.org/";
- license = licenses.mit;
- maintainers = with maintainers; [ thoughtpolice ];
- };
- };
+ rainbowstream = callPackage ../development/python-modules/rainbowstream { };
pendulum = callPackage ../development/python-modules/pendulum { };
- pocket = buildPythonPackage rec {
- name = "pocket-${version}";
- version = "0.3.6";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pocket/${name}.tar.gz";
- sha256 = "1fc9vc5nyzf1kzmnrs18dmns7nn8wjfrg7br1w4c5sgs35mg2ywh";
- };
-
- buildInputs = with self; [
- requests
- ];
-
- meta = {
- description = "Wrapper for the pocket API";
- homepage = "https://github.com/tapanpandita/pocket";
- license = licenses.bsd3;
- maintainers = with maintainers; [ ericsagnes ];
- };
- };
+ pocket = callPackage ../development/python-modules/pocket { };
mistune = callPackage ../development/python-modules/mistune { };
brotlipy = callPackage ../development/python-modules/brotlipy { };
- sortedcollections = buildPythonPackage rec {
- name = "sortedcollections-${version}";
- version = "0.4.2";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/sortedcollections/${name}.tar.gz";
- sha256 = "12dlzln9gyv8smsy2k6d6dmr0ywrpwyrr1cjy649ia5h1g7xdvwa";
- };
- buildInputs = [ self.sortedcontainers ];
-
- # wants to test all python versions with tox:
- doCheck = false;
-
- meta = {
- description = "Python Sorted Collections";
- homepage = http://www.grantjenks.com/docs/sortedcollections/;
- license = licenses.asl20;
- };
- };
+ sortedcollections = callPackage ../development/python-modules/sortedcollections { };
hyperframe = callPackage ../development/python-modules/hyperframe { };
h2 = callPackage ../development/python-modules/h2 { };
- editorconfig = buildPythonPackage rec {
- name = "EditorConfig-${version}";
- version = "0.12.1";
+ editorconfig = callPackage ../development/python-modules/editorconfig { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/e/editorconfig/${name}.tar.gz";
- sha256 = "1qxqy9wfrpb2ldrk5nzidkpymc55lpf9lg3m8c8a5531jmbwhlwb";
- };
-
- meta = {
- description = "EditorConfig File Locator and Interpreter for Python";
- homepage = https://editorconfig.org/;
- license = licenses.psfl;
- };
- };
-
- mock = buildPythonPackage (rec {
- name = "mock-2.0.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/mock/${name}.tar.gz";
- sha256 = "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i";
- };
-
- buildInputs = with self; [ unittest2 ];
- propagatedBuildInputs = with self; [ funcsigs six pbr ];
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
-
- meta = {
- description = "Mock objects for Python";
- homepage = http://python-mock.sourceforge.net/;
- license = stdenv.lib.licenses.bsd2;
- };
- });
+ mock = callPackage ../development/python-modules/mock { };
mock-open = callPackage ../development/python-modules/mock-open { };
- modestmaps = buildPythonPackage rec {
- name = "ModestMaps-1.4.6";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/M/ModestMaps/${name}.tar.gz";
- sha256 = "0vyi1m9q4pc34i6rq5agb4x3qicx5sjlbxwmxfk70k2l5mnbjca3";
- };
-
- disabled = !isPy27;
- propagatedBuildInputs = with self; [ pillow ];
-
- meta = {
- description = "A library for building interactive maps";
- homepage = http://modestmaps.com;
- license = stdenv.lib.licenses.bsd3;
- };
- };
+ modestmaps = callPackage ../development/python-modules/modestmaps { };
# Needed here because moinmoin is loaded as a Python library.
moinmoin = callPackage ../development/python-modules/moinmoin { };
@@ -7197,125 +2783,17 @@ in {
moto = callPackage ../development/python-modules/moto {};
- mox = buildPythonPackage rec {
- name = "mox-0.5.3";
+ mox = callPackage ../development/python-modules/mox { };
- src = pkgs.fetchurl {
- url = "http://pymox.googlecode.com/files/${name}.tar.gz";
- sha256 = "4d18a4577d14da13d032be21cbdfceed302171c275b72adaa4c5997d589a5030";
- };
+ mozsvc = callPackage ../development/python-modules/mozsvc { };
- # error: invalid command 'test'
- doCheck = false;
+ mpmath = callPackage ../development/python-modules/mpmath { };
- meta = {
- homepage = http://code.google.com/p/pymox/;
- description = "A mock object framework for Python";
- };
- };
+ mpd = callPackage ../development/python-modules/mpd { };
- mozsvc = buildPythonPackage rec {
- name = "mozsvc-${version}";
- version = "0.8";
+ mpd2 = callPackage ../development/python-modules/mpd2 { };
- src = pkgs.fetchgit {
- url = https://github.com/mozilla-services/mozservices.git;
- rev = "refs/tags/${version}";
- sha256 = "1zci2ikk83mf7va88c83dr6snfh4ddjqw0lsg3y29qk5nxf80vx2";
- };
-
- patches = singleton (pkgs.fetchurl {
- url = https://github.com/nbp/mozservices/commit/f86c0b0b870cd8f80ce90accde9e16ecb2e88863.diff;
- sha256 = "1lnghx821f6dqp3pa382ka07cncdz7hq0mkrh44d0q3grvrlrp9n";
- });
-
- doCheck = false; # lazy packager
- propagatedBuildInputs = with self; [ pyramid simplejson konfig ];
-
- meta = {
- homepage = https://github.com/mozilla-services/mozservices;
- description = "Various utilities for Mozilla apps";
- };
- };
-
- mpmath = buildPythonPackage rec {
- name = "mpmath-0.19";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/mpmath/${name}.tar.gz";
- sha256 = "08ijsr4ifrqv3cjc26mkw0dbvyygsa99in376hr4b96ddm1gdpb8";
- };
-
- meta = {
- homepage = http://mpmath.googlecode.com;
- description = "A pure-Python library for multiprecision floating arithmetic";
- license = licenses.bsd3;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.unix;
- };
-
- # error: invalid command 'test'
- doCheck = false;
- };
-
-
- mpd = buildPythonPackage rec {
- name = "python-mpd-0.3.0";
-
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/python-mpd/python-mpd-0.3.0.tar.gz";
- sha256 = "02812eba1d2e0f46e37457f5a6fa23ba203622e4bcab0a19b265e66b08cd21b4";
- };
-
- meta = with pkgs.stdenv.lib; {
- description = "An MPD (Music Player Daemon) client library written in pure Python";
- homepage = http://jatreuman.indefero.net/p/python-mpd/;
- license = licenses.gpl3;
- };
- };
-
- mpd2 = buildPythonPackage rec {
- name = "mpd2-${version}";
- version = "0.5.5";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/python-mpd2/python-mpd2-${version}.tar.bz2";
- sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
- };
-
- buildInputs = with self; [ mock ];
- patchPhase = ''
- sed -i -e '/tests_require/d' \
- -e 's/cmdclass.*/test_suite="mpd_test",/' setup.py
- '';
-
- meta = {
- description = "A Python client module for the Music Player Daemon";
- homepage = "https://github.com/Mic92/python-mpd2";
- license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ rvl mic92 ];
- };
- };
-
- mpv = buildPythonPackage rec {
- name = "mpv-0.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/mpv/${name}.tar.gz";
- sha256 = "0b9kd70mshdr713f3l1lbnz1q0vlg2y76h5d8liy1bzqm7hjcgfw";
- };
- buildInputs = [ pkgs.mpv ];
- patchPhase = "substituteInPlace mpv.py --replace libmpv.so ${pkgs.mpv}/lib/libmpv.so";
-
- meta = with pkgs.stdenv.lib; {
- description = "A python interface to the mpv media player";
- homepage = "https://github.com/jaseg/python-mpv";
- license = licenses.agpl3;
- };
-
- };
+ mpv = callPackage ../development/python-modules/mpv { };
mrbob = callPackage ../development/python-modules/mrbob {};
@@ -7330,103 +2808,21 @@ in {
'';
};
- msrplib = buildPythonPackage rec {
- pname = "python-msrplib";
- name = "${pname}-${version}";
- version = "0.19";
-
- src = pkgs.fetchdarcs {
- url = "http://devel.ag-projects.com/repositories/${pname}";
- rev = "release-${version}";
- sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd";
- };
-
- propagatedBuildInputs = with self; [ eventlib application gnutls ];
- };
+ msrplib = callPackage ../development/python-modules/msrplib { };
multipledispatch = callPackage ../development/python-modules/multipledispatch { };
multiprocess = callPackage ../development/python-modules/multiprocess { };
- munkres = buildPythonPackage rec {
- name = "munkres-1.0.6";
+ munkres = callPackage ../development/python-modules/munkres { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/munkres/${name}.tar.gz";
- sha256 = "c78f803b9b776bfb20a25c9c7bb44adbf0f9202c2024d51aa5969d21e560208d";
- };
+ musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { };
- # error: invalid command 'test'
- doCheck = false;
-
- meta = {
- homepage = http://bmc.github.com/munkres/;
- description = "Munkres algorithm for the Assignment Problem";
- license = licenses.bsd3;
- maintainers = with maintainers; [ domenkozar ];
- };
- };
-
-
- musicbrainzngs = buildPythonPackage rec {
- name = "musicbrainzngs-0.5";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/m/musicbrainzngs/${name}.tar.gz";
- sha256 = "281388ab750d2996e9feca4580fd4215d616a698e02cd6719cb9b8562945c489";
- };
-
- buildInputs = [ pkgs.glibcLocales ];
-
- LC_ALL="en_US.UTF-8";
-
- meta = {
- homepage = http://alastair/python-musicbrainz-ngs;
- description = "Python bindings for musicbrainz NGS webservice";
- license = licenses.bsd2;
- maintainers = with maintainers; [ domenkozar ];
- };
- };
-
- mutag = buildPythonPackage rec {
- disabled = ! isPy3k;
- name = "mutag-0.0.2-2ffa0258ca";
- src = pkgs.fetchgit {
- url = "https://github.com/aroig/mutag.git";
- sha256 = "0axdnwdypfd74a9dnw0g25m16xx1yygyl828xy0kpj8gyqdc6gb1";
- rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2";
- };
-
- propagatedBuildInputs = with self; [ pyparsing ];
-
- meta = {
- homepage = https://github.com/aroig/mutag;
- license = licenses.gpl3;
- maintainers = with maintainers; [ ];
- };
- };
+ mutag = callPackage ../development/python-modules/mutag { };
mutagen = callPackage ../development/python-modules/mutagen { };
-
- muttils = buildPythonPackage (rec {
- name = "muttils-1.3";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2;
- sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6";
- };
-
- # Tests don't work
- doCheck = false;
-
- meta = {
- description = "Utilities for use with console mail clients, like mutt";
- homepage = https://www.blacktrash.org/hg/muttils;
- license = licenses.gpl2Plus;
- };
- });
+ muttils = callPackage ../development/python-modules/muttils { };
mygpoclient = callPackage ../development/python-modules/mygpoclient { };
@@ -7438,241 +2834,37 @@ in {
mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };
- neuronpy = buildPythonPackage rec {
- name = "neuronpy-${version}";
- version = "0.1.6";
- disabled = !isPy27;
+ neuronpy = callPackage ../development/python-modules/neuronpy { };
- propagatedBuildInputs = with self; [ numpy matplotlib scipy ];
+ pint = callPackage ../development/python-modules/pint { };
- meta = {
- description = "Interfaces and utilities for the NEURON simulator and analysis of neural data";
- maintainers = [ maintainers.nico202 ];
- license = licenses.mit;
- };
-
- #No tests included
- doCheck = false;
-
- src = pkgs.fetchurl {
- url = "https://pypi.python.org/packages/source/n/neuronpy/neuronpy-${version}.tar.gz";
- sha256 = "1clhc2b5fy2l8nfrji4dagmj9419nj6kam090yqxhq5c28sngk25";
- };
- };
-
- pint = buildPythonPackage rec {
- name = "pint-${version}";
- version = "0.7.2";
-
- meta = {
- description = "Physical quantities module";
- license = licenses.bsd3;
- homepage = "https://github.com/hgrecco/pint/";
- };
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pint/Pint-${version}.tar.gz";
- sha256 = "1bbp5s34gcb9il2wyz4spznshahwbjvwi5bhjm7bnxk358spvf9q";
- };
- };
-
- pygal = buildPythonPackage rec {
- pname = "pygal";
- version = "2.3.1";
- name = "${pname}-${version}";
-
- doCheck = !isPyPy; # one check fails with pypy
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "7ba5a191233d0c2d8bf4b4d26b06e42bd77483a59ba7d3e5b884d81d1a870667";
- };
-
- buildInputs = with self; [ flask pyquery pytest ];
- propagatedBuildInputs = with self; [ cairosvg tinycss cssselect ] ++ optionals (!isPyPy) [ lxml ];
-
- meta = {
- description = "Sexy and simple python charting";
- homepage = http://www.pygal.org;
- license = licenses.lgpl3;
- maintainers = with maintainers; [ sjourdois ];
- };
- };
+ pygal = callPackage ../development/python-modules/pygal { };
pytaglib = callPackage ../development/python-modules/pytaglib { };
pyte = callPackage ../development/python-modules/pyte { };
- graphviz = buildPythonPackage rec {
- name = "graphviz-${version}";
- version = "0.9";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/g/graphviz/${name}.zip";
- sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6";
- };
-
- propagatedBuildInputs = [ pkgs.graphviz ];
-
- meta = {
- description = "Simple Python interface for Graphviz";
- homepage = https://github.com/xflr6/graphviz;
- license = licenses.mit;
- };
- };
+ graphviz = callPackage ../development/python-modules/graphviz { };
pygraphviz = callPackage ../development/python-modules/pygraphviz { };
pymc3 = callPackage ../development/python-modules/pymc3 { };
- pympler = buildPythonPackage rec {
- pname = "Pympler";
- version = "0.4.3";
- name = "${pname}-${version}";
+ pympler = callPackage ../development/python-modules/pympler { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/P/${pname}/${name}.tar.gz";
- sha256 = "0mhyxqlkha98y8mi5zqcjg23r30mgdjdzs05lghbmqfdyvzjh1a3";
- };
-
- # Remove test asizeof.flatsize(), broken and can be missed as
- # test is only useful on python 2.5, see https://github.com/pympler/pympler/issues/22
- patchPhase = ''
- substituteInPlace ./test/asizeof/test_asizeof.py --replace "n, e = test_flatsize" "#n, e = test_flatsize"
- substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(n," "#self.assert_(n,"
- substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e"
- '';
-
- doCheck = stdenv.hostPlatform.isLinux;
-
- meta = {
- description = "Tool to measure, monitor and analyze memory behavior";
- homepage = https://pythonhosted.org/Pympler/;
- license = licenses.asl20;
- };
- };
-
- pymysqlsa = self.buildPythonPackage rec {
- name = "pymysqlsa-${version}";
- version = "1.0";
-
- propagatedBuildInputs = with self; [ pymysql sqlalchemy ];
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pymysql_sa/pymysql_sa-1.0.tar.gz";
- sha256 = "a2676bce514a29b2d6ab418812259b0c2f7564150ac53455420a20bd7935314a";
- };
-
- meta = {
- description = "PyMySQL dialect for SQL Alchemy";
- homepage = https://pypi.python.org/pypi/pymysql_sa;
- license = licenses.mit;
- };
- };
+ pymysqlsa = callPackage ../development/python-modules/pymysqlsa { };
monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; });
- monotonic = buildPythonPackage rec {
- pname = "monotonic";
- version = "1.3";
- name = "${pname}-${version}";
+ monotonic = callPackage ../development/python-modules/monotonic { };
- __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "06vw7jwq96106plhlc5vz1v1xvjismdgw9wjyzvzf0ylglnrwiib";
- };
-
- patchPhase = optionalString stdenv.isLinux ''
- substituteInPlace monotonic.py --replace \
- "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
- '';
- };
-
- MySQL_python = buildPythonPackage rec {
- name = "MySQL-python-1.2.5";
-
- disabled = isPy3k;
-
- # plenty of failing tests
- doCheck = false;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/M/MySQL-python/${name}.zip";
- sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
- };
-
- buildInputs = with self; [ nose ];
-
- propagatedBuildInputs = with self; [ pkgs.mysql.connector-c ];
-
- meta = {
- description = "MySQL database binding for Python";
-
- homepage = https://sourceforge.net/projects/mysql-python;
- };
- };
+ MySQL_python = callPackage ../development/python-modules/mysql_python { };
mysql-connector = callPackage ../development/python-modules/mysql-connector { };
- namebench = buildPythonPackage (rec {
- name = "namebench-1.3.1";
- disabled = isPy3k || isPyPy;
+ namebench = callPackage ../development/python-modules/namebench { };
- src = pkgs.fetchurl {
- url = "http://namebench.googlecode.com/files/${name}-source.tgz";
- sha256 = "09clbcd6wxgk4r6qw7hb78h818mvca7lijigy1mlq5y1f3lgkk1h";
- };
-
- # error: invalid command 'test'
- doCheck = false;
-
- propagatedBuildInputs = [ self.tkinter ];
-
- # namebench expects to be run from its own source tree (it uses relative
- # paths to various resources), make it work.
- postInstall = ''
- sed -i "s|import os|import os; os.chdir(\"$out/namebench\")|" "$out/bin/namebench.py"
- '';
-
- meta = {
- homepage = http://namebench.googlecode.com/;
- description = "Find fastest DNS servers available";
- license = with licenses; [
- asl20
- # third-party program licenses (embedded in the sources)
- "LGPL" # Crystal_Clear
- free # dns
- asl20 # graphy
- "BSD" # jinja2
- ];
- longDescription = ''
- It hunts down the fastest DNS servers available for your computer to
- use. namebench runs a fair and thorough benchmark using your web
- browser history, tcpdump output, or standardized datasets in order
- to provide an individualized recommendation. namebench is completely
- free and does not modify your system in any way.
- '';
- };
- });
-
-
- nameparser = buildPythonPackage rec {
- name = "nameparser-${version}";
- version = "0.3.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/n/nameparser/${name}.tar.gz";
- sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag";
- };
-
- meta = {
- description = "A simple Python module for parsing human names into their individual components";
- homepage = https://github.com/derek73/python-nameparser;
- license = licenses.lgpl21Plus;
- };
- };
+ nameparser = callPackage ../development/python-modules/nameparser { };
nbconvert = callPackage ../development/python-modules/nbconvert { };
@@ -7682,119 +2874,15 @@ in {
nbxmpp = callPackage ../development/python-modules/nbxmpp { };
- sleekxmpp = buildPythonPackage rec {
- name = "sleekxmpp-${version}";
- version = "1.3.3";
+ sleekxmpp = callPackage ../development/python-modules/sleekxmpp { };
- patches = [
- # Fix https://github.com/etingof/pyasn1/issues/112
- (pkgs.fetchpatch {
- url = "https://github.com/kdschlosser/SleekXMPP/commit/597014ba5ca258763e96ee37729ac933c5af1602.patch";
- sha256 = "176v3f3pr0bx48wv1kf9jn2pwxdn7qpqyc2chwv1m8gbppsfaikf";
- })
- ];
+ slixmpp = callPackage ../development/python-modules/slixmpp { };
- propagatedBuildInputs = with self; [ dnspython pyasn1 pyasn1-modules gevent ];
- checkInputs = [ pkgs.gnupg ];
- checkPhase = "${python.interpreter} testall.py";
- doCheck = false; # Tests failed all this time and upstream doesn't seem to care.
+ netaddr = callPackage ../development/python-modules/netaddr { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz";
- sha256 = "0samiq1d97kk8g9pszfbrbfw9zc41zp6017dbkwha9frf7gc24yj";
- };
+ netifaces = callPackage ../development/python-modules/netifaces { };
- meta = {
- description = "XMPP library for Python";
- license = licenses.mit;
- homepage = http://sleekxmpp.com/;
- };
- };
-
- slixmpp = buildPythonPackage rec {
- name = "slixmpp-${version}";
- version = "1.2.4.post1";
-
- disabled = pythonOlder "3.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/slixmpp/${name}.tar.gz";
- sha256 = "0v6430dczai8a2nmznhja2dxl6pxa8c5j20nhc5737bqjg7245jk";
- };
-
- patchPhase = ''
- substituteInPlace slixmpp/thirdparty/gnupg.py \
- --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'"
- '';
-
- propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules];
-
- meta = {
- description = "Elegant Python library for XMPP";
- license = licenses.mit;
- homepage = https://dev.louiz.org/projects/slixmpp;
- };
- };
-
- netaddr = buildPythonPackage rec {
- pname = "netaddr";
- version = "0.7.19";
- name = "${pname}-${version}";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd";
- };
-
- LC_ALL = "en_US.UTF-8";
- buildInputs = with self; [ pkgs.glibcLocales pytest ];
-
- checkPhase = ''
- py.test netaddr/tests
- '';
-
- patches = [
- (pkgs.fetchpatch {
- url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch;
- sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39";
- })
- ];
-
- meta = {
- homepage = https://github.com/drkjam/netaddr/;
- description = "A network address manipulation library for Python";
- };
- };
-
- netifaces = buildPythonPackage rec {
- version = "0.10.6";
- name = "netifaces-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/n/netifaces/${name}.tar.gz";
- sha256 = "1q7bi5k2r955rlcpspx4salvkkpk28jky67fjbpz2dkdycisak8c";
- };
-
- meta = {
- homepage = https://alastairs-place.net/projects/netifaces/;
- description = "Portable access to network interfaces from Python";
- };
- };
-
- hpack = buildPythonPackage rec {
- name = "hpack-${version}";
- version = "2.3.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/hpack/hpack-${version}.tar.gz";
- sha256 = "1ad0fx4d7a52zf441qzhjc7vwy9v3qdrk1zyf06ikz8y2nl9mgai";
- };
-
- meta = with stdenv.lib; {
- description = "========================================";
- homepage = "http://hyper.rtfd.org";
- };
- };
+ hpack = callPackage ../development/python-modules/hpack { };
nevow = callPackage ../development/python-modules/nevow { };
@@ -7804,326 +2892,51 @@ in {
nimfa = callPackage ../development/python-modules/nimfa {};
- nipy = buildPythonPackage rec {
- version = "0.4.0";
- name = "nipy-${version}";
-
- disabled = pythonOlder "2.6";
-
- checkPhase = '' # wants to be run in a different directory
- mkdir nosetests
- cd nosetests
- ${python.interpreter} -c "import nipy; nipy.test()"
- rm -rf .
- '';
- # failing test:
- # nipy.algorithms.statistics.models.tests.test_olsR.test_results(11.593139639404727, 11.593140144880794, 6) # disagrees by 1 at 6th decimal place
- # erroring tests:
- # nipy.modalities.fmri.fmristat.tests.test_FIAC.test_altprotocol
- # nipy.modalities.fmri.fmristat.tests.test_FIAC.test_agreement
- # nipy.tests.test_scripts.test_nipy_4d_realign # because `nipy_4d_realign` script isn't found at test time; works from nix-shell, so could be patched
- # nipy.tests.test_scripts.test_nipy_3_4d # ditto re.: `nipy_3_4d` script
- doCheck = false;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/n/nipy/${name}.tar.gz";
- sha256 = "1hnbn2i4fjxflaaz082s2c57hfp59jfra1zayz1iras5p2dy21nr";
- };
-
- buildInputs = stdenv.lib.optional doCheck [ self.nose ];
-
- propagatedBuildInputs = with self; [
- matplotlib
- nibabel
- numpy
- scipy
- sympy
- ];
-
- meta = {
- homepage = http://nipy.org/nipy/;
- description = "Software for structural and functional neuroimaging analysis";
- license = licenses.bsd3;
- };
- };
+ nipy = callPackage ../development/python-modules/nipy { };
nipype = callPackage ../development/python-modules/nipype {
inherit (pkgs) which;
};
- nixpkgs = buildPythonPackage rec {
- disabled = ! pythonAtLeast "3.5";
- pname = "nixpkgs";
- version = "0.2.2";
- src = fetchPypi {
- inherit pname version;
- sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
- };
- buildInputs = with self; [ pbr ];
- propagatedBuildInputs = with self; [ pythonix ];
- meta = {
- description = "Allows to `from nixpkgs import` stuff in interactive Python sessions";
- homepage = http://github.com/t184256/nixpkgs-python-importer;
- license = licenses.mit;
- maintainers = with maintainers; [ t184256 ];
- };
- };
+ nixpkgs = callPackage ../development/python-modules/nixpkgs { };
nodeenv = callPackage ../development/python-modules/nodeenv { };
- nose = buildPythonPackage rec {
- version = "1.3.7";
- name = "nose-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/n/nose/${name}.tar.gz";
- sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98";
- };
-
- propagatedBuildInputs = [ self.coverage ];
-
- doCheck = false; # lot's of transient errors, too much hassle
- checkPhase = if python.is_py3k or false then ''
- ${python}/bin/${python.executable} setup.py build_tests
- '' else "" + ''
- rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062
- ${python}/bin/${python.executable} selftest.py
- '';
-
- meta = {
- description = "A unittest-based testing framework for python that makes writing and running tests easier";
- };
- };
+ nose = callPackage ../development/python-modules/nose { };
nose-exclude = callPackage ../development/python-modules/nose-exclude { };
- nose2 = buildPythonPackage rec {
- name = "nose2-0.5.0";
- src = pkgs.fetchurl {
- url = "mirror://pypi/n/nose2/${name}.tar.gz";
- sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr";
- };
- meta = {
- description = "nose2 is the next generation of nicer testing for Python";
- };
- propagatedBuildInputs = with self; [ six ];
- # AttributeError: 'module' object has no attribute 'collector'
- doCheck = false;
- };
+ nose2 = callPackage ../development/python-modules/nose2 { };
- nose-cover3 = buildPythonPackage rec {
- name = "nose-cover3-${version}";
- version = "0.1.0";
+ nose-cover3 = callPackage ../development/python-modules/nose-cover3 { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/n/nose-cover3/${name}.tar.gz";
- sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1";
- };
+ nosexcover = callPackage ../development/python-modules/nosexcover { };
- propagatedBuildInputs = with self; [ nose ];
+ nosejs = callPackage ../development/python-modules/nosejs { };
- # No tests included
- doCheck = false;
-
- meta = {
- description = "Coverage 3.x support for Nose";
- homepage = https://github.com/ask/nosecover3;
- license = licenses.lgpl21;
- };
- };
-
- nosexcover = buildPythonPackage (rec {
- name = "nosexcover-1.0.10";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/n/nosexcover/${name}.tar.gz";
- sha256 = "f5b3a7c936c4f703f15418c1f325775098184b69fa572f868edb8a99f8f144a8";
- };
-
- propagatedBuildInputs = with self; [ coverage nose ];
-
- meta = {
- description = "Extends nose.plugins.cover to add Cobertura-style XML reports";
-
- homepage = https://github.com/cmheisel/nose-xcover/;
-
- license = licenses.bsd3;
- };
- });
-
- nosejs = buildPythonPackage {
- name = "nosejs-0.9.4";
- src = pkgs.fetchurl {
- url = mirror://pypi/N/NoseJS/NoseJS-0.9.4.tar.gz;
- sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy";
- };
- buildInputs = with self; [ nose ];
-
- checkPhase = ''
- nosetests -v
- '';
-
- };
-
- nose-cprof = buildPythonPackage rec {
- name = "nose-cprof-${version}";
- version = "0.1.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/n/nose-cprof/${name}.tar.gz";
- sha256 = "0ayy5mbjly9aa9dkgpz0l06flspnxmnj6wxdl6zr59byrrr8fqhw";
- };
-
- meta = {
- description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler";
- };
-
- buildInputs = with self; [ nose ];
- };
+ nose-cprof = callPackage ../development/python-modules/nose-cprof { };
nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { };
notebook = callPackage ../development/python-modules/notebook { };
- notify = pkgs.stdenv.mkDerivation (rec {
- name = "python-notify-0.1.1";
-
- src = pkgs.fetchurl {
- url = http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2;
- sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx";
- };
-
- patches = singleton (pkgs.fetchurl {
- name = "libnotify07.patch";
- url = "http://src.fedoraproject.org/cgit/notify-python.git/plain/"
- + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c";
- sha256 = "1lqdli13mfb59xxbq4rbq1f0znh6xr17ljjhwmzqb79jl3dig12z";
- });
-
- postPatch = ''
- sed -i -e '/^PYGTK_CODEGEN/s|=.*|="${self.pygtk}/bin/pygtk-codegen-2.0"|' \
- configure
- '';
-
- nativeBuildInputs = [ pkgs.pkgconfig ];
- buildInputs = with self; [ python pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus-glib ];
-
- postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
-
- meta = {
- description = "Python bindings for libnotify";
- homepage = http://www.galago-project.org/;
- };
- });
+ notify = callPackage ../development/python-modules/notify { };
notify2 = callPackage ../development/python-modules/notify2 {};
- notmuch = buildPythonPackage rec {
- name = "python-${pkgs.notmuch.name}";
-
- src = pkgs.notmuch.src;
-
- sourceRoot = pkgs.notmuch.pythonSourceRoot;
-
- buildInputs = with self; [ python pkgs.notmuch ];
-
- postPatch = ''
- sed -i -e '/CDLL/s@"libnotmuch\.@"${pkgs.notmuch}/lib/libnotmuch.@' \
- notmuch/globals.py
- '';
-
- meta = {
- description = "A Python wrapper around notmuch";
- homepage = https://notmuchmail.org/;
- maintainers = with maintainers; [ garbas ];
- };
- };
+ notmuch = callPackage ../development/python-modules/notmuch { };
emoji = callPackage ../development/python-modules/emoji { };
- ntfy = buildPythonPackage rec {
- version = "1.2.0";
- name = "ntfy-${version}";
- src = pkgs.fetchFromGitHub {
- owner = "dschep";
- repo = "ntfy";
- rev = "v${version}";
- sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc";
- };
+ ntfy = callPackage ../development/python-modules/ntfy { };
- propagatedBuildInputs = with self; [ appdirs pyyaml requests dbus-python emoji sleekxmpp mock ];
-
- meta = {
- description = "A utility for sending notifications, on demand and when commands finish";
- homepage = http://ntfy.rtfd.org/;
- license = licenses.gpl3;
- maintainers = with maintainers; [ kamilchm ];
- };
- };
-
- ntplib = buildPythonPackage rec {
- name = "ntplib-0.3.3";
- src = pkgs.fetchurl {
- url = mirror://pypi/n/ntplib/ntplib-0.3.3.tar.gz;
- sha256 = "c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede";
- };
-
- # Require networking
- doCheck = false;
-
- meta = {
- description = "Python NTP library";
- license = licenses.mit;
- };
- };
+ ntplib = callPackage ../development/python-modules/ntplib { };
numba = callPackage ../development/python-modules/numba { };
numexpr = callPackage ../development/python-modules/numexpr { };
- Nuitka = let
- # scons is needed but using it requires Python 2.7
- # Therefore we create a separate env for it.
- scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]);
- in buildPythonPackage rec {
- version = "0.5.25";
- name = "Nuitka-${version}";
-
- # Latest version is not yet on PyPi
- src = pkgs.fetchurl {
- url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz";
- sha256 = "11psz0pyj56adv4b3f47hl8jakvp2mc2c85s092a5rsv1la1a0aa";
- };
-
- buildInputs = with self; stdenv.lib.optionals doCheck [ vmprof pyqt4 ];
-
- propagatedBuildInputs = [ scons ];
-
- postPatch = ''
- patchShebangs tests/run-tests
- '' + stdenv.lib.optionalString stdenv.isLinux ''
- substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.utillinux.out}/lib/libuuid.so"'
- '';
-
- # We do not want any wrappers here.
- postFixup = '''';
-
- checkPhase = ''
- tests/run-tests
- '';
-
- # Problem with a subprocess (parts)
- doCheck = false;
-
- # Requires CPython
- disabled = isPyPy;
-
- meta = {
- description = "Python compiler with full language support and CPython compatibility";
- license = licenses.asl20;
- homepage = http://nuitka.net/;
- };
- };
+ Nuitka = callPackage ../development/python-modules/nuitka { };
numpy = callPackage ../development/python-modules/numpy {
blas = pkgs.openblasCompat;
@@ -8137,323 +2950,47 @@ in {
nwdiag = callPackage ../development/python-modules/nwdiag { };
- dynd = buildPythonPackage rec {
- version = "0.7.2";
- name = "dynd-${version}";
- disabled = isPyPy || !isPy3k; # tests fail on python2, 2018-04-11
-
- src = pkgs.fetchFromGitHub {
- owner = "libdynd";
- repo = "dynd-python";
- rev = "v${version}";
- sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh";
- };
-
- # setup.py invokes git on build but we're fetching a tarball, so
- # can't retrieve git version. We hardcode:
- preConfigure = ''
- substituteInPlace setup.py --replace "ver = check_output(['git', 'describe', '--dirty'," "ver = '${version}'"
- substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
- '';
-
- # Python 3 works but has a broken import test that I couldn't
- # figure out.
- doCheck = !isPy3k;
- buildInputs = with pkgs; [ cmake libdynd.dev self.cython ];
- propagatedBuildInputs = with self; [ numpy pkgs.libdynd ];
-
- meta = {
- homepage = http://libdynd.org;
- license = licenses.bsd2;
- description = "Python exposure of dynd";
- maintainers = with maintainers; [ teh ];
- };
- };
+ dynd = callPackage ../development/python-modules/dynd { };
langcodes = callPackage ../development/python-modules/langcodes { };
- livestreamer = buildPythonPackage rec {
- version = "1.12.2";
- name = "livestreamer-${version}";
- disabled = isPyPy;
+ livestreamer = callPackage ../development/python-modules/livestreamer { };
- src = pkgs.fetchurl {
- url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz";
- sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd";
- };
+ livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { };
- buildInputs = [ pkgs.makeWrapper ];
+ oauth = callPackage ../development/python-modules/oauth { };
- propagatedBuildInputs = with self; [ pkgs.rtmpdump pycrypto requests ]
- ++ optionals isPy27 [ singledispatch futures ]
- ++ optionals isPy33 [ singledispatch ];
-
- postInstall = ''
- wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin
- '';
-
- meta = {
- homepage = http://livestreamer.tanuki.se;
- description = ''
- Livestreamer is CLI program that extracts streams from various
- services and pipes them into a video player of choice.
- '';
- license = licenses.bsd2;
- maintainers = with maintainers; [ fuuzetsu ];
- };
- };
-
- livestreamer-curses = buildPythonPackage rec {
- version = "1.5.2";
- name = "livestreamer-curses-${version}";
- disabled = isPyPy;
-
- src = pkgs.fetchurl {
- url = "https://github.com/gapato/livestreamer-curses/archive/v${version}.tar.gz";
- sha256 = "1v49sym6mrci9dxy0a7cpbp4bv6fg2ijj6rwk4wzg18c2x4qzkhn";
- };
-
- propagatedBuildInputs = with self; [ livestreamer ];
-
- meta = {
- homepage = https://github.com/gapato/livestreamer-curses;
- description = "Curses frontend for livestreamer";
- license = licenses.mit;
- };
- };
-
- oauth = buildPythonPackage (rec {
- name = "oauth-1.0.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/o/oauth/oauth-1.0.1.tar.gz";
- sha256 = "0pdgi35hczsslil4890xqawnbpdazkgf2v1443847h5hy2gq2sg7";
- };
-
- # No tests included in archive
- doCheck = false;
-
- meta = {
- homepage = http://code.google.com/p/oauth;
- description = "Library for OAuth version 1.0a";
- license = licenses.mit;
- platforms = platforms.all;
- };
- });
-
- oauth2 = buildPythonPackage (rec {
- name = "oauth2-${version}";
- version = "1.9.0.post1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/o/oauth2/${name}.tar.gz";
- sha256 = "c006a85e7c60107c7cc6da1b184b5c719f6dd7202098196dfa6e55df669b59bf";
- };
-
- propagatedBuildInputs = with self; [ httplib2 ];
-
- buildInputs = with self; [ mock coverage ];
-
- # ServerNotFoundError: Unable to find the server at oauth-sandbox.sevengoslings.net
- doCheck = false;
-
- meta = {
- homepage = "https://github.com/simplegeo/python-oauth2";
- description = "Library for OAuth version 1.0";
- license = licenses.mit;
- maintainers = with maintainers; [ garbas ];
- platforms = platforms.linux;
- };
- });
+ oauth2 = callPackage ../development/python-modules/oauth2 { };
oauth2client = callPackage ../development/python-modules/oauth2client { };
- oauthlib = buildPythonPackage rec {
- version = "2.0.0";
- name = "oauthlib-${version}";
+ oauthlib = callPackage ../development/python-modules/oauthlib { };
- src = pkgs.fetchurl {
- url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz";
- sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf";
- };
+ obfsproxy = callPackage ../development/python-modules/obfsproxy { };
- buildInputs = with self; [ mock nose unittest2 ];
-
- propagatedBuildInputs = with self; [ cryptography blinker pyjwt ];
-
- meta = {
- homepage = https://github.com/idan/oauthlib;
- downloadPage = https://github.com/idan/oauthlib/releases;
- description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
- maintainers = with maintainers; [ prikhi ];
- };
- };
-
-
- obfsproxy = buildPythonPackage ( rec {
- name = "obfsproxy-${version}";
- version = "0.2.13";
-
- src = pkgs.fetchgit {
- url = meta.repositories.git;
- rev = "refs/tags/${name}";
- sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa";
- };
-
- postPatch = ''
- substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'"
- substituteInPlace setup.py --replace "argparse" ""
- '';
-
- propagatedBuildInputs = with self;
- [ pyptlib argparse twisted pycrypto pyyaml ];
-
- # No tests in archive
- doCheck = false;
-
- meta = {
- description = "A pluggable transport proxy";
- homepage = https://www.torproject.org/projects/obfsproxy;
- repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git;
- maintainers = with maintainers; [ phreedom thoughtpolice ];
- };
- });
-
- objgraph = buildPythonPackage rec {
- name = "objgraph-${version}";
- version = "2.0.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/o/objgraph/${name}.tar.gz";
- sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a";
- };
-
- # Tests fail with PyPy.
- disabled = isPyPy;
-
- propagatedBuildInputs = with self; [pkgs.graphviz];
-
- meta = {
- description = "Draws Python object reference graphs with graphviz";
- homepage = https://mg.pov.lt/objgraph/;
- license = licenses.mit;
- };
- };
+ objgraph = callPackage ../development/python-modules/objgraph { };
odo = callPackage ../development/python-modules/odo { };
- offtrac = buildPythonPackage rec {
- name = "offtrac-0.1.0";
- meta.maintainers = with maintainers; [ ];
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/o/offtrac/${name}.tar.gz";
- sha256 = "06vd010pa1z7lyfj1na30iqzffr4kzj2k2sba09spik7drlvvl56";
- };
- doCheck = false;
- };
+ offtrac = callPackage ../development/python-modules/offtrac { };
openpyxl = callPackage ../development/python-modules/openpyxl { };
opentimestamps = callPackage ../development/python-modules/opentimestamps { };
- ordereddict = buildPythonPackage rec {
- name = "ordereddict-${version}";
- version = "1.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/o/ordereddict/${name}.tar.gz";
- sha256 = "07qvy11nvgxpzarrni3wrww3vpc9yafgi2bch4j2vvvc42nb8d8w";
- };
-
- meta = {
- description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6";
- license = licenses.bsd3;
- maintainers = with maintainers; [ garbas ];
- };
- };
+ ordereddict = callPackage ../development/python-modules/ordereddict { };
orderedset = callPackage ../development/python-modules/orderedset { };
- python-otr = buildPythonPackage rec {
- name = "${pname}-${version}";
- pname = "python-otr";
- version = "1.2.0";
-
- disabled = isPy3k;
-
- src = pkgs.fetchFromGitHub {
- owner = "AGProjects";
- repo = pname;
- rev = "release-" + version;
- sha256 = "0p3b1n8jlxwd65gbk2k5007fkhdyjwcvr4982s42hncivxvabzzy";
- };
-
- propagatedBuildInputs = with self; [ zope_interface cryptography application gmpy2 ];
-
- meta = {
- description = "A pure python implementation of OTR";
- homepage = https://github.com/AGProjects/otr;
- license = licenses.lgpl21Plus;
- platforms = platforms.linux;
- maintainers = with maintainers; [ edwtjo ];
- };
- };
+ python-otr = callPackage ../development/python-modules/python-otr { };
plone-testing = callPackage ../development/python-modules/plone-testing { };
ply = callPackage ../development/python-modules/ply { };
- plyvel = buildPythonPackage (rec {
- name = "plyvel-0.9";
+ plyvel = callPackage ../development/python-modules/plyvel { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/plyvel/${name}.tar.gz";
- sha256 = "1scq75qyks9vmjd19bx57f2y60mkdr44ajvb12p3cjg439l96zaq";
- };
-
- buildInputs = with self; [ pkgs.leveldb ]
- ++ optional isPy3k pytest;
-
- # no tests for python2
- doCheck = isPy3k;
-
- meta = {
- description = "Fast and feature-rich Python interface to LevelDB";
- homepage = https://github.com/wbolster/plyvel;
- license = licenses.bsd3;
- };
- });
-
- osc = buildPythonPackage {
- name = "osc-0.162.0-55-gb730f88";
- disabled = isPy3k;
- src = pkgs.fetchFromGitHub {
- owner = "openSUSE";
- repo = "osc";
- rev = "b730f880cfe85a8547f569355a21706f27ebfa78";
- sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh";
- };
- buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper
- propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml lxml ];
- postInstall = ''
- ln -s $out/bin/osc-wrapper.py $out/bin/osc
- install -D -m444 osc.fish $out/etc/fish/completions/osc.fish
- install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper
- mkdir -p $out/share/bash-completion/completions
- cat >>$out/share/bash-completion/completions/osc </dev/null 2>&1 || return
- complete -r _nullcommand >/dev/null 2>&1 || return
- complete -o default -C $out/share/bash-completion/helpers/osc-helper osc
- EOF
- '';
- meta = {
- description = "opensuse-commander with svn like handling";
- maintainers = [ maintainers.peti ];
- license = licenses.gpl2;
- };
- };
+ osc = callPackage ../development/python-modules/osc { };
rfc3986 = callPackage ../development/python-modules/rfc3986 { };
@@ -8464,143 +3001,27 @@ in {
cmd2_9 = callPackage ../development/python-modules/cmd2 {};
cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9;
- warlock = buildPythonPackage rec {
- name = "warlock-${version}";
- version = "1.2.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/w/warlock/${name}.tar.gz";
- sha256 = "0npgi4ks0nww2d6ci791iayab0j6kz6dx3jr7bhpgkql3s4if3bw";
- };
-
- propagatedBuildInputs = with self; [
- six jsonpatch jsonschema jsonpointer
- ];
- buildInputs = with self; [
-
- ];
-
- meta = with stdenv.lib; {
- homepage = https://github.com/bcwaldon/warlock;
- };
- };
-
+ warlock = callPackage ../development/python-modules/warlock { };
pecan = callPackage ../development/python-modules/pecan { };
kaitaistruct = callPackage ../development/python-modules/kaitaistruct { };
- Kajiki = buildPythonPackage rec {
- name = "Kajiki-${version}";
- version = "0.5.5";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/K/Kajiki/${name}.tar.gz";
- sha256 = "effcae388e25c3358eb0bbd733448509d11a1ec500e46c69241fc673021f0517";
- };
-
- propagatedBuildInputs = with self; [
- Babel pytz nine
- ];
- meta = with stdenv.lib; {
- description = "Kajiki provides fast well-formed XML templates";
- homepage = "https://github.com/nandoflorestan/kajiki";
- };
- };
+ Kajiki = callPackage ../development/python-modules/kajiki { };
WSME = callPackage ../development/python-modules/WSME { };
- zake = buildPythonPackage rec {
- name = "zake-${version}";
- version = "0.2.2";
+ zake = callPackage ../development/python-modules/zake { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/z/zake/${name}.tar.gz";
- sha256 = "1rp4xxy7qp0s0wnq3ig4ji8xsl31g901qkdp339ndxn466cqal2s";
- };
-
- propagatedBuildInputs = with self; [ kazoo six ];
- buildInputs = with self; [ testtools ];
- checkPhase = ''
- ${python.interpreter} -m unittest discover zake/tests
- '';
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/yahoo/Zake";
- };
- };
-
- kazoo = buildPythonPackage rec {
- name = "kazoo-${version}";
- version = "2.2.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/k/kazoo/${name}.tar.gz";
- sha256 = "10pb864if9qi2pq9lfb9m8f7z7ss6rml80gf1d9h64lap5crjnjj";
- };
-
- propagatedBuildInputs = with self; [
- six
- ];
- buildInputs = with self; [
- eventlet gevent nose mock coverage pkgs.openjdk8
- ];
-
- # not really needed
- preBuild = ''
- sed -i '/flake8/d' setup.py
- '';
-
- preCheck = ''
- sed -i 's/test_unicode_auth/noop/' kazoo/tests/test_client.py
- '';
-
- # tests take a long time to run and leave threads hanging
- doCheck = false;
- #ZOOKEEPER_PATH = "${pkgs.zookeeper}";
-
- meta = with stdenv.lib; {
- homepage = "https://kazoo.readthedocs.org";
- };
- };
+ kazoo = callPackage ../development/python-modules/kazoo { };
FormEncode = callPackage ../development/python-modules/FormEncode { };
- pycountry = buildPythonPackage rec {
- name = "pycountry-${version}";
- version = "1.17";
+ pycountry = callPackage ../development/python-modules/pycountry { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pycountry/${name}.tar.gz";
- sha256 = "1qvhq0c9xsh6d4apcvjphfzl6xnwhnk4jvhr8x2fdfnmb034lc26";
- };
- };
+ nine = callPackage ../development/python-modules/nine { };
- nine = buildPythonPackage rec {
- name = "nine-${version}";
- version = "0.3.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/n/nine/${name}.tar.gz";
- sha256 = "1zrsbm0hajfvklkhgysp81hy632a3bdakp31m0lcpd9xbp5265zy";
- };
-
- meta = with stdenv.lib; {
- description = "Let's write Python 3 right now!";
- homepage = "https://github.com/nandoflorestan/nine";
- };
- };
-
-
- logutils = buildPythonPackage rec {
- name = "logutils-${version}";
- version = "0.3.3";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/l/logutils/${name}.tar.gz";
- sha256 = "173w55fg3hp5dhx7xvssmgqkcv5fjlaik11w5dah2fxygkjvhhj0";
- };
- };
+ logutils = callPackage ../development/python-modules/logutils { };
ldappool = callPackage ../development/python-modules/ldappool { };
@@ -8808,43 +3229,7 @@ in {
};
};
- paramiko = buildPythonPackage rec {
- pname = "paramiko";
- version = "2.1.1";
- name = "${pname}-${version}";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0xdmamqgx2ymhdm46q8flpj4fncj4wv2dqxzz0bc2dh7mnkss7fm";
- };
-
- propagatedBuildInputs = with self; [ cryptography pyasn1 ];
-
- __darwinAllowLocalNetworking = true;
-
- # https://github.com/paramiko/paramiko/issues/449
- doCheck = !(isPyPy || isPy33);
- checkPhase = ''
- # test_util needs to resolve an hostname, thus failing when the fw blocks it
- sed '/UtilTest/d' -i test.py
-
- ${python}/bin/${python.executable} test.py --no-sftp --no-big-file
- '';
-
- meta = {
- homepage = "https://github.com/paramiko/paramiko/";
- description = "Native Python SSHv2 protocol library";
- license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ aszlig ];
-
- longDescription = ''
- This is a library for making SSH2 connections (client or server).
- Emphasis is on using SSH2 as an alternative to SSL for making secure
- connections between python scripts. All major ciphers and hash methods
- are supported. SFTP client and server mode are both supported too.
- '';
- };
- };
+ paramiko = callPackage ../development/python-modules/paramiko { };
parameterized = callPackage ../development/python-modules/parameterized { };
@@ -11666,6 +6051,8 @@ in {
propagatedBuildInputs = [ self.cffi ];
};
+ safe = callPackage ../development/python-modules/safe { };
+
sampledata = callPackage ../development/python-modules/sampledata { };
sasmodels = callPackage ../development/python-modules/sasmodels { };
@@ -15051,6 +9438,8 @@ EOF
};
};
+ speedtest-cli = callPackage ../development/python-modules/speedtest-cli { };
+
pushbullet = callPackage ../development/python-modules/pushbullet { };
power = buildPythonPackage rec {
@@ -15750,35 +10139,7 @@ EOF
};
};
- poezio = buildPythonApplication rec {
- name = "poezio-${version}";
- version = "0.11";
-
- disabled = pythonOlder "3.4";
-
- buildInputs = with self; [ pytest ];
- propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ];
-
- src = pkgs.fetchurl {
- url = "http://dev.louiz.org/attachments/download/118/${name}.tar.gz";
- sha256 = "07cn3717swarjv47yw8x95bvngz4nvlyyy9m7ck9fhycjgdy82r0";
- };
-
- patches = [
- ../development/python-modules/poezio/fix_gnupg_import.patch
- ];
-
- checkPhase = ''
- py.test
- '';
-
- meta = {
- description = "Free console XMPP client";
- homepage = https://poez.io;
- license = licenses.mit;
- maintainers = [ maintainers.lsix ];
- };
- };
+ poezio = callPackage ../applications/networking/instant-messengers/poezio { };
potr = callPackage ../development/python-modules/potr {};