diff options
Diffstat (limited to 'pkgs')
87 files changed, 482 insertions, 274 deletions
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 33d65a860764..f5560a9b2032 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler, mesa_noglu, lirc }: +, epoxy, poppler, mesa, lirc }: stdenv.mkDerivation rec { name = "fbida-2.14"; - + src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc - mesa_noglu + mesa ]; - + makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ]; patchPhase = '' diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 070d293a183f..1009c2e65066 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -54,7 +54,7 @@ let # Higan // TODO: "higan is not available for the x86_64 architecture" # Libretro - fluidsynth hidapi mesa_noglu libdrm + fluidsynth hidapi mesa libdrm # MAME qt48 fontconfig SDL2_ttf diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index f8aae5da0473..22f35e22fb54 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -1,6 +1,6 @@ -{fetchFromGitHub, libgit2_0_27, ...}: +{fetchFromGitHub, libgit2, ...}: -libgit2_0_27.overrideAttrs (oldAttrs: rec { +libgit2.overrideAttrs (oldAttrs: rec { cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_ICONV=OFF" diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index 32c163c45c41..b7828418db07 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }: +{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }: let version = "0.3.1"; in buildGoPackage { name = "grv-${version}"; - buildInputs = [ ncurses readline curl libgit2_0_27 ]; + buildInputs = [ ncurses readline curl libgit2 ]; nativeBuildInputs = [ pkgconfig ]; goPackagePath = "github.com/rgburke/grv"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 459d1a396b3a..1e39f0496462 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -15,7 +15,7 @@ , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , cephSupport ? false, ceph -, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm +, openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , smbdSupport ? false, samba , hostCpuOnly ? false @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] ++ optionals cephSupport [ ceph ] - ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] + ++ optionals openGLSupport [ mesa epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] ++ optionals smbdSupport [ samba ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 22b6fc30007a..2ba618b89de7 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb +{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva libwebp wayland-protocols colord lcms2 diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index cdfbe4e7c381..990f1ce2e3e3 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -149,7 +149,7 @@ rec { libidn tbb wayland - mesa_noglu + mesa libxkbcommon flac diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 5545142fdc3a..96395b6df2f7 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -3,7 +3,7 @@ , libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp -, curl, libinput, systemd, mesa_noglu, writeText, gtk3 +, curl, libinput, systemd, mesa, writeText, gtk3 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gtk3 ]; - buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu + buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.xorgproto xorg.libX11 udev systemd ]; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 8edf702a24c6..07aac3d611b7 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_noglu, + luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa, xkeyboard_config, pcre }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libpthreadstubs gdbm pcre - mesa_noglu + mesa xkeyboard_config ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # installer to try to do this, the file $out/e-wrappers.nix is created, # containing the needed configuration for wrapping those programs. It # can be used in the enlightenment module. The idea is: - # + # # 1) rename the original binary adding the extension .orig # 2) wrap the renamed binary at /run/wrappers/bin/ # 3) create a new symbolic link using the original binary name (in the diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index ad4620d4f450..409b3f7bb8dd 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { name = "ephoto-${version}"; version = "1.5"; - + src = fetchurl { url = "http://www.smhouston.us/stuff/${name}.tar.gz"; sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) - mesa_noglu.dev # otherwise pkg-config does not find gbm + mesa.dev # otherwise pkg-config does not find gbm makeWrapper ]; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index e7dfb5ca3989..9c3974452242 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa_noglu, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; version = "0.3.0"; - + src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz"; sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meson ninja (pkgconfig.override { vanilla = true; }) - mesa_noglu.dev + mesa.dev wrapGAppsHook ]; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index a2cd8ee192d0..92d36c0e772f 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { pname = "terminology"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ efl pcre - mesa_noglu + mesa ]; meta = { diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 1d3b13937fc0..683f8d7ace09 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -1,5 +1,5 @@ { llvmPackages, lib, fetchFromGitHub, cmake -, libpng, libjpeg, mesa_noglu, eigen, openblas +, libpng, libjpeg, mesa, eigen, openblas }: let @@ -37,7 +37,7 @@ in llvmPackages.stdenv.mkDerivation { # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas - buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen openblas ]; + buildInputs = [ llvmPackages.llvm libpng libjpeg mesa eigen openblas ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index fb8e75e8793a..49715bf256bb 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -12,11 +12,11 @@ (rec { name = "guile-${version}"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "11j01agvnci2cx32wwpqs9078856yxmvs15gcsz7ganpkj2ahlw3"; + sha256 = "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"; }; outputs = [ "out" "dev" "info" ]; @@ -42,7 +42,6 @@ patches = [ ./eai_system.patch - ./riscv.patch ] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 007cd02957ba..fd3c6b471453 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,4 +1,5 @@ -{ stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv +{ stdenv, config, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL, libGLU , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 2909b16d65d8..a2db9c2349d1 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, config, libGLSupported, fetchurl, pkgconfig +{ stdenv, config, fetchurl, pkgconfig +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index d6ebaf3c5663..a241b42e1878 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops +{ lib, stdenv, fetchurl , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 }: @@ -14,9 +14,6 @@ stdenv.mkDerivation rec { sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"; }; - buildInputs = [ libatomic_ops ]; - nativeBuildInputs = [ pkgconfig ]; - outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux; @@ -29,20 +26,12 @@ stdenv.mkDerivation rec { lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch; configureFlags = - [ "--enable-cplusplus" ] + [ "--enable-cplusplus" "--with-libatomic-ops=none" ] ++ lib.optional enableLargeConfig "--enable-large-config" - ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static" - # Configure script can't detect whether C11 atomic intrinsics are available - # when cross-compiling, so it links to libatomic_ops, which has to be - # propagated to all dependencies. To avoid this, assume that the intrinsics - # are available. - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-libatomic-ops=none"; + ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"; doCheck = true; # not cross; - # Don't run the native `strip' when cross-compiling. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 0151bac402cd..e388b3af5f67 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -3,7 +3,7 @@ , x11Support? !stdenv.isDarwin, libXext, libXrender , gobjectSupport ? true, glib , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 -, libGLSupported +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) , libGL ? null # libGLU_combined is no longer a big dependency , pdfSupport ? true diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index cff32ca2d70f..8eacbb4f855f 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 -, mesa_noglu +, mesa , gstreamerSupport ? true, gst_all_1 }: let @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobject-introspection wayland mesa_noglu + glib gdk_pixbuf gobject-introspection wayland mesa libGL libXrandr libXfixes libXcomposite libXdamage ] ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 60d0cc81d2bc..abc32b90c6b8 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.12.14"; - sha256 = "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4"; + version = "1.12.16"; + sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/git2/0.27.nix b/pkgs/development/libraries/git2/0.27.nix deleted file mode 100644 index 510f53f24b17..000000000000 --- a/pkgs/development/libraries/git2/0.27.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, python -, zlib, libssh2, openssl, http-parser, curl -, libiconv, Security -}: - -stdenv.mkDerivation rec { - version = "0.27.8"; - name = "libgit2-${version}"; - - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9"; - }; - - cmakeFlags = [ "-DTHREADSAFE=ON" ]; - - nativeBuildInputs = [ cmake python pkgconfig ]; - - buildInputs = [ zlib libssh2 openssl http-parser curl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; - - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - - enableParallelBuilding = true; - - doCheck = false; # hangs. or very expensive? - - meta = { - description = "The Git linkable library"; - homepage = https://libgit2.github.com/; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 358fc31fc80f..514d21def1e0 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake -, zlib, python, libssh2, openssl, curl, http-parser +{ stdenv, fetchFromGitHub, cmake, pkgconfig, python +, zlib, libssh2, openssl, http-parser, curl , libiconv, Security }: -stdenv.mkDerivation (rec { - name = "libgit2-${version}"; - version = "0.26.6"; +stdenv.mkDerivation rec { + pname = "libgit2"; + version = "0.27.8"; # keep the version in sync with pythonPackages.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3"; + sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9"; }; cmakeFlags = [ "-DTHREADSAFE=ON" ]; @@ -22,17 +22,16 @@ stdenv.mkDerivation (rec { buildInputs = [ zlib libssh2 openssl http-parser curl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) [ libiconv ]; + propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; enableParallelBuilding = true; doCheck = false; # hangs. or very expensive? - meta = with stdenv.lib; { + meta = { description = "The Git linkable library"; homepage = https://libgit2.github.com/; - license = licenses.gpl2; - platforms = with platforms; all; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; all; }; -} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { -}) +} diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 30b33c7aea97..21f1d4c39990 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -2,7 +2,7 @@ , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi , xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook, gsettings-desktop-schemas , x11Support ? stdenv.isLinux -, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols +, waylandSupport ? stdenv.isLinux, mesa, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null , AppKit, Cocoa @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gsettings-desktop-schemas fribidi libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed - ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] + ++ optionals waylandSupport [ mesa wayland wayland-protocols ] ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; #TODO: colord? diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 0ecd568c3763..f75d32c4313e 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmicrohttpd-${version}"; - version = "0.9.63"; + version = "0.9.64"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "173lj66crwvhzwp1r812sc5h1hda7g6lb9l1y5zf7w3pw4dnzhrp"; + sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 097ac0e3e98e..2d827e205210 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi -, libGL, libGL_driver +, libGL, mesa , minimal ? false, libva1-minimal }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = # Add FHS paths for non-NixOS applications. - [ "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ + [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 752d56a344e4..c7f488e8726c 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libXext, libdrm, libXfixes, wayland, libffi, libX11 -, libGL, libGL_driver +, libGL, mesa , minimal ? false, libva-minimal }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ # Add FHS paths for non-NixOS applications. - "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" + "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index a61b3c3f2ac9..d68422260144 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, libGL_driver }: +{ stdenv, fetchurl, pkgconfig, xorg, mesa }: stdenv.mkDerivation rec { name = "libvdpau-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; configureFlags = stdenv.lib.optional stdenv.isLinux - "--with-module-dir=${libGL_driver.driverLink}/lib/vdpau"; + "--with-module-dir=${mesa.drivers.driverLink}/lib/vdpau"; NIX_LDFLAGS = if stdenv.isDarwin then "-lX11" else null; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 40a03707ea59..a35bdb5764bb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -69,7 +69,7 @@ let in let self = stdenv.mkDerivation { - name = "mesa-noglu-${version}"; + name = "mesa-${version}"; src = fetchurl { urls = [ diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 2642ee5510a1..d6fcfb411491 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.38.0"; + version = "1.39.1"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "156r3myrglkmrdv4zh151g9zcr7b92zjn15wx5i9ypw0naanjc4g"; + sha256 = "1vzmkh3pky3l3w6iaffhikh7hslp8zp0jsdqpd6knbflsmzp511a"; }; outputs = [ "bin" "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index dc05251478c9..3b3f406485c7 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -6,8 +6,9 @@ , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, mysql ? null -, libGLSupported -, openglSupport ? libGLSupported, libGLU_combined ? null, libXmu ? null +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLU_combined ? null, libXmu ? null , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index d5bd065ab648..34ef7463817d 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl, fetchpatch, substituteAll , libXrender, libXinerama, libXcursor, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig +, libmng, which, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , flashplayerFix ? false, gdk_pixbuf , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index 6e30825cfb39..2f3ec44a08ce 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mesa_noglu, libX11 }: +{ stdenv, fetchurl, unzip, mesa, libX11 }: stdenv.mkDerivation rec { name = "soil"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52"; }; - buildInputs = [ unzip mesa_noglu libX11 ]; - + buildInputs = [ unzip mesa libX11 ]; + sourceRoot = "Simple OpenGL Image Library/projects/makefile"; preBuild = "mkdir obj"; preInstall = "mkdir -p $out/lib $out/include"; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index b2351a32fa63..ea1c38ea476b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - pname = "sqlite"; + name = "sqlite-${version}"; version = "3.28.0"; # NB! Make sure to update analyzer.nix src (in the same directory). @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" ''; - enableParallelBuilding = true; doCheck = false; # fails to link against tcl meta = { diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 4473100a9f20..72803e09f075 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa_noglu }: +{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m"; }; - buildInputs = [ libGLU epoxy libX11 libdrm mesa_noglu ]; + buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 572adfeb0bb6..3f2891ffd510 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL -, libX11, dbus, wayland-protocols, libdrm, mesa_noglu +, libX11, dbus, wayland-protocols, libdrm, mesa , libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL libX11 libXfixes dbus wayland-protocols - libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] + libpthreadstubs libXdmcp libXext libdrm mesa ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; doCheck = true; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 5567b6595ea5..46b24467af9d 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu +, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libpng, ffmpeg_4 }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu + xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa libpng ffmpeg_4 ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 1b08bb090b4d..b952e8b12673 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, libGLSupported -, withMesa ? libGLSupported, libGLU ? null, libGL ? null +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 18e0cebec859..369d011f9b3c 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , gstreamer, gst-plugins-base, GConf, setfile -, libGLSupported -, withMesa ? libGLSupported, libGLU ? null, libGL ? null +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 4d95b43ff876..b33b0b15331a 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xorgproto, gstreamer, gst-plugins-base, GConf, setfile -, libGLSupported -, withMesa ? libGLSupported, libGLU ? null, libGL ? null +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 1144ca2a27f5..85493f2760a3 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -4,20 +4,20 @@ , markupsafe , nose , mock -, pytest_3 +, pytest , isPyPy }: buildPythonPackage rec { pname = "Mako"; - version = "1.0.10"; + version = "1.0.12"; src = fetchPypi { inherit pname version; - sha256 = "7165919e78e1feb68b4dbe829871ea9941398178fa58e6beedb9ba14acf63965"; + sha256 = "0cfa65de3a835e87eeca6ac856b3013aade55f49e32515f65d999f91a2324162"; }; - checkInputs = [ markupsafe nose mock pytest_3 ]; + checkInputs = [ markupsafe nose mock pytest ]; propagatedBuildInputs = [ markupsafe ]; doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 diff --git a/pkgs/development/python-modules/antlr4-python2-runtime/default.nix b/pkgs/development/python-modules/antlr4-python2-runtime/default.nix new file mode 100644 index 000000000000..b343be1d7bbf --- /dev/null +++ b/pkgs/development/python-modules/antlr4-python2-runtime/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchPypi, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + pname = "antlr4-python2-runtime"; + version = "4.7.2"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "04ljic5wnqpizln8q3c78pqrckz6q5nb433if00j1mlyv2yja22q"; + }; + + meta = { + description = "Runtime for ANTLR"; + homepage = "https://www.antlr.org/"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index bd535a972d15..a2a026e74d5b 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest_3, setuptools_scm }: +, pytest, setuptools_scm }: buildPythonPackage rec { pname = "apipkg"; @@ -11,7 +11,13 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; + + # Fix pytest 4 support. See: https://github.com/pytest-dev/apipkg/issues/14 + postPatch = '' + substituteInPlace "test_apipkg.py" \ + --replace "py.test.ensuretemp('test_apipkg')" "py.path.local('test_apipkg')" + ''; checkPhase = '' py.test @@ -19,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Namespace control and lazy-import mechanism"; - homepage = https://bitbucket.org/hpk42/apipkg; + homepage = "https://github.com/pytest-dev/apipkg"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/azure-cli-core/default.nix b/pkgs/development/python-modules/azure-cli-core/default.nix new file mode 100644 index 000000000000..d5c9fa357842 --- /dev/null +++ b/pkgs/development/python-modules/azure-cli-core/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, python +, buildPythonPackage +, fetchPypi +, adal +, antlr4-python3-runtime +, argcomplete +, azure-cli-telemetry +, colorama +, jmespath +, humanfriendly +, knack +, msrest +, msrestazure +, paramiko +, pygments +, pyjwt +, pyopenssl +, pyyaml +, requests +, six +, tabulate +, azure-mgmt-resource +, pyperclip +, psutil +, enum34 +, futures +, antlr4-python2-runtime +, ndg-httpsclient +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-cli-core"; + version = "2.0.66"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fp6b2x1l9bg07pca7asm80rnjlc4kkm061s3nrb55yj6awsnim5"; + }; + + propagatedBuildInputs = [ + adal + argcomplete + azure-cli-telemetry + colorama + jmespath + humanfriendly + knack + msrest + msrestazure + paramiko + pygments + pyjwt + pyopenssl + pyyaml + requests + six + tabulate + azure-mgmt-resource + pyperclip + psutil + ] + ++ lib.optionals isPy3k [ antlr4-python3-runtime ] + ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ]; + + # Remove overly restrictive version contraints and obsolete namespace setup + prePatch = '' + substituteInPlace setup.py \ + --replace "wheel==0.30.0" "wheel" \ + --replace "azure-mgmt-resource==2.1.0" "azure-mgmt-resource" + substituteInPlace setup.cfg \ + --replace "azure-namespace-package = azure-cli-nspkg" "" + ''; + + # Prevent these __init__'s from violating PEP420, only needed for python2 + postInstall = lib.optionalString isPy3k '' + rm $out/${python.sitePackages}/azure/__init__.py \ + $out/${python.sitePackages}/azure/cli/__init__.py + ''; + + # Tests are not included in sdist package + doCheck = false; + + meta = with lib; { + homepage = https://github.com/Azure/azure-cli; + description = "Next generation multi-platform command line experience for Azure"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-cli-telemetry/default.nix b/pkgs/development/python-modules/azure-cli-telemetry/default.nix new file mode 100644 index 000000000000..73873076bda5 --- /dev/null +++ b/pkgs/development/python-modules/azure-cli-telemetry/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, isPy3k +, python +, applicationinsights +, portalocker +}: + +buildPythonPackage rec { + pname = "azure-cli-telemetry"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "14wmxdsrrlnixaj52q37rrvp9wg5b54gf5wn2z1vq68kxpg1s560"; + }; + + propagatedBuildInputs = [ + applicationinsights + portalocker + ]; + + # tests are not published to pypi + doCheck = false; + + # Remove overly restrictive version contraints and obsolete namespace setup + prePatch = '' + substituteInPlace setup.py \ + --replace "applicationinsights>=0.11.1,<0.11.8" "applicationinsights" \ + --replace "portalocker==1.2.1" "portalocker" + substituteInPlace setup.cfg \ + --replace "azure-namespace-package = azure-cli-nspkg" "" + ''; + + # Prevent these __init__'s from violating PEP420, only needed for python2 + postInstall = lib.optionalString isPy3k '' + rm $out/${python.sitePackages}/azure/__init__.py \ + $out/${python.sitePackages}/azure/cli/__init__.py + ''; + + meta = with lib; { + homepage = https://github.com/Azure/azure-cli; + description = "Next generation multi-platform command line experience for Azure"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 3509a6469936..829ae0b0f14a 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest_3, pytestrunner, hypothesis }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +, pytest, pytestrunner, hypothesis }: buildPythonPackage rec { pname = "chardet"; @@ -10,7 +10,15 @@ buildPythonPackage rec { sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; }; - checkInputs = [ pytest_3 pytestrunner hypothesis ]; + patches = [ + # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174 + (fetchpatch { + url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch"; + sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q"; + }) + ]; + + checkInputs = [ pytest pytestrunner hypothesis ]; meta = with stdenv.lib; { homepage = https://github.com/chardet/chardet; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 7ad1f4267d04..e056d7f21190 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -3,21 +3,21 @@ , buildPythonPackage , isPyPy , fetchPypi -, pytest_3 +, pytest , setuptools_scm , apipkg }: buildPythonPackage rec { pname = "execnet"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a"; + sha256 = "752a3786f17416d491f833a29217dda3ea4a471fc5269c492eebcee8cc4772d3"; }; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ apipkg ]; @@ -34,15 +34,12 @@ buildPythonPackage rec { py.test testing ''; - # not yet compatible with pytest 4 - doCheck = false; - __darwinAllowLocalNetworking = true; meta = with stdenv.lib; { description = "Rapid multi-Python deployment"; license = licenses.gpl2; - homepage = "http://codespeak.net/execnet"; + homepage = "https://execnet.readthedocs.io/"; maintainers = with maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 046cfbad26b6..59fdb35be125 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "0.8"; + version = "0.18"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "b50191ead8c70adfa12495fba19ce6d75f2e0275c14c5a7beb653d6799b512bd"; + sha256 = "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -28,6 +28,9 @@ buildPythonPackage rec { checkInputs = [ importlib-resources packaging ]; + # Two failing tests: https://gitlab.com/python-devs/importlib_metadata/issues/72 + doCheck = false; + meta = with lib; { description = "Read metadata from Python packages"; homepage = https://importlib-metadata.readthedocs.io/; diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix new file mode 100644 index 000000000000..f8427cd7d177 --- /dev/null +++ b/pkgs/development/python-modules/knack/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, argcomplete +, colorama +, jmespath +, knack +, pygments +, pyyaml +, six +, tabulate +, mock +, vcrpy +, pytest +}: + +buildPythonPackage rec { + pname = "knack"; + version = "0.6.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kxxj9m2mvva9rz11m6pgdg0mi712d28faj4633rl23qa53sh7i8"; + }; + + propagatedBuildInputs = [ + argcomplete + colorama + jmespath + pygments + pyyaml + six + tabulate + ]; + + checkInputs = [ + mock + vcrpy + pytest + ]; + + # tries to make a '/homeless-shelter' dir + checkPhase = '' + pytest -k 'not test_cli_exapp1' + ''; + + meta = with lib; { + homepage = https://github.com/microsoft/knack; + description = "A Command-Line Interface framework"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 2a3302aea387..2d12b32b438c 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -18,6 +18,9 @@ buildPythonPackage rec { py.test tests ''; + # Prevent circular dependency + doCheck = false; + meta = with stdenv.lib; { description = "Core utilities for Python packages"; homepage = https://github.com/pypa/packaging; diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 282db0fafc14..331ba8673dd6 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -2,15 +2,16 @@ , lib , fetchPypi , setuptools_scm +, importlib-metadata }: buildPythonPackage rec { pname = "pluggy"; - version = "0.8.1"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "8ddc32f03971bfdf900a81961a48ccf2fb677cf7715108f85295c67405798616"; + sha256 = "0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc"; }; checkPhase = '' @@ -20,11 +21,13 @@ buildPythonPackage rec { # To prevent infinite recursion with pytest doCheck = false; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ importlib-metadata ]; meta = { description = "Plugin and hook calling mechanisms for Python"; - homepage = "https://pypi.python.org/pypi/pluggy"; + homepage = "https://github.com/pytest-dev/pluggy"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index d46f2ddc2d17..37c19f5c14bd 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.5.1"; + version = "5.6.3"; src = fetchPypi { inherit pname version; - sha256 = "045qaqvn6k90bj5bcy259yrwcd2afgznaav3sfhphy9b8ambzkkj"; + sha256 = "863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3"; }; # No tests in archive diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 2334e4a3431b..313a3e5ab189 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, isPyPy, libgit2_0_27, six, cffi }: +{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, isPyPy, libgit2, six, cffi }: buildPythonPackage rec { pname = "pygit2"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; preConfigure = lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${libgit2_0_27}/lib" + export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; patches = [ (fetchpatch { @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "18x1fpmywhjjr4lvakwmy34zpxfqi8pqqj48g1wcib39lh3s7l4f"; }) ]; - propagatedBuildInputs = [ libgit2_0_27 six ] ++ lib.optional (!isPyPy) cffi; + propagatedBuildInputs = [ libgit2 six ] ++ lib.optional (!isPyPy) cffi; preCheck = '' # disable tests that require networking diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index e9ae311d496c..7fc3d4e951fb 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,18 +1,18 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools-git, pytest_3 }: +, setuptools-git, pytest }: buildPythonPackage rec { pname = "pytest-fixture-config"; - version = "1.4.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "839d70343c87d6dda5bca88e3ab06e7b2027998dc1ec452c14d50be5725180a3"; + sha256 = "13i1qpz22w3x4dmw8vih5jdnbqfqvl7jiqs0dg764s0zf8bp98a1"; }; nativeBuildInputs = [ setuptools-git ]; - buildInputs = [ pytest_3 ]; + buildInputs = [ pytest ]; doCheck = false; diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 98cae527672f..90b60686ee6c 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest_3, pytest-shutil, pytest-fixture-config, psutil +, pytest, pytest-shutil, pytest-fixture-config, psutil , requests, future, retry }: buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.6.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c89f9532f62cf851489082ece1ec692b6ed5b0f88f20823bea25e2a963ebee8f"; + sha256 = "07vdv3y89qzv89ws0y48h92yplqsx208b9cizx80w644dazb398g"; }; - buildInputs = [ pytest_3 ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ pytest-shutil pytest-fixture-config psutil requests future retry ]; # RuntimeError: Unable to find a free server number to start Xvfb diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index c5444708be87..6bc7047866ee 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, isPyPy, buildPythonPackage, fetchPypi -, pytest_3, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: buildPythonPackage rec { pname = "pytest-shutil"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "efe615b7709637ec8828abebee7fc2ad033ae0f1fc54145f769a8b5e8cc3b4ca"; + sha256 = "0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq"; }; - checkInputs = [ cmdline pytest_3 ]; + checkInputs = [ cmdline pytest ]; propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; - nativeBuildInputs = [ pytest_3 ]; + nativeBuildInputs = [ pytest ]; checkPhase = '' py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index ec6441870563..0e8add5417be 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,20 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest_3, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: +, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: buildPythonPackage rec { pname = "pytest-virtualenv"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "d281725d10848773cb2b495d1255dd0a42fc9179e34a274c22e1c35837721f19"; + sha256 = "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"; }; - checkInputs = [ pytest_3 pytestcov mock cmdline ]; - propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ]; + checkInputs = [ pytest pytestcov mock cmdline ]; + propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; checkPhase = '' py.test tests/unit ''; - nativeBuildInputs = [ pytest_3 ]; + nativeBuildInputs = [ pytest ]; meta = with stdenv.lib; { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 614a5348bceb..b61bc8d5fa50 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.26.1"; + version = "1.28.0"; src = fetchPypi { inherit pname version; - sha256 = "d03d1ff1b008458ed04fa73e642d840ac69b4107c168e06b71037c62d7813dd4"; + sha256 = "f83a485293e81fd57c8a5a85a3f12473a532c5ca7dec518857cbb72766bb526c"; }; nativeBuildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 45572938496c..c74d59fd9925 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,9 +1,9 @@ { stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools -, atomicwrites, mock, writeText, pathlib2 +, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging }: buildPythonPackage rec { - version = "4.2.1"; + version = "4.6.3"; pname = "pytest"; preCheck = '' @@ -13,12 +13,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c2396a15726218a2dfef480861c4ba37bd3952ebaaa5b0fede3fc23fddcd7f8c"; + sha256 = "4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45"; }; checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index b0300744b5cc..91fa26ef44d2 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -17,13 +17,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ wheel setuptools packaging ]; checkInputs = [ - cmake ninja cython codecov coverage six virtualenv pathpy + cmake ninja cython codecov coverage six pathpy pytest pytestcov pytest-mock pytest-virtualenv pytestrunner requests flake8 ]; disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ "test_hello_develop" # tries setuptools develop install + "test_source_distribution" # pip has no way to install missing dependencies "test_wheel" # pip has no way to install missing dependencies "test_fortran_compiler" # passes if gfortran is available "test_install_command" # tries to alter out path diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 04ea254ee928..399bf56af0ac 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -1,22 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi -, gfortran, glibcLocales -, numpy, scipy, pytest, pillow +{ stdenv, buildPythonPackage, fetchPypi, python +, gfortran, glibcLocales, joblib, pythonOlder +, numpy, scipy, pytest, pillow, cython }: buildPythonPackage rec { pname = "scikit-learn"; - version = "0.20.3"; + version = "0.21.2"; # UnboundLocalError: local variable 'message' referenced before assignment - disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 + disabled = stdenv.isi686 || (pythonOlder "3.5"); # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41"; + sha256 = "0aafc312a55ebf58073151b9308761a5fcfa45b7f7730cea4b1f066f824c72db"; }; buildInputs = [ pillow gfortran glibcLocales ]; - propagatedBuildInputs = [ numpy scipy numpy.blas ]; + propagatedBuildInputs = [ numpy scipy numpy.blas joblib ]; checkInputs = [ pytest ]; + nativeBuildInputs = [ cython ]; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index dd3b899efa9e..7fb1b9e5b5cd 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest_3, mock, six, twisted,isPy37 }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted,isPy37 }: buildPythonPackage rec { pname = "txaio"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe"; }; - checkInputs = [ pytest_3 mock ]; + checkInputs = [ pytest mock ]; propagatedBuildInputs = [ six twisted ]; @@ -17,8 +17,8 @@ buildPythonPackage rec { py.test -k "not test_sdist" ''; - # Needs some fixing for 3.7 - doCheck = !isPy37; + # Needs some fixing + doCheck = false; meta = with stdenv.lib; { description = "Utilities to support code that runs unmodified on Twisted and asyncio."; diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 861d5bcae21e..39ce62ca47c7 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -11,6 +11,9 @@ buildPythonPackage rec { checkInputs = [ pytest ]; + # To prevent infinite recursion with pytest + doCheck = false; + checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 483926ef30b5..cbf82ca7ca3d 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -14,19 +14,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ itsdangerous ]; checkInputs = [ pytest requests hypothesis ]; - # Hi! New version of Werkzeug? Please double-check that this commit is - # inclucded, and then remove the following patch. - # https://github.com/pallets/werkzeug/commit/1cfdcf9824cb20e362979e8f7734012926492165 - patchPhase = '' - substituteInPlace "tests/test_serving.py" --replace "'python'" "sys.executable" - ''; - checkPhase = '' pytest ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"} ''; meta = with stdenv.lib; { - homepage = http://werkzeug.pocoo.org/; + homepage = "https://palletsprojects.com/p/werkzeug/"; description = "A WSGI utility library for Python"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index 246b3c65fc5b..a7b34cf9b364 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest_3 }: +{ stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "Whoosh"; @@ -8,11 +8,12 @@ buildPythonPackage rec { sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; }; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; # Wrong encoding postPatch = '' rm tests/test_reading.py + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" ''; checkPhase = '' # FIXME: test_minimize_dfa fails on python 3.6 @@ -25,6 +26,5 @@ checking library."; homepage = https://bitbucket.org/mchaput/whoosh; license = licenses.bsd2; maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index be0be44af555..da6bdcde463f 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "zeep"; - version = "3.3.1"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "f58328e36264a2fda2484dd20bb1695f4102a9cc918178d60c4d7cf8339c65d0"; + sha256 = "0e98669cfeb60756231ae185498f9ae21b30b2681786b8de58ed34c3b93e41dd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 2c060c9881c0..29153b068fca 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zipp"; - version = "0.3.3"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "55ca87266c38af6658b84db8cfb7343cdb0bf275f93c7afaea0d8e7a209c7478"; + sha256 = "ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -23,6 +23,9 @@ buildPythonPackage rec { pytest ''; + # Prevent infinite recursion with pytest + doCheck = false; + meta = with lib; { description = "Pathlib-compatible object wrapper for zip files"; homepage = https://github.com/jaraco/zipp; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 57fed5c9e8d1..bbcecae8f04f 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1lfvns1f6xamz9905fakzkxh4zmk1wa9w33vxcq78fc5841ivnhg"; + sha256 = "15ah05gharrzcxs8q5pm9mli5dp5lw19nd95apzzmyqnqa4zq1vh"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index f6969af30c2c..c44072309b19 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, libGLSupported +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGLU_combined ? null }: diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index b3a9dec52941..3cf2d8966452 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -138,7 +138,7 @@ in buildFHSUserEnv rec { libidn tbb wayland - mesa_noglu + mesa libxkbcommon # Other things from runtime diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index f8c29bfb88fa..e18faf7c304e 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa_noglu +{ stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa , xorg, libGLU_combined, openal , lib, makeWrapper, makeDesktopItem }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation { p7zip scons gnum4 makeWrapper ]; buildInputs = [ - glibc_multi mesa_noglu.dev xorg.libX11.dev openal + glibc_multi mesa.dev xorg.libX11.dev openal xorg.libXext.dev xorg.libXxf86vm.dev libGLU_combined ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 6e11eaaa5b57..e86db53c88a6 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index a917175b90ce..be43d23d6115 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - python3, readline, udev, libical, systemd, + python3, readline, udev, libical, systemd, fetchpatch, enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }: stdenv.mkDerivation rec { @@ -23,7 +23,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "test" ]; - patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ]; + patches = [ + ./bluez-5.37-obexd_without_systemd-1.patch + (fetchpatch { + url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=1880b299086659844889cdaf687133aca5eaf102"; + name = "CVE-2018-10910-1.patch"; + sha256 = "17spsxza27gif8jpxk7360ynvwii1llfdfwg35rwywjjmvww0qj4"; + }) + (fetchpatch { + url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9213ff7642a33aa481e3c61989ad60f7985b9984"; + name = "CVE-2018-10910-2.patch"; + sha256 = "0j7klbhym64yhn86dbsmybqmwx47bviyyhx931izl1p29z2mg8hn"; + }) + ]; postConfigure = '' substituteInPlace tools/hid2hci.rules \ diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 442c54ac8462..f738b9f6da5f 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa_noglu, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: stdenv.mkDerivation rec { name = "kmscube-2018-06-17"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libdrm libX11 libGL mesa_noglu ]; + buildInputs = [ libdrm libX11 libGL mesa ]; meta = with stdenv.lib; { description = "Example OpenGL app using KMS/GBM"; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1f5de9dba105..2ae444597f41 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1768,7 +1768,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { + xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-video-amdgpu-19.0.1"; builder = ./builder.sh; src = fetchurl { @@ -1777,7 +1777,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto mesa_noglu libGL libdrm udev xorgserver ]; + buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1820,7 +1820,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ati-19.0.1"; builder = ./builder.sh; src = fetchurl { @@ -1829,7 +1829,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto mesa_noglu libGL libdrm udev libpciaccess xorgserver ]; + buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 2c4d4fb3a5ab..21e61bc54d0e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -36,7 +36,7 @@ $pcMap{"uuid"} = "libuuid"; $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "libGL"; $pcMap{"GL"} = "libGL"; -$pcMap{"gbm"} = "mesa_noglu"; +$pcMap{"gbm"} = "mesa"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f668d7bbf2a3..979577575a9d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -3,7 +3,7 @@ automake, autoconf, gettext, libiconv, libtool, intltool, freetype, tradcpp, fontconfig, meson, ninja, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, - mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, + mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, epoxy, openssl, pkgconfig, llvm_6, cf-private, ApplicationServices, Carbon, Cocoa, Xplugin }: @@ -382,7 +382,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ mesa_noglu llvm_6 ]; # for libxatracker + buildInputs = attrs.buildInputs ++ [ mesa llvm_6 ]; # for libxatracker meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; @@ -507,7 +507,7 @@ self: super: if (!isDarwin) then { outputs = [ "out" "dev" ]; - buildInputs = commonBuildInputs ++ [ libdrm mesa_noglu ]; + buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index 5c4c65bc17a2..13d7e06c7304 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, libX11, libGL, mesa_noglu +, libX11, libGL, mesa , nvidia_x11 ? null , libglvnd }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { makeFlags = [ "LIBDIR=$(out)/lib" "PRIMUS_libGLa=${aPackage}/lib/libGL.so" "PRIMUS_libGLd=${libGL}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so" + "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" ]; installPhase = '' diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 102ffae5f9d0..1d77bfe42500 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, fetchpatch , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv + , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin }: @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut libGLU libGL mesa_noglu.osmesa ] + [ freeglut libGLU libGL mesa.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 566d6f48e1cc..1331e38aef7e 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, - python27, wayland, udev, mesa_noglu, wafHook }: + python27, wayland, udev, mesa, wafHook }: stdenv.mkDerivation rec { name = "glmark2-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu + libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa ]; wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index f83a2b940719..c80bb64d0bbd 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh + # Some target platforms, especially when building inside a container have + # issues with the inotify test. + sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail-2/inotify-dir-recreate.sh + # sandbox does not allow setgid sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh substituteInPlace ./tests/install/install-C.sh \ diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index c961ea938bab..e98b085c78d5 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, ncurses, lessSecure ? false }: stdenv.mkDerivation rec { - name = "less-530"; + pname = "less"; + version = "551"; src = fetchurl { - url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "1qpj2z38c53qmvqn8jaa0kq26q989cfbfjj4y0s6z17l1amr2gsh"; + url = "http://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0ggyjl3yzn7c450zk1rixi9ls6asdhgqynhk34zsd0ckhmsm45pz"; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. @@ -18,6 +19,6 @@ stdenv.mkDerivation rec { description = "A more advanced file pager than ‘more’"; platforms = platforms.unix; license = licenses.gpl3; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ eelco dtzWill ]; }; } diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index e6940d2332ca..f2c83c661ae3 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -11,11 +11,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19lb5afx4iq8dgfsy26x9j4194v8f64vwr3nq6dk1ix3wljxzs66"; + sha256 = "07vg2ryyjaxs5h8kmkwqhk4ki750c4di98g0i7h7zglfs16psiqd"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index b0c4a0199c43..154788b3c5d3 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -4,13 +4,13 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { pname = "openconnect"; - version = "8.02"; + version = "8.03"; src = fetchurl { urls = [ "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz" ]; - sha256 = "04p0vzc1791h68hd9803wsyb64zrwm8qpdqx0szhj9pig71g5a0w"; + sha256 = "1wlypi68kqqg2mdck8wvf6aanhrmf9i7z6lngyxvcrp23jdzz34h"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 97a692d7f332..c33e433448f5 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -2,7 +2,7 @@ , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk3, pango , makeWrapper , python, pythonPackages, lib -, lsof, curl, libuuid, cups, mesa_drivers +, lsof, curl, libuuid, cups, mesa }: let @@ -18,7 +18,7 @@ let # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ - mesa_drivers + mesa.drivers libGLU_combined fontconfig freetype diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 71f20b4ae820..6312d1bd5718 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -174,6 +174,7 @@ mapAliases ({ libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 + libGL_driver = mesa.drivers; libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = liblapack; # added 2018-11-05 @@ -193,6 +194,12 @@ mapAliases ({ man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 memtest86 = memtest86plus; # added 2019-05-08 + mesa_noglu = mesa; # added 2019-05-28 + # NOTE: 2018-07-12: legacy alias: + # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ + # floating point textures patents are expired, + # so package reduced to alias + mesa_drivers = mesa.drivers; midoriWrapper = midori; # added 2015-01 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e9fe1528a01..89d3f8d0902b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1087,9 +1087,7 @@ in blockdiag = with python3Packages; toPythonApplication blockdiag; - blsd = callPackage ../tools/misc/blsd { - libgit2 = libgit2_0_27; - }; + blsd = callPackage ../tools/misc/blsd { }; bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; @@ -10227,7 +10225,7 @@ in # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) - mesa_drivers + mesa vaapiIntel libvdpau-va-gl vaapiVdpau @@ -10523,10 +10521,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_27 = callPackage ../development/libraries/git2/0.27.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; glbinding = callPackage ../development/libraries/glbinding { }; @@ -12247,7 +12241,7 @@ in # libGL.so/libEGL.so/... to link agains them. Android NDK provides # an OpenGL implementation, we can just use that. libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv - else mesa_noglu.stubs; + else mesa.stubs; # Default libGLU libGLU = mesa_glu; @@ -12262,29 +12256,17 @@ in extraOutputsToInstall = [ "dev" ]; }; - # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) - libGL_driver = mesa_drivers; - - libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; - - mesa_noglu = callPackage ../development/libraries/mesa { + mesa = callPackage ../development/libraries/mesa { # 7 is the default, but only on Linux, so keep this for now llvmPackages = llvmPackages_7; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; - mesa = mesa_noglu; mesa_glu = callPackage ../development/libraries/mesa-glu { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - # NOTE: 2018-07-12: legacy alias: - # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ - # floating point textures patents are expired, - # so package reduced to alias - mesa_drivers = mesa_noglu.drivers; - ## End libGL/libGLU/Mesa stuff meterbridge = callPackage ../applications/audio/meterbridge { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b693d5578cf3..05edce3d187d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -250,6 +250,10 @@ in { azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; + azure-cli-core = callPackage ../development/python-modules/azure-cli-core { }; + + azure-cli-telemetry = callPackage ../development/python-modules/azure-cli-telemetry { }; + azure-common = callPackage ../development/python-modules/azure-common { }; azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; @@ -1106,6 +1110,8 @@ in { amqplib = callPackage ../development/python-modules/amqplib {}; + antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime {}; + antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {}; apipkg = callPackage ../development/python-modules/apipkg {}; @@ -1704,9 +1710,9 @@ in { pyhepmc = callPackage ../development/python-modules/pyhepmc { }; - pytest = self.pytest_42; + pytest = self.pytest_4; - pytest_42 = callPackage ../development/python-modules/pytest { + pytest_4 = callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; }; }; @@ -3176,6 +3182,8 @@ in { kitchen = callPackage ../development/python-modules/kitchen { }; + knack = callPackage ../development/python-modules/knack { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; pylast = callPackage ../development/python-modules/pylast { }; |