diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index dcb5737afa6..c4e1695f083 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +{ stdenv, fetchFromGitHub, rustPackages_1_45, pkgconfig, openssl , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null @@ -7,7 +7,10 @@ , dbus ? null }: -rustPlatform.buildRustPackage rec { +# rust >= 1.48 causes a panic within spotifyd on music playback. as long as +# there is no upstream fix for the issue we use an older version of rust. +# Upstream issue: https://github.com/Spotifyd/spotifyd/issues/719 +rustPackages_1_45.rustPlatform.buildRustPackage rec { pname = "spotifyd"; version = "0.2.24"; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 2e6e2e592b1..4c64c595fef 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.17.1"; + version = "2.18.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1r0cl4jfgg0b3zr46bh9dhhg2qgsh3xj99w3ryyjdxydfvychvz8"; + sha256 = "19sx9n5mij68v07vy65h1c16rgbpll3kagr437cjb7r95k3nk2zn"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 6275a26118f..16f4aefe349 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,6 +1,5 @@ { stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub -, fetchpatch , cmake, qttools, pkgconfig , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns @@ -28,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.4"; + version = "0.17.1.5"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng"; + sha256 = "0qlcqli0wvrjfy89mbgh1hpmk60dxgn5sws93h8lhgyfwx557iw0"; }; nativeBuildInputs = [ @@ -59,14 +58,7 @@ stdenv.mkDerivation rec { chmod -R +w source/monero ''; - patches = [ - ./move-log-file.patch - # fix build failure due to invalid use of CMAKE_PREFIX_PATH - (fetchpatch { - url = "https://github.com/monero-project/monero-gui/commit/ef2be82c21b0934522ad8e110805b66f5948da1f.patch"; - sha256 = "1rhazk2xwa5dv1cmkrkq8yr08qxslg4k929cvlliabrx20kbr5z5"; - }) - ]; + patches = [ ./move-log-file.patch ]; postPatch = '' # set monero-gui version diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 1010da81da3..2978d65e2ef 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.3"; + version = "0.17.1.5"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1ddkdfd8i5q509qziwcx1f6nm8axs4a1ppzv2y5lgsqpq375if6j"; + sha256 = "0yy9n2qng02j314h8fh5n0mcy6vpdks0yk4d8ifn8hj03f3g2c8b"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index c0aa0a481bd..46143747f6d 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,26 +1,27 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, + qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: mkDerivation rec { pname = "cura"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "19an168iad3cb5w8i71c0wbr79qnz5qnpxqx1j6dgh64qz6ffn2r"; + sha256 = "060fqzspipm93ks0inrj7yrj5wmvkdfv8xaxrv22590yb9f95s9m"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "1w6i0dlff8b30q987x3y0zv8847fc8ppfcr9vi982msmv284c89z"; + sha256 = "0hi9w1fsnazlr0vvxdr3alsdb8m1vjjfp5zhmlz4kyyxhsy3bc33"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ - libsavitar numpy-stl pyserial requests uranium zeroconf + libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d sentry-sdk trimesh ] ++ plugins; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 5cc5db3115f..8993c01a6bd 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "177fk6j4gn3ssi8j1qxj8p4486f7jkz328vc75agxnh7vhd4mwsm"; + sha256 = "083l327ry6hv3yaa1p8dx1hx7fm12b0lh5nlbshxjyym0vi15rw2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 2c58e15c443..0384f9723d5 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,7 +1,8 @@ -{ fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: -python2Packages.buildPythonApplication rec { +{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg_utils, gtk3 }: + +python3Packages.buildPythonApplication rec { pname = "rabbitvcs"; - version = "0.17.1"; + version = "0.18"; namePrefix = ""; src = fetchFromGitHub { @@ -11,7 +12,8 @@ python2Packages.buildPythonApplication rec { sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy"; }; - pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; + buildInputs = [ gtk3 ]; + pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg_utils ]; prePatch = '' sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index e49fad551da..a3178e54804 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "0p3vjf4zj137miix1gbi8rv6g4wvi8kmyhwwxyirw00ankxbxp1n"; + sha256 = "1k8mxkzvd6y9aawxghddrjkldzskhb6607qhbwjfl9f945ns87qa"; }; patches = [ diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix new file mode 100644 index 00000000000..ee61ef8a723 --- /dev/null +++ b/pkgs/development/libraries/libnest2d/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: + +stdenv.mkDerivation rec { + version = "2020-10-09-unstable"; + pname = "libnest2d"; + + # This revision is waiting to be merged upstream + # Once it has been merged, this should be switched to it + # Upstream PR: https://github.com/tamasmeszaros/libnest2d/pull/18 + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "libnest2d"; + rev = "31391fd173249ad9b906390058e13b09238fadc8"; + sha256 = "1hzqi4z55x76rss3xk7hfqhy9hcaq2jaav5jqxa1aqmbvarr2gla"; + }; + + propagatedBuildInputs = [ clipper nlopt boost ]; + nativeBuildInputs = [ cmake ]; + + CLIPPER_PATH = "${clipper.out}"; + cmakeFlags = [ "-DLIBNEST2D_HEADER_ONLY=OFF" ]; + + meta = with stdenv.lib; { + description = + "2D irregular bin packaging and nesting library written in modern C++"; + homepage = "https://github.com/Ultimaker/libnest2d"; + license = licenses.lgpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 5b68695f832..e69e51ccf55 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.7.1"; + version = "4.8.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "0wmrcvw7k34ib93shhmjzh6kpndgqr37kyr377sril5clmac0z1f"; + sha256 = "1dvz1rkvm4309yzvj7vy49v1vskr5yfq4nzqdiydp1jb7zpvhqqm"; }; disabled = pythonOlder "3.4.0"; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 27144ccf1ad..9b6aa7bc3a8 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.7.1"; + version = "4.8.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "0mzr3ynfap51bcn6kshyi2h6iny2gpavn6g3b1xcsgzzlxqgfixf"; + sha256 = "1mxkvnhn8k1a86jlnjnlpf0b8dvrcg3n7pslf60s13cgb7w3sfzh"; }; postPatch = '' diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 25c092200e7..c12888b3a8c 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.8.1"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "a8301a7e11ae44a03a46efc740022f8598ed55b6448b14ba68a63954ef18a240"; + sha256 = "sha256:0l7vj04xm0i5ikxjdqrr5939q7amh0hfp0fqifkcvyjv9fvhyz65"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycxx/default.nix b/pkgs/development/python-modules/pycxx/default.nix new file mode 100644 index 00000000000..c0cf0ac0dc1 --- /dev/null +++ b/pkgs/development/python-modules/pycxx/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchurl, python }: + +buildPythonPackage rec { + pname = "pycxx"; + version = "7.1.4"; + + src = fetchurl { + url = "mirror://sourceforge/cxx/CXX/PyCXX%20V${version}/pycxx-${version}.tar.gz"; + sha256 = "MUMU+/qsm92WENYFxfjQsSuR8/nE/asYG8HgIbaAaz0="; + }; + + outputs = [ "out" "dev" ]; + + postInstall = '' + mkdir -p $dev/include + mv $out/include/${python.libPrefix}*/CXX/ $dev/include/CXX/ + mv $out/CXX $dev/src + sed -i "s|Src|$dev/src|" $dev/src/cxxextensions.c $dev/src/cxxsupport.cxx + ''; + + meta = with lib; { + description = "set of classes to help create extensions of Python in the C++ language"; + homepage = "https://sourceforge.net/projects/cxx/"; + maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix new file mode 100644 index 00000000000..3a7c6b43392 --- /dev/null +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake +, pythonOlder, libnest2d, sip, clipper }: + +buildPythonPackage rec { + version = "4.8.0"; + pname = "pynest2d"; + format = "other"; + + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "pynest2d"; + rev = version; + sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp"; + }; + + propagatedBuildInputs = [ libnest2d sip clipper ]; + nativeBuildInputs = [ cmake ]; + + CLIPPER_PATH = "${clipper.out}"; + + postPatch = '' + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' cmake/SIPMacros.cmake + ''; + + meta = with stdenv.lib; { + description = "Python bindings for libnest2d"; + homepage = "https://github.com/Ultimaker/pynest2d"; + license = licenses.lgpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index d46d3cfc500..d56c10a9591 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -1,43 +1,69 @@ { stdenv +, lib , buildPythonPackage , fetchurl -, pkgs , isPy3k , python +, apr +, aprutil +, bash +, e2fsprogs +, expat +, gcc +, glibcLocales +, neon +, openssl +, pycxx +, subversion }: buildPythonPackage rec { pname = "pysvn"; - version = "1.8.0"; - disabled = isPy3k; + version = "1.9.12"; format = "other"; src = fetchurl { url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; - sha256 = "0srjr2qgxfs69p65d9vvdib2lc142x10w8afbbdrqs7dhi46yn9r"; + sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q="; }; - buildInputs = [ pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] - ++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []); + buildInputs = [ bash subversion apr aprutil expat neon openssl ] + ++ lib.optionals stdenv.isLinux [ e2fsprogs ] + ++ lib.optionals stdenv.isDarwin [ gcc ]; - # There seems to be no way to pass that path to configure. - NIX_CFLAGS_COMPILE="-I${pkgs.aprutil.dev}/include/apr-1"; + postPatch = '' + sed -i "117s|append(|insert(0, |" Tests/benchmark_diff.py + ''; preConfigure = '' cd Source ${python.interpreter} setup.py backport ${python.interpreter} setup.py configure \ - --apr-inc-dir=${pkgs.apr.dev}/include \ - --apu-inc-dir=${pkgs.aprutil.dev}/include \ - --apr-lib-dir=${pkgs.apr.out}/lib \ - --svn-lib-dir=${pkgs.subversion.out}/lib \ - --svn-bin-dir=${pkgs.subversion.out}/bin \ - --svn-root-dir=${pkgs.subversion.dev} - '' + (if !stdenv.isDarwin then "" else '' + --apr-inc-dir=${apr.dev}/include \ + --apu-inc-dir=${aprutil.dev}/include \ + --pycxx-dir=${pycxx.dev}/include \ + --svn-inc-dir=${subversion.dev}/include/subversion-1 \ + --pycxx-src-dir=${pycxx.dev}/src \ + --apr-lib-dir=${apr.out}/lib \ + --svn-lib-dir=${subversion.out}/lib \ + --svn-bin-dir=${subversion.out}/bin + '' + (lib.optionalString (stdenv.isDarwin && !isPy3k) '' sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile ''); - checkPhase = "make -C ../Tests"; + checkInputs = [ glibcLocales ]; + checkPhase = '' + runHook preCheck + + # It is not only shebangs, some tests also write scripts dynamically + # so it is easier to simply search and replace + sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh + make -C ../Tests + + runHook postCheck + ''; + + pythonImportCheck = [ "pysvn" ]; installPhase = '' dest=$(toPythonPath $out)/pysvn @@ -45,15 +71,14 @@ buildPythonPackage rec { cp pysvn/__init__.py $dest/ cp pysvn/_pysvn*.so $dest/ mkdir -p $out/share/doc - mv -v ../Docs $out/share/doc/pysvn-1.7.2 - rm -v $out/share/doc/pysvn-1.7.2/generate_cpp_docs_from_html_docs.py + mv -v ../Docs $out/share/doc/pysvn-${version} + rm -v $out/share/doc/pysvn-${version}/generate_cpp_docs_from_html_docs.py ''; meta = with stdenv.lib; { description = "Python bindings for Subversion"; homepage = "http://pysvn.tigris.org/"; license = licenses.asl20; - broken = true; }; } diff --git a/pkgs/development/python-modules/pytest-xdist/1.nix b/pkgs/development/python-modules/pytest-xdist/1.nix new file mode 100644 index 00000000000..6dc4b666db5 --- /dev/null +++ b/pkgs/development/python-modules/pytest-xdist/1.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest +, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: + +buildPythonPackage rec { + pname = "pytest-xdist"; + version = "1.34.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il"; + }; + + nativeBuildInputs = [ setuptools_scm pytest ]; + checkInputs = [ pytest filelock ]; + propagatedBuildInputs = [ execnet pytest-forked psutil six ]; + + # Encountered a memory leak + # https://github.com/pytest-dev/pytest-xdist/issues/462 + doCheck = !isPy3k; + + checkPhase = '' + # Excluded tests access file system + py.test testing -k "not test_distribution_rsyncdirs_example \ + and not test_rsync_popen_with_path \ + and not test_popen_rsync_subdir \ + and not test_init_rsync_roots \ + and not test_rsyncignore" + ''; + + meta = with stdenv.lib; { + description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; + homepage = "https://github.com/pytest-dev/pytest-xdist"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-xdist/2.nix b/pkgs/development/python-modules/pytest-xdist/2.nix deleted file mode 100644 index cc58c5ab6bd..00000000000 --- a/pkgs/development/python-modules/pytest-xdist/2.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 -, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: - -buildPythonPackage rec { - pname = "pytest-xdist"; - version = "2.1.0"; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2"; - }; - - nativeBuildInputs = [ setuptools_scm pytest_6 ]; - checkInputs = [ pytest_6 filelock ]; - propagatedBuildInputs = [ execnet pytest-forked psutil six ]; - - # pytest6 doesn't allow for new lines - # capture_deprecated not compatible with latest pytest6 - checkPhase = '' - # Excluded tests access file system - export HOME=$TMPDIR - pytest -n $NIX_BUILD_CORES \ - -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)" - ''; - - meta = with stdenv.lib; { - description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; - homepage = "https://github.com/pytest-dev/pytest-xdist"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 56e3f3cad59..cc58c5ab6bd 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,30 +1,27 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { pname = "pytest-xdist"; version = "2.1.0"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "82d938f1a24186520e2d9d3a64ef7d9ac7ecdf1a0659e095d18e596b8cbd0672"; + sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2"; }; - nativeBuildInputs = [ setuptools_scm pytest ]; - checkInputs = [ pytest filelock ]; + nativeBuildInputs = [ setuptools_scm pytest_6 ]; + checkInputs = [ pytest_6 filelock ]; propagatedBuildInputs = [ execnet pytest-forked psutil six ]; - # Encountered a memory leak - # https://github.com/pytest-dev/pytest-xdist/issues/462 - doCheck = !isPy3k; - + # pytest6 doesn't allow for new lines + # capture_deprecated not compatible with latest pytest6 checkPhase = '' # Excluded tests access file system - py.test testing -k "not test_distribution_rsyncdirs_example \ - and not test_rsync_popen_with_path \ - and not test_popen_rsync_subdir \ - and not test_init_rsync_roots \ - and not test_rsyncignore" + export HOME=$TMPDIR + pytest -n $NIX_BUILD_CORES \ + -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index b70c2a80e4a..bdb2f8cbd75 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0xj2gg1z9l1f4aqrsbz5hww8hvrhiyz8fdrpr9861jmbxyzl03y7"; + sha256 = "1fv92f71p7pk3r4aj88kgaiblfii3z4fjbchyj1c9k6br0gwbw8b"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 1e0164e10cf..69ea8c0f9c2 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -1,4 +1,5 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles +, Foundation, Security }: rustPlatform.buildRustPackage rec { pname = "rage"; @@ -15,7 +16,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + Foundation + Security + ]; postBuild = '' cargo run --example generate-docs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d536dbb159f..a3d5f6589f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3547,7 +3547,9 @@ in pax = callPackage ../tools/archivers/pax { }; - rage = callPackage ../tools/security/rage { }; + rage = callPackage ../tools/security/rage { + inherit (darwin.apple_sdk.frameworks) Foundation Security; + }; rar2fs = callPackage ../tools/filesystems/rar2fs { }; @@ -14416,6 +14418,8 @@ in libndctl = callPackage ../development/libraries/libndctl { }; + libnest2d = callPackage ../development/libraries/libnest2d { }; + libnet = callPackage ../development/libraries/libnet { }; libnetfilter_acct = callPackage ../development/libraries/libnetfilter_acct { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40ec8314d9e..08cb32a9408 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5023,6 +5023,8 @@ in { pycurl = callPackage ../development/python-modules/pycurl { }; + pycxx = callPackage ../development/python-modules/pycxx { }; + pydantic = callPackage ../development/python-modules/pydantic { }; pydbus = callPackage ../development/python-modules/pydbus { }; @@ -5341,6 +5343,8 @@ in { pync = callPackage ../development/python-modules/pync { }; + pynest2d = callPackage ../development/python-modules/pynest2d { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pynmea2 = callPackage ../development/python-modules/pynmea2 { }; @@ -5640,7 +5644,9 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pysvn = callPackage ../development/python-modules/pysvn { }; + pysvn = callPackage ../development/python-modules/pysvn { + inherit (pkgs) bash subversion apr aprutil expat neon openssl; + }; pytabix = callPackage ../development/python-modules/pytabix { }; @@ -5823,11 +5829,10 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; - - pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; - - pytest_xdist = self.pytest_xdist_2; + pytest_xdist = if isPy27 then + callPackage ../development/python-modules/pytest-xdist/1.nix { } + else + callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };