diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e5f1d658b5d7..0a3b5ca421d3 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-mVeVjkP8JpTi2aW59ZuzQPi5YvEySVAtxko7xxAx/es="; + sha256 = "sha256-B2ZpwhdmdvPOnxVyJDfNzUT5rTVuBhJXyMwwzCl9Fac="; }; patches = [ diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 5afd0a615b59..35832b0dafb1 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.2.5"; + version = "2.2.7"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-Yb5tCvhVg9p4v7++MmoaeQDyP1qdfpHM+IGj8BoacVs="; + hash = "sha256-Kqvnw0cPPkqgJQdc6vkP4U96AQuyFSNMQTzTdIUghWw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 6d30f4ba8785..6bcde313e9ad 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-+WwxYnVW6rdZ+A4L2qLtXXaMWLC4ulEoP+vtdtkLvlE="; + sha256 = "sha256-LluWV/GWBJ+dmn94GtqPNCIDTZk2zlNhrbcM2pALUpU="; }; - vendorSha256 = "sha256-505nUMuFteOfIurGYRGHqo9diTSEa56tmQZ3jIGtULQ="; + vendorSha256 = "sha256-f7rznlRKEkHsU72QvRpOtvhg5rp9PuEoADhQOeD16rU="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 016b77646f37..946e145a5707 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goeland"; - version = "0.12.1"; + version = "0.12.3"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7ZfZ5sf8vK51geWZ5iKFPwd/v26f7MTDmtKkxamKwRQ="; + sha256 = "sha256-R3ZkGTq0g90DkflLXr2MUBIv5Qspi3OM+sdDGqJYjyw="; }; vendorSha256 = "sha256-iljGBe8c6dqEHRpMN5cz7wmminejoiXXDKuQDazDztA="; diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index 4fb3475c147c..7e268e27f1a0 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-XymtLguAHCtOrRADRcWsPYq9cZo+FVUPOceIj7SmH8k="; + sha256 = "sha256-INoJcb6XUMvT1E56hC3BGK3Ax+v4jSRpZV12zpjYfMA="; }; CGO_ENABLED = 0; ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; - vendorSha256 = "sha256-MJMOCUIosLT9XhRsahQMx4Kq6j/aqCjhPq0ZvJc/Soc="; + vendorSha256 = "sha256-kKIekANzLY2TYFyII1/BkKkqPYgmHB9xEfAVhJyI8FI="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index ad1ee0a0b302..1e4bb853742e 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,36 +1,43 @@ -{ lib, stdenv, fetchurl, pkg-config, libpcap, pcre, libnl, zlib, libmicrohttpd -, sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils -, withNetworkManager ? false, glib, networkmanager -, withPython ? false, python3 -, withSensors ? false, lm_sensors}: - -# couldn't get python modules to build correctly, -# waiting for some other volunteer to fix it -assert !withPython; +{ lib +, stdenv +, binutils +, elfutils +, fetchurl +, glib +, libcap +, libmicrohttpd +, libnl +, libpcap +, libusb1 +, libwebsockets +, lm_sensors +, networkmanager +, pcre +, pkg-config +, openssl +, protobuf +, protobufc +, python3 +, sqlite +, withNetworkManager ? false +, withPython ? true +, withSensors ? false +, zlib +}: stdenv.mkDerivation rec { pname = "kismet"; - version = "2020-09-R2"; + version = "2022-08-R1"; src = fetchurl { url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg"; + hash = "sha256-IUnM6sVSZQhlP00C3PemlOPaPcAAojcqHuS/mYgnl4E="; }; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc - libusb1 libcap binutils elfutils - ] ++ lib.optionals withNetworkManager [ networkmanager glib ] - ++ lib.optional withSensors lm_sensors - ++ lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf - ps.numpy ps.pyserial ])); - - configureFlags = [] - ++ lib.optional (!withNetworkManager) "--disable-libnm" - ++ lib.optional (!withPython) "--disable-python-tools" - ++ lib.optional (!withSensors) "--disable-lmsensors"; + postPatch = '' + substituteInPlace Makefile.in \ + --replace "-m 4550" "" + ''; postConfigure = '' sed -e 's/-o $(INSTUSR)//' \ @@ -40,12 +47,58 @@ stdenv.mkDerivation rec { -i Makefile ''; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals withPython [ + python3 + ]; + + buildInputs = [ + binutils + elfutils + libcap + libmicrohttpd + libnl + libpcap + openssl + libusb1 + libwebsockets + pcre + protobuf + protobufc + sqlite + zlib + ] ++ lib.optionals withNetworkManager [ + networkmanager + glib + ] ++ lib.optional withSensors [ + lm_sensors + ]; + + propagatedBuildInputs = [ + ] ++ lib.optional withPython (python3.withPackages (ps: [ + ps.numpy + ps.protobuf + ps.pyserial + ps.setuptools + ps.websockets + ])); + + configureFlags = [ + ] ++ lib.optional (!withNetworkManager) [ + "--disable-libnm" + ] ++ lib.optional (!withPython) [ + "--disable-python-tools" + ] ++ lib.optional (!withSensors) [ + "--disable-lmsensors" + ]; + enableParallelBuilding = true; meta = with lib; { description = "Wireless network sniffer"; homepage = "https://www.kismetwireless.net/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix index 7c0dbefc5069..db79637ef9ff 100644 --- a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gitnuro"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar"; - hash = "sha256-tAFFl14mmXhLr6V/vTDe9lwX7trsaTWgIqkwxD3mBUw="; + hash = "sha256-ugZBk/aQ2pjL9xY66g20MorAQ02GHIdJTv8ejadaBgY="; }; icon = fetchurl { diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index f5cf94629e62..def387980d63 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-mkGyY50WBmVbZ9FEfZRWoGLeZy0HkBzYACbF2u8EN1o="; + sha256 = "sha256-ZMqqiPSNNJw9t3p5h/GUHa9cvl9LcJ4u0HMf1ag8qCc="; }; vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 9e513fd9676a..2f207e8ee474 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-UtQ9LcGE9mLowttAAwR1ujD+BSCosFk+GHQvDwG/CAQ="; + sha256 = "sha256-VB7v51YW4aA5WHVD5ZWFzv9hQskjQeqMzm+pQ9glODg="; }; - cargoSha256 = "sha256-0cZy7hOaREtdFB0Ww1VSV4ILpB0utSBcKlC3t9fhum8="; + cargoSha256 = "sha256-uII6o/cJktpUFxROuu11dNSXx0p6phVVqszmbYK9Rd0="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 6270d2a66429..80f6b5ce24ae 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -9,8 +9,7 @@ , themeVariants ? [] }: -let - pname = "Whitesur-icon-theme"; +let pname = "Whitesur-icon-theme"; in lib.checkListOfEnum "${pname}: theme variants" [ "default" @@ -27,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-08-30"; + version = "2022-11-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "pcvRD4CUwUT46/kmMbnerj5mqPCcHIRreVIh9wz6Kfg="; + hash = "sha256-crZ6JQeXeSjTHGIBptioNiFZas7MksJcjaKGlMP4fo0="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 2c19c4ae7d01..6431dc5a1718 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "0a55zk3qrw9yl27i87h3brg2hskmmzbfda77dhq9a4if7y70xnfb"; + sha256 = "sha256-0ESRnZTL6/vMpek+2sb0YQU3ajXtzj14yvjfOSQYjf4="; }; PREFIX = "\${out}"; diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/development/libraries/libhv/default.nix new file mode 100644 index 000000000000..a4314b996f22 --- /dev/null +++ b/pkgs/development/libraries/libhv/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, Security }: + +stdenv.mkDerivation (finalAttrs: { + pname = "libhv"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "ithewei"; + repo = "libhv"; + rev = "v${finalAttrs.version}"; + hash = "sha256-LMk8B/1EofcQcIF3kGmtPdM2s+/gN9ctcsybwTpf4Po="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin Security; + + cmakeFlags = [ + "-DENABLE_UDS=ON" + "-DWITH_MQTT=ON" + "-DWITH_CURL=ON" + "-DWITH_NGHTTP2=ON" + "-DWITH_OPENSSL=ON" + "-DWITH_KCP=ON" + ]; + + meta = with lib; { + description = "A c/c++ network library for developing TCP/UDP/SSL/HTTP/WebSocket/MQTT client/server"; + homepage = "https://github.com/ithewei/libhv"; + license = licenses.bsd3; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 0154029b5504..3faa8244b6d7 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -1,25 +1,24 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml, dune-configurator -, mdx, qtest, result +, result, seq +, mdx, ounit2, qcheck-core }: buildDunePackage rec { pname = "iter"; - version = "1.4"; - - useDune2 = true; + version = "1.6"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kk92GM7IVXOSVBkeN6wj67Q3UGCyuOOVi2umpn1AZTo="; + sha256 = "sha256-FbM/Vk/h4wkrBjyf9/QXTvTOA0nNqsdHP1mDnVkg1is="; }; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ result ]; + propagatedBuildInputs = [ result seq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ mdx.bin qtest ]; + checkInputs = [ mdx.bin ounit2 qcheck-core ]; meta = { homepage = "https://github.com/c-cube/sequence"; diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 61b67cb32a31..98bb7a8c7bc3 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.9"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qG+EPZjH3I4TRGka7J21ukGpuJQfA/Nuy6DbIUnykcs="; + hash = "sha256-L2R4Qu72bvUjJyE/bBMeKufK/TAFw9u/oGowS1rCqP4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index c1fd962a41f3..87db5ad026a7 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "11.4.3"; + version = "11.5.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g901qWU6aiaV0kLmtWJffXZrOsKjvOGI0TOgQFzuuPA="; + hash = "sha256-z3ILdtxDU4xLBY5mVAKal2nBo2sdO5rlSQDyexwHUtI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index 30c4fe2e7627..f0c116a1bb68 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -1,18 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi , azure-common , azure-mgmt-core , msrest , msrestazure +, pythonOlder +, typing-extensions }: buildPythonPackage rec { - version = "2.0.0"; pname = "azure-mgmt-security"; - disabled = isPy27; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2sr3clHf5EvbXAx5FH3d3ab1/Y48r6Ojww3p9WX35aM="; + hash = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; extension = "zip"; }; @@ -21,12 +27,17 @@ buildPythonPackage rec { azure-mgmt-core msrest msrestazure + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.security" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.security" + ]; meta = with lib; { description = "Microsoft Azure Security Center Management Client Library for Python"; diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 9b824c33e7b2..daee50ffa832 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.35"; + version = "0.2.36"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-MzVv0HN87eDsz0mP/rqH6FZVRgq95iTuu8mikkofT30="; + sha256 = "sha256-X/nlu/hwdgmUOw7+hALRhyCG/vphnWAK22fSWuUAjs0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index cec5c0d638dd..43fea29cc2f5 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.7"; + version = "0.10.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OPbqCsTZZskZOJMcK1OJsG3Qgx4K0X217g5pNWQZDAM="; + hash = "sha256-uk4DYmbV/4zSyL2QzlAJLvgC6ieBjP/xkuyDktUEmIo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix index 4e632cb34038..73be71e67e5b 100644 --- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix +++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -2,21 +2,30 @@ , buildPythonPackage , fetchPypi , setuptools +, pythonOlder }: buildPythonPackage rec { pname = "clickhouse-cityhash"; - version = "1.0.2.3"; + version = "1.0.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0z8nl0ly2p1h6nygwxs6y40q8y424w40fkjv3jyf8vvcg4h7sdrg"; + sha256 = "sha256-ezEl19CqE8LMTnWDqWWmv7CqlqEhMUdbRCVSustV9Pg="; }; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ]; doCheck = false; - pythonImportsCheck = [ "clickhouse_cityhash" ]; + + pythonImportsCheck = [ + "clickhouse_cityhash" + ]; meta = with lib; { description = "Python-bindings for CityHash, a fast non-cryptographic hash algorithm"; diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index a78b55704aec..a848125a55dc 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -8,9 +8,9 @@ , pytestCheckHook , pythonOlder , python-dateutil -, setuptools +, repeated-test +, setuptools-scm , sigtools -, unittest2 }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -42,14 +42,11 @@ buildPythonPackage rec { ]; }; - # repeated_test no longer exists in nixpkgs - # also see: https://github.com/epsy/clize/issues/74 - doCheck = false; checkInputs = [ pytestCheckHook python-dateutil pygments - unittest2 + repeated-test ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index 183645053771..0c1f376aeaf6 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "compreffor"; - version = "0.5.2"; + version = "0.5.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rsC0HJCl3IGqEqUqfCwRRNwzjtfGDlxcCkeOU3On22Q="; + sha256 = "sha256-fUEpbU+wqh72lt/ZJdKvMifUAwYivpmzx9QQfcb4cTo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 82f0851b1ab3..a72bc5b22bbe 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.14.2"; + version = "0.14.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q8aOpuJD6aX9m9jPm9PY5vZGBJL6Jpf+pPHbcQVOJLg="; + hash = "sha256-zHbo03Ll40H8okBIaqrWSJby4aQAg7ukETNHerUPX28="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 2e62913220e9..a3ea4034e8b6 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "7.0.1"; + version = "7.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-aSWDVdr4J2BXqS5CzsUllK2M/n3VBdbw5W/kQLxEGNA="; + hash = "sha256-OENUR9rTKrt+AdHDlCU5AhpSI4ijtYXVg6biB8wTNJc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index ee51b0e7c8ec..d1d5f926fdab 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -1,17 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.6.0"; + version = "1.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-opQY/0FpADW+ENLJSgZV2rCZAJxouJiDmBPWoQmxTXE="; + hash = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8="; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) doCheck = false; + pythonImportsCheck = [ + "webpack_loader" + ]; + meta = with lib; { description = "Use webpack to generate your static bundles"; homepage = "https://github.com/owais/django-webpack-loader"; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index a79de8f96c01..c3bab1180cf9 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -10,11 +10,10 @@ , glibcLocales , gnupg , gpgme -, mock -, urllib3 , paramiko , pytestCheckHook , pythonOlder +, urllib3 }: buildPythonPackage rec { @@ -36,18 +35,28 @@ buildPythonPackage rec { urllib3 ]; + passthru.optional-dependencies = { + fastimport = [ + fastimport + ]; + pgp = [ + gpgme + gnupg + ]; + paramiko = [ + paramiko + ]; + }; + checkInputs = [ - fastimport gevent geventhttpclient git glibcLocales - gpgme - gnupg - mock - paramiko pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.fastimport + ++ passthru.optional-dependencies.pgp + ++ passthru.optional-dependencies.paramiko; doCheck = !stdenv.isDarwin; @@ -70,7 +79,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Simple Python implementation of the Git file formats and protocols"; + description = "Implementation of the Git file formats and protocols"; longDescription = '' Dulwich is a Python implementation of the Git file formats and protocols, which does not depend on Git itself. All functionality is available in pure Python. diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 3e2d61843de2..c1e70fbf9902 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -7,7 +7,6 @@ , pythonOlder , requests , responses -, tox }: buildPythonPackage rec { @@ -31,7 +30,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook responses - tox ]; disabledTests = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 4750b591f66e..86ac0542591e 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.8"; + version = "2.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QI4NtNPkR3mD/UVFeKimo5pgBmnRKaxQ6JiwPDbjh/0="; + sha256 = "sha256-5ISxzOTTlA1EcBO5N6YtBEah0SRehGeVIONj30zOKk0="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index b2099e162d20..70fed80b282f 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lupa"; - version = "1.13"; + version = "1.14.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4dlKwqYw0nECfawsIdFCh3HZ6p1NiPFfIKd4E0DwKk4="; + sha256 = "sha256-0P1OYK0Un+JckFMOKg4DKkKm8EVfKcoO24Fw1ux1HG4="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index de64e2f8fdc8..805aec6c1e69 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -1,25 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, unittest2 }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, repeated-test +}: buildPythonPackage rec { pname = "od"; version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; + hash = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; - # repeated_test no longer exists in nixpkgs - # also see: https://github.com/epsy/od/issues/1 - doCheck = false; checkInputs = [ - unittest2 + repeated-test + ]; + + pythonImportsCheck = [ + "od" ]; meta = with lib; { description = "Shorthand syntax for building OrderedDicts"; homepage = "https://github.com/epsy/od"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index c3fe1c044708..a5220f018011 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "7.3.3"; + version = "7.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fg5/5x4vUsm0kvVJtvlgB3PZSmU4pXkU6V0+yEDqNRg="; + hash = "sha256-7b6fF6wVNo4kBJ+s1lxNSl1C2vZjnAmHOtVSmqoiY9Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plotext/default.nix b/pkgs/development/python-modules/plotext/default.nix new file mode 100644 index 000000000000..8c6d0b39985c --- /dev/null +++ b/pkgs/development/python-modules/plotext/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +}: + +buildPythonPackage rec { + pname = "plotext"; + version = "5.2.8"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "piccolomo"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-V7N7p5RxLKYLmJeojikYJ/tT/IpVGzG3ZPVvUisDAVs="; + }; + + # Package does not have a conventional test suite that can be run with either + # `pytestCheckHook` or the standard setuptools testing situation. + doCheck = false; + + pythonImportsCheck = [ "plotext" ]; + + meta = with lib; { + description = "Plotting directly in the terminal"; + homepage = "https://github.com/piccolomo/plotext"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index dad2c04b0d6f..35ad60317ad4 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = "http://pwntools.com"; + homepage = "https://pwntools.com"; description = "CTF framework and exploit development library"; license = licenses.mit; maintainers = with maintainers; [ bennofs kristoff3r pamplemousse ]; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index eb7287e4a1b0..87cfe2708dfd 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -1,16 +1,24 @@ -{ lib, substituteAll, buildPythonPackage, fetchFromGitHub -, pandoc, texlive +{ lib +, buildPythonPackage +, fetchFromGitHub +, pandoc +, pandocfilters +, pythonOlder +, substituteAll +, texlive }: buildPythonPackage rec { pname = "pypandoc"; - version = "1.8.1"; + version = "1.10"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "NicklasTegner"; + owner = "JessicaTegner"; repo = pname; rev = "v${version}"; - hash = "sha256-1vQmONQFJrjptwVVjw25Wyt59loatjScsdnSax+q/f8="; + hash = "sha256:05m585l4sipjzpkrv4yj5s7w45yxhxlym55lkhnavsshlvisinkz"; }; patches = [ @@ -24,11 +32,16 @@ buildPythonPackage rec { checkInputs = [ texlive.combined.scheme-small + pandocfilters + ]; + + pythonImportsCheck = [ + "pypandoc" ]; meta = with lib; { description = "Thin wrapper for pandoc"; - homepage = "https://github.com/NicklasTegner/pypandoc"; + homepage = "https://github.com/JessicaTegner/pypandoc"; license = licenses.mit; maintainers = with maintainers; [ sternenseemann bennofs ]; }; diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix index 54566658443c..1d0a0ba022fe 100644 --- a/pkgs/development/python-modules/pyrect/default.nix +++ b/pkgs/development/python-modules/pyrect/default.nix @@ -1,25 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, tox , pytestCheckHook , pygame }: + buildPythonPackage rec { - pname = "PyRect"; + pname = "pyrect"; version = "0.2.0"; src = fetchPypi { - inherit pname version; + pname = "PyRect"; + inherit version; sha256 = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g="; }; - checkInputs = [ tox pytestCheckHook pygame ]; - pythonImportsCheck = [ "pyrect" ]; + checkInputs = [ pytestCheckHook pygame ]; + preCheck = '' export LC_ALL="en_US.UTF-8" ''; + pythonImportsCheck = [ "pyrect" ]; + meta = with lib; { description = "Simple module with a Rect class for Pygame-like rectangular areas"; homepage = "https://github.com/asweigart/pyrect"; diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index ce962e7636a3..48505237ae4f 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.10.1"; + version = "2022.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-BOJ2dFZ4CFII6OXzQU3Q9Mah6kRZPC5+b6ekx8ueYc4="; + sha256 = "sha256-aCgMAaur2ljjiQ7tt/gXm/Vt+o6j/MsCOLN661CkFw4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/repeated-test/default.nix b/pkgs/development/python-modules/repeated-test/default.nix new file mode 100644 index 000000000000..bd8d8d765a09 --- /dev/null +++ b/pkgs/development/python-modules/repeated-test/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "repeated-test"; + version = "2.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + pname = "repeated_test"; + inherit version; + hash = "sha256-TbVyQA7EjCSwo6qfDksbE8IU1ElkSCABEUBWy5j1KJc="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "repeated_test" + ]; + + meta = with lib; { + description = "Unittest-compatible framework for repeating a test function over many fixtures"; + homepage = "https://github.com/epsy/repeated_test"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 7a1b8348a0e6..9f086e4c86e5 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -1,25 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, - flake8, py, pyflakes, six, tox +{ lib +, buildPythonPackage +, fetchPypi +, six +, pythonOlder }: buildPythonPackage rec { pname = "serpy"; version = "0.3.1"; + format = "setuptools"; - meta = { - description = "ridiculously fast object serialization"; - homepage = "https://github.com/clarkduvall/serpy"; - license = lib.licenses.mit; - }; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "3772b2a9923fbf674000ff51abebf6ea8f0fca0a2cfcbfa0d63ff118193d1ec5"; }; - buildInputs = [ flake8 py pyflakes tox ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; # ImportError: No module named 'tests doCheck = false; + + pythonImportsCheck = [ + "serpy" + ]; + + meta = with lib; { + description = "Ridiculously fast object serialization"; + homepage = "https://github.com/clarkduvall/serpy"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index cf32ad5db79c..a41bdbf184bd 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -1,14 +1,13 @@ { lib +, attrs , buildPythonPackage , fetchPypi -, sphinx , mock -, coverage -, unittest2 -, attrs -, funcsigs -, six +, pythonOlder +, repeated-test , setuptools-scm +, sphinx +, unittestCheckHook }: buildPythonPackage rec { @@ -16,9 +15,11 @@ buildPythonPackage rec { version = "4.0.1"; format = "pyproject"; + disabled = pythonOlder "3.4"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw="; + hash = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw="; }; nativeBuildInputs = [ @@ -29,17 +30,21 @@ buildPythonPackage rec { attrs ]; - patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; + checkInputs = [ + mock + repeated-test + sphinx + unittestCheckHook + ]; - # repeated_test no longer exists in nixpkgs - # Also see: https://github.com/epsy/sigtools/issues/26 - doCheck = false; - checkInputs = [ sphinx mock coverage unittest2 ]; + pythonImportsCheck = [ + "sigtools" + ]; meta = with lib; { - description = "Utilities for working with 3.3's inspect.Signature objects."; - homepage = "https://pypi.python.org/pypi/sigtools"; + description = "Utilities for working with inspect.Signature objects"; + homepage = "https://sigtools.readthedocs.io/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 179ab7ce1bfc..a71d3d6bd3d4 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -1,4 +1,11 @@ -{ buildPythonPackage, fetchPypi, lib, python, six, tox, mock, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, python +, six +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "smpplib"; @@ -9,21 +16,27 @@ buildPythonPackage rec { sha256 = "c0b01947b47e404f42ccb59e906b6e4eb507963c971d59b44350db0f29c76166"; }; - propagatedBuildInputs = [ six ]; - checkInputs = [ tox mock pytest ]; + propagatedBuildInputs = [ + six + ]; - checkPhase = '' - pytest - ''; + checkInputs = [ + mock + pytestCheckHook + ]; postInstall = '' rm -rf $out/${python.sitePackages}/tests ''; + pythonImportsCheck = [ + "smpplib" + ]; + meta = with lib; { description = "SMPP library for Python"; homepage = "https://github.com/python-smpplib/python-smpplib"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.globin ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix index b4d83e672271..62e233aec314 100644 --- a/pkgs/development/python-modules/snakebite/default.nix +++ b/pkgs/development/python-modules/snakebite/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, tox -, virtualenv , protobuf }: @@ -15,11 +13,6 @@ buildPythonPackage rec { sha256 = "085238b4944cb9c658ee62d5794de936ac3d0c337c504b2cc86424a205ae978a"; }; - checkInputs = [ - tox - virtualenv - ]; - propagatedBuildInputs = [ protobuf ]; @@ -29,13 +22,17 @@ buildPythonPackage rec { --replace "'argparse'" "" ''; - # tests require hadoop hdfs + # Tests require hadoop hdfs doCheck = false; + pythonImportsCheck = [ + "snakebite" + ]; + meta = with lib; { description = "Pure Python HDFS client"; homepage = "https://github.com/spotify/snakebite"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index 54962387967d..8270834ab609 100644 --- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -4,19 +4,20 @@ , sqlalchemy , setuptools-scm , setuptools -, tox , sphinx -, pytest -, pytest-cov -, pytest-html +, pytestCheckHook , pytest-sugar -, coverage , pymysql -, psycopg2 }: +, psycopg2 +, pythonOlder +}: buildPythonPackage rec { pname = "sqlalchemy-jsonfield"; version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "penguinolog"; @@ -27,18 +28,30 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ sqlalchemy setuptools ]; - checkInputs = [ tox sphinx pytest pytest-cov pytest-html pytest-sugar coverage pymysql psycopg2 ]; + nativeBuildInputs = [ + setuptools-scm + ]; - checkPhase = '' - TOX_TESTENV_PASSENV="PYTHONPATH SETUPTOOLS_SCM_PRETEND_VERSION" tox -e functional - ''; + propagatedBuildInputs = [ + sqlalchemy + setuptools + ]; + + checkInputs = [ + pytestCheckHook + pytest-sugar + pymysql + psycopg2 + ]; + + pythonImportsCheck = [ + "sqlalchemy_jsonfield" + ]; meta = with lib; { homepage = "https://github.com/penguinolog/sqlalchemy_jsonfield"; description = "SQLALchemy JSONField implementation for storing dicts at SQL independently from JSON type support"; license = licenses.asl20; - maintainers = [ maintainers.ivan-tkatchev ]; + maintainers = with maintainers; [ ivan-tkatchev ]; }; } diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 0d4cd9c09e94..dfdbbcf5d814 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -6,13 +6,14 @@ , six , python-dateutil , kitchen +, pytestCheckHook , pytz , pkgs }: buildPythonPackage rec { - version = "2.0.0"; pname = "taskw"; + version = "2.0.0"; src = fetchPypi { inherit pname version; @@ -25,17 +26,16 @@ buildPythonPackage rec { --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' ''; - # https://github.com/ralphbean/taskw/issues/98 - doCheck = false; + buildInputs = [ pkgs.taskwarrior ]; - buildInputs = [ nose pkgs.taskwarrior tox ]; propagatedBuildInputs = [ six python-dateutil kitchen pytz ]; + checkInputs = [ pytestCheckHook ]; + meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; description = "Python bindings for your taskwarrior database"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pierron ]; }; - } diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 8936d0e58273..6cf44ee9dc7f 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.15.2"; + version = "7.15.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-Y7rQxoculQ2Dp02/sEowsEf677pDA7AQpWuEiiywvwo="; + hash = "sha256-c1UNqp8eYK9tkogpcDtTOTHa5ME+yOkop2UccXwOAqM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 2a0e3a38fa59..9fa0baac88e6 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.2"; + version = "0.4.15.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-FXy+ZuFjllliWEZNONeMrojYEus9erKoc+Da9PR8bIk="; + hash = "sha256-k2L0kWdQX3EbvJpjUtrmZQSVswUzg4aPf3a/642SMAI="; }; # Module has no tests diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index c08117d2ad4a..acf092b8411c 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.3"; + version = "2.8.19.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-oxMoTfXtP9B4MDJi7cDv3iiZjNCOUGHvHMwLtf700to="; + hash = "sha256-NRqMqa/UrqZi+HwXJNLhrln59fmWkb47OxHSOTzTqqE="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index f53c4a141a6a..730a0a591540 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.11.4"; + version = "2.28.11.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1PNCsN9DImLp4ybRdjjurpaliB5456aq5G0zhw1zlS4="; + sha256 = "sha256-p983zG+2GHqECX2pUfjiHTNUSKolAaawo5y9HXyp7io="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index c9ce9c92c4cd..c67524015ee1 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "65.5.0.2"; + version = "65.5.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mEfebXCH+x3UqIwqIVQ9G4amF5w2dE8IGXQwP+LzD1A="; + sha256 = "sha256-F3aRcfXyotxpslwNMQZVKlzadnu/azbLYhKyba5aqfw="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index ec73535a9386..fff70bd611f7 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.8"; + version = "0.10.8.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-t+fqVyMIsQMNyGw7qCXFIQgUwoJWEuxnnreBT43ZKVo="; + sha256 = "sha256-FxvbMWPXmlIFYPJLqRap/Jv/gWWcVEip/qiSQJI3Ir4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 057ec581d0ab..55ab0f9ee1e5 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.3"; + version = "1.26.25.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GAe4e47hrgImgTuixSMw7/IPsr9jWbHeJN8I6zCQ5EI="; + hash = "sha256-7sVVZCjuyGKxrFePtpqrOHeZWpn/7J5aEs9/vQzJ2u4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index a14895fa7996..ea878d6e0cbc 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "unicodedata2"; - version = "14.0.0"; + version = "15.0.0"; disabled = isPy27; src = fetchPypi { inherit version pname; - sha256 = "110nnvh02ssp92xbmswy39aa186jrmb7m41x4220wigl8c0dzxs1"; + sha256 = "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 5f058d5f1b15..5cfe9861f465 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -16,13 +16,14 @@ buildPythonPackage rec { pname = "versioningit"; - version = "2.0.1"; - disabled = pythonOlder "3.8"; + version = "2.1.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; - hash = "sha256-gJfiYNm99nZYW9gTO/e1//rDeox2KWJVtC2Gy1EqsuM="; + hash = "sha256-c/KWXjDS6/1/+ra/JjaPIjdXBiLdKknH+8GZXenGdtY="; }; postPatch = '' @@ -35,9 +36,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging setuptools - tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; checkInputs = [ diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index e929ef98fbf6..bbc781d6ab27 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -1,32 +1,27 @@ { lib -, alsa-lib , fetchzip , libXxf86vm , makeWrapper +, openal , openjdk , stdenv , xorg , copyDesktopItems , makeDesktopItem +, writeScript }: stdenv.mkDerivation rec { pname = "starsector"; - version = "0.95.1a-RC5"; + version = "0.95.1a-RC6"; src = fetchzip { url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip"; - sha256 = "sha256-V8/WQPvPIrF3Tg7JVO+GfeYqWhkWWrnHSVcFXGQqDAA="; + sha256 = "sha256-+0zGJHM+SMonx3sytCQNQA/QBgzdPMEfQvOjrCDSOs8="; }; - nativeBuildInputs = [ - copyDesktopItems - makeWrapper - ]; - buildInputs = with xorg; [ - alsa-lib - libXxf86vm - ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + buildInputs = [ xorg.libXxf86vm openal ]; dontBuild = true; @@ -47,7 +42,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin - rm -r jre_linux # remove jre7 + rm -r jre_linux # remove bundled jre7 rm starfarer.api.zip cp -r ./* $out @@ -66,10 +61,13 @@ stdenv.mkDerivation rec { # it tries to run everything with relative paths, which makes it CWD dependent # also point mod, screenshot, and save directory to $XDG_DATA_HOME + # additionally, add some GC options to improve performance of the game postPatch = '' substituteInPlace starsector.sh \ --replace "./jre_linux/bin/java" "${openjdk}/bin/java" \ - --replace "./native/linux" "$out/native/linux" + --replace "./native/linux" "$out/native/linux" \ + --replace "=." "=\''${XDG_DATA_HOME:-\$HOME/.local/share}/starsector" \ + --replace "-XX:+CompilerThreadHintNoPreempt" "-XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSConcurrentMTEnabled -XX:+DisableExplicitGC" ''; meta = with lib; { @@ -79,4 +77,12 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ bbigras ]; }; + + passthru.updateScript = writeScript "starsector-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -eou pipefail; + version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-\K.*?(?=\.zip)" | head -1) + update-source-version ${pname} "$version" --file=./pkgs/games/starsector/default.nix + ''; } diff --git a/pkgs/tools/misc/gitlint/default.nix b/pkgs/tools/misc/gitlint/default.nix index c32171585969..626739864c71 100644 --- a/pkgs/tools/misc/gitlint/default.nix +++ b/pkgs/tools/misc/gitlint/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gitlint"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "jorisroovers"; repo = "gitlint"; rev = "v${version}"; - sha256 = "sha256-RXBMb43BBiJ23X0eKC1kqgLw8iFKJnP5iejY0AWcUrU="; + sha256 = "sha256-MmXzrooN+C9MUaAz4+IEGkGJWHbgvPMSLHgssM0wyN8="; }; # Upstream splitted the project into gitlint and gitlint-core to diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f3d3a787d6..4cd257bb1ebb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20402,6 +20402,10 @@ with pkgs; libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; + libhv = callPackage ../development/libraries/libhv { + inherit (darwin.apple_sdk.frameworks) Security; + }; + libhwy = callPackage ../development/libraries/libhwy { }; libHX = callPackage ../development/libraries/libHX { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 44b34cf2071f..eb85a22c71e2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -179,7 +179,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 - repeated_test = throw "repeated_test is no longer maintained"; # added 2022-01-11 + repeated_test = repeated-test; # added 2022-11-15 requests_oauthlib = requests-oauthlib; # added 2022-02-12 requests_toolbelt = requests-toolbelt; # added 2017-09-26 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f72e8f96a538..431d9a46cba7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7145,6 +7145,8 @@ self: super: with self; { plone-testing = callPackage ../development/python-modules/plone-testing { }; + plotext = callPackage ../development/python-modules/plotext { }; + plotly = callPackage ../development/python-modules/plotly { }; plotnine = callPackage ../development/python-modules/plotnine { }; @@ -9652,6 +9654,8 @@ self: super: with self; { reparser = callPackage ../development/python-modules/reparser { }; + repeated-test = callPackage ../development/python-modules/repeated-test { }; + repocheck = callPackage ../development/python-modules/repocheck { }; reportengine = callPackage ../development/python-modules/reportengine { };