From 546346849e489054bc9107c55037ebf7f514de89 Mon Sep 17 00:00:00 2001 From: Volth Date: Sun, 25 Jun 2017 12:25:01 +0000 Subject: [PATCH 001/475] fetchMavenArtifact: prevent leaking nix hash to jar name --- pkgs/build-support/fetchmavenartifact/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From 6fcee4e1dde50336a7f1874dc63ec8e52b6254d9 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 20 Jun 2018 20:52:36 -0400 Subject: [PATCH 002/475] clementine: add gst_plugins to buildInputs so setup hooks work when the build was refactored in ef5e212d, this was lost. a4ba8c65 got most of it back, but missed the addition of gst_plugins to buildInputs. fixes #39960 --- pkgs/applications/audio/clementine/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 6379975e951..a18622e8baf 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -72,7 +72,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" ]; @@ -104,7 +105,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 From 1ce496bfab37bca1619c053db7a535e0ff96eed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Fri, 21 Sep 2018 23:46:30 +0200 Subject: [PATCH 003/475] nixos lircd: fix deletion of lircd socket --- nixos/modules/services/hardware/lirc.nix | 4 ++++ 1 file changed, 4 insertions(+) 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} \ From 3b685ee5171416ef322f244187ec9bee01faa358 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 13 Sep 2018 17:43:31 +0200 Subject: [PATCH 004/475] xpra: modernize Port to Python 3 and GTK+ 3. --- pkgs/tools/X11/xpra/default.nix | 64 +++++++++++++++-------------- pkgs/tools/X11/xpra/fix-paths.patch | 33 +++++++++++++++ 2 files changed, 66 insertions(+), 31 deletions(-) create mode 100644 pkgs/tools/X11/xpra/fix-paths.patch diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 915144daa90..4df793c5b16 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 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; }; - 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 From d4d87b049ba127df57bdb03bc9d960fac964a5a1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 13 Sep 2018 17:45:42 +0200 Subject: [PATCH 005/475] xpraGtk3: point to xpra xpra now uses GTK 3 --- pkgs/tools/X11/xpra/gtk3.nix | 79 --------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 pkgs/tools/X11/xpra/gtk3.nix 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/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92a0f2b4570..114902af920 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -310,6 +310,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 827e430a728..330498375e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19681,8 +19681,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 { }; From f81fe9d978c2b4eeea8cf628cebccdf57fb40060 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 9 Jun 2018 01:35:34 +0200 Subject: [PATCH 006/475] uhub: re-enable sqlite plugin --- pkgs/servers/uhub/default.nix | 1 + pkgs/servers/uhub/plugin-dir.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 87d0a0ee455..297e064d7ca 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "mod_welcome" "mod_logging" "mod_auth_simple" + "mod_auth_sqlite" "mod_chat_history" "mod_chat_only" "mod_topic" 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 ) From 92a77c32baa6c0f7cbb12213c27f8961bca9bb67 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 8 Oct 2018 00:53:16 +0200 Subject: [PATCH 007/475] uhub: use official upstream sources the project changed the code repository to github --- pkgs/servers/uhub/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 297e064d7ca..456f73dc52e 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, fetchurl, 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 ]; From 018573b7579b4212d7001bf6f0e9b31e1bdadb14 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 10 Oct 2018 01:20:42 +0200 Subject: [PATCH 008/475] nixos/weechat: add setuid wrapper for `screen' to ensure true multiuser capabilities Previously you either had to set the setuid bit yourself or workaround `isSystemUser = true` (for a loginable shell) to access the weechat screen. `programs.screen` shouldn't do this by default to avoid taking too much assumptions about the setup, however `services.weechat` explicitly requires tihs. See #45728 --- nixos/modules/services/misc/weechat.nix | 4 +++- nixos/modules/services/misc/weechat.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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 From 36834a04957af8ce830e7994eb00080bcc5a2f90 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 11 Oct 2018 22:45:44 +0000 Subject: [PATCH 009/475] perlPackages.LWP: fix cross-compilation --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff7d672da36..0034db8864c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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 ]; From 201d3ef704ba93476902e7b1acb789a92dab3c59 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 11 Oct 2018 22:46:55 +0000 Subject: [PATCH 010/475] perlPackages.XMLParser: fix cross-compilation --- pkgs/top-level/perl-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0034db8864c..0e5dde02a1d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17600,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 ]; }; From 16d064cc961d4e85dc701b0de97dbd2e0fcd38d6 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 09:43:29 +0000 Subject: [PATCH 011/475] perlPackages.JSON: apply cross-compilation patch only when needed --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e5dde02a1d..abf24391802 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 ]; From 70858e21a1720992b619e1e78a262da8dd690e43 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 00:56:23 +0000 Subject: [PATCH 012/475] perlPackages.NetDBus: fix cross-compilation --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index abf24391802..e5f8186ea37 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11111,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 = { From d74ea280d1cdd630642da22230b4eb9391392e03 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 8 Oct 2018 00:54:00 +0200 Subject: [PATCH 013/475] uhub: fix build for aarch64 related: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770175 related: https://github.com/janvidar/uhub/issues/46 --- pkgs/servers/uhub/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 456f73dc52e..52866784faa 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd +{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd , tlsSupport ? false }: assert tlsSupport -> openssl != null; @@ -31,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"; }) From c0fed1ba7740070cb20454d6aa77f087751a2a2b Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 22:56:15 +0000 Subject: [PATCH 014/475] perlXMLParser -> perlPackages.XMLParser --- pkgs/applications/audio/gtkpod/default.nix | 6 ++--- pkgs/applications/audio/jamin/default.nix | 10 ++++----- .../graphics/cinepaint/default.nix | 8 +++---- pkgs/applications/graphics/dia/default.nix | 9 ++++---- .../applications/graphics/gcolor2/default.nix | 5 +++-- .../graphics/inkscape/default.nix | 5 +++-- .../instant-messengers/ekiga/default.nix | 7 +++--- .../instant-messengers/pidgin/default.nix | 7 +++--- pkgs/applications/office/gnumeric/default.nix | 12 +++++----- pkgs/applications/video/kino/default.nix | 5 +++-- pkgs/applications/video/wxcam/default.nix | 10 ++++----- pkgs/applications/video/xvidcap/default.nix | 10 ++++----- pkgs/data/misc/shared-mime-info/default.nix | 6 ++--- .../gnome-2/desktop/scrollkeeper/default.nix | 5 +++-- pkgs/development/libraries/avahi/default.nix | 5 +++-- .../development/libraries/libgksu/default.nix | 22 +++++++++---------- .../development/libraries/libgpod/default.nix | 7 +++--- pkgs/development/libraries/rarian/default.nix | 5 +++-- .../tools/misc/intltool/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 20 files changed, 77 insertions(+), 73 deletions(-) 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/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 a1f26f7bc09..326166fdfb6 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 }: @@ -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; - 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/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/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/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/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index f1df81f2db4..7183010dce3 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 @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig gettext intltool perl perlXMLParser libxml2 glib - ]; + pkgconfig gettext intltool libxml2 glib + ] ++ (with perlPackages; [ perl XMLParser ]); meta = with stdenv.lib; { inherit version; 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/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/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/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/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/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1e2930a83c..82f2e17b71d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12924,8 +12924,6 @@ with pkgs; perlPackages = perl528Packages; inherit (perlPackages) perl buildPerlPackage; - perlXMLParser = perlPackages.XMLParser; - ack = perlPackages.ack; perlArchiveCpio = perlPackages.ArchiveCpio; From ccd4024c56df7a084d112779daafa5ddc1a09e24 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 23:00:19 +0000 Subject: [PATCH 015/475] aliases.nix: add perlXMLParser --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92a0f2b4570..c89ce2c5d34 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -203,6 +203,7 @@ mapAliases ({ owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 + perlXMLParser = perlPackages.XMLParser; # 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 From 028164ef057119ee37c99bcb98224672441d2d81 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Oct 2018 02:54:42 +0200 Subject: [PATCH 016/475] monero: 0.12.3.0 -> 0.13.0.2 --- pkgs/applications/altcoins/monero/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index a4a884707a9..2b396c4b938 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.2"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i"; + sha256 = "078iw76ajvaj08rgnx3c13pnq8fxah1z9wwyz54fcnj2349sjbf5"; }; 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 = [ From 6dc4ae5eb237b709dcb1b637b6b3a733fdc1f616 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Oct 2018 03:02:10 +0200 Subject: [PATCH 017/475] xmr-stak: 2.4.7 -> 2.5.0 --- pkgs/applications/misc/xmr-stak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From 4b12cfb92e2576b738e20be24b7bc5596018ebc3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:55:19 +0200 Subject: [PATCH 018/475] python: Theano: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/Theano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From c26359c1eb2643b34698b1272e8b516e4384affe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:55:27 +0200 Subject: [PATCH 019/475] python: alabaster: 0.7.11 -> 0.7.12 --- pkgs/development/python-modules/alabaster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 7e3a047cb85fb04667198ef26351a78d6f41a218 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:55:35 +0200 Subject: [PATCH 020/475] python: autobahn: 18.8.1 -> 18.8.2 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ] ++ From 5b91e4abf890641dbf041f02b34d67c239b212a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:55:42 +0200 Subject: [PATCH 021/475] python: beancount: 2.1.2 -> 2.1.3 --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 81ba7e844bf6197cb8084d209a0880f7dd95d377 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:55:48 +0200 Subject: [PATCH 022/475] python: zc.buildout: 2.12.1 -> 2.12.2 --- pkgs/development/python-modules/buildout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; { From 96c30ae57c6afc4cc16e7e88721cbea7cb3be735 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:55:55 +0200 Subject: [PATCH 023/475] python: zc.buildout: 2.12.1 -> 2.12.2 --- pkgs/development/python-modules/buildout-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 1c28b768877959631e355ea2e1492d807c288190 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:02 +0200 Subject: [PATCH 024/475] python: bumps: 0.7.10 -> 0.7.11 --- pkgs/development/python-modules/bumps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; { From 44c13b1400c810ec9ea8b481072e2eae2342ef23 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:09 +0200 Subject: [PATCH 025/475] python: carbon: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/carbon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 74b8eb5452bfc2c47865a66911f1d8a021bb2b2c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:16 +0200 Subject: [PATCH 026/475] python: click-plugins: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/click-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 7977097a39c26f9af1cd5f2156df1a8ea4a86688 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:16 +0200 Subject: [PATCH 027/475] python: cloudpickle: 0.5.5 -> 0.5.6 --- pkgs/development/python-modules/cloudpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From ed721f8edb2496df5b2f81634c5452d15a7cbdb2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:16 +0200 Subject: [PATCH 028/475] python: cupy: 4.4.0 -> 4.4.1 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 094ea76f2902fa6c9c7a1f87541aeca6784852e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:16 +0200 Subject: [PATCH 029/475] python: cvxopt: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/cvxopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 81298e4477411d5d90c8bc60d43c8464f48f997a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:16 +0200 Subject: [PATCH 030/475] python: dask-image: 0.1.1 -> 0.1.2 --- pkgs/development/python-modules/dask-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 83d47c548c0a686d673c2ccd7847e9bb3e05a04d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:16 +0200 Subject: [PATCH 031/475] python: deprecation: 2.0.5 -> 2.0.6 --- pkgs/development/python-modules/deprecation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From e8783b82841b60709e34ebbff9f685b9c7239f33 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:16 +0200 Subject: [PATCH 032/475] python: distributed: 1.23.1 -> 1.23.3 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 0d11570e78a0ec181a6c56a452f6020490393b6b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:16 +0200 Subject: [PATCH 033/475] python: dominate: 2.3.1 -> 2.3.4 --- pkgs/development/python-modules/dominate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From ec0d777daba02bffd41785323e6a99e52c1beece Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:16 +0200 Subject: [PATCH 034/475] python: emoji: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 2c3b7cc0552..082958fcce1 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "001b92b9c8a157e1ca49187745fa450513bc8b31c87328dfd83d674b9d7dfa63"; + sha256 = "a9e9c08be9907c0042212c86dfbea0f61f78e9897d4df41a1d6307017763ad3e"; }; checkInputs = [ nose ]; From 40446b216ae041ad6d8e77ca1d0089ce09c69a6d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 035/475] python: Eve: 0.8 -> 0.8.1 --- pkgs/development/python-modules/eve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From f23d6af608080c4e7fba5cfd9f86558490173a1b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 036/475] python: filelock: 3.0.6 -> 3.0.9 --- pkgs/development/python-modules/filelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; { From 07a3f3fbb79bf06b3fae5d45ceba35c84a8a494b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 037/475] python: Flask-AutoIndex: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/flask-autoindex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 3fb78d42e23f93a11b1a8f1925aac5702e209287 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 038/475] python: fonttools: 3.29.0 -> 3.29.1 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; }; From 9cef968a398ae56c436fb8770be64cbe7eb530bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 039/475] python: genanki: 0.6.0 -> 0.6.3 --- pkgs/development/python-modules/genanki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 08389e35cef7e67288ce34d31f9fd8aaf1825d5c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 040/475] python: gpapi: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/gpapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From ab635c1ff5e337daf54dfaeb14a32d314bfe4da1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 041/475] python: GPy: 1.9.2 -> 1.9.5 --- pkgs/development/python-modules/gpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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'" From f1300daa92a489672c6a6657906c1ddb17240a33 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 042/475] python: graphite-web: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/graphite-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From e7324a07ebab25e11d52786bdf66b565eb9281c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 043/475] python: greenlet: 0.4.14 -> 0.4.15 --- pkgs/development/python-modules/greenlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 1d85fc11a4035e161cafc4e560bbc62bde7629ad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 044/475] python: grpcio-tools: 1.14.1 -> 1.14.2 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From 98c03124fd34b7af2628485b74165854d1d3d014 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 045/475] python: hdbscan: 0.8.15 -> 0.8.18 --- pkgs/development/python-modules/hdbscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From c65161878e5f10544a9e6188628965ef3b17a0ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 046/475] python: hupper: 1.3 -> 1.3.1 --- pkgs/development/python-modules/hupper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 5131e64a3c2..5f6a4a35ce1 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.3"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "20387760e4d32bd4813c2cabc8e51d92b2c22c546102a0af182c33c152cd7ede"; + sha256 = "899a1da85b71b62d903b5732703cad7454425b4ba9a6453930ad9168ec08ae0e"; }; checkPhase = '' From fe239dddcbc89021ba01714d2265921e17591fca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 047/475] python: hvac: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/hvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 310bd91b22b..7bc0d9d2107 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "54672a93f75453a7de13c7c10c6d8a51630e2559a8e2a563d8e272e9e188443f"; + sha256 = "d7f23883c44458078359142608d0bc6373c4bcec107bdb609c827ee1dda61431"; }; propagatedBuildInputs = [ requests ]; From 2237055688a0f689daf5b0d13bcab70143dfec7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 048/475] python: identify: 1.1.4 -> 1.1.7 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index b4b5d9c8727..1d6b1ed0b19 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.1.4"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "0hvwfpf6fmgn93abrvj88pi7sbcib32s4c5r99lw67kbziq5x129"; + sha256 = "5e956558a9a1e3b3891d7c6609fc9709657a11878af288ace484d1a46a93922b"; }; # Tests not included in PyPI tarball From ed4231d2fac08603bbb750327747cf1c0bf69fe5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:17 +0200 Subject: [PATCH 049/475] python: inflect: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/inflect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 94b0fc801fa..8c58a4f9de7 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "inflect"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0ll34l5b2wsbcw9i2hvkhmq6szxrp7fzc2hjmpz1cvny81bhg3kx"; + sha256 = "ec42f5d5d2baa54ba6e3fa23698554c09362dd478cc66b3c28c5d0b76d7d0581"; }; buildInputs = [ setuptools_scm ]; From 56db8abfb2fa0fda004e69f12665bbbd307c0d73 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 050/475] python: ipywidgets: 7.4.0 -> 7.4.2 --- pkgs/development/python-modules/ipywidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index dde041140b9..b91b5d7a775 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.4.0"; + version = "7.4.2"; src = fetchPypi { inherit pname version; - sha256 = "fd24a66d82f2ea49e281da7714a7c656340d3ec24dff376b17590fa59469b817"; + sha256 = "a3e224f430163f767047ab9a042fc55adbcab0c24bbe6cf9f306c4f89fdf0ba3"; }; # Tests are not distributed From 6e5561b2fa87a6240112464e6926cb3093b253f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 051/475] python: jdatetime: 3.0.0 -> 3.0.2 --- pkgs/development/python-modules/jdatetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index a7c362231ca..03aa9d0d0f8 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.0.0"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "07cdb02e8d6610c38e8ae7746b12cbc39068cc5d54fb2baa915579b60d781b5b"; + sha256 = "21824ab1e29e9ccbca85e77562a090067882976880603c41af8d9c4cffc1d4fc"; }; propagatedBuildInputs = [ six ]; From c4e56035eba2f9eea6d90e18ae870ee528e35ecb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 052/475] python: jupyterlab: 0.34.6 -> 0.34.12 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 23aaff8a728..f0bd058271a 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }: buildPythonPackage rec { pname = "jupyterlab"; - version = "0.34.6"; + version = "0.34.12"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d6e5a3855a0d55e6aa4ab704379da5da3db2e652442e79acfa2e9d14ef50ccb3"; + sha256 = "7d8378d19a0ae173e91a493db996c37828b410b7ee556da21a153486168ecf87"; }; propagatedBuildInputs = [ From f6ac7c183d00b8b6bd0ffd266ae0ba53a4753049 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 053/475] python: Keras: 2.2.2 -> 2.2.4 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 43f3bd935d2..83ef2328279 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.2.2"; + version = "2.2.4"; src = fetchPypi { inherit pname version; - sha256 = "468d98da104ec5c3dbb10c2ef6bb345ab154f6ca2d722d4c250ef4d6105de17a"; + sha256 = "90b610a3dbbf6d257b20a079eba3fdf2eed2158f64066a7c6f7227023fd60bc9"; }; checkInputs = [ From 0579e63ad92ab87d03cb4ef25c4eaa2ff3abcb7a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 054/475] python: Keras_Applications: 1.0.5 -> 1.0.6 --- .../development/python-modules/keras-applications/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix index f9617f03d8e..a069c205144 100644 --- a/pkgs/development/python-modules/keras-applications/default.nix +++ b/pkgs/development/python-modules/keras-applications/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Applications"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "26a7318b9d8d5be80d75ab08a1284aaf4b94125dd8271b18ca89791e16eb2cfc"; + sha256 = "a03af60ddc9c5afdae4d5c9a8dd4ca857550e0b793733a5072e0725829b87017"; }; # Cyclic dependency: keras-applications requires keras, which requires keras-applications From f3b67b35c142e4a55b2c90d659a6dc9a80df9c8d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 055/475] python: Keras_Preprocessing: 1.0.3 -> 1.0.5 --- .../python-modules/keras-preprocessing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index 45ce1d7f61d..a57b6f7dfa3 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Preprocessing"; - version = "1.0.3"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "02ba0a3b31ed89c4b0c21d55ba7d87529097d56f394e3850b6d3c9e6c63ce7ae"; + sha256 = "ef2e482c4336fcf7180244d06f4374939099daa3183816e82aee7755af35b754"; }; # Cyclic dependency: keras-preprocessing requires keras, which requires keras-preprocessing From a77e19790a6a711c575665cb4ab969884be1e12a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 056/475] python: ledgerblue: 0.1.19 -> 0.1.20 --- pkgs/development/python-modules/ledgerblue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index d324afcc647..52d7cba3f95 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.19"; + version = "0.1.20"; src = fetchPypi { inherit pname version; - sha256 = "3969b3c375c0f3fb60ff1645621ebf2f39fb697a53851620705f27ed7b283097"; + sha256 = "fb7ac6389ad13d3c9baa149b527e2cb5798e749e2b6729e5fe8437092ece6164"; }; propagatedBuildInputs = [ From 568c58e8112c145dfae31fef98e77bf7fadb8d05 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 057/475] python: llfuse: 1.3.4 -> 1.3.5 --- pkgs/development/python-modules/llfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 7eac54d84d8..78daa85ea80 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.3.4"; + version = "1.3.5"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "50396c5f3c49c3145e696e5b62df4fcca8b66634788020fba7b6932a858c78c2"; + sha256 = "6e412a3d9be69162d49b8a4d6fb3c343d1c1fba847f4535d229e0ece2548ead8"; }; nativeBuildInputs = [ pkgconfig ]; From 2de68556fb5dc22ff9c5663f6ba08988a1fb56bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 058/475] python: lxml: 4.2.4 -> 4.2.5 --- pkgs/development/python-modules/lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 3778098922a..5672fce602e 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.2.4"; + version = "4.2.5"; src = fetchPypi { inherit pname version; - sha256 = "e2afbe403090f5893e254958d02875e0732975e73c4c0cdd33c1f009a61963ca"; + sha256 = "36720698c29e7a9626a0dc802ef8885f8f0239bfd1689628ecd459a061f2807f"; }; buildInputs = [ libxml2 libxslt ]; From 6f50ec64148150ff71f37d53329790734ab6574b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 059/475] python: markdown2: 2.3.5 -> 2.3.6 --- pkgs/development/python-modules/markdown2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; { From b50b3f9fd44a62d1834fb34e0158c1c72f9d34dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 060/475] python: marshmallow: 2.15.4 -> 2.15.6 --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 0ba97937a4b8e6cdc4099035175e73d9c7cfee6b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 061/475] python: micawber: 0.3.5 -> 0.3.8 --- pkgs/development/python-modules/micawber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d4ed697be4b2b0da32532a04b1905b968a04f86c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 062/475] python: moto: 1.3.5 -> 1.3.6 --- pkgs/development/python-modules/moto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From ddc70213cd15da53d88a261ed2c9a5e8dda7f440 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 063/475] python: msgpack-numpy: 0.4.3.1 -> 0.4.4.1 --- pkgs/development/python-modules/msgpack-numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 54bfa340a83b2c8b2bd529a041f1675548f726fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 064/475] python: ncclient: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/ncclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 1355a82c7f41a4c1e07cc36cdf79a69f48ef58d1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 065/475] python: nipype: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From bc5d1182088ea64cb249cf1f384a4ed3d12c4165 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:18 +0200 Subject: [PATCH 066/475] python: numpy: 1.15.1 -> 1.15.2 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From c17efa1f5ab93408b021b2fd4a524778d756025d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 067/475] python: oauth2client: 4.1.2 -> 4.1.3 --- pkgs/development/python-modules/oauth2client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From f0097a9570c3ec70c874e732701945792230729b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 068/475] python: openpyxl: 2.5.6 -> 2.5.8 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 0e13ee70d92f5d51383be11d5d1d3901d2fd7a40 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 069/475] python: ordered-set: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/ordered-set/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From d2c4a8a88f976121d87881b7df79e99ea2bc70c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 070/475] python: paramz: 0.9.2 -> 0.9.4 --- pkgs/development/python-modules/paramz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From bb0fdab84f0203eb33a5a0bb90478d1e0707f6d4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 071/475] python: pathspec: 0.5.7 -> 0.5.9 --- pkgs/development/python-modules/pathspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = { From 5dadb3ba2bdfdba3f5ad2412b5d2f9cd6635b4a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 072/475] python: phonenumbers: 8.9.12 -> 8.9.15 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = { From 50c881f7c394c36368572ea51011a08b078dd1e7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 073/475] python: pyaxmlparser: 0.3.10 -> 0.3.11 --- pkgs/development/python-modules/pyaxmlparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From c94a91bf4c43ef5e47b3e316584961bdc8163dda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 074/475] python: pycuda: 2018.1 -> 2018.1.1 --- pkgs/development/python-modules/pycuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From f4c4e0579c50e5abe2079d4a4093d707792fe723 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 075/475] python: pyhomematic: 0.1.47 -> 0.1.50 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From b84c96cf1fec634b007eba6eabdefc2ef7b92c90 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 076/475] python: pymatgen: 2018.9.1 -> 2018.9.30 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d5892452808c48f141121e7917548ba2b1c5d9b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 077/475] python: pyparsing: 2.2.0 -> 2.2.2 --- pkgs/development/python-modules/pyparsing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From fd6b7311ddeaf056b7fdde0c6a75814d0f677cb4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 078/475] python: pyperclip: 1.6.4 -> 1.6.5 --- pkgs/development/python-modules/pyperclip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From 293a15ce725f781580890918bd8cd4871dc32ec7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 079/475] python: pyroute2: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 5a3963fd1c2f95597c62dd8fea55fb9bbfe8eacf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 080/475] python: pyspark: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/pyspark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From fd560838eeb11f961d8164b543c56eb5dd30f8bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 081/475] python: pysrim: 0.5.8 -> 0.5.9 --- pkgs/development/python-modules/pysrim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 9b75e87dd109c4cf9124c59efbcc926e585dc2f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:19 +0200 Subject: [PATCH 082/475] python: pytest-isort: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/pytest-isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d2e51e1185d17f3c41f93bec30be4e42e6e8d685 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 083/475] python: pytest-xdist: 1.23.0 -> 1.23.2 --- pkgs/development/python-modules/pytest-xdist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From fc1c2be412d75644e161aaf71716983e190aa4b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 084/475] python: python-slugify: 1.2.5 -> 1.2.6 --- pkgs/development/python-modules/python-slugify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From f52ffd37289f9abd04b8ff1dd965f68e40813ba3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 085/475] python: python_openzwave: 0.4.9 -> 0.4.10 --- pkgs/development/python-modules/python_openzwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; }; From 61daddff0ac9341c6e8de6f1a0f563d1f3ebf8ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 086/475] python: reikna: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/reikna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From a16db8284fa0cf1e7477fa7ce780f27c7aaf96b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 087/475] python: relatorio: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/relatorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 661753c9c82667a61747e99b42faf2679ffb4467 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 088/475] python: reportlab: 3.5.6 -> 3.5.9 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From f242b08759ee8dfaf7a61c174f087a2adb07ecba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 089/475] python: rlp: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/rlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 632e3f03fdfafdfcbb0ae7e11568e1bfa6e972d6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 090/475] python: scikit-image: 0.14.0 -> 0.14.1 --- pkgs/development/python-modules/scikit-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 913172d31ccee92077935ee5ee2e99f0a18e84a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 091/475] python: seekpath: 1.8.2 -> 1.8.4 --- pkgs/development/python-modules/seekpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From 6ec8493077c82b61700bb277e3e9ad93a53b1bcb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 092/475] python: shippai: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/shippai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; { From 1cbe6392adadcdfacd8b6d06900699f56f9ab486 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 093/475] python: sortedcontainers: 2.0.4 -> 2.0.5 --- pkgs/development/python-modules/sortedcontainers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 5f775596513ce7393611c50aa94016cb73ae9ecb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 094/475] python: sounddevice: 0.3.11 -> 0.3.12 --- pkgs/development/python-modules/sounddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 57ac3d45f3d24028303c9178b109e7054001ff31 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 095/475] python: sphfile: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/sphfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 8e0393b088df97511ed615ad6baab96ea4bab55c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 096/475] python: Sphinx: 1.7.8 -> 1.7.9 --- pkgs/development/python-modules/sphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From e2c943bf46abb13caeda96ec16ad454cfea46be8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 097/475] python: SQLAlchemy: 1.2.11 -> 1.2.12 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 955df4c3f5f5fd9db73eb402af24c9a46069e0a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 098/475] python: sqlmap: 1.2.8 -> 1.2.10 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 6049cc70b13dc6c384bea3f4cdb1abdca9a66fd7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:20 +0200 Subject: [PATCH 099/475] python: toml: 0.9.4 -> 0.9.6 --- pkgs/development/python-modules/toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) From a2baea1ccb79d0717451c920db32bc5e50fe18b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:21 +0200 Subject: [PATCH 100/475] python: whisper: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/whisper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 019da05d0811b4ff7fa8bf874fbeb86b277ebce2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:21 +0200 Subject: [PATCH 101/475] python: widgetsnbextension: 3.4.0 -> 3.4.2 --- .../development/python-modules/widgetsnbextension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 8b92e7e49112058231685b0ff80a6c71abda7264 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:21 +0200 Subject: [PATCH 102/475] python: xarray: 0.10.8 -> 0.10.9 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From e85e99f4af17f25931f6170d8fa042b06aad18f7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:21 +0200 Subject: [PATCH 103/475] python: xml2rfc: 2.10.0 -> 2.10.3 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From bcf8f90768757afd9f9ea79dca1de4938de67c78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:21 +0200 Subject: [PATCH 104/475] python: XStatic: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/xstatic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix index 02931215b8d..bbfcce54d89 100644 --- a/pkgs/development/python-modules/xstatic/default.nix +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit version pname; - sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f"; + sha256 = "80b78dfe37bce6dee4343d64c65375a80bcf399b46dd47c0c7d56161568a23a8"; }; # no tests implemented From 8cad4553b87c3b124b40a8d1c6476b54326fd582 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:21 +0200 Subject: [PATCH 105/475] python: XStatic-Bootstrap: 3.3.5.1 -> 3.3.7.1 --- pkgs/development/python-modules/xstatic-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index 757c2cc240e..a474bf84d0f 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Bootstrap"; - version = "3.3.5.1"; + version = "3.3.7.1"; src = fetchPypi { inherit version pname; - sha256 = "0jzjq3d4vp2shd2n20f9y53jnnk1cvphkj1v0awgrf18qsy2bmin"; + sha256 = "0c949e78e8cd77983fd803a68a98df0124e0c3a872fddb9ac8e6e5b4a487f131"; }; # no tests implemented From cca5e5194942bb3c8c711adbc9937e73f476f10f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:21 +0200 Subject: [PATCH 106/475] python: XStatic-jquery-ui: 1.12.0.1 -> 1.12.1.1 --- pkgs/development/python-modules/xstatic-jquery-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix index 1b884a97eb2..3424c8fcf6f 100644 --- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "XStatic-jquery-ui"; - version = "1.12.0.1"; + version = "1.12.1.1"; src = fetchPypi { inherit version pname; - sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2"; + sha256 = "d6ba48bb474420a8bcb2be02eef6ae96281ec24eff6befa54f04ebc9e4cc8910"; }; # no tests implemented From 20fba59b2d6368cff2e749113cb4e38ca5a45de9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:21 +0200 Subject: [PATCH 107/475] python: zetup: 0.2.43 -> 0.2.45 --- pkgs/development/python-modules/zetup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From b05a5969fc2e8a01b9000d17f6e96f57b3d72899 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:56:35 +0200 Subject: [PATCH 108/475] python.pkgs.bootstrapped-pip: update pip, setuptools and wheel --- .../python-modules/bootstrapped-pip/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 = '' From 323ca09641fb6065743164a4fa9dc1d45f08fba9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 12:58:29 +0200 Subject: [PATCH 109/475] python.pkgs.cython: 0.28.3 -> 0.28.5 --- pkgs/development/python-modules/Cython/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) 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; From 474c78a3e543f0817fb787a1cd0b3e9824529e78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Oct 2018 13:06:15 +0200 Subject: [PATCH 110/475] python.pkgs.pip: 18.0 -> 18.1 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From e8c6b66e759b4ab95786cd8f2f74c1005cf2797f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 14:26:26 -0400 Subject: [PATCH 111/475] pythonPackages.pytest-relaxed: init at 1.1.4 --- .../python-modules/pytest-relaxed/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-relaxed/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62b77b187bc..c21b6321efa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1937,6 +1937,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 { }; From d51311861c700586b9049a65a1f20b4d2cc03675 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 14:27:12 -0400 Subject: [PATCH 112/475] pythonPackages.paramiko: 2.1.1 -> 2.4.2 refactor move to python-modules --- .../python-modules/paramiko/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 38 +-------------- 2 files changed, 49 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/python-modules/paramiko/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c21b6321efa..6c3161b3f9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9112,43 +9112,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 { }; From 49719ae6e435e3af889a9bb9d010d5d968a02068 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 14:27:51 -0400 Subject: [PATCH 113/475] pythonPackages.Fabric: 1.13.2 -> 2.4.0 refactor move to python-modules --- .../python-modules/Fabric/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------- 2 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/Fabric/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c3161b3f9f..607b4b61018 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2385,23 +2385,7 @@ in { }; }; - 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 {} From 66f5f1a75b81b43d07ef0ba41b9c096bf6a1e003 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 23:19:55 +0000 Subject: [PATCH 114/475] perlArchiveCpio -> perlPackages.ArchiveCpio --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0abf0e60846..f45808686f4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -208,6 +208,7 @@ mapAliases ({ owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 + 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f4bc519285..b77dbf8d420 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12939,8 +12939,6 @@ with pkgs; ack = perlPackages.ack; - perlArchiveCpio = perlPackages.ArchiveCpio; - perlcritic = perlPackages.PerlCritic; sqitchPg = callPackage ../development/tools/misc/sqitch { From 548ced628d233e6ec5431ae3d8d1668d65177639 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Oct 2018 10:56:51 +0200 Subject: [PATCH 115/475] python.buildEnv: new argument `makeWrapperArgs` `python.buildEnv` would already wrap executables exporting `PYTHONHOME`. With this change, it is possible to pass in additional arguments to the underlying `makeWrapper`. --- pkgs/development/interpreters/python/wrapper.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 From 8e15e9c45235f015bb7cfbb634fd5f91a03acbb2 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 14 Oct 2018 02:41:33 +0200 Subject: [PATCH 116/475] monero-gui: 0.12.3.0 -> 0.13.0.2 --- pkgs/applications/altcoins/monero-gui/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 49b8db51bcc..c26df670930 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.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i"; + sha256 = "02419rqi3zfy6yjyw3b3gvkbxh2ypdfpijiiklc7lyblb9nnjr68"; }; 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 = [ From f65dfb3caf8f4cff1e5a1c3f63c564b860eeae1f Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 23:10:38 +0000 Subject: [PATCH 117/475] buildPerlPackage -> perlPackages.buildPerlPackage --- pkgs/applications/misc/get_iplayer/default.nix | 8 ++++---- pkgs/development/tools/analysis/egypt/default.nix | 4 ++-- pkgs/development/tools/misc/ninka/default.nix | 6 +++--- pkgs/servers/mail/postfix/pflogsumm.nix | 5 ++--- pkgs/servers/mail/spamassassin/default.nix | 4 ++-- pkgs/servers/monitoring/fusion-inventory/default.nix | 4 ++-- pkgs/servers/openxpki/default.nix | 4 ++-- pkgs/servers/slimserver/default.nix | 4 ++-- pkgs/tools/graphics/feedgnuplot/default.nix | 4 ++-- pkgs/tools/graphics/graph-easy/default.nix | 4 ++-- pkgs/tools/misc/rename/default.nix | 4 ++-- pkgs/tools/networking/ddclient/default.nix | 4 ++-- pkgs/tools/virtualization/linode-cli/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 ++---- 15 files changed, 32 insertions(+), 34 deletions(-) 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/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/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/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/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/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/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/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 f45808686f4..fce35aed5cf 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b77dbf8d420..a98846a3a61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5026,9 +5026,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 { }; @@ -12933,7 +12931,7 @@ with pkgs; }); perlPackages = perl528Packages; - inherit (perlPackages) perl buildPerlPackage; + inherit (perlPackages) perl; perlXMLParser = perlPackages.XMLParser; From 3287e88cf0fa4896e2d0a527a3a993c458acc536 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 15:00:37 -0400 Subject: [PATCH 118/475] pythonPackages.backports_os: init at 0.1.1 --- .../python-modules/backports_os/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/backports_os/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7445c6d8b..32b9daa45e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -995,6 +995,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 From 77c1ca887bcb419c341b2e7e6a6d6ab7374a0621 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 15:01:14 -0400 Subject: [PATCH 119/475] pythonPackages.pyftpdlib: init at 1.5.4 --- .../python-modules/pyftpdlib/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyftpdlib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32b9daa45e5..2bde64c1486 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3857,6 +3857,8 @@ in { pydotplus = callPackage ../development/python-modules/pydotplus { }; + pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; + pyfxa = callPackage ../development/python-modules/pyfxa { }; pyhomematic = callPackage ../development/python-modules/pyhomematic { }; From 7f613c8d4992b980a97c8d06aa550e09ebc7dbd1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 15:01:40 -0400 Subject: [PATCH 120/475] pythonPackages.fs: 0.5.4 -> 2.1.1 refactor move to python-modules --- .../development/python-modules/fs/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 +---------- 2 files changed, 54 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/fs/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bde64c1486..c4bd0b6446b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5581,37 +5581,7 @@ in { }; }; - 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; - }; - }; + fs = callPackage ../development/python-modules/fs { }; fusepy = buildPythonPackage rec { name = "fusepy-2.0.4"; From a4118294e84ccc37b13f6fb19236106a4b2114ad Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 14 Oct 2018 15:23:37 +0000 Subject: [PATCH 121/475] freetype: fix cross-compilation (#48352) --- pkgs/development/libraries/freetype/default.nix | 4 ++++ 1 file changed, 4 insertions(+) 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"; From 143884d45613de38cf10a99abdf067682d0ebdfd Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 14 Oct 2018 21:57:01 +0000 Subject: [PATCH 122/475] shared-mime-info: fix cross build (#48259) --- pkgs/data/misc/shared-mime-info/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 7183010dce3..f82ae5f1f9f 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6"; }; - nativeBuildInputs = [ - pkgconfig gettext intltool libxml2 glib - ] ++ (with perlPackages; [ perl XMLParser ]); + nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]); + buildInputs = [ libxml2 glib ]; meta = with stdenv.lib; { inherit version; From 91ddc9d27f669e1dc09012cc7577377bf4e90e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Oct 2018 13:12:06 +0100 Subject: [PATCH 123/475] postfix: add setgid wrapper for postqueue/postdrop Both postqueue[1] and postdrop[2] implement a subset of administration task that are supposed to be run unprivileged users and require the setgid bit to full-fill this task. [1] http://www.postfix.org/postqueue.1.html [2] http://www.postfix.org/postdrop.1.html --- nixos/modules/services/mail/postfix.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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"; From 7414ec1fa0e6d41d7fcfc2ffb9405455b4239edc Mon Sep 17 00:00:00 2001 From: ryan4729 Date: Mon, 15 Oct 2018 00:22:24 -0700 Subject: [PATCH 124/475] protobuf3: support cross compilation PR #48450 --- pkgs/development/libraries/protobuf/generic-v3.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 From b6cfaf1d9f369a0e0cad6cb2aeda29d3b6a52b93 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 21:35:20 -0700 Subject: [PATCH 125/475] gzdoom: 3.5.1 -> 3.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gzdoom/versions --- pkgs/games/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From eeb2ee296c00358516082fd4cdf1a2625a6c54d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 21:54:45 -0700 Subject: [PATCH 126/475] gmsh: 4.0.1 -> 4.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gmsh/versions --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From f3a8e772a567ccb76372f390ccd455bfd088695a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:04:05 -0700 Subject: [PATCH 127/475] git-review: 1.26.0 -> 1.27.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-review/versions --- pkgs/applications/version-management/git-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 15f3717b5ebbddda6516f08e41ec25471931d90a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:31:17 -0700 Subject: [PATCH 128/475] fio: 3.10 -> 3.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fio/versions --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ] From 98e5a0f9f45921fce867188b7942011b11be0321 Mon Sep 17 00:00:00 2001 From: florianjacob Date: Tue, 16 Oct 2018 09:04:37 +0200 Subject: [PATCH 129/475] mariadb.connector-c: 2.3.6 -> 2.3.7 (#48078) --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; }; From e14f9cea94f08abdbf78b8fdd0a3ca2d3144b073 Mon Sep 17 00:00:00 2001 From: "Christoph Neidahl (OPNA2608)" Date: Tue, 16 Oct 2018 11:40:27 +0200 Subject: [PATCH 130/475] x11vnc: 0.9.13 -> 0.9.15 updated x11vnc to use the GitHub repo and up-to-date version 0.9.15 --- pkgs/tools/X11/x11vnc/default.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 2dc6d8ffd78..d91c91b10e2 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,34 +1,42 @@ -{ 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 \ + 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 ''; 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; }; From 09504f62a72ea38435a3cb1217c8cd12a695a79d Mon Sep 17 00:00:00 2001 From: "Christoph Neidahl (OPNA2608)" Date: Tue, 16 Oct 2018 11:43:48 +0200 Subject: [PATCH 131/475] x11vnc: added maintainer adding myself as maintainer --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/X11/x11vnc/default.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5f33e316e18..3791c6772c4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3110,6 +3110,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/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index d91c91b10e2..51307f0df09 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/LibVNC/x11vnc/; platforms = platforms.linux; license = licenses.gpl2; + maintainers = with maintainers; [ OPNA2608 ]; }; } From 2b2e4e1a3b7dd28a16c23fd3bcb731bfc1388993 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 04:53:24 -0700 Subject: [PATCH 132/475] adapta-gtk-theme: 3.94.0.149 -> 3.95.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From 62dc7fbc6170e9c96fed8eda70783bb012f57a84 Mon Sep 17 00:00:00 2001 From: tilpner Date: Tue, 16 Oct 2018 13:55:31 +0200 Subject: [PATCH 133/475] appimage-run: Fix type-1 support, used wrong directory --- pkgs/tools/package-management/appimage-run/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From d36c55a530e31955ef9657dab745faf9f315eae8 Mon Sep 17 00:00:00 2001 From: Doug Beardsley Date: Mon, 15 Oct 2018 16:15:03 -0400 Subject: [PATCH 134/475] Add name parameter to developPackage --- pkgs/development/haskell-modules/make-package-set.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index ef2c33c1091..40046526488 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -194,6 +194,7 @@ 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 @@ -207,6 +208,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # 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); From 56ef6eeb43f2ea9c47701bbe4534999aca78dd34 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 09:54:51 -0500 Subject: [PATCH 135/475] radare2: 2.9.0 -> 3.0.0 --- .../tools/analysis/radare2/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index f10b820a73e..4a2a32bf22a 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -86,21 +86,21 @@ 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"; + version_commit = "19720"; gittap = "2.8.0-189-gf82b28982"; gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; - version = "2018-08-14"; + version = "2018-08-13"; sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1"; cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; From f88957d1701d08e61dc44653d34524fa930b2778 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 11:57:44 -0500 Subject: [PATCH 136/475] radare2: libuv and actually use deps we're providing Particularly openssl and zlib. There are others we may wish to provide but for now let's at least use the ones in buildInputs :). --- pkgs/development/tools/analysis/radare2/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 4a2a32bf22a..a6dbb8e601f 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] From 9b590126a7af8a9488d52f1ea752a79cf2ab8a3d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 09:56:17 -0500 Subject: [PATCH 137/475] radare2-cutter: 1.7.1 -> 1.7.2 --- .../tools/analysis/radare2/cutter.nix | 4 ++-- .../tools/analysis/radare2/default.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) 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..3302e17c69c 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -96,14 +96,14 @@ in { cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; }; 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"; }; # } From 6fdc1655649076262a93cddd4cb389457a0287e4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 12:35:16 -0500 Subject: [PATCH 138/475] r2-for-cutter: revert accidental change to version info --- pkgs/development/tools/analysis/radare2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a6dbb8e601f..7e7f10ea7ff 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -100,11 +100,11 @@ in { cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; r2-for-cutter = generic { - version_commit = "19720"; + version_commit = "19349"; gittap = "2.8.0-189-gf82b28982"; gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; - version = "2018-08-13"; + version = "2018-08-14"; sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1"; cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; From 26dfc0c533a226de7bc2b0e93f6cac6009247e6e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 14:01:08 -0500 Subject: [PATCH 139/475] radare2: fix update script to handle invocation from elsewhere It looks like `with Path:` is supposed to be a context-manager for changing directory but it doesn't seem to work and the only way I've found to make that work is if we made our own and annotated it. Instead just use nix search path to tell the expression where to find the file it looks for. Also re-use SCRIPT_DIR elsewhere instead of re-"computing" it. --- pkgs/development/tools/analysis/radare2/update.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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) From 5ac9af234060b509d48ca8cca9082ca93080490c Mon Sep 17 00:00:00 2001 From: "nagato.pain" Date: Tue, 16 Oct 2018 14:33:48 -0700 Subject: [PATCH 140/475] pythonPackages.python-ldap-test: init at 0.3.1 --- .../python-ldap-test/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/python-ldap-test/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c66fd52d43..e53cee98134 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -563,6 +563,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; From 1e3ce59e7d1da5f8ccee921d58bec909e91c9c0c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 18:09:22 -0500 Subject: [PATCH 141/475] git-recent: 1.0.4 -> 1.1.0 --- .../version-management/git-and-tools/git-recent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d8410167d1a5c3f84a4bf88995528a3e788db9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= Date: Tue, 16 Oct 2018 18:31:14 -0500 Subject: [PATCH 142/475] linux_testing_bcachefs: 4.18.2018.09.21 -> 4.18.2018.10.12 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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"; From 0c4a7a86fd26a45c44c258181f7e2d977071b95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= Date: Tue, 16 Oct 2018 18:31:53 -0500 Subject: [PATCH 143/475] bcachefs-tools: 2018-08-22 -> 2018-10-12 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; From 8f64cedf17c320150dabe92813d5016281fab7ae Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 17 Oct 2018 00:12:40 -0400 Subject: [PATCH 144/475] nextpnr: 2018.08.09 -> 2018.10.17 --- pkgs/development/compilers/nextpnr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ]; From 95e3b53b064c13409ec1e6cfcae3b1b3a1be9d24 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 17 Oct 2018 00:13:05 -0400 Subject: [PATCH 145/475] yosys: 2018.09.30 -> 2018.10.17 --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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"; }) From 9d00ad43f5976ff507fc7fc4bf988b0a238f1d4f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 11:46:43 -0400 Subject: [PATCH 146/475] pythonPackages.caldavclientlibrary-asynk: refactor move to python-modules --- .../caldavclientlibrary-asynk/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +-------------- 2 files changed, 36 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 607b4b61018..6a26d7652f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1065,34 +1065,7 @@ in { 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 { }; From b14225b37b8be86fde3c54d75cd9c2b273d5f99b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 11:47:16 -0400 Subject: [PATCH 147/475] pythonPackages.binwalk: refactor move to python-modules --- .../python-modules/binwalk/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 ++------------- 2 files changed, 41 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/binwalk/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a26d7652f0..0adf70764b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1035,33 +1035,11 @@ 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 { }; From 564c6f0f369c964a584c9cf46b0e67c3080b1903 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 11:47:44 -0400 Subject: [PATCH 148/475] pythonPackages.bedup: refactor move to python-modules --- .../python-modules/bedup/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +-------------- 2 files changed, 43 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/bedup/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0adf70764b3..0c894af384d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1047,38 +1047,7 @@ in { 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 {}; From 9bbf54ea2daaa15111af5d4973fe98375a419727 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 11:53:02 -0400 Subject: [PATCH 149/475] pythonPackages.capstone: refactor move to python-modules --- .../python-modules/capstone/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------- 2 files changed, 39 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/capstone/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c894af384d..3f54712ddc9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1070,33 +1070,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 {}; From 0f4383eae500a6a5ace6982afbb83cb60b38dee1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 12:06:15 -0400 Subject: [PATCH 150/475] pythonPackages.venusian: 1.0 -> 1.1.0 Added tests and refactored moved to python-modules --- .../python-modules/venusian/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------- 2 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/venusian/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f54712ddc9..8bb4ef2f76c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4255,23 +4255,7 @@ in { 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; - }; - }; - + venusian = callPackage ../development/python-modules/venusian { }; chameleon = buildPythonPackage rec { name = "Chameleon-2.25"; From d572503c7a7485042a900d6e40b4af913930bc27 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 12:10:43 -0400 Subject: [PATCH 151/475] pythonPackages.cornice: 1.2.1 -> 3.4.1 --- .../python-modules/cornice/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +-------- 2 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/cornice/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8bb4ef2f76c..7ef02f63bcb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1098,19 +1098,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 { }; From 45323efb5544114ea390c5fc9174c41dfb803d5c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 12:28:32 -0400 Subject: [PATCH 152/475] pythonPackages.bsddb3: 6.1.1 -> 6.2.6 refactor move to python-modules. --- .../python-modules/bsddb3/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +-------------- 2 files changed, 39 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/bsddb3/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ef02f63bcb..a65583a413b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1182,35 +1182,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 { }; From 5b0013e4225fcf203ffce6de5e7b1dc9588440aa Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 12:29:22 -0400 Subject: [PATCH 153/475] pythonPackages.box2d: 2.3b0 -> 2.3.2 refactor move to python-modules --- .../python-modules/box2d/default.nix | 37 +++++++++++++++++++ .../python-modules/box2d/disable-test.patch | 14 ------- pkgs/top-level/python-packages.nix | 26 +------------ 3 files changed, 38 insertions(+), 39 deletions(-) create mode 100644 pkgs/development/python-modules/box2d/default.nix delete mode 100644 pkgs/development/python-modules/box2d/disable-test.patch 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a65583a413b..144ee205ecc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1225,31 +1225,7 @@ 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 { }; From 5ced81456bc1c41f7f1b403a1a40f1ca6551a3be Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 12:36:58 -0400 Subject: [PATCH 154/475] pythonPackages.bugz: 0.9.3 -> 0.13 refactor move to python-modules --- .../python-modules/bugz/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/bugz/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 144ee205ecc..bd908b7f1a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1231,23 +1231,7 @@ in { 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 { }; From 22a6d2be219bc8f64b40e2ef37ef2453c311baa7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 12:51:43 -0400 Subject: [PATCH 155/475] pythonPackages.cassandra-driver: refactor move to python-modules --- .../cassandra-driver/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +---------- 2 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/cassandra-driver/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd908b7f1a8..5d5e5481694 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1268,38 +1268,7 @@ 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 {}; From ac2ec2ecc1a821f4fc0030af4351aa30ee03d518 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 12:54:10 -0400 Subject: [PATCH 156/475] pythonPackages.CDDB: refactor move to python-modules --- .../python-modules/cddb/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/cddb/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d5e5481694..57bea81da68 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1272,24 +1272,7 @@ in { cccolutils = callPackage ../development/python-modules/cccolutils {}; - CDDB = buildPythonPackage rec { - name = "CDDB-1.4"; - - 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; - }; - }; + CDDB = callPackage ../development/python-modules/cddb { }; cntk = buildPythonPackage rec { inherit (pkgs.cntk) name version src meta; From 24dc5c67810a96ab3fa2f768789d5352a183b34b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 13:11:39 -0400 Subject: [PATCH 157/475] pythonPackages.cntk: refactor move to python-modules --- .../python-modules/cntk/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------- 2 files changed, 39 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/cntk/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57bea81da68..27815318c96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1274,33 +1274,7 @@ in { CDDB = callPackage ../development/python-modules/cddb { }; - 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 { }; From e70a3c75991813d9bba1e2afe571ad01a1cd9f3b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 14:28:56 -0400 Subject: [PATCH 158/475] pythonPackages.closure-linter: refactor move to python-modules --- .../python-modules/closure-linter/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/closure-linter/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27815318c96..481b8d5ed5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1312,29 +1312,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 { }; From d0e058f669acd24f12bb7ae5e4bdaa6849fbfc6a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 14:33:51 -0400 Subject: [PATCH 159/475] pythonPackages.ColanderAlchemy: refactor move to python-modules --- .../colanderalchemy/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------- 2 files changed, 36 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/colanderalchemy/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 481b8d5ed5e..c9977ca48cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1343,31 +1343,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 { }; From 6fd8fb98d92940ab377794c6675df31c2c02846f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 14:37:10 -0400 Subject: [PATCH 160/475] pythonPackages.openant: refactor move to python-modules --- .../python-modules/openant/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +-------------- 2 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/openant/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9977ca48cd..44716eeb131 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1411,36 +1411,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; From 1c4bd5703c7cbe8cf942727955d70759d3271109 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 14:43:03 -0400 Subject: [PATCH 161/475] pythonPackages.minidb: 2.0.1 -> 2.0.2 enable tests and move to python-modules --- .../python-modules/minidb/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------- 2 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/minidb/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44716eeb131..c87004a3835 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1431,21 +1431,7 @@ 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 {}; From 12067dc30ffdfb4648607bee8c41630d1ef03b3f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 14:46:38 -0400 Subject: [PATCH 162/475] pythonPackages.mixpanel: refactor move to python-modules --- .../python-modules/mixpanel/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/mixpanel/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c87004a3835..05c8f96894b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1435,27 +1435,7 @@ in { 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 { }; From acfa2e172b2ce52b07927a4078bce65253ba8d4e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 14:58:31 -0400 Subject: [PATCH 163/475] pythonPackages.pyhepmc: refactor move to python-modules added tests --- .../python-modules/pyhepmc/default.nix | 47 +++++++++++++++++++ .../{ => pyhepmc}/pyhepmc_export_edges.patch | 0 .../{ => pyhepmc}/pyhepmc_export_flow.patch | 0 pkgs/top-level/python-packages.nix | 35 +------------- 4 files changed, 48 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/python-modules/pyhepmc/default.nix rename pkgs/development/python-modules/{ => pyhepmc}/pyhepmc_export_edges.patch (100%) rename pkgs/development/python-modules/{ => pyhepmc}/pyhepmc_export_flow.patch (100%) 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05c8f96894b..e98589422fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1500,40 +1500,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; From f6a29fbb69654df4e94468b94587240b4edb812b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:01:43 -0400 Subject: [PATCH 164/475] pythonPackages.deskcon: refactor move to python-modules --- .../python-modules/deskcon/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 34 +-------------- 2 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/deskcon/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e98589422fc..fb155334939 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1664,39 +1664,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 { }; From f379425159ee4fd1aa01a6451be9f2f13858bf60 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:16:03 -0400 Subject: [PATCH 165/475] pythonPackages.mxnet: refactor move to python-modules --- .../python-modules/mxnet/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------- 2 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/mxnet/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb155334939..6b5605b3cf7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1439,32 +1439,7 @@ in { 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 { }; From 63a0e8613a507a24694ae23df698c6b5c148484d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:20:29 -0400 Subject: [PATCH 166/475] pythonPackages.editorconfig: refactor move to python-modules --- .../python-modules/editorconfig/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +-------------- 2 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/editorconfig/default.nix diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix new file mode 100644 index 00000000000..82338bbcc8f --- /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.0"; + + # 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b5605b3cf7..e32e89fe758 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1712,30 +1712,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 { }; From 7fde0dd2ef2a86f2e28074645e6774d0cacff10d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:23:31 -0400 Subject: [PATCH 167/475] pythonPackages.etcd: refactor move to python-modules --- .../python-modules/etcd/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------- 2 files changed, 35 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/etcd/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e32e89fe758..4578dd17007 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1730,31 +1730,7 @@ 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 {}; From 8ea312f7714115d8c0ab18684ed08dc8e53a360b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:31:19 -0400 Subject: [PATCH 168/475] pythonPackages.eventlib: refactor move to python-modules --- .../python-modules/eventlib/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +--------------- 2 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/eventlib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4578dd17007..b9bc8db9b8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1736,31 +1736,7 @@ in { 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 { }; From 3c36c02ca58efe53553efb5c6990fe472cf28d37 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:34:55 -0400 Subject: [PATCH 169/475] pythonPackages.eyeD3: refactor move to python-modules --- .../python-modules/eyed3/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 35 +--------------- 2 files changed, 43 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/python-modules/eyed3/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9bc8db9b8e..345dfa6892f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1740,40 +1740,7 @@ in { events = callPackage ../development/python-modules/events { }; - eyeD3 = buildPythonPackage rec { - version = "0.7.8"; - name = "eyeD3-${version}"; - disabled = isPyPy; - - 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. - ''; - }; - }; + eyeD3 = callPackage ../development/python-modules/eyed3 { }; execnet = buildPythonPackage rec { name = "${pname}-${version}"; From 9ffd373ff1958965ac99566650547a90ad3e410e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:37:32 -0400 Subject: [PATCH 170/475] pythonPackages.execnet: refactor move to python-modules --- .../python-modules/execnet/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------ 2 files changed, 43 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/execnet/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 345dfa6892f..208a2e4cc0f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1742,34 +1742,7 @@ in { eyeD3 = callPackage ../development/python-modules/eyed3 { }; - 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 {}; From 09d6b372d60a22eaa9cd9b941b24949bd43dc977 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:40:57 -0400 Subject: [PATCH 171/475] pythonPackages.fake_factory: refactor move to python-modules --- .../python-modules/fake_factory/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------ 2 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/fake_factory/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 208a2e4cc0f..a597d426401 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1754,28 +1754,7 @@ in { faker = callPackage ../development/python-modules/faker { }; - fake_factory = buildPythonPackage rec { - name = "fake-factory-${version}"; - version = "0.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/fake-factory/${name}.tar.gz"; - sha256 = "09sgk0kylsshs64a1xsz3qr187sbnqrbf4z8k3dgsy32lsgyffv2"; - }; - - 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; - }; - }; + fake_factory = callPackage ../development/python-modules/fake_factory { }; factory_boy = buildPythonPackage rec { name = "factory_boy-${version}"; From f8465776dd933fb81bf622485dc41756d88c1335 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:43:20 -0400 Subject: [PATCH 172/475] pythonPackages.factory_boy: refactor move to python-modules --- .../python-modules/factory_boy/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/factory_boy/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a597d426401..4b005c290a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1756,23 +1756,7 @@ in { fake_factory = callPackage ../development/python-modules/fake_factory { }; - 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; - }; - }; + factory_boy = callPackage ../development/python-modules/factory_boy { }; Fabric = callPackage ../development/python-modules/Fabric { }; From 49a61ab978f8ebd8fc91b8dc298dda02c40aabb6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:47:17 -0400 Subject: [PATCH 173/475] pythonPackages.flowlogs_reader: refactor move to python-modules --- .../flowlogs_reader/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------- 2 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/flowlogs_reader/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b005c290a9..107d5d58b98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1768,28 +1768,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 {}; From c9b960cdffa19e4e03daf90a3d9a7f93a171e640 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:55:39 -0400 Subject: [PATCH 174/475] pythonPackages.fudge: refactor move to python-modules --- .../python-modules/fudge/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 ++++----------- 2 files changed, 41 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/fudge/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 107d5d58b98..4b46925285b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1784,30 +1784,17 @@ 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"; From a3f18ca87f6b76ad039d1e935658178cce3890f6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:58:13 -0400 Subject: [PATCH 175/475] pythonPackages.funcparserlib: refactor move to python-modules --- .../python-modules/funcparserlib/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------- 2 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/funcparserlib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b46925285b..78991a228cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1796,28 +1796,7 @@ in { }; }); - 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 { }; From 56739bc25feccb9d83f93d8fa183028032cdef88 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:01:07 -0400 Subject: [PATCH 176/475] pythonPackages.functools32: refactor move to python-modules --- .../python-modules/functools32/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/functools32/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78991a228cc..d846e9b99ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1800,21 +1800,7 @@ in { fastcache = callPackage ../development/python-modules/fastcache { }; - functools32 = if isPy3k then null else buildPythonPackage rec { - name = "functools32-${version}"; - version = "3.2.3-2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/functools32/functools32-${version}.tar.gz"; - 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"; - }; - }; + functools32 = callPackage ../development/python-modules/functools32 { }; gateone = buildPythonPackage rec { name = "gateone-1.2-0d57c3"; From 076857913fa207c5842d00b3a531171fa16067c2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:04:15 -0400 Subject: [PATCH 177/475] pythonPackages.gateone: refactor move to python-modules --- .../python-modules/gateone/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +---------- 2 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/gateone/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d846e9b99ec..4828b667911 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1802,26 +1802,7 @@ in { functools32 = callPackage ../development/python-modules/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 - ''; - }; + gateone = callPackage ../development/python-modules/gateone { }; gcutil = buildPythonPackage rec { name = "gcutil-1.16.1"; From b0e0dd399b92cd1a1e578b5b638a1dec8910cd63 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:12:25 -0400 Subject: [PATCH 178/475] pythonPackages.ipaddr: refactor move to python-modules --- .../python-modules/ipaddr/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/ipaddr/default.nix diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix new file mode 100644 index 00000000000..4325e6ea884 --- /dev/null +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "ipaddr"; + version = "2.1.11"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"; + }; + + meta = with stdenv.lib; { + description = "Google's IP address manipulation library"; + homepage = http://code.google.com/p/ipaddr-py/; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4828b667911..8eab8cd96ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5618,22 +5618,7 @@ in { ipywidgets = callPackage ../development/python-modules/ipywidgets { }; - ipaddr = buildPythonPackage rec { - name = "ipaddr-${version}"; - version = "2.1.11"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipaddr/${name}.tar.gz"; - sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"; - }; - - meta = { - description = "Google's IP address manipulation library"; - homepage = http://code.google.com/p/ipaddr-py/; - license = licenses.asl20; - }; - }; + ipaddr = callPackage ../development/python-modules/ipaddr { }; ipaddress = if (pythonAtLeast "3.3") then null else buildPythonPackage rec { name = "ipaddress-1.0.18"; From 1504902b9406aa61d04886f3746370a7538f3129 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:12:58 -0400 Subject: [PATCH 179/475] pythonPackages.gcutil: refactor fix broken move to python-modules --- .../python-modules/gcutil/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +-------------- 2 files changed, 42 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/gcutil/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8eab8cd96ec..4b5373ed87e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1804,38 +1804,7 @@ in { gateone = callPackage ../development/python-modules/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 { }; From 82d27cd4f48103100b01b4ad153d922f76c35457 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:17:00 -0400 Subject: [PATCH 180/475] pythonPackages.ipaddress: refactor move to python-modules --- .../python-modules/ipaddress/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/ipaddress/default.nix diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix new file mode 100644 index 00000000000..5052c3dc2f4 --- /dev/null +++ b/pkgs/development/python-modules/ipaddress/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, python +}: + +if (pythonAtLeast "3.3") then null else buildPythonPackage rec { + pname = "ipaddress"; + version = "1.0.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q8klj9d84cmxgz66073x1j35cplr3r77vx1znhxiwl5w74391ax"; + }; + + checkPhase = '' + ${python.interpreter} test_ipaddress.py + ''; + + meta = with stdenv.lib; { + description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2"; + homepage = https://github.com/phihag/ipaddress; + license = licenses.psfl; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b5373ed87e..39513bc8ee7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5589,24 +5589,7 @@ in { ipaddr = callPackage ../development/python-modules/ipaddr { }; - ipaddress = if (pythonAtLeast "3.3") then null else buildPythonPackage rec { - name = "ipaddress-1.0.18"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipaddress/${name}.tar.gz"; - sha256 = "1q8klj9d84cmxgz66073x1j35cplr3r77vx1znhxiwl5w74391ax"; - }; - - checkPhase = '' - ${python.interpreter} test_ipaddress.py - ''; - - meta = { - description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2"; - homepage = https://github.com/phihag/ipaddress; - license = licenses.psfl; - }; - }; + ipaddress = callPackage ../development/python-modules/ipaddress { }; ipdb = buildPythonPackage rec { name = "ipdb-${version}"; From 2750333f9d11d734926c4ace755140721f8fbb59 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:30:08 -0400 Subject: [PATCH 181/475] pythonPackages.ipdb: refactor move to python-modules --- .../python-modules/ipdb/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +------- 2 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/ipdb/default.nix diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix new file mode 100644 index 00000000000..3203963b29d --- /dev/null +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ipython +, isPyPy +}: + +buildPythonPackage rec { + pname = "ipdb"; + version = "0.8.1"; + disabled = isPyPy; # setupterm: could not find terminfo database + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1763d1564113f5eb89df77879a8d3213273c4d7ff93dcb37a3070cdf0c34fd7c"; + }; + + propagatedBuildInputs = [ ipython ]; + + meta = with stdenv.lib; { + homepage = https://github.com/gotcha/ipdb; + description = "IPython-enabled pdb"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39513bc8ee7..2bebd5a01fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5591,17 +5591,7 @@ in { ipaddress = callPackage ../development/python-modules/ipaddress { }; - ipdb = buildPythonPackage rec { - name = "ipdb-${version}"; - version = "0.8.1"; - - disabled = isPyPy; # setupterm: could not find terminfo database - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipdb/${name}.zip"; - sha256 = "1763d1564113f5eb89df77879a8d3213273c4d7ff93dcb37a3070cdf0c34fd7c"; - }; - propagatedBuildInputs = with self; [ ipython ]; - }; + ipdb = callPackage ../development/python-modules/ipdb { }; ipdbplugin = buildPythonPackage { name = "ipdbplugin-1.4"; From 85731ef51c8b4f7285547633f9b4eb99956a6199 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:30:32 -0400 Subject: [PATCH 182/475] pythonPackages.ipdbplugin: refactor move to python-modules --- .../python-modules/ipdbplugin/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 9 +------ 2 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/python-modules/ipdbplugin/default.nix diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix new file mode 100644 index 00000000000..1f5435461ab --- /dev/null +++ b/pkgs/development/python-modules/ipdbplugin/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, ipython +}: + +buildPythonPackage rec { + pname = "ipdbplugin"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "4778d78b5d0af1a2a6d341aed9e72eb73b1df6b179e145b4845d3a209137029c"; + }; + + propagatedBuildInputs = [ nose ipython ]; + + meta = with stdenv.lib; { + homepage = http://github.com/flavioamieiro/nose-ipdb/tree/master; + description = "Nose plugin to use iPdb instead of Pdb when tests fail"; + license = licenses.lgpl2; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bebd5a01fd..bda9da7b9fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5593,14 +5593,7 @@ in { ipdb = callPackage ../development/python-modules/ipdb { }; - ipdbplugin = buildPythonPackage { - name = "ipdbplugin-1.4"; - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipdbplugin/ipdbplugin-1.4.tar.gz"; - sha256 = "4778d78b5d0af1a2a6d341aed9e72eb73b1df6b179e145b4845d3a209137029c"; - }; - propagatedBuildInputs = with self; [ self.nose self.ipython ]; - }; + ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; pythonIRClib = buildPythonPackage rec { name = "irclib-${version}"; From d430e7ece13564115c4cd56ff61831cfc9610d39 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:33:23 -0400 Subject: [PATCH 183/475] pythonPackages.pythonIRClib: refactor move to python-modules --- .../python-modules/pythonirclib/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +-------------- 2 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/pythonirclib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bda9da7b9fa..9a5b151ac22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5595,32 +5595,7 @@ in { ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - pythonIRClib = buildPythonPackage rec { - name = "irclib-${version}"; - version = "0.4.8"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz"; - sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1"; - }; - - patches = [(pkgs.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 = with self; [ paver ]; - - disabled = isPy3k; - meta = { - description = "Python IRC library"; - homepage = https://bitbucket.org/jaraco/irc; - license = with licenses; [ lgpl21 ]; - }; - }; + pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; iso-639 = callPackage ../development/python-modules/iso-639 {}; From 1ff519e090bc2a83017d759690220a6810eef250 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:36:16 -0400 Subject: [PATCH 184/475] pythonPackages.j2cli: refactor move to python-modules --- .../python-modules/j2cli/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +-------------- 2 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/j2cli/default.nix diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix new file mode 100644 index 00000000000..d8da0d8f129 --- /dev/null +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, nose +, jinja2 +, pyyaml +}: + +buildPythonPackage rec { + pname = "j2cli"; + version = "0.3.1-0"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0y3w1x9935qzx8w6m2r6g4ghyjmxn33wryiif6xb56q7cj9w1433"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ jinja2 pyyaml ]; + + meta = with stdenv.lib; { + homepage = https://github.com/kolypto/j2cli; + description = "Jinja2 Command-Line Tool"; + license = licenses.bsd3; + longDescription = '' + J2Cli is a command-line tool for templating in shell-scripts, + leveraging the Jinja2 library. + ''; + maintainers = with maintainers; [ rushmorem ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a5b151ac22..4ca5b8cd45b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5611,33 +5611,7 @@ in { jellyfish = callPackage ../development/python-modules/jellyfish { }; - j2cli = buildPythonPackage rec { - name = "j2cli-${version}"; - version = "0.3.1-0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/j2cli/${name}.tar.gz"; - sha256 = "0y3w1x9935qzx8w6m2r6g4ghyjmxn33wryiif6xb56q7cj9w1433"; - }; - - disabled = !isPy27; - - buildInputs = [ self.nose ]; - - propagatedBuildInputs = with self; [ jinja2 pyyaml ]; - - meta = { - homepage = https://github.com/kolypto/j2cli; - description = "Jinja2 Command-Line Tool"; - license = licenses.bsd3; - longDescription = '' - J2Cli is a command-line tool for templating in shell-scripts, - leveraging the Jinja2 library. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ rushmorem ]; - }; - }; + j2cli = callPackage ../development/python-modules/j2cli { }; jinja2 = callPackage ../development/python-modules/jinja2 { }; From e137ac1db9d9007437dbb144ec8c8a6d457cab1c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:38:24 -0400 Subject: [PATCH 185/475] pythonPackages.jinja2_time: refactor move to python-modules --- .../python-modules/jinja2_time/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/jinja2_time/default.nix diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2_time/default.nix new file mode 100644 index 00000000000..69fbffa92b2 --- /dev/null +++ b/pkgs/development/python-modules/jinja2_time/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, arrow +, jinja2 +}: + +buildPythonPackage rec { + version = "0.2.0"; + pname = "jinja2-time"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni"; + }; + + propagatedBuildInputs = [ arrow jinja2 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/hackebrot/jinja2-time; + description = "Jinja2 Extension for Dates and Times"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ca5b8cd45b..6df28e5bcf1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5615,23 +5615,7 @@ in { jinja2 = callPackage ../development/python-modules/jinja2 { }; - jinja2_time = buildPythonPackage rec { - version = "0.2.0"; - name = "jinja2-time-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jinja2-time/${name}.tar.gz"; - sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni"; - }; - - propagatedBuildInputs = with self; [ arrow jinja2 ]; - - meta = { - homepage = https://github.com/hackebrot/jinja2-time; - description = "Jinja2 Extension for Dates and Times"; - license = licenses.mit; - }; - }; + jinja2_time = callPackage ../development/python-modules/jinja2_time { }; jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; From 62d972b0b149fff805db781638491873dd798c78 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:40:37 -0400 Subject: [PATCH 186/475] pythonPackages.jmespath: refactor move to python-modules --- .../python-modules/jmespath/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/jmespath/default.nix diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix new file mode 100644 index 00000000000..c4755b45eec --- /dev/null +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ply +, nose +}: + +buildPythonPackage rec { + pname = "jmespath"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0g9xvl69y7nr3w7ag4fsp6sm4fqf6vrqjw7504x2hzrrsh3ampq8"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ ply ]; + + meta = with stdenv.lib; { + homepage = https://github.com/boto/jmespath; + description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; + license = "BSD"; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6df28e5bcf1..16bead6f074 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5619,23 +5619,7 @@ in { jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; - jmespath = buildPythonPackage rec { - name = "jmespath-0.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jmespath/${name}.tar.gz"; - sha256 = "0g9xvl69y7nr3w7ag4fsp6sm4fqf6vrqjw7504x2hzrrsh3ampq8"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ ply ]; - - meta = { - homepage = https://github.com/boto/jmespath; - description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; - license = "BSD"; - }; - }; + jmespath = callPackage ../development/python-modules/jmespath { }; journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; From 63877c6a40d0b941483ccc2064ec4b0bd603ff87 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:43:27 -0400 Subject: [PATCH 187/475] pythonPackages.jsonpath_rw: refactor move to python-modules --- .../python-modules/jsonpath_rw/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +--------------- 2 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/jsonpath_rw/default.nix diff --git a/pkgs/development/python-modules/jsonpath_rw/default.nix b/pkgs/development/python-modules/jsonpath_rw/default.nix new file mode 100644 index 00000000000..a109404c06f --- /dev/null +++ b/pkgs/development/python-modules/jsonpath_rw/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPyPy +, ply +, six +, decorator +}: + +buildPythonPackage rec { + pname = "jsonpath-rw"; + version = "1.4.0"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fac4fbec"; + }; + + propagatedBuildInputs = [ ply six decorator ]; + + # ImportError: No module named tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/kennknowles/python-jsonpath-rw; + description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16bead6f074..7cc7e750762 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5641,31 +5641,7 @@ in { jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; - jsonpath_rw = buildPythonPackage rec { - name = "jsonpath-rw-${version}"; - version = "1.4.0"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsonpath-rw/${name}.tar.gz"; - sha256 = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fac4fbec"; - }; - - propagatedBuildInputs = with self; [ - ply - six - decorator - ]; - - # ImportError: No module named tests - doCheck = false; - - meta = { - homepage = https://github.com/kennknowles/python-jsonpath-rw; - description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming"; - license = licenses.asl20; - }; - }; + jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; kerberos = buildPythonPackage rec { name = "kerberos-1.2.4"; From 441bf57eca2ca5dd2b5503fe6d259e7fd2fa3c88 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:46:00 -0400 Subject: [PATCH 188/475] pythonPackages.kerberos: refactor move to python-modules --- .../python-modules/kerberos/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/kerberos/default.nix diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix new file mode 100644 index 00000000000..fdaec0d817d --- /dev/null +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkgs +}: + +buildPythonPackage rec { + pname = "kerberos"; + version = "1.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "11q9jhzdl88jh8jgn7cycq034m36g2ncxds7mr3vqkngpcirkx6n"; + }; + + buildInputs = [ pkgs.kerberos ]; + + meta = with stdenv.lib; { + description = "Kerberos high-level interface"; + homepage = https://pypi.python.org/pypi/kerberos; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cc7e750762..d894222bf1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5643,22 +5643,7 @@ in { jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; - kerberos = buildPythonPackage rec { - name = "kerberos-1.2.4"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/k/kerberos/${name}.tar.gz"; - sha256 = "11q9jhzdl88jh8jgn7cycq034m36g2ncxds7mr3vqkngpcirkx6n"; - }; - - buildInputs = [ pkgs.kerberos ]; - - meta = { - description = "Kerberos high-level interface"; - homepage = https://pypi.python.org/pypi/kerberos; - license = licenses.asl20; - }; - }; + kerberos = callPackage ../development/python-modules/kerberos { }; keyring = callPackage ../development/python-modules/keyring { }; From e5ca5a81a78e5e0a8d8b0e38ca4390e9ba0f7146 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:48:11 -0400 Subject: [PATCH 189/475] pythonPackages.lazy-object-proxy: refactor move to python-modules --- .../lazy-object-proxy/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/lazy-object-proxy/default.nix diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix new file mode 100644 index 00000000000..f72e71fd4bd --- /dev/null +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "lazy-object-proxy"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "22ed751a2c63c6cf718674fd7461b1dfc45215bab4751ca32b6c9b8cb2734cb3"; + }; + + buildInputs = [ pytest ]; + checkPhase = '' + py.test tests + ''; + + # Broken tests. Seem to be fixed upstream according to Travis. + doCheck = false; + + meta = with stdenv.lib; { + description = "A fast and thorough lazy object proxy"; + homepage = https://github.com/ionelmc/python-lazy-object-proxy; + license = with licenses; [ bsd2 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d894222bf1e..2d416e74f34 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5674,30 +5674,7 @@ in { lark-parser = callPackage ../development/python-modules/lark-parser { }; - lazy-object-proxy = buildPythonPackage rec { - name = "lazy-object-proxy-${version}"; - version = "1.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/lazy-object-proxy/${name}.tar.gz"; - sha256 = "22ed751a2c63c6cf718674fd7461b1dfc45215bab4751ca32b6c9b8cb2734cb3"; - }; - - buildInputs = with self; [ pytest ]; - checkPhase = '' - py.test tests - ''; - - # Broken tests. Seem to be fixed upstream according to Travis. - doCheck = false; - - meta = { - description = "A fast and thorough lazy object proxy"; - homepage = https://github.com/ionelmc/python-lazy-object-proxy; - license = with licenses; [ bsd2 ]; - }; - - }; + lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; ldaptor = callPackage ../development/python-modules/ldaptor { }; From a6e601869460d282d588963ecf3e14cf71d4cf48 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:52:40 -0400 Subject: [PATCH 190/475] pythonPackages.le: refactor move to python-modules --- .../development/python-modules/le/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------ 2 files changed, 31 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/le/default.nix diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix new file mode 100644 index 00000000000..cb0a8bc6348 --- /dev/null +++ b/pkgs/development/python-modules/le/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPy3k +, simplejson +, psutil +}: + +buildPythonPackage rec { + pname = "le"; + version = "1.4.29"; + + src = fetchurl { + url = "https://github.com/logentries/le/archive/v${version}.tar.gz"; + sha256 = "d29738937cb6e714b6ec2ae74b66b1983482ffd54b4faa40767af18509521d4c"; + }; + + disabled = isPy3k; + + doCheck = false; + + propagatedBuildInputs = [ simplejson psutil ]; + + meta = with stdenv.lib; { + homepage = https://github.com/rapid7/le; + description = "Logentries agent"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d416e74f34..0240dfe27cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5678,26 +5678,7 @@ in { ldaptor = callPackage ../development/python-modules/ldaptor { }; - le = buildPythonPackage rec { - name = "le-${version}"; - version = "1.4.29"; - - src = pkgs.fetchurl { - url = "https://github.com/logentries/le/archive/v${version}.tar.gz"; - sha256 = "d29738937cb6e714b6ec2ae74b66b1983482ffd54b4faa40767af18509521d4c"; - }; - - disabled = isPy3k; - - doCheck = false; - - propagatedBuildInputs = with self; [ simplejson psutil ]; - - meta = { - homepage = "https://github.com/logentries/le"; - description = "Logentries agent"; - }; - }; + le = callPackage ../development/python-modules/le { }; lektor = buildPythonPackage rec { name = "lektor-${version}"; From 7e8a4f67fefadd5598cc37d0d08dba1c1a336a99 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:56:42 -0400 Subject: [PATCH 191/475] pythonPackages.lektor: refactor move to python-modules --- .../python-modules/lektor/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +----------- 2 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/lektor/default.nix diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix new file mode 100644 index 00000000000..6eb84043d78 --- /dev/null +++ b/pkgs/development/python-modules/lektor/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, click +, watchdog +, exifread +, requests +, mistune +, inifile +, Babel +, jinja2 +, flask +, pyopenssl +, ndg-httpsclient +, pkgs +}: + +buildPythonPackage rec { + pname = "lektor"; + version = "2.3"; + + src = fetchgit { + url = "https://github.com/lektor/lektor"; + rev = "refs/tags/${version}"; + sha256 = "1n0ylh1sbpvi9li3g6a7j7m28njfibn10y6s2gayjxwm6fpphqxy"; + }; + + buildInputs = [ pkgs.glibcLocales ]; + propagatedBuildInputs = [ + click watchdog exifread requests mistune inifile Babel jinja2 + flask pyopenssl ndg-httpsclient + ]; + + LC_ALL="en_US.UTF-8"; + + # No tests included in archive + doCheck = false; + + meta = with stdenv.lib; { + description = "A static content management system"; + homepage = "https://www.getlektor.com/"; + license = licenses.bsd0; + maintainers = with maintainers; [ vozz ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0240dfe27cd..2ce4f5cb984 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5680,34 +5680,7 @@ in { le = callPackage ../development/python-modules/le { }; - lektor = buildPythonPackage rec { - name = "lektor-${version}"; - - version = "2.3"; - - src = pkgs.fetchgit { - url = "https://github.com/lektor/lektor"; - rev = "refs/tags/${version}"; - sha256 = "1n0ylh1sbpvi9li3g6a7j7m28njfibn10y6s2gayjxwm6fpphqxy"; - }; - - LC_ALL="en_US.UTF-8"; - - meta = { - description = "A static content management system"; - homepage = "https://www.getlektor.com/"; - license = "BSD"; - maintainers = with maintainers; [ vozz ]; - }; - - # No tests included in archive - doCheck = false; - - propagatedBuildInputs = with self; [ - click watchdog exifread requests mistune inifile Babel jinja2 - flask pyopenssl ndg-httpsclient pkgs.glibcLocales - ]; - }; + lektor = callPackage ../development/python-modules/lektor { }; python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; From 599b9045bae6deac0683610bf8f0bad86dd1ac1b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:59:06 -0400 Subject: [PATCH 192/475] pythonPackages.python-Levenshtein: refactor move to python-modules --- .../python-levenshtein/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/python-levenshtein/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ce4f5cb984..80bb7a51a90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5686,25 +5686,7 @@ in { python_openzwave = callPackage ../development/python-modules/python_openzwave { }; - python-Levenshtein = buildPythonPackage rec { - name = "python-Levenshtein-${version}"; - version = "0.12.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-Levenshtein/${name}.tar.gz"; - sha256 = "1c9ybqcja31nghfcc8xxbbz9h60s9qi12b9hr4jyl69xbvg12fh3"; - }; - - # No tests included in archive - doCheck = false; - - meta = { - 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 ]; - }; - }; + python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; libcloud = buildPythonPackage (rec { name = "libcloud-1.2.1"; From 67550913a43bdb2060a2d660498d65c03af36b37 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:02:51 -0400 Subject: [PATCH 193/475] pythonPackages.libcloud: refactor move to python-modules --- .../python-modules/libcloud/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------ 2 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/libcloud/default.nix diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix new file mode 100644 index 00000000000..90688d8e4ea --- /dev/null +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, mock +, pycrypto +}: + +buildPythonPackage rec { + pname = "apache-libcloud"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qlhyz5f32xg8i10biyzqscks8d28vklk63hvj45vzy1amw60kqz"; + }; + + buildInputs = [ mock ]; + propagatedBuildInputs = [ pycrypto ]; + + preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; + + # failing tests for 26 and 27 + doCheck = false; + + meta = with stdenv.lib; { + description = "A unified interface to many cloud providers"; + homepage = http://incubator.apache.org/libcloud/; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80bb7a51a90..244d534f6c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5688,27 +5688,7 @@ in { python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; - libcloud = buildPythonPackage (rec { - name = "libcloud-1.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/apache-libcloud/apache-${name}.tar.bz2"; - sha256 = "0qlhyz5f32xg8i10biyzqscks8d28vklk63hvj45vzy1amw60kqz"; - }; - - buildInputs = with self; [ mock ]; - - propagatedBuildInputs = with self; [ pycrypto ]; - preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; - - # failing tests for 26 and 27 - doCheck = false; - - meta = { - description = "A unified interface to many cloud providers"; - homepage = http://incubator.apache.org/libcloud/; - }; - }); + libcloud = callPackage ../development/python-modules/libcloud { }; libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; From 61552d789385680d5ac30f6e2afc4c82d97291b2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:05:43 -0400 Subject: [PATCH 194/475] pythonPackages.limnoria: refactor move to python-modules --- .../python-modules/limnoria/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/limnoria/default.nix diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix new file mode 100644 index 00000000000..96490c8f0a0 --- /dev/null +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkgs +}: + +buildPythonPackage rec { + pname = "limnoria"; + version = "2016.05.06"; + + src = fetchPypi { + inherit pname version; + sha256 = "09kbii5559d09jjb6cryj8rva1050r54dvb67hlcvxhy8g3gr1y3"; + }; + + patchPhase = '' + sed -i 's/version=version/version="${version}"/' setup.py + ''; + buildInputs = [ pkgs.git ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A modified version of Supybot, an IRC bot"; + homepage = http://supybot.fr.cr; + license = licenses.bsd3; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 244d534f6c3..174eed85c3b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5717,30 +5717,7 @@ in { limits = callPackage ../development/python-modules/limits { }; - limnoria = buildPythonPackage rec { - name = "limnoria-${version}"; - version = "2016.05.06"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/limnoria/${name}.tar.gz"; - sha256 = "09kbii5559d09jjb6cryj8rva1050r54dvb67hlcvxhy8g3gr1y3"; - }; - - patchPhase = '' - sed -i 's/version=version/version="${version}"/' setup.py - ''; - buildInputs = with self; [ pkgs.git ]; - propagatedBuildInputs = with self; [ ]; - - doCheck = false; - - meta = { - description = "A modified version of Supybot, an IRC bot"; - homepage = http://supybot.fr.cr; - license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu ]; - }; - }; + limnoria = callPackage ../development/python-modules/limnoria { }; line_profiler = callPackage ../development/python-modules/line_profiler { }; From 3f60a4cce4dd29a82b4ab76fcd7ca5e775234721 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:07:54 -0400 Subject: [PATCH 195/475] pythonPackages.linode: refactor move to python-modules --- .../python-modules/linode/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/linode/default.nix diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix new file mode 100644 index 00000000000..d0c8b0ff794 --- /dev/null +++ b/pkgs/development/python-modules/linode/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "linode"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "db3c2a7fab8966d903a63f16c515bff241533e4ef2d746aa7aae4a49bba5e573"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ghickman/linode"; + description = "A thin python wrapper around Linode's API"; + license = licenses.mit; + maintainers = with maintainers; [ nslqqq ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 174eed85c3b..8cf847a07c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5721,24 +5721,7 @@ in { line_profiler = callPackage ../development/python-modules/line_profiler { }; - linode = buildPythonPackage rec { - name = "linode-${version}"; - version = "0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/linode/linode-${version}.tar.gz"; - sha256 = "db3c2a7fab8966d903a63f16c515bff241533e4ef2d746aa7aae4a49bba5e573"; - }; - - propagatedBuildInputs = with self; [ requests ]; - - meta = { - homepage = "https://github.com/ghickman/linode"; - description = "A thin python wrapper around Linode's API"; - license = licenses.mit; - maintainers = with maintainers; [ nslqqq ]; - }; - }; + linode = callPackage ../development/python-modules/linode { }; linode-api = callPackage ../development/python-modules/linode-api { }; From 93e026ce04df3b495ba70bcf7747a3533af5d5d9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:10:16 -0400 Subject: [PATCH 196/475] pythonPackages.lxc: refactor move to python-modules --- .../python-modules/lxc/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/lxc/default.nix diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix new file mode 100644 index 00000000000..a078d33a889 --- /dev/null +++ b/pkgs/development/python-modules/lxc/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pkgs +}: + +buildPythonPackage rec { + pname = "python-lxc-unstable"; + version = "2016-08-25"; + disabled = isPy3k; + + src = fetchFromGitHub { + owner = "lxc"; + repo = "python2-lxc"; + rev = "0553f05d23b56b59bf3015fa5e45bfbfab9021ef"; + sha256 = "0p9kb20xvq91gx2wfs3vppb7vsp8kmd90i3q95l4nl1y4aismdn4"; + }; + + buildInputs = [ pkgs.lxc ]; + + meta = with stdenv.lib; { + description = "Out of tree python 2.7 binding for liblxc"; + homepage = https://github.com/lxc/python2-lxc; + license = licenses.lgpl2; + maintainers = with maintainers; [ mic92 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cf847a07c3..c259ed984c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5765,26 +5765,7 @@ in { lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt;}; - lxc = buildPythonPackage (rec { - name = "python-lxc-unstable-2016-08-25"; - disabled = !isPy27; - - src = pkgs.fetchFromGitHub { - owner = "lxc"; - repo = "python2-lxc"; - rev = "0553f05d23b56b59bf3015fa5e45bfbfab9021ef"; - sha256 = "0p9kb20xvq91gx2wfs3vppb7vsp8kmd90i3q95l4nl1y4aismdn4"; - }; - - buildInputs = [ pkgs.lxc ]; - - meta = { - description = "Out of tree python 2.7 binding for liblxc"; - homepage = https://github.com/lxc/python2-lxc; - license = licenses.lgpl2; - maintainers = with maintainers; [ mic92 ]; - }; - }); + lxc = callPackage ../development/python-modules/lxc { }; py_scrypt = callPackage ../development/python-modules/py_scrypt { }; From a8d1e5c4a5d1feb3d89db012e9e0267e3570a4fa Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:13:23 -0400 Subject: [PATCH 197/475] pythonPackages.magic: refactor move to python-modules --- .../python-modules/magic/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/magic/default.nix diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix new file mode 100644 index 00000000000..41c932ed111 --- /dev/null +++ b/pkgs/development/python-modules/magic/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, pkgs +}: + +buildPythonPackage rec { + name = "${pkgs.file.name}"; + + src = pkgs.file.src; + + patchPhase = '' + substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + buildInputs = [ pkgs.file ]; + + preConfigure = "cd python"; + + # No test suite + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python wrapper around libmagic"; + homepage = http://www.darwinsys.com/file/; + license = licenses.lgpl2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c259ed984c5..85082f28490 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5771,27 +5771,7 @@ in { python_magic = callPackage ../development/python-modules/python-magic { }; - magic = buildPythonPackage rec { - name = "${pkgs.file.name}"; - - src = pkgs.file.src; - - patchPhase = '' - substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - - buildInputs = with self; [ pkgs.file ]; - - preConfigure = "cd python"; - - # No test suite - doCheck = false; - - meta = { - description = "A Python wrapper around libmagic"; - homepage = http://www.darwinsys.com/file/; - }; - }; + magic = callPackage ../development/python-modules/magic { }; m2crypto = buildPythonPackage rec { version = "0.24.0"; From 03a19a19d9b72738d7b8885759875b2387e25245 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:16:23 -0400 Subject: [PATCH 198/475] pythonPackages.m2crypto: refactor move to python-modules --- .../python-modules/m2crypto/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------- 2 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/m2crypto/default.nix diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix new file mode 100644 index 00000000000..87a74c79f55 --- /dev/null +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkgs +}: + + +buildPythonPackage rec { + version = "0.24.0"; + pname = "M2Crypto"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s2y0pf2zg7xf4nfwrw7zhwbk615r5a7bgi5wwkwzh6jl50n99c0"; + }; + + buildInputs = [ pkgs.swig2 pkgs.openssl ]; + + preConfigure = '' + substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${pkgs.openssl.dev}'" + ''; + + doCheck = false; # another test that depends on the network. + + meta = with stdenv.lib; { + description = "A Python crypto and SSL toolkit"; + homepage = http://chandlerproject.org/Projects/MeTooCrypto; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85082f28490..34603d6d9b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5773,28 +5773,7 @@ in { magic = callPackage ../development/python-modules/magic { }; - m2crypto = buildPythonPackage rec { - version = "0.24.0"; - name = "m2crypto-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/M2Crypto/M2Crypto-${version}.tar.gz"; - sha256 = "1s2y0pf2zg7xf4nfwrw7zhwbk615r5a7bgi5wwkwzh6jl50n99c0"; - }; - - buildInputs = with self; [ pkgs.swig2 pkgs.openssl ]; - - preConfigure = '' - substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${pkgs.openssl.dev}'" - ''; - - doCheck = false; # another test that depends on the network. - - meta = { - description = "A Python crypto and SSL toolkit"; - homepage = http://chandlerproject.org/Projects/MeTooCrypto; - }; - }; + m2crypto = callPackage ../development/python-modules/m2crypto { }; Mako = callPackage ../development/python-modules/Mako { }; From d5fa9ee54188727466cbf6b1b654352af31a757b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:18:52 -0400 Subject: [PATCH 199/475] pythonPackages.markupsafe: refactor move to python-modules --- .../python-modules/markupsafe/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/markupsafe/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34603d6d9b7..9be36299647 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5799,22 +5799,7 @@ in { marisa-trie = callPackage ../development/python-modules/marisa-trie { }; - markupsafe = buildPythonPackage rec { - name = "markupsafe-${version}"; - version = "1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/MarkupSafe/MarkupSafe-${version}.tar.gz"; - sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6"; - }; - - meta = { - description = "Implements a XML/HTML/XHTML Markup safe string"; - homepage = http://dev.pocoo.org; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar garbas ]; - }; - }; + markupsafe = callPackage ../development/python-modules/markupsafe { }; marshmallow = callPackage ../development/python-modules/marshmallow { }; From 1bbb17afe54afc8738263cbc05fb1bfc84439869 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:21:25 -0400 Subject: [PATCH 200/475] pythonPackages.manuel: refactor move to python-modules --- .../python-modules/manuel/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/manuel/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9be36299647..94bdcf014a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5805,23 +5805,7 @@ in { marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { }; - manuel = buildPythonPackage rec { - name = "manuel-${version}"; - version = "1.8.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/manuel/${name}.tar.gz"; - sha256 = "1diyj6a8bvz2cdf9m0g2bbx9z2yjjnn3ylbg1zinpcjj6vldfx59"; - }; - - propagatedBuildInputs = with self; [ six zope_testing ]; - - meta = { - description = "A documentation builder"; - homepage = https://pypi.python.org/pypi/manuel; - license = licenses.zpl20; - }; - }; + manuel = callPackage ../development/python-modules/manuel { }; mapsplotlib = buildPythonPackage rec { name = "mapsplotlib-${version}"; From d70a0fc07937b28843c8e552dafb63b68dda0a3c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:44:05 -0400 Subject: [PATCH 201/475] pythonPackages.mapsplotlib: refactor move to python-modules --- .../python-modules/mapsplotlib/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------- 2 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/mapsplotlib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94bdcf014a8..95314d94d35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5807,25 +5807,7 @@ in { manuel = callPackage ../development/python-modules/manuel { }; - mapsplotlib = buildPythonPackage rec { - name = "mapsplotlib-${version}"; - version = "1.0.6"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mapsplotlib/${name}.tar.gz"; - sha256 = "09gpws3x0jd88n636baxx5izjffrpjy4j6jl8l7vj29yzvrdr2bp"; - }; - - propagatedBuildInputs = with self; [ matplotlib scipy pandas requests pillow ]; - - meta = { - description = "Custom Python plots on a Google Maps background"; - homepage = https://github.com/tcassou/mapsplotlib; - maintainers = [ maintainers.rob ]; - }; - }; + mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; markdown = callPackage ../development/python-modules/markdown { }; From 6f01ed332bda74b937714806b26b669ccf154c68 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:45:33 -0400 Subject: [PATCH 202/475] pythonPackages.markdown-macros: refactor move to python-modules --- .../markdown-macros/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 --------------- 2 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/markdown-macros/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95314d94d35..0c4845974fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5813,39 +5813,6 @@ in { markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; - markdown-macros = buildPythonPackage rec { - name = "markdown-macros-${version}"; - version = "0.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/markdown-macros/${name}.tar.gz"; - sha256 = "1lzvrb7nci22yp21ab2qqc9p0fhkazqj29vw0wln2r4ckb2nbawv"; - }; - - patches = [ - # Fixes a bug with markdown>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" From 5ec1bfa7fc95198db0656a1b8cf95ca7d54ad8ad Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:46:49 -0400 Subject: [PATCH 203/475] pythonPackages.mathics: refactor move to python-modules --- .../python-modules/mathics/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 44 +--------------- 2 files changed, 52 insertions(+), 42 deletions(-) create mode 100644 pkgs/development/python-modules/mathics/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c4845974fa..af4e51df2db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5813,49 +5813,9 @@ in { markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; - 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; From 1308d1108a33aeaa83cd5489c2c1920e9734cd90 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:47:59 -0400 Subject: [PATCH 204/475] pythonPackages.mechanize: refactor move to python-modules --- .../python-modules/mechanize/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/mechanize/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af4e51df2db..4882fb671af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5829,27 +5829,7 @@ 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 { }; From f5a4b625dbb0ba3e56befbd0c1f61bda434fc8dd Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:48:50 -0400 Subject: [PATCH 205/475] pythonPackage.meld3: refactor move to python-modules --- .../python-modules/meld3/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/meld3/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4882fb671af..8f815b0c69b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5833,22 +5833,7 @@ in { 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 {}; From 0edde48336aaf204a4a48a7ea90ac67f0f51248c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:49:46 -0400 Subject: [PATCH 206/475] pythonPackages.memcached: refactor move to python-modules --- .../python-modules/memcached/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/memcached/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f815b0c69b..ea3c013fe13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5839,23 +5839,7 @@ in { meinheld = callPackage ../development/python-modules/meinheld { }; - memcached = buildPythonPackage rec { - name = "memcached-1.51"; - - 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/; - }; - }; - + memcached = callPackage ../development/python-modules/memcached { }; memory_profiler = buildPythonPackage rec { name = "memory_profiler-${version}"; From 815fdff2ff81d149ae1ef9d634999796604fe552 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:50:34 -0400 Subject: [PATCH 207/475] pythonPackages.memory_profiler: refactor move to python-modules --- .../memory_profiler/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/memory_profiler/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea3c013fe13..33765975b06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5841,24 +5841,7 @@ in { memcached = callPackage ../development/python-modules/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 { }; From 348b2fb38c5d7f41c5c58448e16db822c951f521 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:36:16 -0400 Subject: [PATCH 208/475] pythonPackages.gmusicapi: refactor move to python-modules --- .../python-modules/gmusicapi/default.nix | 37 +++++++++++++++++++ .../python-modules/helper/default.nix | 29 +++++++++++++++ .../python-modules/hovercraft/default.nix | 36 ++++++++++++++++++ .../python-modules/hsaudiotag/default.nix | 26 +++++++++++++ .../python-modules/hsaudiotag3k/default.nix | 26 +++++++++++++ .../python-modules/httpauth/default.nix | 24 ++++++++++++ .../python-modules/humanize/default.nix | 28 ++++++++++++++ pkgs/top-level/python-packages.nix | 32 +--------------- 8 files changed, 207 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/gmusicapi/default.nix create mode 100644 pkgs/development/python-modules/helper/default.nix create mode 100644 pkgs/development/python-modules/hovercraft/default.nix create mode 100644 pkgs/development/python-modules/hsaudiotag/default.nix create mode 100644 pkgs/development/python-modules/hsaudiotag3k/default.nix create mode 100644 pkgs/development/python-modules/httpauth/default.nix create mode 100644 pkgs/development/python-modules/humanize/default.nix 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/helper/default.nix b/pkgs/development/python-modules/helper/default.nix new file mode 100644 index 00000000000..1f151ebd9ef --- /dev/null +++ b/pkgs/development/python-modules/helper/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, mock +, pyyaml +}: + +buildPythonPackage rec { + pname = "helper"; + version = "2.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e33dde42ad4df30fb7790689f93d77252cff26a565610d03ff2e434865a53a2"; + }; + + buildInputs = [ mock ]; + propagatedBuildInputs = [ pyyaml ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Development library for quickly writing configurable applications and daemons"; + homepage = https://helper.readthedocs.org/; + license = licenses.bsd3; + }; + +} 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/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/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/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix new file mode 100644 index 00000000000..25c335c0016 --- /dev/null +++ b/pkgs/development/python-modules/humanize/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, mock +}: + +buildPythonPackage rec { + version = "0.5.1"; + pname = "humanize"; + + src = fetchPypi { + inherit pname version; + sha256 = "a43f57115831ac7c70de098e6ac46ac13be00d69abbf60bdcac251344785bb19"; + }; + + buildInputs = [ mock ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python humanize utilities"; + homepage = https://github.com/jmoiron/humanize; + license = licenses.mit; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; # can only test on linux + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33765975b06..cb53bafac47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1812,38 +1812,8 @@ 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"; - }; - - 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"; From 74472620cea29ee372e81200d64117d0e14619ae Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:37:11 -0400 Subject: [PATCH 209/475] pythonPackages.gnureadline: refactor move to python-modules --- .../python-modules/gnureadline/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------- 2 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/gnureadline/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb53bafac47..247bf21c694 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1814,22 +1814,7 @@ in { gmusicapi = callPackage ../development/python-modules/gmusicapi { }; - - 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" - ''; - }; + gnureadline = callPackage ../development/python-modules/gnureadline { }; gnutls = buildPythonPackage rec { pname = "python-gnutls"; From 522a8a84d2b10cb3525f0552398a38754ebcc783 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:37:42 -0400 Subject: [PATCH 210/475] pythonPackages.gnutls: refactor move to python-modules --- .../python-modules/gnutls/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +--------- 2 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/gnutls/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 247bf21c694..589694b441d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1816,22 +1816,7 @@ in { gnureadline = callPackage ../development/python-modules/gnureadline { }; - 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 { }; From 99ce4fa5d6b7e3fe185be08620b33e1ce8b3895a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:38:16 -0400 Subject: [PATCH 211/475] pythonPackages.gpsoauth: refactor move to python-modules --- .../python-modules/gpsoauth/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 +---------------- 2 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/gpsoauth/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 589694b441d..1a8b564d7b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1838,37 +1838,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 { }; From ce6ed524b3763f3bcb0116e86e118067f4b24f9b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:38:46 -0400 Subject: [PATCH 212/475] pythonPackages.gtimelog: refactor move to python-modules --- .../python-modules/gtimelog/default.nix | 44 +++++ pkgs/top-level/python-packages.nix | 166 +----------------- 2 files changed, 51 insertions(+), 159 deletions(-) create mode 100644 pkgs/development/python-modules/gtimelog/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a8b564d7b8..7e443419c41 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1846,41 +1846,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 { @@ -1892,143 +1858,25 @@ in { hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - helper = buildPythonPackage rec { - pname = "helper"; - version = "2.4.1"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/${pname}/${name}.tar.gz"; - sha256 = "4e33dde42ad4df30fb7790689f93d77252cff26a565610d03ff2e434865a53a2"; - }; - - buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ pyyaml ]; - - # No tests - doCheck = false; - - meta = { - description = "Development library for quickly writing configurable applications and daemons"; - homepage = https://helper.readthedocs.org/; - license = licenses.bsd3; - }; - - - }; + helper = callPackage ../development/python-modules/helper { }; hiro = callPackage ../development/python-modules/hiro {}; 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 = callPacakge ../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 = callPacakge ../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 { }; From 80f7dc9c5572b7561a116ebf3b1b6df5905aee23 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:39:15 -0400 Subject: [PATCH 213/475] pythonPackages.imagesize: refactor move to python-modules --- .../python-modules/imagesize/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +-------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/imagesize/default.nix diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix new file mode 100644 index 00000000000..32a8310334a --- /dev/null +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "imagesize"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0msgz4ncp2nb5nbsxnf8kvxsl6nhwvc3b46ik097fvznl3y10gdv"; + }; + + meta = with stdenv.lib; { + description = "Getting image size from png/jpeg/jpeg2000/gif file"; + homepage = https://github.com/shibukawa/imagesize_py; + license = with licenses; [ mit ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e443419c41..1d7fcc8c62a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1884,22 +1884,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 { }; From 8d57d4fbe81813a26609db5398d53eb6e00f7222 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:39:44 -0400 Subject: [PATCH 214/475] pythonPackages.imread: refactor move to python-modules --- .../python-modules/imread/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +---------------- 2 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/imread/default.nix diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix new file mode 100644 index 00000000000..9a67568d9e5 --- /dev/null +++ b/pkgs/development/python-modules/imread/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, nose +, pkgs +, numpy +}: + +buildPythonPackage rec { + pname = "python-imread"; + version = "0.6"; + + src = pkgs.fetchurl { + url = "https://github.com/luispedro/imread/archive/release-${version}.tar.gz"; + sha256 = "0i14bc67200zhzxc41g5dfp2m0pr1zaa2gv59p2va1xw0ji2dc0f"; + }; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ nose pkgs.libjpeg pkgs.libpng pkgs.libtiff pkgs.libwebp ]; + propagatedBuildInputs = [ 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; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d7fcc8c62a..f20e1bbeeca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1892,33 +1892,7 @@ 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 { }; From 2fb2f7d4e401aba09481bf9af9875d0c149fa516 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:40:14 -0400 Subject: [PATCH 215/475] pythonPackages.ipfsapi: refactor move to python-modules --- .../python-modules/ipfsapi/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/ipfsapi/default.nix diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix new file mode 100644 index 00000000000..377ed8549cf --- /dev/null +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, six +, requests +}: + +buildPythonPackage rec { + pname = "ipfsapi"; + version = "0.4.2.post1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "ipfs"; + repo = "py-ipfs-api"; + rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61"; + sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn"; + }; + + propagatedBuildInputs = [ six requests ]; + + meta = with stdenv.lib; { + description = "A python client library for the IPFS API"; + license = licenses.mit; + maintainers = with maintainers; [ mguentner ]; + homepage = "https://pypi.python.org/pypi/ipfsapi"; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f20e1bbeeca..a698970d44d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1896,27 +1896,7 @@ in { imaplib2 = callPackage ../development/python-modules/imaplib2 { }; - ipfsapi = buildPythonPackage rec { - name = "ipfsapi-${version}"; - version = "0.4.2.post1"; - disabled = isPy27; - - src = pkgs.fetchFromGitHub { - owner = "ipfs"; - repo = "py-ipfs-api"; - rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61"; - sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn"; - }; - - propagatedBuildInputs = with self; [ six requests ]; - - meta = { - description = "A python client library for the IPFS API"; - license = licenses.mit; - maintainers = with maintainers; [ mguentner ]; - homepage = "https://pypi.python.org/pypi/ipfsapi"; - }; - }; + ipfsapi = callPackage ../development/python-modules/ipfsapi { }; itsdangerous = buildPythonPackage rec { name = "itsdangerous-0.24"; From 202f7192e32eebac673a426134209d41c01cd3a0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:40:42 -0400 Subject: [PATCH 216/475] pythonPackages.itsdangerous: refactor move to python-modules --- .../python-modules/itsdangerous/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------------ 2 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/itsdangerous/default.nix diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix new file mode 100644 index 00000000000..385708f436e --- /dev/null +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "itsdangerous"; + version = "0.24"; + + src = fetchPypi { + inherit pname version; + sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb"; + }; + + meta = with stdenv.lib; { + description = "Helpers to pass trusted data to untrusted environments and back"; + homepage = "https://pypi.python.org/pypi/itsdangerous/"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a698970d44d..3170da02b3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1898,19 +1898,7 @@ in { ipfsapi = callPackage ../development/python-modules/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/"; - }; - }; + itsdangerous = callPackage ../development/python-modules/itsdangerous { }; iniparse = buildPythonPackage rec { From 05887b8eede69e41903788dcc2dc86b5e6765c6a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:41:48 -0400 Subject: [PATCH 217/475] pythonPackages.iniparse: refactor move to python-modules --- .../python-modules/iniparse/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/iniparse/default.nix diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix new file mode 100644 index 00000000000..e0c2fd765c9 --- /dev/null +++ b/pkgs/development/python-modules/iniparse/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "iniparse"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0m60k46vr03x68jckachzsipav0bwhhnqb8715hm1cngs89fxhdb"; + }; + + checkPhase = '' + ${python.interpreter} runtests.py + ''; + + # Does not install tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Accessing and Modifying INI files"; + homepage = http://code.google.com/p/iniparse/; + license = licenses.mit; + maintainers = with maintainers; [ danbst ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3170da02b3f..d1fb19f8a7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1900,29 +1900,7 @@ in { itsdangerous = callPackage ../development/python-modules/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 ]; - }; - }; + iniparse = callPackage ../development/python-modules/iniparse { }; i3-py = buildPythonPackage rec { version = "0.6.4"; From 2c986a700d292b5929741141023a99cc9ea38224 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:42:16 -0400 Subject: [PATCH 218/475] pythonPackages.i3-py: refactor move to python-packages --- .../python-modules/i3-py/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/i3-py/default.nix diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix new file mode 100644 index 00000000000..e433cd51c20 --- /dev/null +++ b/pkgs/development/python-modules/i3-py/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "0.6.4"; + pname = "i3-py"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y"; + }; + + # no tests in tarball + doCheck = false; + + meta = with stdenv.lib; { + description = "Tools for i3 users and developers"; + homepage = "https://github.com/ziberna/i3-py"; + license = licenses.gpl3; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1fb19f8a7d..0e0be30c48a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1902,25 +1902,7 @@ in { iniparse = callPackage ../development/python-modules/iniparse { }; - 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 {}; From 036ccbc3ffac569f0de5d648a19f56852fd621ff Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:42:53 -0400 Subject: [PATCH 219/475] pythonPackages.jsonpointer: refactor move to python-modules --- .../python-modules/jsonpointer/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/jsonpointer/default.nix diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix new file mode 100644 index 00000000000..c07a4bf3a35 --- /dev/null +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jsonpointer"; + version = "1.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "39403b47a71aa782de6d80db3b78f8a5f68ad8dfc9e674ca3bb5b32c15ec7308"; + }; + + meta = with stdenv.lib; { + description = "Resolve JSON Pointers in Python"; + homepage = "https://github.com/stefankoegl/python-json-pointer"; + license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi" + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e0be30c48a..a38509b109c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1926,20 +1926,7 @@ 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 = buildPythonPackage rec { name = "jsonrpclib-${version}"; From d2d4cc9775823085d0967cd84922a62c9d2576d9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:43:17 -0400 Subject: [PATCH 220/475] pythonPackages.jsonrpclib: refactor move to python-modules --- .../python-modules/jsonrpclib/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/jsonrpclib/default.nix diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/pkgs/development/python-modules/jsonrpclib/default.nix new file mode 100644 index 00000000000..441de549a8e --- /dev/null +++ b/pkgs/development/python-modules/jsonrpclib/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, cjson +, isPy3k +}: + +buildPythonPackage rec { + pname = "jsonrpclib"; + version = "0.1.7"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; + }; + + propagatedBuildInputs = [ cjson ]; + + meta = with stdenv.lib; { + description = "JSON RPC client library"; + homepage = https://pypi.python.org/pypi/jsonrpclib/; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.joachifm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a38509b109c..414ae8a1901 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1928,26 +1928,7 @@ in { jsonpointer = callPackage ../development/python-modules/jsonpointer { }; - jsonrpclib = buildPythonPackage rec { - name = "jsonrpclib-${version}"; - version = "0.1.7"; - - disabled = !isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsonrpclib/${name}.tar.gz"; - sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; - }; - - propagatedBuildInputs = with self; [ cjson ]; - - meta = { - description = "JSON RPC client library"; - homepage = https://pypi.python.org/pypi/jsonrpclib/; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.joachifm ]; - }; - }; + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {}; From aa03d6cfc2058870ddac446da5d8607a30bcc0da Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:43:49 -0400 Subject: [PATCH 221/475] pythonPackages.jsonwatch: refactor move to python-modules --- .../python-modules/jsonwatch/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +-------------- 2 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/jsonwatch/default.nix diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix new file mode 100644 index 00000000000..177b0d4cfee --- /dev/null +++ b/pkgs/development/python-modules/jsonwatch/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, six +, isPyPy +}: + +buildPythonPackage rec { + pname = "jsonwatch"; + version = "0.2.0"; + disabled = isPyPy; # doesn't find setuptools + + src = fetchurl { + url = "https://github.com/dbohdan/jsonwatch/archive/v0.2.0.tar.gz"; + sha256 = "04b616ef97b9d8c3887004995420e52b72a4e0480a92dbf60aa6c50317261e06"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + 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; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 414ae8a1901..325a8e83977 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1932,33 +1932,7 @@ in { 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 {}; From 9163ad5f973a873d6df484af43aa49874154ae44 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:44:31 -0400 Subject: [PATCH 222/475] pythonPackages.libthumbor: refactor move to python-modules --- .../python-modules/libthumbor/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/libthumbor/default.nix diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix new file mode 100644 index 00000000000..6c9987a5b8e --- /dev/null +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django +, six +, pycrypto +}: + +buildPythonPackage rec { + pname = "libthumbor"; + version = "1.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vjhszsf8wl9k16wyg2rfjycjnawzl7z8j39bhiysbz5x4lqg91b"; + }; + + buildInputs = [ django ]; + propagatedBuildInputs = [ six pycrypto ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "libthumbor is the python extension to thumbor"; + homepage = https://github.com/heynemann/libthumbor; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 325a8e83977..6b2907d3a2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1942,28 +1942,6 @@ in { libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - libthumbor = buildPythonPackage rec { - name = "libthumbor-${version}"; - version = "1.3.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/libthumbor/${name}.tar.gz"; - sha256 = "1vjhszsf8wl9k16wyg2rfjycjnawzl7z8j39bhiysbz5x4lqg91b"; - }; - - buildInputs = with self; [ django ]; - - 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"; @@ -1996,6 +1974,7 @@ in { url = "mirror://pypi/l/lightning-python/${name}.tar.gz"; sha256 = "3987d7d4a634bdb6db9bcf212cf4d2f72bab5bc039f4f6cbc02c9d01c4ade792"; }; + libthumbor = callPackage ../development/python-modules/libthumbor { }; buildInputs = with self; [ pytest ]; From 44353b0e0d5863de31b89fbd763da890d0ce19f7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:45:05 -0400 Subject: [PATCH 223/475] pythonPackages.lightblue: refactor move to python-modules --- .../python-modules/lightblue/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +---------------- 2 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/lightblue/default.nix diff --git a/pkgs/development/python-modules/lightblue/default.nix b/pkgs/development/python-modules/lightblue/default.nix new file mode 100644 index 00000000000..f826bbecb0a --- /dev/null +++ b/pkgs/development/python-modules/lightblue/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, pkgs +, isPy3k +}: + +buildPythonPackage rec { + pname = "lightblue"; + version = "0.4"; + disabled = isPy3k; # build fails, 2018-04-11 + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "016h1mlhpqxjj25lcvl4fqc19k8ifmsv6df7rhr12fyfcrp5i14d"; + }; + + buildInputs = [ pkgs.bluez pkgs.openobex ]; + + meta = with stdenv.lib; { + homepage = http://lightblue.sourceforge.net; + description = "Cross-platform Bluetooth API for Python"; + maintainers = with maintainers; [ leenaars ]; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b2907d3a2c..554b110173a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1942,30 +1942,6 @@ in { libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - 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}"; @@ -2001,6 +1977,7 @@ in { url = "mirror://pypi/j/jupyter/${name}.tar.gz"; sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f"; }; + lightblue = callPackage ../development/python-modules/lightblue { }; propagatedBuildInputs = with self; [ notebook From af46dbb32e6be1aecb2e04b9fffe6d426b9bfa96 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:45:44 -0400 Subject: [PATCH 224/475] pythonPackages.lightning: refactor move to python-modules --- .../python-modules/lightning/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +--------------- 2 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/lightning/default.nix diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix new file mode 100644 index 00000000000..d0e1a10ae00 --- /dev/null +++ b/pkgs/development/python-modules/lightning/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, jinja2 +, matplotlib +, numpy +, requests +, six +}: + +buildPythonPackage rec { + version = "1.2.1"; + pname = "lightning-python"; + + src = fetchPypi { + inherit pname version; + sha256 = "3987d7d4a634bdb6db9bcf212cf4d2f72bab5bc039f4f6cbc02c9d01c4ade792"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ jinja2 matplotlib numpy requests six ]; + + meta = with stdenv.lib; { + description = "A Python client library for the Lightning data visualization server"; + homepage = http://lightning-viz.org; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 554b110173a..27a3988497f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1942,33 +1942,8 @@ in { libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - 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"; - }; libthumbor = callPackage ../development/python-modules/libthumbor { }; - 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}"; @@ -1987,6 +1962,7 @@ in { ipykernel ipywidgets ]; + lightning = callPackage ../development/python-modules/lightning { }; # Meta-package, no tests doCheck = false; From 6102dd1991e0cd5d3fa0e04ac6934bb90c0ea438 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:46:15 -0400 Subject: [PATCH 225/475] pythonPackages.jupyter: refactor move to python-modules --- .../python-modules/jupyter/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +-------------- 2 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/jupyter/default.nix diff --git a/pkgs/development/python-modules/jupyter/default.nix b/pkgs/development/python-modules/jupyter/default.nix new file mode 100644 index 00000000000..14f83672553 --- /dev/null +++ b/pkgs/development/python-modules/jupyter/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, notebook +, qtconsole +, jupyter_console +, nbconvert +, ipykernel +, ipywidgets +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "jupyter"; + + src = fetchPypi { + inherit pname version; + sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f"; + }; + + propagatedBuildInputs = [ notebook qtconsole jupyter_console nbconvert ipykernel ipywidgets ]; + + # Meta-package, no tests + doCheck = false; + + meta = with stdenv.lib; { + 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 + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27a3988497f..a781a3558fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1944,37 +1944,11 @@ in { libthumbor = callPackage ../development/python-modules/libthumbor { }; - jupyter = buildPythonPackage rec { - version = "1.0.0"; - name = "jupyter-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jupyter/${name}.tar.gz"; - sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f"; - }; lightblue = callPackage ../development/python-modules/lightblue { }; - propagatedBuildInputs = with self; [ - notebook - qtconsole - jupyter_console - nbconvert - ipykernel - ipywidgets - ]; lightning = callPackage ../development/python-modules/lightning { }; - # 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 { }; From dd44ffbcbee8dbc482ac28c6d0ec7b72da1b925a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:46:46 -0400 Subject: [PATCH 226/475] pythonPackages.lmdb: refactor move to python-modules --- .../python-modules/lmdb/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +--------------- 2 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/lmdb/default.nix diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix new file mode 100644 index 00000000000..d46b51e27d3 --- /dev/null +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "lmdb"; + version = "0.92"; + + src = fetchPypi { + inherit pname version; + sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx"; + }; + + # Some sort of mysterious failure with lmdb.tool + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "Universal Python binding for the LMDB 'Lightning' Database"; + homepage = "https://github.com/dw/py-lmdb"; + license = licenses.openldap; + maintainers = with maintainers; [ copumpkin ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a781a3558fb..95fdad4faec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1958,29 +1958,9 @@ in { PyLTI = callPackage ../development/python-modules/pylti { }; - lmdb = buildPythonPackage rec { - pname = "lmdb"; - version = "0.92"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx"; - }; - - # 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"; + lmdb = callPackage ../development/python-modules/lmdb { }; src = pkgs.fetchurl { url = "http://download.logilab.org/pub/astng/${name}.tar.gz"; From 0d22a594b28427fc01fc294d62e7e3643093cc15 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:47:17 -0400 Subject: [PATCH 227/475] pythonPackages.logilab_astng: refactor move to python-modules --- pkgs/top-level/python-packages.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95fdad4faec..df22958c804 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1958,18 +1958,8 @@ in { PyLTI = callPackage ../development/python-modules/pylti { }; - logilab_astng = buildPythonPackage rec { - name = "logilab-astng-0.24.3"; lmdb = callPackage ../development/python-modules/lmdb { }; - 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}"; @@ -1977,6 +1967,7 @@ in { disabled = isPy3k; propagatedBuildInputs = with self; [ lxml docutils pillow ]; + logilab_astng = callPackage ../development/python-modules/logilab_astng { }; src = pkgs.fetchFromGitHub { owner = "lpod"; From 0088ac899c2298ac3bd31ff62bf3ec3a26462983 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:47:56 -0400 Subject: [PATCH 228/475] pythonPackages.lpod: refactor move to python-modules --- .../python-modules/logilab_astng/default.nix | 24 ++++++++++++++ .../python-modules/lpod/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------ 3 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/logilab_astng/default.nix create mode 100644 pkgs/development/python-modules/lpod/default.nix diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix new file mode 100644 index 00000000000..53284d12228 --- /dev/null +++ b/pkgs/development/python-modules/logilab_astng/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, logilab_common +}: + +buildPythonPackage rec { + pname = "logilab-astng"; + version = "0.24.3"; + + src = fetchurl { + url = "http://download.logilab.org/pub/astng/${pname}-${version}.tar.gz"; + sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn"; + }; + + propagatedBuildInputs = [ logilab_common ]; + + meta = with stdenv.lib; { + homepage = https://www.logilab.org/project/logilab-astng; + description = "Python Abstract Syntax Tree New Generation"; + license = licenses.lgpl2; + }; + +} diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix new file mode 100644 index 00000000000..dd40ac85186 --- /dev/null +++ b/pkgs/development/python-modules/lpod/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, lxml +, docutils +, pillow +, isPy3k +}: + +buildPythonPackage rec { + version = "1.1.7"; + pname = "python-lpod"; + # lpod library currently does not support Python 3.x + disabled = isPy3k; + + propagatedBuildInputs = [ lxml docutils pillow ]; + + src = fetchFromGitHub { + owner = "lpod"; + repo = "lpod-python"; + rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67"; + sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/lpod/lpod-python/; + description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) "; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df22958c804..db4b4390127 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1960,28 +1960,9 @@ in { lmdb = callPackage ../development/python-modules/lmdb { }; - 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 ]; logilab_astng = callPackage ../development/python-modules/logilab_astng { }; - 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 { }; From ab656c87722ba1a6d84ff7f4015b08e3082ca809 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:48:24 -0400 Subject: [PATCH 229/475] pythonPackages.mailchimp: refactor move to python-modules --- .../python-modules/mailchimp/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/mailchimp/default.nix diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/pkgs/development/python-modules/mailchimp/default.nix new file mode 100644 index 00000000000..b9640a4ab5d --- /dev/null +++ b/pkgs/development/python-modules/mailchimp/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, docopt +, requests +}: + +buildPythonPackage rec { + version = "2.0.9"; + pname = "mailchimp"; + + src = fetchPypi { + inherit pname version; + sha256 = "0351ai0jqv3dzx0xxm1138sa7mb42si6xfygl5ak8wnfc95ff770"; + }; + + buildInputs = [ docopt ]; + propagatedBuildInputs = [ requests ]; + patchPhase = '' + sed -i 's/==/>=/' 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db4b4390127..d8580cde4ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1968,27 +1968,7 @@ in { m2r = callPackage ../development/python-modules/m2r { }; - mailchimp = buildPythonPackage rec { - version = "2.0.9"; - name = "mailchimp-${version}"; - - 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; - }; - }; + mailchimp = callPackage ../development/python-modules/mailchimp { }; python-mapnik = buildPythonPackage rec { name = "python-mapnik-${version}"; From ed1ee313e4ba4159509687892211f68483e00526 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:48:51 -0400 Subject: [PATCH 230/475] pythonPackages.python-mapnik: refactor move to python-modules --- .../python-modules/python-mapnik/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 48 +-------------- 2 files changed, 59 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/python-modules/python-mapnik/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d8580cde4ac..ee20b4cf340 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1970,53 +1970,7 @@ in { mailchimp = callPackage ../development/python-modules/mailchimp { }; - 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 {}; From 8db4905ab20ae22184a279249a487de63baa04bd Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 23:49:31 -0400 Subject: [PATCH 231/475] pythonPackages.mwlib: refactor move to python-modules --- .../python-modules/mwlib/default.nix | 55 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 57 +------------------ 2 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 pkgs/development/python-modules/mwlib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee20b4cf340..7a628759f7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1976,62 +1976,7 @@ in { mt-940 = callPackage ../development/python-modules/mt-940 { }; - mwlib = let - pyparsing = buildPythonPackage rec { - name = "pyparsing-1.5.7"; - disabled = isPy3k; - - 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}"; - - 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 = callPackage ../development/python-modules/mwlib { }; mwlib-ext = buildPythonPackage rec { version = "0.13.2"; From 4482edcc45884e9eb2e7595e80eb3d35eec25d2c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 08:20:07 -0400 Subject: [PATCH 232/475] pythonPackages.hovercraft: refactor move to python-modules --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a628759f7f..1c430cc3311 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1868,11 +1868,11 @@ in { hupper = callPackage ../development/python-modules/hupper {}; - hovercraft = callPacakge ../development/python-modules/hovercraft { }; + hovercraft = callPackage ../development/python-modules/hovercraft { }; hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; - hsaudiotag3k = callPacakge ../development/python-modules/hsaudiotag3k { }; + hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; htmlmin = callPackage ../development/python-modules/htmlmin {}; From fd051c3ddef69c0198c940f17010f972ee72d951 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:10:46 -0400 Subject: [PATCH 233/475] pythonPackages.mwlib-ext: refactor move to python-modules --- .../python-modules/mwlib-ext/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/mwlib-ext/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c430cc3311..6295aa27b32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1978,22 +1978,7 @@ in { mwlib = callPackage ../development/python-modules/mwlib { }; - 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-ext = callPackage ../development/python-modules/mwlib-ext { }; mwlib-rl = buildPythonPackage rec { version = "0.14.6"; From 5e3aec5963fb27d316f63a49598d85666cf5bd81 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:14:44 -0400 Subject: [PATCH 234/475] pythonPackages.mwlib-rl: refactor move to python-modules Downgraded to 0.14.6 -> 0.14.5 (so we can use Pypi) --- .../python-modules/mwlib-rl/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +--------------- 2 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/mwlib-rl/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6295aa27b32..b10b1161a5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1980,28 +1980,7 @@ in { mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; - 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 { }; From d7da2d4e2b47f0e5aed17b86566bd292e66b90d5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:18:43 -0400 Subject: [PATCH 235/475] pythonPackages.ndg-httpsclient: refactor move to python-modules --- .../ndg-httpsclient/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/ndg-httpsclient/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b10b1161a5f..9fdd828f47f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1988,29 +1988,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 { }; From b1549317ac3a95768f7f676ef01f87a8ead4fbda Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:21:31 -0400 Subject: [PATCH 236/475] pythonPackages.nx-python: refactor move to python-modules --- .../python-modules/nxt-python/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------- 2 files changed, 37 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/nxt-python/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9fdd828f47f..a7930408fec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1996,32 +1996,7 @@ 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 { }; From 08890bd6ea963bd291018a156392051f6b7febc8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:24:43 -0400 Subject: [PATCH 237/475] pythonPackages.pamela: refactor move to python-modules --- .../python-modules/pamela/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pamela/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7930408fec..4ac629852aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2002,29 +2002,7 @@ in { 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; From 592e8a2ef1933206d1e7e18d2f33fe7a8fc85530 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:26:50 -0400 Subject: [PATCH 238/475] pythonPackages.pathtools: refactor move to python-modules --- .../python-modules/pathtools/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/pathtools/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ac629852aa..099797867f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2015,22 +2015,7 @@ in { pathspec = callPackage ../development/python-modules/pathspec { }; - pathtools = buildPythonPackage rec { - name = "pathtools-${version}"; - version = "0.1.2"; - - 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 ]; - }; - }; + pathtools = callPackage ../development/python-modules/pathtools { }; paver = buildPythonPackage rec { version = "1.2.2"; From be4f6cf7117cc2731460350474c47dec836fdc72 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:30:06 -0400 Subject: [PATCH 239/475] pythonPackages.paver: refactor move to python-modules --- .../python-modules/paver/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/paver/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 099797867f5..9c17bb27b31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2017,29 +2017,7 @@ in { pathtools = callPackage ../development/python-modules/pathtools { }; - 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 { }; From c7f8cabd83e51c3166d2985ff37cbbbd45d57914 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:33:23 -0400 Subject: [PATCH 240/475] pythonPackages.path-and-address: refactor move to python-modules --- .../path-and-address/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------- 2 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/path-and-address/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c17bb27b31..fb4ad725a97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2021,28 +2021,7 @@ in { passlib = callPackage ../development/python-modules/passlib { }; - path-and-address = buildPythonPackage rec { - version = "2.0.1"; - name = "path-and-address-${version}"; - - buildInputs = with self; [ pytest ]; - - 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]; - }; - }; + path-and-address = callPackage ../development/python-modules/path-and-address { }; peppercorn = buildPythonPackage rec { name = "peppercorn-0.5"; From 4e29f175492e1719e50a3db4d4fa4d8489826598 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:36:04 -0400 Subject: [PATCH 241/475] pythonPackages.peppercorn: refactor move to python-modules --- .../python-modules/peppercorn/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +----------- 2 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/peppercorn/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb4ad725a97..ba74e470866 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2023,19 +2023,7 @@ in { path-and-address = callPackage ../development/python-modules/path-and-address { }; - 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; - }; - }; + peppercorn = callPackage ../development/python-modules/peppercorn { }; pex = buildPythonPackage rec { name = "pex-${version}"; From d40edcb9113702c244a06079238c5f62316f57a3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:37:57 -0400 Subject: [PATCH 242/475] pythonPackages.pex: refactor move to python-modules --- .../python-modules/pex/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/pex/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba74e470866..cd655aa83b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2025,30 +2025,7 @@ in { peppercorn = callPackage ../development/python-modules/peppercorn { }; - 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 { }; From 2d5c53ce49c69722f80383c595a1fa2d2b576203 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:40:22 -0400 Subject: [PATCH 243/475] pythonPackages.poyo: refactor move to python-modules --- .../python-modules/poyo/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/poyo/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd655aa83b3..97fb2d32fc7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2052,21 +2052,7 @@ 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 { }; From a4ff15029a66d32a115776720d46871058e98582 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:42:49 -0400 Subject: [PATCH 244/475] pythonPackages.pudb: refactor move to python-modules --- .../python-modules/pudb/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pudb/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97fb2d32fc7..47d68ba13e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2056,25 +2056,7 @@ in { 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 {}; From 04169f4c3cb27c82997c451ee03704e2ec8a4771 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:44:58 -0400 Subject: [PATCH 245/475] pythonPackages.pycallgraph: refactor move to python-modules --- .../python-modules/pycallgraph/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pycallgraph/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47d68ba13e8..e2ff8f0df37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2062,28 +2062,7 @@ in { 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 { }; From 0c1af32ed6faaf7eaac52e68a3820be20ae9885b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:47:35 -0400 Subject: [PATCH 246/475] pythonPackages.pybluez: refactor move to python-modules --- .../python-modules/pybluez/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pybluez/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2ff8f0df37..e30ec187eed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2068,29 +2068,7 @@ in { pyblake2 = callPackage ../development/python-modules/pyblake2 { }; - pybluez = buildPythonPackage rec { - version = "unstable-20160819"; - pname = "pybluez"; - name = "${pname}-${version}"; - - 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 ]; - }; - }; + pybluez = callPackage ../development/python-modules/pybluez { }; pycares = buildPythonPackage rec { name = "pycares-${version}"; From 2dbdea23b66d43743d6f49a29adc5997c588674f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:49:52 -0400 Subject: [PATCH 247/475] pythonPackages.pycares: refactor move to python-modules --- .../python-modules/pycares/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/pycares/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e30ec187eed..c1f3f3a5d76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2070,26 +2070,7 @@ in { pybluez = callPackage ../development/python-modules/pybluez { }; - 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; From e6d98dc92ab2b3622576c472dc2822e5ed39bc88 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:55:33 -0400 Subject: [PATCH 248/475] pythonPackages.pypopplar: refactor move to python-modules --- .../python-modules/pypoppler/default.nix | 41 +++++++++++++++++++ .../{ => pypoppler}/pypoppler-0.39.0.patch | 0 .../{ => pypoppler}/pypoppler-poppler.c.patch | 0 pkgs/top-level/python-packages.nix | 32 +-------------- 4 files changed, 42 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/pypoppler/default.nix rename pkgs/development/python-modules/{ => pypoppler}/pypoppler-0.39.0.patch (100%) rename pkgs/development/python-modules/{ => pypoppler}/pypoppler-poppler.c.patch (100%) 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c1f3f3a5d76..f39a9e44087 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2089,37 +2089,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 { }; From eea723b3ec697bb9400b18baf31e876e1279b591 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:03:28 -0400 Subject: [PATCH 249/475] pythonPackages.pyramid: refactor move to python-modules --- .../python-modules/pyramid/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 42 +---------------- 2 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 pkgs/development/python-modules/pyramid/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f39a9e44087..afb768e33fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2101,47 +2101,7 @@ 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 { }; From 8c158456d656ff5195d74112850aea297302c0de Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:08:22 -0400 Subject: [PATCH 250/475] pythonPackages.pyamid_chameleon: refactor move to python-modules --- .../pyramid_chameleon/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/pyramid_chameleon/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index afb768e33fe..ba2a55c86fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2105,26 +2105,7 @@ in { pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; - pyramid_chameleon = buildPythonPackage rec { - name = "pyramid_chameleon-0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyramid_chameleon/${name}.tar.gz"; - sha256 = "d176792a50eb015d7865b44bd9b24a7bd0489fa9a5cebbd17b9e05048cef9017"; - }; - - propagatedBuildInputs = with self; [ - chameleon - pyramid - zope_interface - setuptools - ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; - + pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; pyramid_jinja2 = buildPythonPackage rec { name = "pyramid_jinja2-${version}"; From 8ad4ee2c801f243d07ca303bc7cd62bf16f850f2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:15:47 -0400 Subject: [PATCH 251/475] pythonPacakges.pyramid_jinja2: refactor move to python-modules --- .../python-modules/pyramid_jinja2/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/pyramid_jinja2/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba2a55c86fa..ec204a1a683 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2107,24 +2107,7 @@ in { pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; - 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_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; pyramid_mako = buildPythonPackage rec { name = "pyramid_mako-0.3.1"; From 5b2e663e770b371c4c9d6b7ed30aecfc85aa52cf Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:19:37 -0400 Subject: [PATCH 252/475] pythonPackages.pyramid_mako: refactor move to python-modules --- .../python-modules/pyramid_mako/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +-------- 2 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/pyramid_mako/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec204a1a683..4d0793c42f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2109,18 +2109,7 @@ in { pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; - 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_mako = callPackage ../development/python-modules/pyramid_mako { }; pyramid_exclog = buildPythonPackage rec { name = "pyramid_exclog-0.7"; From 0a0a1811db3ded3f5bf669f2f8a18cb3549c1f3f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:22:59 -0400 Subject: [PATCH 253/475] pythonPackages.pyramid_exclog: refactor move to python-modules --- .../python-modules/pyramid_exclog/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/pyramid_exclog/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d0793c42f9..a7dcbe7cd35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2111,22 +2111,7 @@ in { pyramid_mako = callPackage ../development/python-modules/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_exclog = callPackage ../development/python-modules/pyramid_exclog { }; pyramid_multiauth = buildPythonPackage rec { name = "pyramid_multiauth-${version}"; From 3c1815eb448f75e4110f37444919c3f5af719ce4 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:27:47 -0400 Subject: [PATCH 254/475] pythonPackages.pyramid_multiauth: refactor move to python-modules --- .../pyramid_multiauth/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/pyramid_multiauth/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7dcbe7cd35..3e15429f936 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2113,22 +2113,7 @@ in { pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; - 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_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; pyramid_hawkauth = buildPythonPackage rec { name = "pyramidhawkauth-${version}"; From bad2b3c229ceebbce5e41711b1fe25fcdbb06b5f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:32:07 -0400 Subject: [PATCH 255/475] pythonPackages.pyramid_hawkauth: refactor move to python-modules --- .../pyramid_hawkauth/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +-------- 2 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/pyramid_hawkauth/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e15429f936..edcd19a9684 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2115,18 +2115,7 @@ in { pyramid_multiauth = callPackage ../development/python-modules/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 ]; - }; + pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; pyroute2 = callPackage ../development/python-modules/pyroute2 { }; From 238f179d933c2aa208c412063be7ffff637d5677 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:34:20 -0400 Subject: [PATCH 256/475] pythonPackages.pytun: refactor move to python-modules --- .../python-modules/pytun/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +--------------- 2 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pytun/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index edcd19a9684..b2fa31d7a33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2127,28 +2127,7 @@ 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; - }; - }; + pytun = callPackage ../development/python-modules/pytun { }; python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; From 35ef822992d3201b2940721bee8e48e505e403ec Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:36:13 -0400 Subject: [PATCH 257/475] pythonPackages.rethinkdb: refactor move to python-modules --- .../python-modules/rethinkdb/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +-------------- 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/rethinkdb/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2fa31d7a33..d864a580b29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2137,23 +2137,7 @@ 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; - }; - }; + rethinkdb = callPackage ../development/python-modules/rethinkdb { }; roman = buildPythonPackage rec { version = "2.0.0"; From 89575266d3bd9992261def0529cbf886445c3b64 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:38:27 -0400 Subject: [PATCH 258/475] pythonPackages.roman: refactor move to python-modules --- .../python-modules/roman/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------------ 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/roman/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d864a580b29..ec885bac390 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2139,27 +2139,7 @@ in { rethinkdb = callPackage ../development/python-modules/rethinkdb { }; - 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; - }; - }; - - + roman = callPackage ../development/python-modules/roman { }; librosa = buildPythonPackage rec { pname = "librosa"; From 1786765934994c3af3703af5a77a06d1f2c29454 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:45:20 -0400 Subject: [PATCH 259/475] pythonPackages.librosa: refactor move to python-modules --- .../python-modules/librosa/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------ 2 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/librosa/default.nix diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix new file mode 100644 index 00000000000..adc740fbcf0 --- /dev/null +++ b/pkgs/development/python-modules/librosa/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, joblib +, matplotlib +, six +, scikitlearn +, decorator +, audioread +, resampy +}: + +buildPythonPackage rec { + pname = "librosa"; + version = "0.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "209626c53556ca3922e52d2fae767bf5b398948c867fcc8898f948695dacb247"; + }; + + propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Python module for audio and music processing"; + homepage = http://librosa.github.io/; + license = licenses.isc; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec885bac390..79f8900f76b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2141,27 +2141,7 @@ in { roman = callPackage ../development/python-modules/roman { }; - 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; - }; - }; + librosa = callPackage ../development/python-modules/librosa { }; joblib = callPackage ../development/python-modules/joblib { }; From 1f472f4a36fa97ae665589e868915190ce2e87c8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:47:30 -0400 Subject: [PATCH 260/475] pythonPackages.safe: refactor move to python-modules --- .../python-modules/safe/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/safe/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79f8900f76b..a0127802579 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2145,22 +2145,7 @@ in { 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"; - }; - }; + safe = callPackage ../development/python-modules/safe { }; samplerate = buildPythonPackage rec { name = "scikits.samplerate-${version}"; From 27c87bbe87b21f46d111fe2c486812d3cb6bddf0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:51:10 -0400 Subject: [PATCH 261/475] pythonPackages.samplerate: refactor move to python-modules --- .../python-modules/samplerate/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +----------- 2 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/samplerate/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0127802579..a18523ae31c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2147,29 +2147,7 @@ in { safe = callPackage ../development/python-modules/safe { }; - 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; - }; + samplerate = callPackage ../development/python-modules/samplerate { }; sarge = callPackage ../development/python-modules/sarge { }; From 80b1908800768cb22bdf5e2387ce6f5d931af45d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 12:42:37 -0400 Subject: [PATCH 262/475] pythonPackages.ssdeep: refactor move to python-modules fixed package that was originally broken. --- .../python-modules/ssdeep/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +------- 2 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/ssdeep/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a18523ae31c..44259b08af3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2157,18 +2157,7 @@ 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 - }; + ssdeep = callPackage ../development/python-modules/ssdeep { }; s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; From 0adcbd7289a4891537edb3ef50ad7c2edd80cebe Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 12:45:24 -0400 Subject: [PATCH 263/475] pythonPackages.statsd: refactor move to python-modules --- .../python-modules/statsd/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +-------------- 2 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/statsd/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44259b08af3..a0a34c114ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2161,32 +2161,7 @@ in { 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 - ''; - - }; + statsd = callPackage ../development/python-modules/statsd { }; py3status = callPackage ../development/python-modules/py3status {}; From 1543d06a675f5608aaf4e16b6454455b5d73660f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 12:48:05 -0400 Subject: [PATCH 264/475] pythonPackages.multi_key_dict: refactor move to python-modules --- .../python-modules/multi_key_dict/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/multi_key_dict/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0a34c114ad..1cdd18d3777 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2165,21 +2165,7 @@ in { 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"; - }; - }; - + multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; From c38f4d64079b3ec4b431a6752299316ef0c82adb Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 12:54:15 -0400 Subject: [PATCH 265/475] pythonPackages.random2: refactor move to python-modules --- .../python-modules/random2/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 11 +-------- 2 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/random2/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1cdd18d3777..13134b7fc08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2169,16 +2169,7 @@ in { 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"; - }; - }; + random2 = callPackage ../development/python-modules/random2 { }; scandir = callPackage ../development/python-modules/scandir { }; From e49ffc0434a963a9e005a70127756e8a0cd4b0bd Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 12:56:16 -0400 Subject: [PATCH 266/475] pythonPackages.schedule: refactor move to python-modules --- .../python-modules/schedule/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/schedule/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13134b7fc08..0d26a4073ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2173,22 +2173,7 @@ in { 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; - }; - }; + schedule = callPackage ../development/python-modules/schedule { }; schema = callPackage ../development/python-modules/schema {}; From 162db7094f0ad4edd5354e15afb8112b8245b536 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 12:59:27 -0400 Subject: [PATCH 267/475] pythonPackages.repoze_lru: refactor move to python-modules --- .../python-modules/repoze_lru/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +----------- 2 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/repoze_lru/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d26a4073ac..d1acb8e7d33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2187,19 +2187,7 @@ 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_lru = callPackage ../development/python-modules/repoze_lru { }; repoze_sphinx_autointerface = buildPythonPackage rec { name = "repoze.sphinx.autointerface-0.7.1"; From 9974b330f6748612b77c0a797fff3b119d1f6502 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:06:17 -0400 Subject: [PATCH 268/475] pythonPackages.repoze_sphinx_atointerface: refactor move to python-modules --- .../repoze_sphinx_autointerface/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1acb8e7d33..849e956178f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2189,22 +2189,7 @@ in { repoze_lru = callPackage ../development/python-modules/repoze_lru { }; - 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; - }; - }; - + repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; setuptools-git = buildPythonPackage rec { name = "setuptools-git-${version}"; From 65d71d574f66e035fc9348b5250dbe9560eee41a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:08:57 -0400 Subject: [PATCH 269/475] pythonPackages.setuptools-git: refactor move to python-modules --- .../python-modules/setuptools-git/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/setuptools-git/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 849e956178f..a386448dc7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2191,25 +2191,7 @@ in { repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; - 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; - }; - }; - + setuptools-git = callPackage ../development/python-modules/setuptools-git { }; watchdog = buildPythonPackage rec { name = "watchdog-${version}"; From b37a318d4171fbf9a88b8a3d62f528cc28ab2ad7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:11:47 -0400 Subject: [PATCH 270/475] pythonPackages.watchdog: refactor move to python-modules --- .../python-modules/watchdog/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/watchdog/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a386448dc7f..4220846ffec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2193,29 +2193,7 @@ in { setuptools-git = callPackage ../development/python-modules/setuptools-git { }; - 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 ]; - }; - }; + watchdog = callPackage ../development/python-modules/watchdog { }; pywatchman = callPackage ../development/python-modules/pywatchman { }; From 5c440b5aae8504fcd06d5b71a80fde9c2ebb8742 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:16:04 -0400 Subject: [PATCH 271/475] pythonPackages.zope_deprecation: refactor move to python-modules --- .../zope_deprecation/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/zope_deprecation/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4220846ffec..e95f39abbb8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2199,21 +2199,7 @@ in { 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; - }; - }; + zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; validictory = buildPythonPackage rec { name = "validictory-1.0.0a2"; From 92663b2aa4cdb7b55b1f31be77566779bf8e9d24 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:18:17 -0400 Subject: [PATCH 272/475] pythonPackages.validictory: refactor move to python-modules --- .../python-modules/validictory/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/validictory/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e95f39abbb8..b17828366ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2201,22 +2201,7 @@ in { zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; - 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; - }; - }; + validictory = callPackage ../development/python-modules/validictory { }; vcrpy = callPackage ../development/python-modules/vcrpy { }; From 48e807cf9f3828720b8061411714f1c8e9687056 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:21:27 -0400 Subject: [PATCH 273/475] pythonPackages.chameleon: refactor move to python-modules --- .../python-modules/chameleon/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +---------- 2 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/chameleon/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b17828366ed..9077587eed1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2207,18 +2207,7 @@ in { venusian = callPackage ../development/python-modules/venusian { }; - 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 ]; - }; - }; + chameleon = callPackage ../development/python-modules/chameleon { }; ddt = buildPythonPackage (rec { name = "ddt-1.0.0"; From e1a948388a434b53a95cceca930ae33070544772 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:23:30 -0400 Subject: [PATCH 274/475] pythonPackages.ddt: refactor move to python-modules --- .../python-modules/ddt/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +-------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/ddt/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9077587eed1..47281cf6563 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2209,22 +2209,7 @@ in { chameleon = callPackage ../development/python-modules/chameleon { }; - 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; - }; - }); + ddt = callPackage ../development/python-modules/ddt { }; descartes = callPackage ../development/python-modules/descartes { }; From 83f9f1ef38e53e8b5e35fd1e5bddd1d6dca42314 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:25:42 -0400 Subject: [PATCH 275/475] pythonPackages.distutils_extra: refactor move to python-modules --- .../distutils_extra/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/distutils_extra/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47281cf6563..91e8948d2f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2213,21 +2213,7 @@ in { 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; - }; - }; + distutils_extra = callPackage ../development/python-modules/distutils_extra { }; pyxdg = buildPythonPackage rec { name = "pyxdg-0.25"; From ddce81ce8a1ade831c82e17c100bac1f40a1737e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:29:36 -0400 Subject: [PATCH 276/475] pythonPackages.pyxdg: refactor move to python-modules --- .../python-modules/pyxdg/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/pyxdg/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91e8948d2f1..ca104f8f686 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2215,24 +2215,7 @@ in { distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - 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 ]; - }; - }; + pyxdg = callPackage ../development/python-modules/pyxdg { }; chardet = callPackage ../development/python-modules/chardet { }; From 4906ff50a9751be2aed42c39b976d7c53aac66d4 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:32:27 -0400 Subject: [PATCH 277/475] pythonPackages.django_1_8: refactor move to python-modules --- .../development/python-modules/django/1_8.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/django/1_8.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca104f8f686..41e40486e15 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2235,29 +2235,7 @@ 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 { }; From 90089d8786b2324f803df6df5e617df7693dc9e7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:34:35 -0400 Subject: [PATCH 278/475] pythonPackages.django_colorful: refactor move to python-modules --- .../django_colorful/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/django_colorful/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41e40486e15..1b99dc33733 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2241,27 +2241,7 @@ in { 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 { }; From 3ec02fd00401e5c9266c4275dcc34b5ad9d0ca96 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:36:26 -0400 Subject: [PATCH 279/475] pythonPackages.django_environ: refactor move to python-modules --- .../python-modules/django_environ/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/django_environ/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b99dc33733..67344a571a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2247,25 +2247,7 @@ in { django_compat = callPackage ../development/python-modules/django-compat { }; - django_environ = buildPythonPackage rec { - name = "django-environ-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-environ/${name}.tar.gz"; - sha256 = "0i32vsgk1xmwpi7i6f6v5hg653y9dl0fsz5qmv94skz6hwgm5kvh"; - }; - - # 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_environ = callPackage ../development/python-modules/django_environ { }; django_evolution = buildPythonPackage rec { name = "django_evolution-0.7.5"; From 0d7a983a2767feffc90abefbe8044adb606e49d7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:39:25 -0400 Subject: [PATCH 280/475] pythonPackages.django_evolution: refactor move to python-modules --- .../django_evolution/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +----------- 2 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/django_evolution/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67344a571a5..3b3841afa88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2249,22 +2249,7 @@ in { django_environ = callPackage ../development/python-modules/django_environ { }; - 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 { }; From 9c573f5379b1bf449d0aca58aa7ed4d071dd621e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:43:42 -0400 Subject: [PATCH 281/475] pythonPackages.django_classtags: refactor move to python-modules --- .../django_classytags/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/django_classytags/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3b3841afa88..fd557a6ba50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2289,26 +2289,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`. From 194dd4b2f254df9356f3cef2341afe40aa8e3c26 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:45:51 -0400 Subject: [PATCH 282/475] pythonPackages.django_nose: refactor move to python-modules --- .../python-modules/django_nose/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/django_nose/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd557a6ba50..1b6170b6e4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2298,26 +2298,7 @@ in { django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; - django_nose = buildPythonPackage rec { - name = "django-nose-${version}"; - version = "1.4.4"; - - 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_nose = callPackage ../development/python-modules/django_nose { }; django_modelcluster = buildPythonPackage rec { name = "django-modelcluster-${version}"; From 90859b17c68db2c4d995407f1895466371e8916a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:47:51 -0400 Subject: [PATCH 283/475] pythonPakcages.django_modelcluster: refactor move to python-modules --- .../django_modelcluster/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/django_modelcluster/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b6170b6e4f..e0a5a8c4303 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2300,26 +2300,7 @@ in { django_nose = callPackage ../development/python-modules/django_nose { }; - 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 { }; From 99a5f22de641a5b83644fe8c48bc0ce6a027948d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:49:52 -0400 Subject: [PATCH 284/475] pythonPackages.django_reversion: refactor move to python-modules --- .../django_reversion/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/django_reversion/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0a5a8c4303..d2a43c1c1d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2308,23 +2308,7 @@ in { django_redis = callPackage ../development/python-modules/django_redis { }; - django_reversion = buildPythonPackage rec { - name = "django-reversion-${version}"; - version = "1.10.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-reversion/${name}.tar.gz"; - sha256 = "01iv8w6lmmq98qjhxmnp8ddjxifmhxcmp612ijd91wc8nv8lk12w"; - }; - - propagatedBuildInputs = with self; [ django ]; - - 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_reversion = callPackage ../development/python-modules/django_reversion { }; django_silk = buildPythonPackage rec { name = "django-silk-${version}"; From e0d349a5f105048c3588273d2a5203bf197d164f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:52:45 -0400 Subject: [PATCH 285/475] pythonPackages.django_silk: refactor move to python-modules --- .../python-modules/django_silk/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +---------------- 2 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/django_silk/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2a43c1c1d8..c44cc1185a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2310,38 +2310,7 @@ in { django_reversion = callPackage ../development/python-modules/django_reversion { }; - 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_silk = callPackage ../development/python-modules/django_silk { }; django_taggit = buildPythonPackage rec { name = "django-taggit-${version}"; From 13b5bfbad4407ea746e0a4cca42585439f6f80e6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:55:31 -0400 Subject: [PATCH 286/475] pythonPackages.django_taggit: refactor move to python-modules --- .../python-modules/django_taggit/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/django_taggit/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c44cc1185a1..c2444cd878a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2312,25 +2312,7 @@ in { django_silk = callPackage ../development/python-modules/django_silk { }; - 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_taggit = callPackage ../development/python-modules/django_taggit { }; django_treebeard = buildPythonPackage rec { name = "django-treebeard-${version}"; From 0e8cf61604b0d8bf439e98698da39125f4292dfe Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:00:54 -0400 Subject: [PATCH 287/475] pythonPackages.django_treebeard: refactor move to python-modules --- .../django_treebeard/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/django_treebeard/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2444cd878a..8d37e86f2ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2314,25 +2314,7 @@ in { django_taggit = callPackage ../development/python-modules/django_taggit { }; - 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 { }; From 64d22bc0a9278227a64d070111ed66c4471a002f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:05:02 -0400 Subject: [PATCH 288/475] pythonPackages.pillowfight: refactor move to python-modules --- .../python-modules/pillowfight/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pillowfight/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d37e86f2ae..ee1cf9b6911 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2322,23 +2322,7 @@ in { djmail = callPackage ../development/python-modules/djmail { }; - pillowfight = buildPythonPackage rec { - name = "pillowfight-${version}"; - version = "0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pillowfight/pillowfight-${version}.tar.gz"; - sha256 = "1mh1nhcjjgv7x134sv0krri59ng8bp2w6cwsxc698rixba9f3g0m"; - }; - - propagatedBuildInputs = with self; [ - pillow - ]; - meta = with stdenv.lib; { - description = "Pillow Fight"; - homepage = "https://github.com/beanbaginc/pillowfight"; - }; - }; + pillowfight = callPackage ../development/python-modules/pillowfight { }; kaptan = buildPythonPackage rec { name = "kaptan-${version}"; From c099f8aaa3b9b0921208914212a1a18c5f8989a5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:05:25 -0400 Subject: [PATCH 289/475] pythonPackages.kaptan: refactor move to python-modules --- .../python-modules/kaptan/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/kaptan/default.nix diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix new file mode 100644 index 00000000000..af24471d68d --- /dev/null +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyyaml +}: + +buildPythonPackage rec { + pname = "kaptan"; + version = "0.5.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b8r86yyvdvyxd6f10mhkl6cr2jhxm80jjqr4zch96w9hs9rh5vq"; + }; + + propagatedBuildInputs = [ 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 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee1cf9b6911..c916473b8e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2324,25 +2324,7 @@ in { pillowfight = callPackage ../development/python-modules/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 ]; - }; - }; + kaptan = callPackage ../development/python-modules/kaptan { }; keepalive = buildPythonPackage rec { name = "keepalive-${version}"; From 0e26b1e3661e748cedc4c19049ecc6e6ed8a01ae Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:07:29 -0400 Subject: [PATCH 290/475] pythonPackages.keepalive: refactor move to python-modules --- .../python-modules/keepalive/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/keepalive/default.nix diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix new file mode 100644 index 00000000000..c53bc25d198 --- /dev/null +++ b/pkgs/development/python-modules/keepalive/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "keepalive"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + 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"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c916473b8e3..12627d6ca79 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2326,23 +2326,7 @@ in { kaptan = callPackage ../development/python-modules/kaptan { }; - 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 {}; From 4d25c10bff07bc39bf9eccd6933424d738d9834b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:10:36 -0400 Subject: [PATCH 291/475] pythonPackages.SPARQLWrapper: refactor move to python-modules --- .../python-modules/sparqlwrapper/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------- 2 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/sparqlwrapper/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12627d6ca79..87f4c4a03f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2330,32 +2330,7 @@ in { 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; From 99d1456df7df388595673b673664f994609a842c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:12:38 -0400 Subject: [PATCH 292/475] pythonPackages.hg-git: refactor move to python-modules --- .../python-modules/hg-git/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/hg-git/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87f4c4a03f2..0660aec9a35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2336,25 +2336,7 @@ in { inherit (pkgs) git glibcLocales; }; - hg-git = buildPythonPackage rec { - name = "hg-git-${version}"; - version = "0.8.11"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/hg-git/${name}.tar.gz"; - sha256 = "08kw1sj3sq1q1571hwkc51w20ks9ysmlg93pcnmd6gr66bz02dyn"; - }; - - 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; - }; - }; + hg-git = callPackage ../development/python-modules/hg-git { }; dtopt = buildPythonPackage rec { name = "dtopt-0.1"; From b148467e9b673ad6c6634dfa1ec3e138466812a9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:18:42 -0400 Subject: [PATCH 293/475] pythonPackages.dtopt: refactor move to python-modules --- .../python-modules/dtopt/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/dtopt/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0660aec9a35..b60c24cc5f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2338,22 +2338,7 @@ in { hg-git = callPackage ../development/python-modules/hg-git { }; - 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; - }; - + dtopt = callPackage ../development/python-modules/dtopt { }; ecdsa = buildPythonPackage rec { name = "ecdsa-${version}"; From 9d8fa906473b83d216eb98f644f2a067086dba62 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:20:52 -0400 Subject: [PATCH 294/475] pythonPackages.ecdsa: refactor move to python-modjules --- .../python-modules/ecdsa/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/ecdsa/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b60c24cc5f9..eb282b8e874 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2340,25 +2340,7 @@ in { dtopt = callPackage ../development/python-modules/dtopt { }; - 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 {}; From 29ac3c651d5ab845cbba144b51d27474f7f6a095 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:24:38 -0400 Subject: [PATCH 295/475] pythonPackages.elpy: refactor move to python-modules --- .../python-modules/elpy/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------- 2 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/elpy/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb282b8e874..fb133d40fef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2344,24 +2344,7 @@ in { 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; - - doCheck = false; # there are no tests - - meta = { - description = "Backend for the elpy Emacs mode"; - homepage = "https://github.com/jorgenschaefer/elpy"; - }; - }; - + elpy = callPackage ../development/python-modules/elpy { }; enum = buildPythonPackage rec { name = "enum-0.4.4"; From 61ed2b6ca1f1c68e6a62566c8c3cfdb2550a45cc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:27:29 -0400 Subject: [PATCH 296/475] pythonPackages.enum: refactor move to python-modules --- .../python-modules/enum/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/enum/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb133d40fef..a7668070403 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2346,26 +2346,7 @@ in { elpy = callPackage ../development/python-modules/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 { }; From 266ebed4a8750c48928f8e1a9a8cc8295a1843dc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:30:03 -0400 Subject: [PATCH 297/475] pythonPackages.enum34: refactor move to python-modules --- .../python-modules/enum34/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/enum34/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7668070403..2bc713d39ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2350,27 +2350,7 @@ in { 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}"; - - src = fetchPypi { - inherit pname version; - sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - - 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"; - }; - }; + enum34 = callPackage ../development/python-modules/enum34 { }; epc = buildPythonPackage rec { name = "epc-0.0.3"; From cb6be049d33bf54a955d9a58f9a227672f13c9e0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:32:29 -0400 Subject: [PATCH 298/475] pythonPackages.epc: refactor move to python-modules --- .../python-modules/epc/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/epc/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bc713d39ff..c3b939b6989 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2352,21 +2352,7 @@ in { enum34 = callPackage ../development/python-modules/enum34 { }; - 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"; - }; - }; + epc = callPackage ../development/python-modules/epc { }; et_xmlfile = buildPythonPackage rec { version = "1.0.1"; From ecf71f3c1097dd39c23cefeddbe6aef312331d80 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:34:49 -0400 Subject: [PATCH 299/475] pythonPackages.et_xmlfile: refactor move to python-modules --- .../python-modules/et_xmlfile/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 +-------------- 2 files changed, 41 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/et_xmlfile/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c3b939b6989..d52085fdc20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2354,37 +2354,7 @@ in { epc = callPackage ../development/python-modules/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 ]; - }; - }; + et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; eventlet = buildPythonPackage rec { pname = "eventlet"; From 16dc45288e6f3c5d35b770027e01fcc54f8c2cad Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:37:33 -0400 Subject: [PATCH 300/475] pythonPackages.eventlet: refactor move to python-modules --- .../python-modules/eventlet/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------ 2 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/eventlet/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d52085fdc20..55213482b0c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2356,28 +2356,7 @@ in { et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; - 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"; - }; - }; + eventlet = callPackage ../development/python-modules/eventlet { }; exifread = buildPythonPackage rec { name = "ExifRead-2.1.2"; From 18c345dfaa5ae78dc16868ac24925b234e5a3516 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:39:59 -0400 Subject: [PATCH 301/475] pythonPackages.exifread: refactor move to python-modules --- .../python-modules/exifread/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/exifread/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55213482b0c..fefd8d0bd3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2358,21 +2358,7 @@ in { eventlet = callPackage ../development/python-modules/eventlet { }; - 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 { }; From 75aaf63f6c7b0a66b7eee7b621cc6a09b9712495 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:42:00 -0400 Subject: [PATCH 302/475] pythonPackages.feedparser: refactor move to python-modules --- .../python-modules/feedparser/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/feedparser/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fefd8d0bd3f..150b9a65d5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2372,24 +2372,7 @@ in { inherit (pkgs) glibcLocales; }; - feedparser = buildPythonPackage (rec { - name = "feedparser-5.2.1"; - - 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 ]; - }; - }); + feedparser = callPackage ../development/python-modules/feedparser { }; pyfribidi = buildPythonPackage rec { version = "0.11.0"; From 5e90be5fd763cb55aa34be61fd7cc5a02ca9a242 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:45:52 -0400 Subject: [PATCH 303/475] pythonPackage.pyfribidi: refactor move to python-modules --- .../python-modules/pyfribidi/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/pyfribidi/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 150b9a65d5f..ca197f0f05f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2374,22 +2374,7 @@ in { feedparser = callPackage ../development/python-modules/feedparser { }; - 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 {}; From 7aa1a742c4a9c979b354091015cfaa76f050c8b6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:51:20 -0400 Subject: [PATCH 304/475] pythonPackages.fdroidserver: refactor move to python-modules --- .../python-modules/fdroidserver/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +----------- 2 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/fdroidserver/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca197f0f05f..1512c986358 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2378,28 +2378,7 @@ in { docker_compose = callPackage ../development/python-modules/docker_compose {}; - fdroidserver = buildPythonPackage rec { - version = "2016-05-31"; - name = "fdroidserver-git-${version}"; - - disabled = ! isPy3k; - - 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; - }; - }; + fdroidserver = callPackage ../development/python-modules/fdroidserver { }; filebrowser_safe = buildPythonPackage rec { version = "0.3.6"; From 6f4332daa4dc6111317fa9af4b3f2c9ac45785a3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:54:07 -0400 Subject: [PATCH 305/475] pythonPackages.filebrowser_safe: refactor move to python-modules --- .../filebrowser_safe/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 34 +--------------- 2 files changed, 41 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/filebrowser_safe/default.nix 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..cbef81de8cd --- /dev/null +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django +}: + +buildPythonPackage rec { + version = "0.3.6"; + pname = "filebrowser_safe"; + + src = fetchPypi { + inherit pname version; + sha256 = "02bn60fdslvng2ckn65fms3hjbzgsa8qa5161a8lr720wbx8gpj2"; + }; + + 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1512c986358..1cbaad29e91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2380,39 +2380,7 @@ in { fdroidserver = callPackage ../development/python-modules/fdroidserver { }; - 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 { }; From 40cfaacf0d3186efef99201c0c059575fdd43e81 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:56:20 -0400 Subject: [PATCH 306/475] pythonPackages.filebytes: refactor move to python-modules --- .../python-modules/filebytes/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/filebytes/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1cbaad29e91..28517aec0cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2384,20 +2384,7 @@ in { 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 {}; From 1a76b2c7f8fc334b0c7197c5e64e84e4bb29c845 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:58:18 -0400 Subject: [PATCH 307/475] pythonPacakges.flaky: refactor move to python-modules --- .../python-modules/flaky/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/flaky/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28517aec0cc..1b84296d7f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2400,26 +2400,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 { }; From 7b2ed00ef62476080fe439ce91219376ab8c8a2e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 15:02:35 -0400 Subject: [PATCH 308/475] pythonPackges.wtforms: refactor move to python-modules --- .../python-modules/wtforms/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/wtforms/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b84296d7f0..626ec2efb72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2460,27 +2460,7 @@ 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 { }; From ef927360e3c71418f833e1b7cb5a73e42973050e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 17 Oct 2018 14:53:39 +0800 Subject: [PATCH 309/475] unifiStable: 5.8.30 -> 5.9.29 --- pkgs/servers/unifi/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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; } From 3055a0c9755c89616257c5d8318a32dc42b01341 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 12 Oct 2018 13:39:26 -0400 Subject: [PATCH 310/475] lirc: add support for Python bindings --- pkgs/development/libraries/lirc/default.nix | 20 +++++++++++++------- pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 17 insertions(+), 7 deletions(-) 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 981b3146a07..f5b747b165c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2929,6 +2929,10 @@ in { }; }; + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { + python3 = python; + })); + jupyter = buildPythonPackage rec { version = "1.0.0"; name = "jupyter-${version}"; From 725fcdef3f675e96e591377ff9776c72edb13c60 Mon Sep 17 00:00:00 2001 From: clefru Date: Wed, 17 Oct 2018 09:18:52 +0200 Subject: [PATCH 311/475] Fix hostapd's place in systemd dependency tree. (#45464) * nat/bind/dhcp.service: Remove. Those services have nothing to do with a link-level service. * sys-subsystem-net-devices-${if}.device: Add as BindsTo dependency as this will make hostapd stop when the device is unplugged. * network-link-${if}.service: Add hostapd as dependency for this service via requiredBy clause, so that the network link is only considered to be established only after hostapd has started. * network.target: Remove this from wantedBy clause as this is already implied from dependencies stacked above hostapd. And if it's not implied than starting hostapd is not required for this particular network configuration. --- nixos/modules/services/networking/hostapd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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}"; From 32b9e77388aaf188f6598402d5eac93096fede61 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 17 Oct 2018 09:49:22 +0200 Subject: [PATCH 312/475] fix eval, add missing python.pkgs.safe --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fca98fcdc35..04b044bc6cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8246,6 +8246,8 @@ in { propagatedBuildInputs = [ self.cffi ]; }; + safe = callPackage ../development/python-modules/safe { }; + sampledata = callPackage ../development/python-modules/sampledata { }; sasmodels = callPackage ../development/python-modules/sasmodels { }; From d0d04c26d7a06dee755fe85969c9a4de830169ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 17 Oct 2018 09:35:45 +0200 Subject: [PATCH 313/475] libxml2: support python3 --- pkgs/development/libraries/libxml2/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04b044bc6cc..a4d6290ab4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3417,8 +3417,7 @@ in { libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py; - libxml2 = disabledIf isPy3k - (toPythonModule (pkgs.libxml2.override{pythonSupport=true; python2=python;})).py; + libxml2 = toPythonModule (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py; libxslt = disabledIf isPy3k (toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py; From ec9d761628a70264dc117e889f12ab27da26474e Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 16 Oct 2018 11:39:41 +0200 Subject: [PATCH 314/475] slixmpp: 1.2.4-post1 -> 1.4.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 607b4b61018..db7d56919cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8001,13 +8001,13 @@ in { slixmpp = buildPythonPackage rec { name = "slixmpp-${version}"; - version = "1.2.4.post1"; + version = "1.4.0"; disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "0v6430dczai8a2nmznhja2dxl6pxa8c5j20nhc5737bqjg7245jk"; + sha256 = "155qxx4xlkkjb4hphc09nsi2mi4xi3m2akg0z7064kj3nbzkwjn2"; }; patchPhase = '' From e83b15c1b19d53cf5d5e2867dea2704445922267 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 16 Oct 2018 11:40:15 +0200 Subject: [PATCH 315/475] poezio: 0.11 -> 0.12 --- .../python-modules/poezio/fix_gnupg_import.patch | 12 ------------ pkgs/top-level/python-packages.nix | 13 +++++-------- 2 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/python-modules/poezio/fix_gnupg_import.patch 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db7d56919cb..c9887e27f89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16030,22 +16030,19 @@ EOF poezio = buildPythonApplication rec { name = "poezio-${version}"; - version = "0.11"; + version = "0.12"; disabled = pythonOlder "3.4"; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ]; + propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 cffi ]; + nativeBuildInputs = with pkgs; [ pkgconfig ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/118/${name}.tar.gz"; - sha256 = "07cn3717swarjv47yw8x95bvngz4nvlyyy9m7ck9fhycjgdy82r0"; + url = "http://dev.louiz.org/attachments/download/129/${name}.tar.gz"; + sha256 = "11n9x82xyjwbqk28lsfnvqwn8qc9flv6w2c64camh6j3148ykpvz"; }; - patches = [ - ../development/python-modules/poezio/fix_gnupg_import.patch - ]; - checkPhase = '' py.test ''; From a420be1e79f3ad3fb80227caeff249454e701d61 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 16 Oct 2018 17:29:24 +0200 Subject: [PATCH 316/475] slixmpp: move out of python-modules, use gnupg --- .../python-modules/slixmpp/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------------ 2 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/slixmpp/default.nix diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix new file mode 100644 index 00000000000..0a8e5accea8 --- /dev/null +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, pythonOlder, fetchurl, aiodns, pyasn1, pyasn1-modules, gnupg }: +buildPythonPackage rec { + name = "slixmpp-${version}"; + version = "1.4.0"; + + disabled = pythonOlder "3.4"; + + src = fetchurl { + url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; + 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9887e27f89..aa7c6abfb50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7999,30 +7999,7 @@ in { }; }; - slixmpp = buildPythonPackage rec { - name = "slixmpp-${version}"; - version = "1.4.0"; - - disabled = pythonOlder "3.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "155qxx4xlkkjb4hphc09nsi2mi4xi3m2akg0z7064kj3nbzkwjn2"; - }; - - 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; - }; - }; + slixmpp = callPackage ../development/python-modules/slixmpp {}; netaddr = buildPythonPackage rec { pname = "netaddr"; From d6a003e95305f87690fb07af7317f8269ee8aac3 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 17 Oct 2018 09:48:30 +0200 Subject: [PATCH 317/475] poezio: move out of python-packages.nix --- .../instant-messengers/poezio/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +----------------- 2 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/poezio/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa7c6abfb50..ac9a00550b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16005,32 +16005,7 @@ EOF }; }; - poezio = buildPythonApplication rec { - name = "poezio-${version}"; - version = "0.12"; - - disabled = pythonOlder "3.4"; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 cffi ]; - nativeBuildInputs = with pkgs; [ pkgconfig ]; - - src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/129/${name}.tar.gz"; - sha256 = "11n9x82xyjwbqk28lsfnvqwn8qc9flv6w2c64camh6j3148ykpvz"; - }; - - 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 {}; From 0800c3a72208eaf9d2087c72746da46b69b10483 Mon Sep 17 00:00:00 2001 From: "Christoph Neidahl (OPNA2608)" Date: Wed, 17 Oct 2018 10:09:16 +0200 Subject: [PATCH 318/475] x11vnc: don't build broken Xdummy script patching the currently broken Xdummy script out of the Makefile.am, else it gets put into bin. this is not a regression of functionality, as it doesn't appear to be put into bin in the upstream version either. --- pkgs/tools/X11/x11vnc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 51307f0df09..9e38a2bc888 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { --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' src/ssltools.h + sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am ''; meta = with stdenv.lib; { From 17f1eebb5be05c96d56754a585b4672015abb706 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 2 Oct 2018 19:52:27 +0300 Subject: [PATCH 319/475] pythonPackages.pvlib: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/pvlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 4051fc901b52c233b7fa3f4ee2ac390ed3406583 Mon Sep 17 00:00:00 2001 From: Anatolii Prylutskyi Date: Wed, 17 Oct 2018 08:08:44 +0300 Subject: [PATCH 320/475] rambox: fix invalid sha256 --- pkgs/applications/networking/instant-messengers/rambox/bare.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ]; From 695156e1f5f4cbb0b4fe356c8d1a8bf2796c0681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 15:08:52 +0200 Subject: [PATCH 321/475] pdfpc: 4.1.2 -> 4.2.1 --- pkgs/applications/misc/pdfpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 4035086bafadaa92d7993c27b9a63124f024d0fc Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 17 Oct 2018 14:28:29 +0000 Subject: [PATCH 322/475] oraclejdk8: 8u181 -> 8u191 (#48624) --- pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 10 +++++----- pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) 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"; From 54de840aaf156169bf8e3bf15e4968a12b78a8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 17 Oct 2018 11:29:49 -0300 Subject: [PATCH 323/475] theme-obsidian2: 2.6 -> 2.7 (#48601) --- pkgs/misc/themes/obsidian2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 6ed5b4624dd660a7af8137273c8b1818f70a30ca Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 17 Oct 2018 10:50:43 +0200 Subject: [PATCH 324/475] grafana: 5.2.4 -> 5.3.1 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 = '' From d447f01ec6f9c69b0387f1a53c5f7bc3ca050995 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Oct 2018 09:49:39 -0500 Subject: [PATCH 325/475] gpa: 0.9.10 -> 0.10.0 (#48620) https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000430.html --- pkgs/applications/misc/gpa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d3657f676638ef8e8e024998b26a7d46e922d481 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 17 Oct 2018 00:45:25 +0200 Subject: [PATCH 326/475] speedtest-cli: move ot python-modules --- .../python-modules/speedtest-cli/default.nix | 26 +++++++++++++++++++ .../networking/speedtest-cli/default.nix | 21 --------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 4 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/speedtest-cli/default.nix delete mode 100644 pkgs/tools/networking/speedtest-cli/default.nix 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/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c118561c8b..bd1f0fbd2e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8784,7 +8784,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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee1bee109a3..4087b58bd48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15458,6 +15458,8 @@ EOF }; }; + speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; + pushbullet = callPackage ../development/python-modules/pushbullet { }; power = buildPythonPackage rec { From f0c643a99e8813df39bcff497ccf29361a26fe88 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 17 Oct 2018 00:51:39 +0200 Subject: [PATCH 327/475] home-assistant: add speedtest-cli to component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ]; From 7026831c7ac5790ab61cd60a1228c1b07b001178 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Oct 2018 14:33:07 +0100 Subject: [PATCH 328/475] bundler: 1.16.3 -> 1.16.6 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From 5ef745b98379fc05fba250fa2c865d41ed66eac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 17:47:35 +0200 Subject: [PATCH 329/475] esptool: 2.5.0 -> 2.5.1 --- pkgs/tools/misc/esptool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 280b1171c11eabdddb5b34ecef3f6d7b1147463d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 17:49:33 +0200 Subject: [PATCH 330/475] seafile-shared: 6.2.4 -> 6.2.5 --- pkgs/misc/seafile-shared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From dc427b0ff06a52b65979be536bb20a5edaaa3686 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 17 Oct 2018 21:55:05 +0800 Subject: [PATCH 331/475] pulseaudio-modules-bt: unstable-2018-09-11 -> unstable-2018-10-16 --- .../audio/pulseaudio-modules-bt/default.nix | 35 ++++++++++++++----- .../fix-install-path.patch | 11 ++++++ 2 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index e3d07fcc245..6bb432b3fd8 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -4,11 +4,14 @@ , libpulseaudio , pulseaudio , pkgconfig +, ffmpeg_4 +, patchelf , libtool , cmake , bluez , dbus , sbc +, lib }: let @@ -20,37 +23,53 @@ 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 "$orig_rpath:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules" \ + "$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/) From 1ee5cbe9d435af9e179a2fb6ed286c60d26a2054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 17:56:57 +0200 Subject: [PATCH 332/475] abcm2ps: 8.13.24 -> 8.14.0 --- pkgs/tools/audio/abcm2ps/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 ]; From 8929e036ce2d683f17a27474685a10b13c18f72f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 17 Oct 2018 18:00:51 +0200 Subject: [PATCH 333/475] monero: 0.13.0.2 -> 0.13.0.3 --- pkgs/applications/altcoins/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 2b396c4b938..e344f4d94ba 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.13.0.2"; + version = "0.13.0.3"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "078iw76ajvaj08rgnx3c13pnq8fxah1z9wwyz54fcnj2349sjbf5"; + sha256 = "03qx8y74zxnmabdi5r3a274pp8zvm3xhkdwi1xf5sb40vf4sfmwb"; }; nativeBuildInputs = [ cmake pkgconfig git ]; From e57438faf030f139bc73e79e28cefa668c2a2edb Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 17 Oct 2018 18:02:11 +0200 Subject: [PATCH 334/475] monero-gui: 0.13.0.2 -> 0.13.0.3 --- pkgs/applications/altcoins/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index c26df670930..46e317a3b12 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.13.0.2"; + version = "0.13.0.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "02419rqi3zfy6yjyw3b3gvkbxh2ypdfpijiiklc7lyblb9nnjr68"; + sha256 = "1rvxwz7p1yw9c817n07m60xvmv2p97s82sfzwkg2x880fpxb0gj9"; }; nativeBuildInputs = [ qmake pkgconfig ]; From 6963bc351194ca902577955b9b02eff1482df02f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 17 Oct 2018 18:34:15 +0200 Subject: [PATCH 335/475] bs1770gain: 0.4.12 -> 0.5.0 (#48628) --- pkgs/applications/audio/bs1770gain/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd8ee2b2a55..b8b09186acc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15826,9 +15826,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 { }; From 5179813d98baad08db90e8987107309c654c1848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 17 Oct 2018 13:52:56 -0300 Subject: [PATCH 336/475] deepin-desktop-base: init at 2018.7.23 (#48552) --- .../deepin/deepin-desktop-base/default.nix | 45 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-desktop-base/default.nix 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 { }; From ea691fc8ee9cb4b49342148bac05b73e5068323f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 17 Oct 2018 19:39:49 +0200 Subject: [PATCH 337/475] tdesktopPackages.preview: 1.4.3 -> 1.4.4 --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) 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; }); } From e494e1c4e3135304175e26502946f9d8645d9897 Mon Sep 17 00:00:00 2001 From: "nagato.pain" Date: Tue, 16 Oct 2018 14:57:47 -0700 Subject: [PATCH 338/475] pythonPackages.python-packer: init at 0.1.2 --- .../python-modules/python-packer/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/python-packer/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c66fd52d43..66247546954 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -570,6 +570,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 { }; From 37593414201b31e719d796a09d58ba62251979e1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 17 Oct 2018 19:59:15 +0200 Subject: [PATCH 339/475] monkeysphere: 0.41 -> 0.42 --- pkgs/tools/security/monkeysphere/default.nix | 23 +++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) 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 : " From 07f135c7f55cfb96bd1e49170b98abbbb847da90 Mon Sep 17 00:00:00 2001 From: "Christoph Neidahl (OPNA2608)" Date: Wed, 17 Oct 2018 20:13:07 +0200 Subject: [PATCH 340/475] x11vnc: moving substitutions, commenting sed line moved substitutions to postPatch phase and commented on workaround sed line, as requested in the code reviews --- pkgs/tools/X11/x11vnc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 9e38a2bc888..6dc785621b5 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -24,17 +24,21 @@ stdenv.mkDerivation rec { libvncserver ]; - preConfigure = '' - configureFlags="--mandir=$out/share/man" - + 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' 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 = https://github.com/LibVNC/x11vnc/; From c3c82aa675bb32f666d67b320a0f2a624298c0d7 Mon Sep 17 00:00:00 2001 From: Doug Beardsley Date: Wed, 17 Oct 2018 14:44:07 -0400 Subject: [PATCH 341/475] Update developPackage documentation --- .../development/haskell-modules/make-package-set.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 40046526488..5803e2946bf 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -200,12 +200,12 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # , 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 From 15c5f9b1f067f98051cfe3374a2775a8ccc6ecf3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 19:56:01 +0200 Subject: [PATCH 342/475] libHX: add licenses --- pkgs/development/libraries/libHX/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 ]; }; } From c8709769dcfdaef18ae75e50ad360369f514e7e0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:01:03 +0200 Subject: [PATCH 343/475] lesstif: add license, description, and homepage --- pkgs/development/libraries/lesstif/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 ]; }; } From a0a4756ed3e4c48bb75cd28a3fc2252841fb6ade Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:03:43 +0200 Subject: [PATCH 344/475] libaccounts-glib: add license + description --- pkgs/development/libraries/libaccounts-glib/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; }; } From bbcfb99e8d79f79dc41e061d5f46c7ebe3212483 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:06:06 +0200 Subject: [PATCH 345/475] libaom: add license --- pkgs/development/libraries/libaom/default.nix | 1 + 1 file changed, 1 insertion(+) 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; }; } From 8ddce99ab9211152987f01c03d7a7046432a2601 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:07:05 +0200 Subject: [PATCH 346/475] libbap: add license --- pkgs/development/libraries/libbap/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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; }; } From a36e9b2047d8c6f74a3c4dd905f5afb33de751af Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:08:55 +0200 Subject: [PATCH 347/475] libdbusmenu-qt: add license --- pkgs/development/libraries/libdbusmenu-qt/default.nix | 2 +- pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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; }; } From f54413553b349c61693c0df67fb356bada61c3b4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:12:38 +0200 Subject: [PATCH 348/475] libexttextcat: add license --- pkgs/development/libraries/libexttextcat/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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; }; } From 2887798de50bdf852c625b9810a06414e122503c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:31:22 +0200 Subject: [PATCH 349/475] libgdiplus: add license + meta data --- pkgs/development/libraries/libgdiplus/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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; }; } From 06cb58fba77beab5d3ba396af779afb888ea791d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:33:02 +0200 Subject: [PATCH 350/475] libgnome-keyring: add license --- pkgs/development/libraries/libgnome-keyring/default.nix | 1 + 1 file changed, 1 insertion(+) 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; }; } From 3e85c53ca6f1effb2617f33603084e3c6bc509a6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:42:47 +0200 Subject: [PATCH 351/475] libgnurl: add licenses --- pkgs/development/libraries/libgnurl/default.nix | 1 + 1 file changed, 1 insertion(+) 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 ]; }; } From 592e998cd7fe5f76e919deab0accb8bc98c5eb2b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:45:44 +0200 Subject: [PATCH 352/475] libicns: add licenses --- pkgs/development/libraries/libicns/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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; }; } From ed09cdd0f6bd3f049c0545eaa779f6ca86f69c81 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:55:14 +0200 Subject: [PATCH 353/475] libiodbc: add license --- pkgs/development/libraries/libiodbc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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; }; } From 1d902ca5a2e3f48ce29917a9e4a7c63ed294f12c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:59:00 +0200 Subject: [PATCH 354/475] libite: add licenses --- pkgs/development/libraries/libite/default.nix | 1 + 1 file changed, 1 insertion(+) 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 ]; }; } From d039722d0e56ad08982154b5e02232ab9cd0945b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 17 Oct 2018 21:03:43 +0000 Subject: [PATCH 355/475] chromium 71+: add at-spi2-core dependency (#48594) --- pkgs/applications/networking/browsers/chromium/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index acd3493fe7c..e39a35ae1b0 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 From d767ba99964eb776c2b482ca8a3a0ef42d7ccf8b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 17 Oct 2018 21:04:15 +0000 Subject: [PATCH 356/475] chromium 71+: there is no more option 'use_gtk3' (#48595) --- pkgs/applications/networking/browsers/chromium/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e39a35ae1b0..c18f77f8f99 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -233,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; @@ -244,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; From 21bb1fa004aae4d96e38bb14a06c24062118dde0 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 11 Aug 2018 11:32:00 -0400 Subject: [PATCH 357/475] nvidia_x11_beta: reinit at 410.57 --- nixos/modules/hardware/video/nvidia.nix | 12 ++-- pkgs/os-specific/linux/nvidia-x11/builder.sh | 58 +++++++++++-------- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++- pkgs/os-specific/linux/nvidia-x11/generic.nix | 25 +++++--- 4 files changed, 65 insertions(+), 38 deletions(-) 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/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; From b2dabdc697b760b3c95056c2dd8dc2771ef93a12 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 17 Oct 2018 20:48:19 -0400 Subject: [PATCH 358/475] sbt: 1.2.4 -> 1.2.6 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From f1195b912be8bd55c34ce6dfa268cb402d9abec7 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 17 Oct 2018 20:59:52 -0400 Subject: [PATCH 359/475] jdk10: remove special handling for arm neither oraclejdk nor openjdk is supported on arm, so this is needless complexity --- pkgs/top-level/all-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1879dc063e..4c888fe1f5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6964,14 +6964,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" From 1c7d38bcfbf5a27fe3df9cefa1dac5864e492075 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Tue, 16 Oct 2018 09:38:36 +1100 Subject: [PATCH 360/475] bazel: 0.17.1 -> 0.18.0 --- .../tools/build-managers/bazel/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) 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 From 613d3bac86eebfeec082ee742b1706f2cc66c7c1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 18 Oct 2018 03:04:36 +0800 Subject: [PATCH 361/475] pulseaudio-modules-bt: Patched rpath takes precedence over original This fixes a segmentation fault when loaded via pulseaudio's dl-search-path --- pkgs/applications/audio/pulseaudio-modules-bt/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 6bb432b3fd8..b377db65c0c 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -1,7 +1,6 @@ { stdenv , runCommand , fetchFromGitHub -, libpulseaudio , pulseaudio , pkgconfig , ffmpeg_4 @@ -44,7 +43,6 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - libpulseaudio pulseaudio ffmpeg_4 libtool @@ -67,7 +65,7 @@ in stdenv.mkDerivation rec { for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "$orig_rpath:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules" \ + --set-rpath "${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ "$so" done ''; From 78c0e1aa11f6b93fcbbf473b0691f3dbf9bc6039 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 18 Oct 2018 03:05:46 +0800 Subject: [PATCH 362/475] nixos/pulseaudio: Add extraModules config option --- nixos/modules/config/pulseaudio.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) 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; }) From d23381f713a06e2f75d2b7111463c1495c0c2ef1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 15:40:14 -0400 Subject: [PATCH 363/475] pythonPackages.grappelli_safe: refactor move to pyhton-modules --- .../python-modules/grappelli_safe/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +-------------- 2 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/grappelli_safe/default.nix 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..f32246c9005 --- /dev/null +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "0.3.13"; + pname = "grappelli_safe"; + + src = fetchPypi { + inherit pname version; + sha256 = "8b21b4724bce449cc4f22dc74ed0be9b3e841d968f3271850bf4836864304eb6"; + }; + + 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0562d60ab15..f3c49c3159d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2248,33 +2248,7 @@ in { 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: From ef769d741cee7ae0c2c4d606113d5e1998855b7c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 15:44:31 -0400 Subject: [PATCH 364/475] pythonPackages.python2-pythondialog: refactor move to python-modules --- .../python2-pythondialog/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/python2-pythondialog/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3c49c3159d..9626ef7a9b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2274,24 +2274,7 @@ in { cudaSupport = false; }; - python2-pythondialog = buildPythonPackage rec { - name = "python2-pythondialog-${version}"; - version = "3.3.0"; - disabled = !isPy27; - - 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/"; - }; - }; + python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; pyRFC3339 = buildPythonPackage rec { name = "pyRFC3339-${version}"; From d9d19b2de919173d13d2355325151a32ccd610d7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 15:47:52 -0400 Subject: [PATCH 365/475] pythonPackages.pyRFC3339: refactor move to python-modules --- .../python-modules/pyrfc3339/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +--------- 2 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/pyrfc3339/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9626ef7a9b6..ae594295b1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2276,18 +2276,7 @@ in { python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; - 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 { }; From fd9d52e1fe468c61029a990310902692ffc7f27f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 15:51:21 -0400 Subject: [PATCH 366/475] pythonPackages.falcon: refactor move to python-modules --- .../python-modules/falcon/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +---------- 2 files changed, 38 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/falcon/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae594295b1d..12e2d0e8456 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2284,28 +2284,8 @@ 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"; - }; - - 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 { From cfe52039ac37044f571536346e1716c2f070bf76 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 15:58:44 -0400 Subject: [PATCH 367/475] pythonPackages.flup: refactor move to pyhton-modules added pypifetch --- .../python-modules/flup/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +---------- 2 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/flup/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12e2d0e8456..c7cc5e7fbdd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2305,20 +2305,8 @@ in { 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 { }; From 918af2267ec06e5e95ec6dfc610de5d1fcf9065f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:04:36 -0400 Subject: [PATCH 368/475] pythonPackages.hug: refactor move to python-modules --- .../python-modules/hug/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/hug/default.nix diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix new file mode 100644 index 00000000000..4aeffc75823 --- /dev/null +++ b/pkgs/development/python-modules/hug/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, falcon +, requests +}: + +buildPythonPackage rec { + pname = "hug"; + version = "2.1.2"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c"; + }; + + propagatedBuildInputs = [ falcon requests ]; + + # tests are not shipped in the tarball + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; + homepage = https://github.com/timothycrosley/hug; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7cc5e7fbdd..2a13c1421cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2286,25 +2286,7 @@ in { falcon = callPackage ../development/python-modules/falcon { }; - 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; - }; - }; + hug = callPackage ../development/python-modules/hug { }; flup = callPackage ../development/python-modules/flup { }; From 991adf820bb6d3f4512384ac2ae787b91834d4ba Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:04:58 -0400 Subject: [PATCH 369/475] pythonPackages.foolscap: refactor move to python-modules --- .../python-modules/foolscap/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 36 +---------------- 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/python-modules/foolscap/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a13c1421cf..0aa1f56037b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2301,41 +2301,7 @@ in { fonttools = callPackage ../development/python-modules/fonttools { }; - foolscap = buildPythonPackage (rec { - name = "foolscap-${version}"; - version = "0.12.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/foolscap/${name}.tar.gz"; - sha256 = "1bpmqq6485mmr5jza9q2c55l9m1bfsvsbd9drsip7p5qcsi22jrz"; - }; - - 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 = [ ]; - }; - }); + foolscap = callPackage ../development/python-modules/foolscap { }; forbiddenfruit = buildPythonPackage rec { version = "0.1.0"; From 84fc0eae5e4fdc0335be56cf1d84e4eeed469e85 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:06:47 -0400 Subject: [PATCH 370/475] pythonPackages.forbiddenfruit: refactor move to python-modules --- .../python-modules/forbiddenfruit/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/forbiddenfruit/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0aa1f56037b..775f7f3dfd9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2303,21 +2303,7 @@ in { foolscap = callPackage ../development/python-modules/foolscap { }; - 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; - }; - }; + forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; fs = buildPythonPackage rec { name = "fs-0.5.4"; From a8278eab657de3cff474e1dfef5035a8885fa65b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:09:24 -0400 Subject: [PATCH 371/475] pythonPackages.fusepy: refactor move to python-modules --- .../python-modules/fusepy/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +-------------- 2 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/fusepy/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 775f7f3dfd9..98bc670498a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2337,35 +2337,7 @@ in { }; }; - 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 { From b5ae82f5b84f728babfb2bcf1fe77d17d5c4db4c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:11:43 -0400 Subject: [PATCH 372/475] pythonPackages.gocovr: refactor move to python-modules --- .../python-modules/gcovr/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------------ 2 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/gcovr/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98bc670498a..a67aa1c5861 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2352,19 +2352,7 @@ 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; From 235c6edd42eced4f1a15124de7fdad5d4f8340b0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:14:20 -0400 Subject: [PATCH 373/475] pythonPackages.gdrivefs: refactor move to python-modules --- .../python-modules/gdrivefs/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 36 +------------- 2 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/python-modules/gdrivefs/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a67aa1c5861..4ba370abb4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2358,41 +2358,7 @@ in { pythonPackages = self; }); - gdrivefs = buildPythonPackage rec { - version = "0.14.9"; - name = "gdrivefs-${version}"; - namePrefix = ""; - disabled = !isPy27; - - 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; - }; - }; + gdrivefs = callPackage ../development/python-modules/gdrivefs { }; genshi = buildPythonPackage { name = "genshi-0.7"; From 5448e18d1226be2c3f362f8f61df6a3913b5810f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:18:24 -0400 Subject: [PATCH 374/475] pythonPackages.genshi: refactor move to python-modules --- .../python-modules/genshi/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +--------------- 2 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/genshi/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ba370abb4b..462b725cb3b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2360,32 +2360,7 @@ in { gdrivefs = callPackage ../development/python-modules/gdrivefs { }; - 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 { }; From 5582de06a71d9e5e145f34ce7c4bb6af69ade226 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:20:40 -0400 Subject: [PATCH 375/475] pythonPackages.geventhttpclient: refactor move to pyhton-modules --- .../geventhttpclient/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------- 2 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/geventhttpclient/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 462b725cb3b..9e1572115a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2364,31 +2364,7 @@ in { gevent = callPackage ../development/python-modules/gevent { }; - geventhttpclient = buildPythonPackage rec { - name = "geventhttpclient-${version}"; - version = "1.3.1"; - - 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 ]; - }; - }; + geventhttpclient = callPackage ../development/python-modules/geventhttpclient { }; gevent-socketio = buildPythonPackage rec { name = "gevent-socketio-0.3.6"; From cdd7e77ac4fa0500b3f258c2b6c300ef0b758989 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:23:43 -0400 Subject: [PATCH 376/475] pythonPackages.gevent-socketio: refactor move to python-modules --- .../gevent-socketio/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +-------- 2 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/gevent-socketio/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e1572115a5..d772e0a334f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2366,18 +2366,7 @@ in { geventhttpclient = callPackage ../development/python-modules/geventhttpclient { }; - 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 { }; From f7b0a11dd8a3a74e050a4586b73b541bb1118f64 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:27:27 -0400 Subject: [PATCH 377/475] pythonPackages.gevent-websocket: refactor move to python-modules --- .../gevent-websocket/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +---------- 2 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/gevent-websocket/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d772e0a334f..592d9536959 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2372,20 +2372,7 @@ in { 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 ]; - - }; + gevent-websocket = callPackage ../development/python-modules/gevent-websocket { }; genzshcomp = buildPythonPackage { name = "genzshcomp-0.5.1"; From 7771d40c054e99b8fe67ec6325774e2bdd0ce00c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:30:17 -0400 Subject: [PATCH 378/475] pythonPackages.genzshcomp: refactor move to python-modules --- .../python-modules/genzshcomp/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/genzshcomp/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 592d9536959..fe9ab57c20f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2374,22 +2374,7 @@ in { gevent-websocket = callPackage ../development/python-modules/gevent-websocket { }; - 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"; - }; - }; - + genzshcomp = callPackage ../development/python-modules/genzshcomp { }; gflags = callPackage ../development/python-modules/gflags { }; From 968b1ab947b5016304b4ab81bea257bb2442e9c6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:32:16 -0400 Subject: [PATCH 379/475] pythonPackages.gipc: refactor move to python-modules --- .../python-modules/gipc/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------- 2 files changed, 36 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/gipc/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe9ab57c20f..890ca2789a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2380,31 +2380,7 @@ in { ghdiff = callPackage ../development/python-modules/ghdiff { }; - gipc = buildPythonPackage rec { - name = "gipc-0.5.0"; - disabled = !isPy27; - - 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; - }; - }; + gipc = callPackage ../development/python-modules/gipc { }; git-sweep = buildPythonPackage rec { name = "git-sweep-0.1.1"; From c26dd4138b86071816e6f5fa14400f231549428c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:33:57 -0400 Subject: [PATCH 380/475] pythonPackage.git-sweep: refactor move to python-modules --- .../python-modules/git-sweep/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/git-sweep/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 890ca2789a2..86ebe743895 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2382,23 +2382,7 @@ in { gipc = callPackage ../development/python-modules/gipc { }; - 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 { }; From dc56c8faf903126a0566506379bc867e71124ffb Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:37:02 -0400 Subject: [PATCH 381/475] pythonPackages.github3_py: refactor move to python-modules --- .../python-modules/github3_py/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +------------ 2 files changed, 46 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/github3_py/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86ebe743895..9362aefe675 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2386,35 +2386,7 @@ in { glances = callPackage ../development/python-modules/glances { }; - github3_py = buildPythonPackage rec { - name = "github3.py-${version}"; - version = "1.1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/github3.py/${name}.tar.gz"; - sha256 = "1cxaqdqmz9w2afc0cw2jyv783fp0grydbik0frzj79azzkhyg4gf"; - }; - - 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 ]; - }; - }; + github3_py = callPackage ../development/python-modules/github3_py { }; github-webhook = buildPythonPackage rec { name = "github-webhook-${version}"; From 060ba731b68f45231147a81e99e69cffb7d0cc38 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:39:10 -0400 Subject: [PATCH 382/475] pythonPackages.github-webhook: refactor move to python-modules --- .../python-modules/github-webhook/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/github-webhook/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9362aefe675..369c6945562 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2388,27 +2388,7 @@ in { github3_py = callPackage ../development/python-modules/github3_py { }; - 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; - }; - }; + github-webhook = callPackage ../development/python-modules/github-webhook { }; goobook = buildPythonPackage rec { name = "goobook-1.9"; From 7300b2c7141469b1e69776e79c78dfbf6178813f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:41:29 -0400 Subject: [PATCH 383/475] pythonPackages.goobook: refactor move to python-modules --- .../python-modules/goobook/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------ 2 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/goobook/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 369c6945562..2456cb9d692 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2390,31 +2390,7 @@ in { github-webhook = callPackage ../development/python-modules/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 { }; From 1e00e981cb1aec8efb5d4e9abd0b291061bec028 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:44:15 -0400 Subject: [PATCH 384/475] pythonPackages.google_apputils: refactor move to python-modules --- .../google_apputils/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------ 2 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/google_apputils/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2456cb9d692..16410267a97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2400,31 +2400,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 { }; From d0d3891d8ab4fd69d01e222b0307af8751652d3b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:46:14 -0400 Subject: [PATCH 385/475] pythonPackages.gspread: refactored move to python-modules --- .../python-modules/gspread/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/gspread/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16410267a97..8b18f7e1e05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2428,21 +2428,7 @@ in { grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; - gspread = buildPythonPackage rec { - version = "0.2.3"; - name = "gspread-${version}"; - - 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; - }; - }; + gspread = callPackage ../development/python-modules/gspread { }; gyp = buildPythonPackage rec { name = "gyp-${version}"; From f4c92c603c25d79b8b0a8916d6490327faa151c0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:48:57 -0400 Subject: [PATCH 386/475] pythonPackages.gyp: refactor move to python-modules --- .../python-modules/gyp/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +--------------- 2 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/gyp/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8b18f7e1e05..961c4e3dfb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2430,35 +2430,7 @@ in { gspread = callPackage ../development/python-modules/gspread { }; - 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 { }; From d063f818d5e09163dbf633aa4ae27e74315c044f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:52:17 -0400 Subject: [PATCH 387/475] pythonPackages.hackauthlib: refactor move to python-modules --- .../python-modules/hawkauthlib/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +-------- 2 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/hawkauthlib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 961c4e3dfb1..6c14e4ccedb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2438,17 +2438,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 { }; From a340c88b2d77a4995a3dfc0c08383e2f7e3a1474 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:54:03 -0400 Subject: [PATCH 388/475] pythonPackages.hetzner: refactor move to python-modules --- .../python-modules/hetzner/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/hetzner/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c14e4ccedb..c5252c3d38d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2446,25 +2446,7 @@ 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 ]; - }; - }; - + hetzner = callPackage ../development/python-modules/hetzner { }; htmllaundry = buildPythonPackage rec { name = "htmllaundry-2.0"; From 2bc69b7526415206ccaa5ca56b6863bab0ac222f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:56:52 -0400 Subject: [PATCH 389/475] pythonPackages.htmllaundry: refactor move to python-modules --- .../python-modules/htmllaundry/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/htmllaundry/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5252c3d38d..bf5d9b789b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2448,27 +2448,7 @@ in { hetzner = callPackage ../development/python-modules/hetzner { }; - 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; - }; - }; - + htmllaundry = callPackage ../development/python-modules/htmllaundry { }; html5lib = callPackage ../development/python-modules/html5lib { }; From 8b5d562d2557114d4656920f077cac79832bd95c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:59:16 -0400 Subject: [PATCH 390/475] pythonPackages.http_signature: refactor move to python-modules --- .../python-modules/http_signature/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/http_signature/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf5d9b789b5..d2e6b9676fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2452,23 +2452,7 @@ in { 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 { }; From 0dafa8e8be1160a3df2d429a3b3371ac725475d1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:02:03 -0400 Subject: [PATCH 391/475] pythonPackages.colored: refactor move to python-modules --- .../python-modules/colored/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +--------- 2 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/colored/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2e6b9676fd..efb2a473bbc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2462,18 +2462,7 @@ 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"; - }; - - # No proper test suite - doCheck = false; - }; - + colored = callPackage ../development/python-modules/colored { }; xdis = buildPythonPackage rec { name = "xdis-${version}"; From d3f57e372d37ab7ae49111f6cec3f7e6c988fb2c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:03:41 -0400 Subject: [PATCH 392/475] pythonPackages.xdis: refactor move to python-modules --- .../python-modules/xdis/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/xdis/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efb2a473bbc..fe0b16298b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2464,21 +2464,7 @@ in { colored = callPackage ../development/python-modules/colored { }; - 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 ]; - - meta = { - description = "Python cross-version byte-code disassembler and marshal routines"; - homepage = https://github.com/rocky/python-xdis/; - license = licenses.mit; - }; - }; + xdis = callPackage ../development/python-modules/xdis { }; uncompyle6 = buildPythonPackage rec { name = "uncompyle6-${version}"; From d1a48cc23ecfd0492954b9c466a3d26416cef030 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:05:31 -0400 Subject: [PATCH 393/475] pythonPackages.uncompyle6: refactor move to python-modules --- .../python-modules/uncompyle6/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +---------- 2 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/uncompyle6/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe0b16298b2..e5823130a53 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2466,20 +2466,7 @@ in { xdis = callPackage ../development/python-modules/xdis { }; - 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; - }; - }; + uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; lsi = buildPythonPackage rec { name = "lsi-${version}"; From 45bbac9091a406f68a63a639d3c5ad2730d27510 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:07:52 -0400 Subject: [PATCH 394/475] pythonPackages.lsi: refactor move to python-modules --- .../python-modules/lsi/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/lsi/default.nix diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix new file mode 100644 index 00000000000..ebf98d9e7b2 --- /dev/null +++ b/pkgs/development/python-modules/lsi/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, isPy3k +, fetchPypi +, colored +, boto +, pkgs +}: + +buildPythonPackage rec { + pname = "lsi"; + version = "0.2.2"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0429iilb06yhsmvj3xp6wyhfh1rp4ndxlhwrm80r97z0w7plrk94"; + }; + + propagatedBuildInputs = [ colored boto pkgs.openssh pkgs.which ]; + + meta = with stdenv.lib; { + description = "CLI for querying and SSHing onto AWS EC2 instances"; + homepage = https://github.com/NarrativeScience/lsi; + maintainers = [maintainers.adnelson]; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5823130a53..f8281dd18a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2468,27 +2468,7 @@ in { uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; - 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; - }; - }; + lsi = callPackage ../development/python-modules/lsi { }; hkdf = buildPythonPackage rec { name = "hkdf-${version}"; From 8a821466cdab051df2156f6a8d9fb2b1bad6212f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:12:17 -0400 Subject: [PATCH 395/475] pythonPackages.hkdf: refactor move to python-modules --- .../python-modules/hkdf/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/hkdf/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8281dd18a0..bec6757f0e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2470,27 +2470,7 @@ in { lsi = callPackage ../development/python-modules/lsi { }; - 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; - }; - }; + hkdf = callPackage ../development/python-modules/hkdf { }; httpretty = buildPythonPackage rec { name = "httpretty-${version}"; From dadd7546563db6e311f1116c4ae7d135bc2304ad Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:15:06 -0400 Subject: [PATCH 396/475] pythonPackages.httpretty: refactor move to python-modules --- .../python-modules/httpretty/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 37 +------------- 2 files changed, 51 insertions(+), 36 deletions(-) create mode 100644 pkgs/development/python-modules/httpretty/default.nix 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 < Date: Tue, 16 Oct 2018 17:16:57 -0400 Subject: [PATCH 397/475] pythonPackages.icalendar: refactor move to python-modules --- .../python-modules/icalendar/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/icalendar/default.nix diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix new file mode 100644 index 00000000000..b83785211f8 --- /dev/null +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools +, dateutil +, pytz +}: + +buildPythonPackage rec { + version = "3.9.0"; + pname = "icalendar"; + + src = fetchPypi { + inherit pname version; + sha256 = "93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792"; + }; + + buildInputs = [ setuptools ]; + propagatedBuildInputs = [ dateutil pytz ]; + + meta = with stdenv.lib; { + description = "A parser/generator of iCalendar files"; + homepage = "http://icalendar.readthedocs.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ olcai ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 070512a8e7d..2ae3efdbcd0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2474,25 +2474,7 @@ in { httpretty = callPackage ../development/python-modules/httpretty { }; - icalendar = buildPythonPackage rec { - version = "3.9.0"; - name = "icalendar-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/icalendar/${name}.tar.gz"; - sha256 = "93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792"; - }; - - buildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with self; [ dateutil pytz ]; - - meta = { - description = "A parser/generator of iCalendar files"; - homepage = "http://icalendar.readthedocs.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ olcai ]; - }; - }; + icalendar = callPackage ../development/python-modules/icalendar { }; imageio = buildPythonPackage rec { name = "imageio-${version}"; From f725650c69cec41cf7044d88aaf3efad04bb787b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:18:40 -0400 Subject: [PATCH 398/475] pythonPackages.imageio: refactor move to python-modules --- .../python-modules/imageio/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +-------------- 2 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/imageio/default.nix diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix new file mode 100644 index 00000000000..cdbcfee7180 --- /dev/null +++ b/pkgs/development/python-modules/imageio/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, pytest +, numpy +}: + +buildPythonPackage rec { + pname = "imageio"; + version = "1.6"; + + src = fetchurl { + url = "https://github.com/imageio/imageio/archive/v${version}.tar.gz"; + sha256 = "195snkk3fsbjqd5g1cfsd9alzs5q45gdbi2ka9ph4yxqb31ijrbv"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ numpy ]; + + checkPhase = '' + py.test + ''; + + # Tries to write in /var/tmp/.imageio + doCheck = false; + + meta = with stdenv.lib; { + description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; + homepage = http://imageio.github.io/; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ae3efdbcd0..be2465ca657 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2476,31 +2476,7 @@ in { icalendar = callPackage ../development/python-modules/icalendar { }; - imageio = buildPythonPackage rec { - name = "imageio-${version}"; - version = "1.6"; - - src = pkgs.fetchurl { - url = "https://github.com/imageio/imageio/archive/v${version}.tar.gz"; - sha256 = "195snkk3fsbjqd5g1cfsd9alzs5q45gdbi2ka9ph4yxqb31ijrbv"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy ]; - - checkPhase = '' - py.test - ''; - - # Tries to write in /var/tmp/.imageio - doCheck = false; - - meta = { - description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; - homepage = http://imageio.github.io/; - license = licenses.bsd2; - }; - }; + imageio = callPackage ../development/python-modules/imageio { }; imgaug = callPackage ../development/python-modules/imgaug { }; From c1f0f33fee7e0aaf0871347889a1e9beef6ec9d0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:20:29 -0400 Subject: [PATCH 399/475] pythonPackages.influxdb: refactor move to python-modules --- .../python-modules/influxdb/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------- 2 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/influxdb/default.nix diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix new file mode 100644 index 00000000000..100ca5b0ff9 --- /dev/null +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, dateutil +, pytz +, six +}: + +buildPythonPackage rec { + pname = "influxdb"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0injsml6zmb3hkgc03117fdlg573kbfgjbijpd5npf0vsy0xnpvz"; + }; + + # ImportError: No module named tests + doCheck = false; + propagatedBuildInputs = [ requests dateutil pytz six ]; + + meta = with stdenv.lib; { + description = "Python client for InfluxDB"; + homepage = https://github.com/influxdb/influxdb-python; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be2465ca657..fc10d29535d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2482,24 +2482,7 @@ in { inflection = callPackage ../development/python-modules/inflection { }; - influxdb = buildPythonPackage rec { - name = "influxdb-4.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/influxdb/${name}.tar.gz"; - sha256 = "0injsml6zmb3hkgc03117fdlg573kbfgjbijpd5npf0vsy0xnpvz"; - }; - - # ImportError: No module named tests - doCheck = false; - propagatedBuildInputs = with self; [ requests dateutil pytz six ]; - - meta = { - description = "Python client for InfluxDB"; - homepage = https://github.com/influxdb/influxdb-python; - license = licenses.mit; - }; - }; + influxdb = callPackage ../development/python-modules/influxdb { }; infoqscraper = buildPythonPackage rec { name = pname + "-" + version; From 7a35ae188f24f5619bb63f50de51ac3b72ed551d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:22:59 -0400 Subject: [PATCH 400/475] pythonPackages.infoqscaper: refactor move to python-modules --- .../python-modules/infoqscraper/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +-------------- 2 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/infoqscraper/default.nix diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix new file mode 100644 index 00000000000..f9ced7e63da --- /dev/null +++ b/pkgs/development/python-modules/infoqscraper/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, html5lib +, six +, beautifulsoup4 +, pkgs +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "infoqscraper"; + + src = pkgs.fetchFromGitHub { + owner = "cykl"; + repo = pname; + rev = "v${version}"; + sha256 = "07mxp4mla7fwfc032f3mxrhjarnhkjqdxxibf9ba87c93z3dq8jj"; + }; + + # requires network + doCheck = false; + + buildInputs = [ html5lib ]; + propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg pkgs.swftools pkgs.rtmpdump ]; + + meta = with stdenv.lib; { + description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; + homepage = "https://github.com/cykl/infoqscraper/wiki"; + license = licenses.mit; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc10d29535d..4553cbc40d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2484,32 +2484,7 @@ in { influxdb = callPackage ../development/python-modules/influxdb { }; - infoqscraper = buildPythonPackage rec { - name = pname + "-" + version; - version = "0.1.0"; - pname = "infoqscraper"; - - src = pkgs.fetchFromGitHub { - owner = "cykl"; - repo = pname; - rev = "v" + version; - sha256 = "07mxp4mla7fwfc032f3mxrhjarnhkjqdxxibf9ba87c93z3dq8jj"; - }; - - # requires network - doCheck = false; - - buildInputs = with self; [ html5lib ]; - propagatedBuildInputs = (with self; [ six beautifulsoup4 ]) - ++ (with pkgs; [ ffmpeg swftools rtmpdump ]); - - meta = { - description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; - homepage = "https://github.com/cykl/infoqscraper/wiki"; - license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; - }; - }; + infoqscraper = callPackage ../development/python-modules/infoqscraper { }; inifile = buildPythonPackage rec { name = "inifile-0.3"; From 45f47bd75f59ed8b36fdb4041edd604f1227bbeb Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:25:00 -0400 Subject: [PATCH 401/475] pythonPackages.inifile: refactor move to python-modules --- .../python-modules/inifile/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/inifile/default.nix diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix new file mode 100644 index 00000000000..e64ef76356d --- /dev/null +++ b/pkgs/development/python-modules/inifile/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "inifile"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zgd53czc1irwx6b5zip8xlmyfr40hz2pd498d8yv61znj6lm16h"; + }; + + meta = with stdenv.lib; { + description = "A small INI library for Python"; + homepage = "https://github.com/mitsuhiko/python-inifile"; + license = licenses.bsd0; + maintainers = with maintainers; [ vozz ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4553cbc40d0..1c0ee4cb877 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2486,21 +2486,7 @@ in { infoqscraper = callPackage ../development/python-modules/infoqscraper { }; - inifile = buildPythonPackage rec { - name = "inifile-0.3"; - - meta = { - description = "A small INI library for Python"; - homepage = "https://github.com/mitsuhiko/python-inifile"; - license = "BSD"; - maintainers = with maintainers; [ vozz ]; - }; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/inifile/${name}.tar.gz"; - sha256 = "0zgd53czc1irwx6b5zip8xlmyfr40hz2pd498d8yv61znj6lm16h"; - }; - }; + inifile = callPackage ../development/python-modules/inifile { }; interruptingcow = callPackage ../development/python-modules/interruptingcow {}; From 1de37f01ee10950c0f427143aa5b01eba006e8b6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:27:12 -0400 Subject: [PATCH 402/475] pythonPackages.iptools: refactor move to python-modules --- .../python-modules/iptools/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/iptools/default.nix diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix new file mode 100644 index 00000000000..e5c5d298b43 --- /dev/null +++ b/pkgs/development/python-modules/iptools/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + version = "0.6.1"; + pname = "iptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f03875a5bed740ba4bf44decb6a78679cca914a1ee8a6cc468114485c4d98e3"; + }; + + buildInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; + homepage = https://pypi.python.org/pypi/iptools; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c0ee4cb877..979caf6a21a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2490,22 +2490,7 @@ in { interruptingcow = callPackage ../development/python-modules/interruptingcow {}; - iptools = buildPythonPackage rec { - version = "0.6.1"; - name = "iptools-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/iptools/iptools-${version}.tar.gz"; - sha256 = "0f03875a5bed740ba4bf44decb6a78679cca914a1ee8a6cc468114485c4d98e3"; - }; - - buildInputs = with self; [ nose ]; - - meta = { - description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; - homepage = https://pypi.python.org/pypi/iptools; - }; - }; + iptools = callPackage ../development/python-modules/iptools { }; ipy = callPackage ../development/python-modules/IPy { }; From 32414fe980e47bfa1715e0e8be507c2b4cfa1e7c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:50:00 -0400 Subject: [PATCH 403/475] pythonPackages.django_contrib_comments: init at 1.9.0 --- .../django_contrib_comments/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/django_contrib_comments/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 979caf6a21a..02233491347 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2031,6 +2031,8 @@ in { django_compat = callPackage ../development/python-modules/django-compat { }; + django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; + django_environ = callPackage ../development/python-modules/django_environ { }; django_evolution = callPackage ../development/python-modules/django_evolution { }; From 82eaa207250c39a970e4daa5c527397bef81d93b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:51:22 -0400 Subject: [PATCH 404/475] pythonPackages.mezzanine: refactor move to pyhton-modules required update and creation of new package to fix broken. --- .../filebrowser_safe/default.nix | 4 +- .../python-modules/grappelli_safe/default.nix | 4 +- .../python-modules/mezzanine/default.nix | 70 +++++++++++++++++++ .../mezzanine/writable_settings.patch | 21 ------ pkgs/top-level/python-packages.nix | 54 +------------- 5 files changed, 75 insertions(+), 78 deletions(-) create mode 100644 pkgs/development/python-modules/mezzanine/default.nix delete mode 100644 pkgs/development/python-modules/mezzanine/writable_settings.patch diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index cbef81de8cd..8e95d1e413e 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.3.6"; + version = "0.5.0"; pname = "filebrowser_safe"; src = fetchPypi { inherit pname version; - sha256 = "02bn60fdslvng2ckn65fms3hjbzgsa8qa5161a8lr720wbx8gpj2"; + sha256 = "5dcd31dd79684025139b43841f6515af1da5a4bb0de15bc4d88003db1970648e"; }; buildInputs = [ django ]; diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index f32246c9005..bbba074b3f5 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.3.13"; + version = "0.5.1"; pname = "grappelli_safe"; src = fetchPypi { inherit pname version; - sha256 = "8b21b4724bce449cc4f22dc74ed0be9b3e841d968f3271850bf4836864304eb6"; + sha256 = "27660faa628186d74258781edfa03ef812555d49b4925cfe19c05bcd3da85e40"; }; meta = with stdenv.lib; { 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 02233491347..d95b17bcd7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2750,59 +2750,7 @@ in { 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 { }; From 67988e545ca96f7d5eeaffbfac09e511c9fd228f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:00:18 -0400 Subject: [PATCH 405/475] pythonPacakges.moviepy: refactor move to python-modules --- .../python-modules/moviepy/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/moviepy/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d95b17bcd7f..4228ad2f35f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2775,25 +2775,7 @@ in { }; }; - 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 { }; From 9f6909e77e0906c812ad245ba84520a0785c8fa5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:02:36 -0400 Subject: [PATCH 406/475] pythonPackages.munch: refactor move to python-modules --- .../python-modules/munch/default.nix | 21 ++++++++++++ pkgs/top-level/python-packages.nix | 32 ++----------------- 2 files changed, 23 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/munch/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4228ad2f35f..7b075140ee7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2783,21 +2783,7 @@ 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 { }; @@ -3225,21 +3211,7 @@ in { }; }; - 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"; - }; - }; + pint = callPackage ../development/python-modules/pint { }; pygal = buildPythonPackage rec { pname = "pygal"; From 4bb98c4c1ae34d4e2ecd815ab3b141e29fbb86ab Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:06:16 -0400 Subject: [PATCH 407/475] pythonPackages.rainbowstream: refactor move to python-modules --- .../python-modules/rainbowstream/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 45 +--------------- 2 files changed, 55 insertions(+), 44 deletions(-) create mode 100644 pkgs/development/python-modules/rainbowstream/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b075140ee7..1daae68d290 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2787,50 +2787,7 @@ in { 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 { }; From 36d0404ed6ac9e068ef5c80b666532c87b905744 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:08:09 -0400 Subject: [PATCH 408/475] pythonPackages.pocket: refactor move to python-modules --- .../python-modules/pocket/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +--------------- 2 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/pocket/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1daae68d290..1bf49963c5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2791,26 +2791,7 @@ in { 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 { }; From bf98e3b44675aa92ba1f906594cd36170183334c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:09:58 -0400 Subject: [PATCH 409/475] pythonPackages.sortedcollections: refactor move to python-modules --- .../sortedcollections/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/sortedcollections/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1bf49963c5a..3e5dd5d4de7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2797,25 +2797,7 @@ in { 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 { }; From 55087971596e94dc9e576671fdf9a58e86cb6f01 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:12:58 -0400 Subject: [PATCH 410/475] pythonPackages.editorconfig: refactor join with EditorConfig attr --- .../python-modules/editorconfig/default.nix | 2 +- pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 82338bbcc8f..97e486a0532 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "EditorConfig"; - version = "0.12.0"; + version = "0.12.1"; # fetchgit used to ensure test submodule is available src = fetchgit { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e5dd5d4de7..6bde2d0a1fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2803,21 +2803,7 @@ in { h2 = callPackage ../development/python-modules/h2 { }; - editorconfig = buildPythonPackage rec { - name = "EditorConfig-${version}"; - version = "0.12.1"; - - 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; - }; - }; + editorconfig = callPackage ../development/python-modules/editorconfig { }; mock = buildPythonPackage (rec { name = "mock-2.0.0"; From 34a2b86fbc16b0e357d3a79b1626798c7f1b5d8e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:15:17 -0400 Subject: [PATCH 411/475] pythonPacakges.mock: refactor move to python-modules --- .../python-modules/mock/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------ 2 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/mock/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6bde2d0a1fb..7a35a2cb1bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2805,27 +2805,7 @@ in { editorconfig = callPackage ../development/python-modules/editorconfig { }; - 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 { }; From ded3676b18b19f83d72ccbcd2433254b9506f983 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:18:37 -0400 Subject: [PATCH 412/475] pythonPackages.modestmaps: refactor move to python-modules --- .../python-modules/modestmaps/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/modestmaps/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a35a2cb1bc..5d62487c68b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2809,23 +2809,7 @@ in { 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 { }; From 4860875eaa6b4c9c47c0d4cb9f56ce75dd515553 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:20:39 -0400 Subject: [PATCH 413/475] pythonPackages.mox: refactor move to python-modules --- .../python-modules/mox/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/mox/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d62487c68b..05a17f42d76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2818,22 +2818,7 @@ in { moto = callPackage ../development/python-modules/moto {}; - mox = buildPythonPackage rec { - name = "mox-0.5.3"; - - src = pkgs.fetchurl { - url = "http://pymox.googlecode.com/files/${name}.tar.gz"; - sha256 = "4d18a4577d14da13d032be21cbdfceed302171c275b72adaa4c5997d589a5030"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://code.google.com/p/pymox/; - description = "A mock object framework for Python"; - }; - }; + mox = callPackage ../development/python-modules/mox { }; mozsvc = buildPythonPackage rec { name = "mozsvc-${version}"; From 99ec6e3c08e7c09ac6acee187c6d2d27d9829b23 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:23:51 -0400 Subject: [PATCH 414/475] pythonPackages.mozsvc: refactor move to python-modules --- .../python-modules/mozsvc/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------ 2 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/mozsvc/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05a17f42d76..aad7c88f2e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2820,29 +2820,7 @@ in { mox = callPackage ../development/python-modules/mox { }; - mozsvc = buildPythonPackage rec { - name = "mozsvc-${version}"; - version = "0.8"; - - 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"; - }; - }; + mozsvc = callPackage ../development/python-modules/mozsvc { }; mpmath = buildPythonPackage rec { name = "mpmath-0.19"; From 2c30da5ec186a135b89aef9aa9a4f566cd10de97 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:25:46 -0400 Subject: [PATCH 415/475] pythonPackages.mpmath: refactor move to python-modules --- .../python-modules/mpmath/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/mpmath/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aad7c88f2e4..d967f79bb0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2822,26 +2822,7 @@ in { mozsvc = callPackage ../development/python-modules/mozsvc { }; - 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; - }; - + mpmath = callPackage ../development/python-modules/mpmath { }; mpd = buildPythonPackage rec { name = "python-mpd-0.3.0"; From f3548b46e7d948aed4958b5253afad2f817e01e9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:27:29 -0400 Subject: [PATCH 416/475] pythonPackages.mpd: refactor move to python-modules --- .../python-modules/mpd/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/mpd/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d967f79bb0d..f38f3690914 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2824,22 +2824,7 @@ in { mpmath = callPackage ../development/python-modules/mpmath { }; - 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; - }; - }; + mpd = callPackage ../development/python-modules/mpd { }; mpd2 = buildPythonPackage rec { name = "mpd2-${version}"; From 8edd20b7ae5efe0b3af70efe2744062307834fda Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:29:08 -0400 Subject: [PATCH 417/475] pythonPackages.mpd2: refactor move to python-modules --- .../python-modules/mpd2/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/mpd2/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f38f3690914..0fb41fd5aea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2826,28 +2826,7 @@ in { mpd = callPackage ../development/python-modules/mpd { }; - 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 ]; - }; - }; + mpd2 = callPackage ../development/python-modules/mpd2 { }; mpv = buildPythonPackage rec { name = "mpv-0.1"; From b11138d594cc27c1df62b0f241e7543b534616cb Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:30:45 -0400 Subject: [PATCH 418/475] pythonPackages.mpv: refactor move to python-modules --- .../python-modules/mpv/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/mpv/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0fb41fd5aea..517f58e2e9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2828,23 +2828,7 @@ in { mpd2 = callPackage ../development/python-modules/mpd2 { }; - 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 {}; From 616137d77f6abfb03f7900c56fa7efa97f1bafcb Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:34:14 -0400 Subject: [PATCH 419/475] pythonPackages.msrplib: refactor move to python-modules --- .../python-modules/msrplib/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +--------- 2 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/msrplib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 517f58e2e9b..01d3f9ae02a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2843,19 +2843,7 @@ 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 { }; From e4caef3c23b0ced9b398af70f99b9d2f16119896 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:36:07 -0400 Subject: [PATCH 420/475] pythonPackage.munkres: refactor move to python-modules --- .../python-modules/munkres/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/munkres/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01d3f9ae02a..3415fb0ae48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2849,25 +2849,7 @@ in { multiprocess = callPackage ../development/python-modules/multiprocess { }; - munkres = buildPythonPackage rec { - name = "munkres-1.0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/munkres/${name}.tar.gz"; - sha256 = "c78f803b9b776bfb20a25c9c7bb44adbf0f9202c2024d51aa5969d21e560208d"; - }; - - # 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 ]; - }; - }; - + munkres = callPackage ../development/python-modules/munkres { }; musicbrainzngs = buildPythonPackage rec { name = "musicbrainzngs-0.5"; From 0bca111a36b70716a2a485ad6b3336b503c730e2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:37:56 -0400 Subject: [PATCH 421/475] pythonPackages.musicbrainzngs: refactor move to python-modules --- .../python-modules/musicbrainzngs/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/musicbrainzngs/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3415fb0ae48..fd5df526ab6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2851,25 +2851,7 @@ in { munkres = callPackage ../development/python-modules/munkres { }; - 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 ]; - }; - }; + musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; mutag = buildPythonPackage rec { disabled = ! isPy3k; From bd64776230630cfe786040c1749be581a4868d68 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:40:34 -0400 Subject: [PATCH 422/475] pythonPackages.mutag: refactor move to python-modules --- .../python-modules/mutag/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/mutag/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd5df526ab6..69415a808cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2853,23 +2853,7 @@ in { musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; - 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 { }; From c81b423fbe53fc225958ed4ab3d448d8c7645b2d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:01:53 -0400 Subject: [PATCH 423/475] pythonPackages.muttils: refactor move to python-modules --- .../python-modules/muttils/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/muttils/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69415a808cf..6af78e446fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2857,25 +2857,7 @@ in { 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 { }; From c2d600919b5c47e5059659d9213cfac9adfce7aa Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:04:24 -0400 Subject: [PATCH 424/475] pythonPackages.mwclient: refactor move to python-modules --- .../python-modules/mwclient/default.nix | 3 +-- pkgs/top-level/python-packages.nix | 22 +------------------ 2 files changed, 2 insertions(+), 23 deletions(-) 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6af78e446fa..20f84331efc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2869,27 +2869,7 @@ in { mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; - neuronpy = buildPythonPackage rec { - name = "neuronpy-${version}"; - version = "0.1.6"; - disabled = !isPy27; - - propagatedBuildInputs = with self; [ numpy matplotlib scipy ]; - - 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"; - }; - }; + neuronpy = callPackage ../development/python-modules/neuronpy { }; pint = callPackage ../development/python-modules/pint { }; From 66faaa3b7416865fe85c2cf8b1a7fe711a5be4f0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:06:54 -0400 Subject: [PATCH 425/475] pythonPackages.neuronpy: refactor move to python-modules --- .../python-modules/neuronpy/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/neuronpy/default.nix 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; + }; + +} From e900eb2a61994600096fe7b13442cd51c90e8234 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:24:31 -0400 Subject: [PATCH 426/475] pythonPackages.pint: refactor move to python-modules --- .../python-modules/pint/default.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/pint/default.nix 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/"; + }; + +} From c13f598fc2ac795fcff5c5f8315035b021b2f8aa Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:27:15 -0400 Subject: [PATCH 427/475] pythonPackages.pygal: refactor move to python-modules --- .../python-modules/pygal/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +----------- 2 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pygal/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20f84331efc..f1fc2e63b89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2873,28 +2873,7 @@ in { pint = callPackage ../development/python-modules/pint { }; - 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 { }; From d954c8ff8275240300d93c6ef577c3fd2c924f59 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:29:06 -0400 Subject: [PATCH 428/475] pythonPackages.graphviz: refactor move to python-modules --- .../python-modules/graphviz/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/graphviz/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f1fc2e63b89..cbde624cfa1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2879,23 +2879,7 @@ in { 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 { }; From 11707332440cc285f24562a45e96011bdcb66d9d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:31:08 -0400 Subject: [PATCH 429/475] pythonPackages.pympler: refactor move to python-modules --- .../python-modules/pympler/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +--------------- 2 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/pympler/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cbde624cfa1..252119b1e72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2885,32 +2885,7 @@ in { pymc3 = callPackage ../development/python-modules/pymc3 { }; - pympler = buildPythonPackage rec { - pname = "Pympler"; - version = "0.4.3"; - name = "${pname}-${version}"; - - 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; - }; - }; + pympler = callPackage ../development/python-modules/pympler { }; pymysqlsa = self.buildPythonPackage rec { name = "pymysqlsa-${version}"; From 8afd718c0a62cd16805e738f6dc05240e548902b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:33:09 -0400 Subject: [PATCH 430/475] pythonPackages.pymysqlsa: refactor move to python-modules --- .../python-modules/pymysqlsa/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pymysqlsa/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 252119b1e72..0540d07f035 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2887,23 +2887,7 @@ in { pympler = callPackage ../development/python-modules/pympler { }; - 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; }); From 05fb6b5dee0cae322c46d4b4fc52b5d328025085 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:36:07 -0400 Subject: [PATCH 431/475] pythonPackages.monotonic: refactor move to python-modules --- .../python-modules/monotonic/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------- 2 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/monotonic/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0540d07f035..2a0fcce1f9c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2891,23 +2891,7 @@ in { monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; }); - monotonic = buildPythonPackage rec { - pname = "monotonic"; - version = "1.3"; - name = "${pname}-${version}"; - - __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'" - ''; - }; + monotonic = callPackage ../development/python-modules/monotonic { }; MySQL_python = buildPythonPackage rec { name = "MySQL-python-1.2.5"; From f2329dc489c035eea5a5ccde79c3c497505923af Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:41:21 -0400 Subject: [PATCH 432/475] pythonPackages.MySQL_python: refactor move to python-modules --- .../python-modules/mysql_python/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/mysql_python/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a0fcce1f9c..e16a15b0b91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2893,29 +2893,7 @@ in { monotonic = callPackage ../development/python-modules/monotonic { }; - 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 { }; From 17ef9059e993820cc877585286850ab667ab9101 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:45:59 -0400 Subject: [PATCH 433/475] pythonPackages.nameparser: refactor move to python-modules --- .../python-modules/nameparser/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/nameparser/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e16a15b0b91..d903dc78a69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2939,21 +2939,7 @@ in { }); - 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 { }; From bf6f2a63ab5725c50526edc9284c6ee7b1c2aefb Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:48:19 -0400 Subject: [PATCH 434/475] pythonPackages.sleekxmpp: refactor move to python-modules --- .../python-modules/sleekxmpp/default.nix | 1 + pkgs/top-level/python-packages.nix | 29 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d903dc78a69..fd96843d933 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2949,34 +2949,7 @@ in { nbxmpp = callPackage ../development/python-modules/nbxmpp { }; - sleekxmpp = buildPythonPackage rec { - name = "sleekxmpp-${version}"; - version = "1.3.3"; - - patches = [ - # Fix https://github.com/etingof/pyasn1/issues/112 - (pkgs.fetchpatch { - url = "https://github.com/kdschlosser/SleekXMPP/commit/597014ba5ca258763e96ee37729ac933c5af1602.patch"; - sha256 = "176v3f3pr0bx48wv1kf9jn2pwxdn7qpqyc2chwv1m8gbppsfaikf"; - }) - ]; - - 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. - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz"; - sha256 = "0samiq1d97kk8g9pszfbrbfw9zc41zp6017dbkwha9frf7gc24yj"; - }; - - meta = { - description = "XMPP library for Python"; - license = licenses.mit; - homepage = http://sleekxmpp.com/; - }; - }; + sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; slixmpp = callPackage ../development/python-modules/slixmpp {}; From d50320d126548a8a1d3c9135c4bf24bd88dddbe8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:50:48 -0400 Subject: [PATCH 435/475] pythonPackages.slixmpp: refactor move to python-modules --- pkgs/development/python-modules/slixmpp/default.nix | 9 +++++---- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 0a8e5accea8..88c43bce297 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -1,12 +1,13 @@ -{ lib, buildPythonPackage, pythonOlder, fetchurl, aiodns, pyasn1, pyasn1-modules, gnupg }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, fetchurl, aiodns, pyasn1, pyasn1-modules, gnupg }: + buildPythonPackage rec { - name = "slixmpp-${version}"; + pname = "slixmpp"; version = "1.4.0"; disabled = pythonOlder "3.4"; - src = fetchurl { - url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "155qxx4xlkkjb4hphc09nsi2mi4xi3m2akg0z7064kj3nbzkwjn2"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd96843d933..9cba5f5a9d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2951,7 +2951,7 @@ in { sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; - slixmpp = callPackage ../development/python-modules/slixmpp {}; + slixmpp = callPackage ../development/python-modules/slixmpp { }; netaddr = buildPythonPackage rec { pname = "netaddr"; From 667782f8f13b7f3e3c29a7e8cab84cfcc8c5e6f6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:52:48 -0400 Subject: [PATCH 436/475] pythonPackages.netaddr: refactor move to python-modules --- .../python-modules/netaddr/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +-------------- 2 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/netaddr/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cba5f5a9d2..a315b01c419 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2953,35 +2953,7 @@ in { slixmpp = callPackage ../development/python-modules/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"; - }; - }; + netaddr = callPackage ../development/python-modules/netaddr { }; netifaces = buildPythonPackage rec { version = "0.10.6"; From 0660849bdcc2e397f3b596efbc57a0282c4762d2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:54:42 -0400 Subject: [PATCH 437/475] pythonPackages.netifaces: refactor move to python-modules --- .../python-modules/netifaces/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/netifaces/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a315b01c419..08397746646 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2955,20 +2955,7 @@ in { netaddr = callPackage ../development/python-modules/netaddr { }; - 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"; - }; - }; + netifaces = callPackage ../development/python-modules/netifaces { }; hpack = buildPythonPackage rec { name = "hpack-${version}"; From 8d7f629fb46d8d899a046e21d7a679667af335f8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:56:46 -0400 Subject: [PATCH 438/475] pythonPackages.hpack: refactor move to python-modules --- .../python-modules/hpack/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/hpack/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08397746646..bda244f3340 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2957,20 +2957,7 @@ in { netifaces = callPackage ../development/python-modules/netifaces { }; - 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 { }; From 5f03c01b358c8ff30927bf33c56305ca67b6dab1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 01:00:46 -0400 Subject: [PATCH 439/475] pythonPackages.nipy: refactor move to python-modules --- .../python-modules/nipy/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 43 +--------------- 2 files changed, 50 insertions(+), 42 deletions(-) create mode 100644 pkgs/development/python-modules/nipy/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bda244f3340..1c5156eab68 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2967,48 +2967,7 @@ 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; From a38edd38b29432ddc19a826c134754020d77e4f5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 01:02:39 -0400 Subject: [PATCH 440/475] pythonPackages.nixpkgs: refactor move to python-modules --- .../python-modules/nixpkgs/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------- 2 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/nixpkgs/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c5156eab68..849488a0884 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2973,23 +2973,7 @@ in { 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 { }; From 9492a17e87383a832a1063268f260a9dd813914a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 01:05:15 -0400 Subject: [PATCH 441/475] pythonPackages.nose: refactor move to python-modules --- .../python-modules/nose/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/nose/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 849488a0884..a30033615df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2977,29 +2977,7 @@ in { 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 { }; From 1059d7194740a4689056b746d787805f87f6177e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 01:08:03 -0400 Subject: [PATCH 442/475] pythonPackages.nose2: refactor move to python-modules --- .../python-modules/nose2/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +--------- 2 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/nose2/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a30033615df..7cd3e20adde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2981,19 +2981,7 @@ in { 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}"; From 962ff0296f989db63e8687731db3410b0f2d6a98 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 01:09:53 -0400 Subject: [PATCH 443/475] pythonPackages.nose-cover3: refactor move to python-modules --- .../python-modules/nose-cover3/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/nose-cover3/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cd3e20adde..a83f6162cfd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2983,26 +2983,7 @@ in { nose2 = callPackage ../development/python-modules/nose2 { }; - nose-cover3 = buildPythonPackage rec { - name = "nose-cover3-${version}"; - version = "0.1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nose-cover3/${name}.tar.gz"; - sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - # No tests included - doCheck = false; - - meta = { - description = "Coverage 3.x support for Nose"; - homepage = https://github.com/ask/nosecover3; - license = licenses.lgpl21; - }; - }; + nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; nosexcover = buildPythonPackage (rec { name = "nosexcover-1.0.10"; From 94b15aa9e658daef07a711bc073bf149eb48fb8e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 01:11:56 -0400 Subject: [PATCH 444/475] pythonPackages.nosexcover: refactor move to python-modules --- .../python-modules/nosexcover/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/nosexcover/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a83f6162cfd..3527a02aead 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2985,24 +2985,7 @@ in { nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; - 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; - }; - }); + nosexcover = callPackage ../development/python-modules/nosexcover { }; nosejs = buildPythonPackage { name = "nosejs-0.9.4"; From 648a03cc7c06e55ea2053d3230aa43e653f311e8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 01:29:05 -0400 Subject: [PATCH 445/475] pythonPackages.nosejs: refactor move to python-modules --- .../python-modules/nosejs/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +--------- 2 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/nosejs/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3527a02aead..504e4265f2b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2987,19 +2987,7 @@ in { nosexcover = callPackage ../development/python-modules/nosexcover { }; - 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 - ''; - - }; + nosejs = callPackage ../development/python-modules/nosejs { }; nose-cprof = buildPythonPackage rec { name = "nose-cprof-${version}"; From 76eea7cf645da588847e64db7cb99852ab1db731 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 01:31:36 -0400 Subject: [PATCH 446/475] pythonPackages.nose-cprof: refactor move to python-modules --- .../python-modules/nose-cprof/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/nose-cprof/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 504e4265f2b..39c54901a80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2989,21 +2989,7 @@ in { nosejs = callPackage ../development/python-modules/nosejs { }; - 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 { }; From d448a1dd5765fcf45c8c6586423ca90cbb66b7f3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 11:46:00 -0400 Subject: [PATCH 447/475] pythonPackages.namebench: refactor move to python-modules --- .../python-modules/namebench/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 42 +--------------- 2 files changed, 51 insertions(+), 41 deletions(-) create mode 100644 pkgs/development/python-modules/namebench/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39c54901a80..bd70364474f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2897,47 +2897,7 @@ in { mysql-connector = callPackage ../development/python-modules/mysql-connector { }; - namebench = buildPythonPackage (rec { - name = "namebench-1.3.1"; - disabled = isPy3k || isPyPy; - - 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. - ''; - }; - }); - + namebench = callPackage ../development/python-modules/namebench { }; nameparser = callPackage ../development/python-modules/nameparser { }; From 3c5edb16a73932efa21fd2a9a98a9dcfd6216de1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 11:47:17 -0400 Subject: [PATCH 448/475] pythonPackages.minimock: refactor move to python-modules --- .../python-modules/minimock/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/minimock/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd70364474f..787677ee59b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2756,24 +2756,7 @@ in { milksnake = callPackage ../development/python-modules/milksnake { }; - minimock = buildPythonPackage rec { - version = "1.2.8"; - name = "minimock-${version}"; - - 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; - }; - }; + minimock = callPackage ../development/python-modules/minimock { }; moviepy = callPackage ../development/python-modules/moviepy { }; From e78967294505d236e9a9bd196a8991bf0348b4b5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:16:47 -0400 Subject: [PATCH 449/475] pythonPackages.notify: refactor move to python-modules --- .../python-modules/notify/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +------------- 2 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/notify/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 787677ee59b..b1c854fbe7c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2938,36 +2938,7 @@ in { 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 {}; From 48d62293522c957330378bcb6f68ef42dae24323 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:19:42 -0400 Subject: [PATCH 450/475] pythonPackages.notmuch: refactor move to python-modules --- .../python-modules/notmuch/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/notmuch/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1c854fbe7c..d676ced41f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2942,26 +2942,7 @@ in { 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 { }; From d9d93f8e14c8459406fbdadb9dad0f5403489256 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:22:05 -0400 Subject: [PATCH 451/475] pythonPackages.ntfy: refactor move to python-modules --- .../python-modules/ntfy/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +---------- 2 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/ntfy/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d676ced41f6..62b3a883807 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2946,25 +2946,7 @@ in { 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"; - }; - - 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 ]; - }; - }; + ntfy = callPackage ../development/python-modules/ntfy { }; ntplib = buildPythonPackage rec { name = "ntplib-0.3.3"; From 1a267e65f74e79bc8ae323f72041b869c84bc93e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:24:24 -0400 Subject: [PATCH 452/475] pythonPackages.ntplib: refactor move to python-modules --- .../python-modules/ntplib/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------ 2 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/ntplib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62b3a883807..712d9940f5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2948,21 +2948,7 @@ in { ntfy = callPackage ../development/python-modules/ntfy { }; - 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 { }; From 5934b25cb0cb7361274fb30ba844ced27220358c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:27:34 -0400 Subject: [PATCH 453/475] pythonPackages.nuitka: refactor move to python-modules --- .../python-modules/nuitka/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 44 +-------------- 2 files changed, 55 insertions(+), 43 deletions(-) create mode 100644 pkgs/development/python-modules/nuitka/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 712d9940f5d..aa138999953 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2954,49 +2954,7 @@ in { 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; From f320b8456ba09f09843832dae7d26932218f4492 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:30:06 -0400 Subject: [PATCH 454/475] pythonPackages.dynd: refactor move to python-modules --- .../python-modules/dynd/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +------------- 2 files changed, 44 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/dynd/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa138999953..935b79ab21c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2968,38 +2968,7 @@ 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 { }; From a599dc127943a79256f05a5bfddf8ef60ab920f2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:32:31 -0400 Subject: [PATCH 455/475] pythonPackages.livestreamer: refactor move to python-modules --- .../python-modules/livestreamer/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +------------ 2 files changed, 45 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/livestreamer/default.nix diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix new file mode 100644 index 00000000000..94394c11e04 --- /dev/null +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, pkgs +, isPyPy +, pycrypto +, requests +, singledispatch +, futures +, isPy27 +, isPy33 +}: + +buildPythonPackage rec { + version = "1.12.2"; + pname = "livestreamer"; + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz"; + sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd"; + }; + + buildInputs = [ pkgs.makeWrapper ]; + + propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] + ++ stdenv.lib.optionals isPy27 [ singledispatch futures ] + ++ stdenv.lib.optionals isPy33 [ singledispatch ]; + + postInstall = '' + wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin + ''; + + meta = with stdenv.lib; { + 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 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 935b79ab21c..b0def3b7f7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2972,36 +2972,7 @@ in { langcodes = callPackage ../development/python-modules/langcodes { }; - livestreamer = buildPythonPackage rec { - version = "1.12.2"; - name = "livestreamer-${version}"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz"; - sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd"; - }; - - buildInputs = [ pkgs.makeWrapper ]; - - 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 = callPackage ../development/python-modules/livestreamer { }; livestreamer-curses = buildPythonPackage rec { version = "1.5.2"; From a543d4236e626276b01dbdcc915c795d36d96bb6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:36:06 -0400 Subject: [PATCH 456/475] pythonPackages.livestreamer-curses: refactor move to python-modules --- .../livestreamer-curses/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/livestreamer-curses/default.nix diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix new file mode 100644 index 00000000000..bf3b2cc1164 --- /dev/null +++ b/pkgs/development/python-modules/livestreamer-curses/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPyPy +, livestreamer +}: + +buildPythonPackage rec { + version = "1.5.2"; + pname = "livestreamer-curses"; + disabled = isPyPy; + + src = fetchurl { + url = "https://github.com/gapato/livestreamer-curses/archive/v${version}.tar.gz"; + sha256 = "1v49sym6mrci9dxy0a7cpbp4bv6fg2ijj6rwk4wzg18c2x4qzkhn"; + }; + + propagatedBuildInputs = [ livestreamer ]; + + meta = with stdenv.lib; { + homepage = https://github.com/gapato/livestreamer-curses; + description = "Curses frontend for livestreamer"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0def3b7f7a..9671c108133 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2974,24 +2974,7 @@ in { livestreamer = callPackage ../development/python-modules/livestreamer { }; - 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; - }; - }; + livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; oauth = buildPythonPackage (rec { name = "oauth-1.0.1"; From bc1c971ef4215c555545c5900d01a9c57e788f6b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:38:14 -0400 Subject: [PATCH 457/475] pythonPackages.oauth: refactor move to python-modules --- .../python-modules/oauth/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/oauth/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9671c108133..3bea54f4c18 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2976,24 +2976,7 @@ in { livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; - 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; - }; - }); + oauth = callPackage ../development/python-modules/oauth { }; oauth2 = buildPythonPackage (rec { name = "oauth2-${version}"; From c83ce200af804cd8484619fade241ce6ae0921d7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:40:14 -0400 Subject: [PATCH 458/475] pythonPackages.oauth2: refactor move to python-modules --- .../python-modules/oauth2/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +-------------- 2 files changed, 33 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/oauth2/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3bea54f4c18..2dad961ca4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2978,30 +2978,7 @@ in { oauth = callPackage ../development/python-modules/oauth { }; - 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 { }; From c24d25276f7c0c87b5343f16baba279e24ce0c4b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:42:09 -0400 Subject: [PATCH 459/475] pythonPackages.oauthlib: refactor move to python-modules --- .../python-modules/oauthlib/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------ 2 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/oauthlib/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2dad961ca4f..ca88619251e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2982,27 +2982,7 @@ in { oauth2client = callPackage ../development/python-modules/oauth2client { }; - oauthlib = buildPythonPackage rec { - version = "2.0.0"; - name = "oauthlib-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz"; - sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf"; - }; - - 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 ]; - }; - }; - + oauthlib = callPackage ../development/python-modules/oauthlib { }; obfsproxy = buildPythonPackage ( rec { name = "obfsproxy-${version}"; From da78a13ad1807c603f37ef7328323afdfc9842d2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:44:37 -0400 Subject: [PATCH 460/475] pythonPackages.obfsproxy: refactor move to python-modules --- .../python-modules/obfsproxy/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------- 2 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/obfsproxy/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca88619251e..ea89c5030ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2984,34 +2984,7 @@ in { oauthlib = callPackage ../development/python-modules/oauthlib { }; - 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 ]; - }; - }); + obfsproxy = callPackage ../development/python-modules/obfsproxy { }; objgraph = buildPythonPackage rec { name = "objgraph-${version}"; From 1ff8adc940e70470b44a4faa1e1166fd4f804ac3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:46:29 -0400 Subject: [PATCH 461/475] pythonPackages.objgraph: refactor move to python-modules --- .../python-modules/objgraph/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/objgraph/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea89c5030ca..8c2af30b11c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2986,26 +2986,7 @@ in { obfsproxy = callPackage ../development/python-modules/obfsproxy { }; - 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 { }; From 1cb8ab267d19afb4e931bdb26fc568d4bd48c37b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:49:33 -0400 Subject: [PATCH 462/475] pythonPackages.offtrac: refactor move to python-modules --- .../python-modules/offtrac/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 11 +-------- 2 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/offtrac/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c2af30b11c..92da550b7cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2990,16 +2990,7 @@ in { 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 { }; From 3df4461e21084669eaa8ad225f66f0397f678160 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:51:14 -0400 Subject: [PATCH 463/475] pythonPackages.ordereddict: refactor move to python-modules --- .../python-modules/ordereddict/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/ordereddict/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92da550b7cd..322096dcb3c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2996,21 +2996,7 @@ in { 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 { }; From 28542253faa6c7bd538a0939eff45f3940f5198f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:53:27 -0400 Subject: [PATCH 464/475] pythonPackages.python-otr: refactor move to python-modules --- .../python-modules/python-otr/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------- 2 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/python-otr/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 322096dcb3c..ee2f0043978 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3000,30 +3000,7 @@ in { 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 { }; From 30296bc49e14169df7a4cb8097a2ac04aeb85ef3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:55:35 -0400 Subject: [PATCH 465/475] pythonPackages.plyvel: refactor move to python-modules --- .../python-modules/plyvel/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/plyvel/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee2f0043978..dc6d8732f10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3006,26 +3006,7 @@ in { ply = callPackage ../development/python-modules/ply { }; - plyvel = buildPythonPackage (rec { - name = "plyvel-0.9"; - - 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; - }; - }); + plyvel = callPackage ../development/python-modules/plyvel { }; osc = buildPythonPackage { name = "osc-0.162.0-55-gb730f88"; From 4156569b54d974f23beab6846e54c651d3bc8716 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:57:51 -0400 Subject: [PATCH 466/475] pythonPackages.osc: refactor move to python-modules --- .../python-modules/osc/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +----------- 2 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/osc/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc6d8732f10..0c0877779df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3008,35 +3008,7 @@ in { plyvel = callPackage ../development/python-modules/plyvel { }; - 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 { }; From 08b3dbea20b318cf40ffdd2b7059201d8e6d4d98 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 15:00:59 -0400 Subject: [PATCH 467/475] pythonPackages.warlock: refactor move to python-modules --- .../python-modules/warlock/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/warlock/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c0877779df..5af934e335a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3019,27 +3019,7 @@ 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 { }; From aecd6aeb112c574533192fb780ca592183760558 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 15:03:06 -0400 Subject: [PATCH 468/475] pythonPackages.Kajiki: refactor move to python-modules --- .../python-modules/kajiki/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/kajiki/default.nix diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix new file mode 100644 index 00000000000..2391b334d61 --- /dev/null +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, Babel +, pytz +, nine +}: + +buildPythonPackage rec { + pname = "Kajiki"; + version = "0.5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "effcae388e25c3358eb0bbd733448509d11a1ec500e46c69241fc673021f0517"; + }; + + propagatedBuildInputs = [ Babel pytz nine ]; + + meta = with stdenv.lib; { + description = "Kajiki provides fast well-formed XML templates"; + homepage = "https://github.com/nandoflorestan/kajiki"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5af934e335a..4274ec9146a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3025,23 +3025,7 @@ in { 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 { }; From ee6b3076e4edb7f8da23d50599ea3dcff5608f0d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 15:06:00 -0400 Subject: [PATCH 469/475] pythonPackages.zake: refactor move to python-modules --- .../python-modules/zake/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------- 2 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/zake/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4274ec9146a..dc74705f5e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3029,25 +3029,7 @@ in { WSME = callPackage ../development/python-modules/WSME { }; - zake = buildPythonPackage rec { - name = "zake-${version}"; - version = "0.2.2"; - - 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"; - }; - }; + zake = callPackage ../development/python-modules/zake { }; kazoo = buildPythonPackage rec { name = "kazoo-${version}"; From abc0996dd0e7ccc8c6b67cdd72e948027a52234d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 15:08:42 -0400 Subject: [PATCH 470/475] pythonPackages.kazoo: refactor move to pyhton-modules --- .../python-modules/kazoo/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 34 +------------- 2 files changed, 45 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/kazoo/default.nix diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix new file mode 100644 index 00000000000..ae9d15dd786 --- /dev/null +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, eventlet +, gevent +, nose +, mock +, coverage +, pkgs +}: + +buildPythonPackage rec { + pname = "kazoo"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "10pb864if9qi2pq9lfb9m8f7z7ss6rml80gf1d9h64lap5crjnjj"; + }; + + propagatedBuildInputs = [ six ]; + buildInputs = [ 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"; + description = "Higher Level Zookeeper Client"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc74705f5e1..0d17d417ca4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3031,39 +3031,7 @@ in { zake = callPackage ../development/python-modules/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 { }; From 3e1f1f76bb1fa8b984db9d7ab3405cca0e5d0eb6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 15:11:35 -0400 Subject: [PATCH 471/475] pythonPackages.pycountry: refactor move to python-modules --- .../python-modules/pycountry/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +-------- 2 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/pycountry/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d17d417ca4..8ca78054564 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3035,15 +3035,7 @@ in { FormEncode = callPackage ../development/python-modules/FormEncode { }; - pycountry = buildPythonPackage rec { - name = "pycountry-${version}"; - version = "1.17"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pycountry/${name}.tar.gz"; - sha256 = "1qvhq0c9xsh6d4apcvjphfzl6xnwhnk4jvhr8x2fdfnmb034lc26"; - }; - }; + pycountry = callPackage ../development/python-modules/pycountry { }; nine = buildPythonPackage rec { name = "nine-${version}"; From 976162ed9002637d365bf1c0edd3309a1b5f0c41 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 15:13:24 -0400 Subject: [PATCH 472/475] pythonPackages.nine: refactor move to python-modules --- .../python-modules/nine/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/nine/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ca78054564..fffd3eec209 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3037,21 +3037,7 @@ in { pycountry = callPackage ../development/python-modules/pycountry { }; - 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"; - }; - }; - + nine = callPackage ../development/python-modules/nine { }; logutils = buildPythonPackage rec { name = "logutils-${version}"; From b889d7a43fd49798a315f9a4c7c05b90b8c600d0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 15:19:33 -0400 Subject: [PATCH 473/475] pythonPackages.logutils: refactor move to python-modules --- .../python-modules/logutils/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +-------- 2 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/logutils/default.nix diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix new file mode 100644 index 00000000000..d6595b19db6 --- /dev/null +++ b/pkgs/development/python-modules/logutils/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "logutils"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "173w55fg3hp5dhx7xvssmgqkcv5fjlaik11w5dah2fxygkjvhhj0"; + }; + + meta = with stdenv.lib; { + description = "Logging utilities"; + homepage = http://code.google.com/p/logutils/; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fffd3eec209..8ac69021525 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3039,15 +3039,7 @@ in { nine = callPackage ../development/python-modules/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 { }; From 5df3a4d9b916bf2f6c2a1eeb1594d161cf2a6352 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 17 Oct 2018 21:38:38 -0500 Subject: [PATCH 474/475] pythonPackages.pathlib2: remove unnecessary python version check --- pkgs/development/python-modules/pathlib2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; From 5143e303619dd21e134d036667d4f2316b6e8a27 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 17 Oct 2018 21:40:16 -0500 Subject: [PATCH 475/475] pythonPackages.pytest: pathlib2 is only required for python<3.6 --- pkgs/development/python-modules/pytest/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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