diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4de9fa56a8a9..7de5fc1ad45c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3660,6 +3660,10 @@ github = "expipiplus1"; githubId = 857308; name = "Ellie Hermaszewska"; + keys = [{ + longkeyid = "rsa4096/0xC8116E3A0C1CA76A"; + fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; + }]; }; extends = { email = "sharosari@gmail.com"; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 4b53c91edf28..0c2776778b53 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "10p815dv86775ky90m96l11026xkhjwvrrhvviqw6g6hsayjqhia"; - x86_64-darwin = "1b8d7iw9v172viczdbcdxhf51dyshmx2665prv2pm0ygsy8yii3p"; - aarch64-linux = "155sbsmnapnzhkzkaggm80bkarh4l7dbqyhgy40mmdgqpyp3gx1v"; - aarch64-darwin = "1pnqjih37r4xqfjfrf8mhsbvmn62358rmf50rackqh5as50siwa2"; - armv7l-linux = "00k2fmivbsp8fyh9cy6vr6sq031f6marz4sbj1nrlzdl40wd30bi"; + x86_64-linux = "0dwpczbxqy3rsqprdiakmqv6s3jzcg2wqxnf1znarx2qffb4ii9x"; + x86_64-darwin = "0si76v80r0vhl76gbdwbykk6acifhifz8sb8wiyiiywkinlxs19w"; + aarch64-linux = "0nwgdvvsblh2r72ys2ng5b084wizkdjd00mm73506mgbs8pzcky4"; + aarch64-darwin = "0qivq4077g5a4gwkskvvzxaa60w1gpgl67pmdyqn81rina04rdqs"; + armv7l-linux = "0myf96s1vdpllnw0vz0rpmyv2pfirv3p8pqgxxnpw860s2c26f2f"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.1"; + version = "1.62.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/misc/sfm/default.nix index 808e64cdcce5..800ea9419cbe 100644 --- a/pkgs/applications/misc/sfm/default.nix +++ b/pkgs/applications/misc/sfm/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; + makeFlags = [ "CC:=$(CC)" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index eee449de53e3..cd8d1f703d2d 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.22.9"; + version = "0.22.15"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h19Cj4ztgypT/j1gB+PbvgDJ7jlJ3CYPEbK62tJeMss="; + sha256 = "sha256-Aim80bg1vGRkiIlVqDa4qOFQ+mwSOL75HOPYQYovYlE="; }; vendorSha256 = null; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 533be220633f..3efc0f1ceab3 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "101"; + version = "102"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "sha256-rNiZQIQqNbc1P2A6UTn0dRHeT3BS+nv1o81aPaJy+5U="; + sha256 = "sha256-UlktpY9tyjYNkmiBZM42QGg67kcPo7VDy2B4Ty1YIew="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 70b6cfe3d9c8..c401240f7d50 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.63.0"; + version = "1.64.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "1511jh38h7nmn4dpyi1vfxvhybcacc6gavwfifxvb5npirphziga"; + sha256 = "04a1ncikapx53jjrx0ac1qi907wlj6javylz4aksg4nfbph6y9j4"; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0hfp2k84mvq11h7q96hkcj3k6f3sxw8wx89acg4hy6lbh8xpy6ai"; + sha256 = "0skrzxn99c1gqil7z0dv0xhg883k98v6mh96nycf7whl2d25965x"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index c204261644c5..c19e39bcd48f 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -1,12 +1,21 @@ -{ lib, isPy3k, fetchFromGitHub, buildPythonPackage -, attrs, atpublic }: +{ lib +, atpublic +, attrs +, buildPythonPackage +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, pythonOlder +, typing-extensions +}: buildPythonPackage rec { pname = "aiosmtpd"; version = "1.4.2"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; - # Release not published to Pypi src = fetchFromGitHub { owner = "aio-libs"; repo = pname; @@ -15,19 +24,34 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - atpublic attrs + atpublic + attrs + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # Tests need network access - doCheck = false; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + disabledTests = [ + # Requires git + "test_ge_master" + # Seems to be a sandbox issue + "test_byclient" + ]; + + pythonImportsCheck = [ + "aiosmtpd" + ]; meta = with lib; { - homepage = "https://aiosmtpd.readthedocs.io/en/latest/"; description = "Asyncio based SMTP server"; + homepage = "https://aiosmtpd.readthedocs.io/"; longDescription = '' This is a server for SMTP and related protocols, similar in utility to the - standard library's smtpd.py module, but rewritten to be based on asyncio for - Python 3. + standard library's smtpd.py module. ''; license = licenses.asl20; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index a8aaec9f45b2..bc776e42f07b 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -1,27 +1,36 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +}: buildPythonPackage rec { pname = "anybadge"; - version = "1.7.0"; + version = "1.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jongracecox"; repo = pname; rev = "v${version}"; - sha256 = "1d02fnig04zlrhfqqcf4505vy4p51whl2ifilnx3mkhis9lcwrmr"; + sha256 = "sha256-xKHIoV/8qsNMcU5fd92Jjh7d7jTeYN5xakMEjR6qPX8="; }; # setup.py reads its version from the TRAVIS_TAG environment variable TRAVIS_TAG = "v${version}"; - pythonImportsCheck = [ "anybadge" ]; + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "anybadge" + ]; meta = with lib; { - description = "A Python project for generating badges for your projects, with a focus on simplicity and flexibility"; - license = licenses.mit; + description = "Python tool for generating badges for your projects"; homepage = "https://github.com/jongracecox/anybadge"; - maintainers = [ maintainers.fabiangd ]; + license = licenses.mit; + maintainers = with maintainers; [ fabiangd ]; }; } diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index f043936f7d72..8565f7d7dd5d 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.3.1"; + version = "3.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-JQf+OWHV2Vok5FmP7mlzeqbKUlxB+FC1c3ruX2aQEEs="; + sha256 = "sha256-XBIrFb/XDneaOf/TeHxyeEfyQ7qQcWO7LJF0k1f4Ark="; }; preBuild = '' diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 4d96bcbe26b5..8bf81556770a 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -1,6 +1,8 @@ -{ lib, isPy3k, pythonOlder, fetchPypi, buildPythonPackage -, pytest -, pytest-cov +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder , sybil , typing-extensions }: @@ -8,7 +10,9 @@ buildPythonPackage rec { pname = "atpublic"; version = "2.3"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -20,25 +24,25 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest pytest-cov sybil + pytestCheckHook + sybil ]; - checkPhase = '' - pytest + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=public" "" ''; + pythonImportsCheck = [ + "public" + ]; + meta = with lib; { - homepage = "https://public.readthedocs.io/en/latest/"; - description = "A decorator and function which populates a module's __all__ and globals"; + description = "Python decorator and function which populates a module's __all__ and globals"; + homepage = "https://public.readthedocs.io/"; longDescription = '' This is a very simple decorator and function which populates a module's __all__ and optionally the module globals. - - This provides both a pure-Python implementation and a C implementation. It is - proposed that the C implementation be added to builtins_ for Python 3.6. - - This proposal seems to have been rejected, for more information see - https://bugs.python.org/issue26632. ''; license = licenses.asl20; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index d66b80d00c71..f428dc788bf9 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.1.0"; + version = "1.2.1"; disabled = !isPy3k; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "370e8e44a0bac4ebbedb7e62570be3a75a7a3807a297d6e82a94301b4681fc22"; + sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579"; }; buildInputs = [ boost ]; diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index ab3cdd6e6d06..50faf89d600a 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -59,6 +59,9 @@ buildPythonPackage rec { "test_alpha_is_080" "test_face_and_lines_at_half_visibility" "test_polygon_fully_inside_image__no_rectangular_shape" + # flaky due to timing-based assertions + "test_imap_batches_output_buffer_size" + "test_imap_batches_unordered_output_buffer_size" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 2d3ec976d64b..649d8d4cf3df 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -5,6 +5,7 @@ , mock , nose2 , python +, pythonOlder , requests , zope_interface }: @@ -14,6 +15,8 @@ buildPythonPackage rec { version = "1.1.0"; format = "setuptools"; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx"; diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix new file mode 100644 index 000000000000..3c290b843941 --- /dev/null +++ b/pkgs/development/python-modules/pybalboa/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pybalboa"; + version = "0.13"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "garbled1"; + repo = pname; + rev = version; + sha256 = "0aw5jxpsvzyx05y1mg8d63lxx1i607yb6x19n9jil5wfis95m8pd"; + }; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "pybalboa" + ]; + + meta = with lib; { + description = " Python module to interface with a Balboa Spa"; + homepage = "https://github.com/garbled1/pybalboa"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix new file mode 100644 index 000000000000..d6ad5480ddd3 --- /dev/null +++ b/pkgs/development/python-modules/pylaunches/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pylaunches"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "0mczxkwczyh9kva4xzpmnawy0hjha1fdrwj6igip9w5z1q48zs49"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytestCheckHook + pytest-asyncio + ]; + + postPatch = '' + # Upstream doesn't set version in the repo + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' \ + --replace ', "pytest-runner"' "" + ''; + + pythonImportsCheck = [ + "pylaunches" + ]; + + meta = with lib; { + description = "Python module to get information about upcoming space launches"; + homepage = "https://github.com/ludeeus/pylaunches"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index abf9c7ebf54a..7914af6ec808 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "buf"; - version = "1.0.0-rc7"; + version = "1.0.0-rc8"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ufXz9+WI4NARkQg36mPhGncL7G9fWjDX9Ka/EJdsTvk="; + sha256 = "sha256-Oye+nYvKdT9t36hAMJSAJZCOQ2L3rHSjhjIu9gU2MWo="; }; - vendorSha256 = "sha256-wycrRCL7Mjx0QR5Y64WylpmDtKNh010mNxWAg6ekrds="; + vendorSha256 = "sha256-aZv44ZPW/bJ8TEXU79ExREj2DH6j7J1+E/E1yh13Hvc="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 36f7ffb8a5d3..7ce08f35080a 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -617,7 +617,7 @@ stdenv.mkDerivation rec { ./bazel_src/output/bazel-complete.fish ''; - doInstallCheck = true; + doInstallCheck = stdenv.hostPlatform.system != "aarch64-darwin"; installCheckPhase = '' export TEST_TMPDIR=$(pwd) diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index 94693f1559e5..4e3693aba6f1 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iptstate"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068"; + sha256 = "sha256-iW3wYCiFRWomMfeV1jT8ITEeUF+MkQNI5jEoYPIJeVU="; }; buildInputs = [ libnetfilter_conntrack ncurses ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c46248d93963..ca03e68f57c7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -448,7 +448,7 @@ "lametric" = ps: with ps; [ lmnotify ]; "lannouncer" = ps: with ps; [ ]; "lastfm" = ps: with ps; [ pylast ]; - "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches + "launch_library" = ps: with ps; [ pylaunches ]; "lcn" = ps: with ps; [ pypck ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 6af262567720..92fe6e0403a2 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "sha256-UHMj0g17P3BfSc+MB9Q3xtgJC+0H4Vo8DsQF7a1Up9Q="; + sha256 = "1g5ii5vvcr87qkabsbyg3n7kzy1g5k2n5gwa8468w5d0ava424hg"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 83d16c3eb772..cec4f2981298 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lego"; - version = "4.5.2"; + version = "4.5.3"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ytU1G0kT8/sx9kR8yrrGqUta+vi96aCovoABit0857g="; + sha256 = "sha256-xvTV6jZmQWs6g8Oq+IrwPZVS3fzY1/adg7IWh189ftU="; }; vendorSha256 = "sha256-EK2E2YWdk2X1awdUhMOJh+qr+jnnftnKuPPpiHzXZHk="; diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index cf63342fbb65..608a7379ef9a 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "tonarino"; - repo = pname; + repo = "innernet"; rev = "v${version}"; - sha256 = "sha256-9oL91jacfUADaPvdTTvvXhpwzr9OnNnVLwy1okORss4="; + sha256 = "1ja7khvc4cy317ckglnlf11wfmin62ihic061phdp6rmfv95cza0"; }; - cargoSha256 = "sha256-jHWt7Jqv4B7u6Mvo3q69Omcn8kdnXGJSyzod1lDzvKE="; + cargoSha256 = "18xpwav48xv7xm7r3w9qplmv2i18cg09pkahyvs5l4akdjgxyw10"; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 7344b12180e6..d86eb8c88657 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-nr5qvo/SLzQ16B/83lCzlQ5zduPGxOhfqWat/Grsf/Q="; + sha256 = "sha256-Itq06zE2AVQ1HSUEQdNUuvEazfU56Hs86T0DEVuF8d4="; }; preConfigure = '' diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 0c6318dc4353..d1e114e32450 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.13" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.14" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index a080cfa68df9..27690111611c 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 643afb56f7f86a858e3da144fd367575a2f0b2c6 - ref: refs/tags/6.1.13 + revision: 2c47df62b425e4083f4816d71405fed1c0e8b35b + ref: refs/tags/6.1.14 specs: - metasploit-framework (6.1.13) + metasploit-framework (6.1.14) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,13 +128,13 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.525.0) - aws-sdk-core (3.122.0) + aws-partitions (1.528.0) + aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.277.0) + aws-sdk-ec2 (1.279.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.63.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index c3cf57bc2ae8..674418693c75 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.13"; + version = "6.1.14"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ncmLizpX1yEtr8biUoWVVK4Ziv3QMiKWsj694yubA1M="; + sha256 = "sha256-ySQOc/k+kvdSj5g88ujm4e2apvPVbiaspzSbCdEQ4ZA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 411be2a11277..7c1947ddb4d9 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "181a2xf9zs0hz77jkpmxidvkjzs65vsyqv1a31fcali7f0kvh4h9"; + sha256 = "1awcpdvfk6dlb9n5wiksq8vhqwdpmkybv4ga8drmlx6x9li3my5k"; type = "gem"; }; - version = "1.525.0"; + version = "1.528.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krx8cfajc72gv6mpyb67vnhd2m2iya19846jgipgfris194gjm2"; + sha256 = "07cdd2jiydn663xgqv5fykd9zfiv96ma3j4k2khwf06czy40cvwq"; type = "gem"; }; - version = "3.122.0"; + version = "3.122.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qy318swkl3393gl5031n634z8msb7rghhp7zdnawvs39c0fbmxd"; + sha256 = "1cvf70lj99r59wn35pqxg5c6c2qkgnir0b8fqgi8h757xz6b9m72"; type = "gem"; }; - version = "1.277.0"; + version = "1.279.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "643afb56f7f86a858e3da144fd367575a2f0b2c6"; - sha256 = "0lq3kcmy7g9ynab24cnhzn51kbjljn2m5qn6mwnj3msp7a5qpjcx"; + rev = "2c47df62b425e4083f4816d71405fed1c0e8b35b"; + sha256 = "1471238hk6rllyn2cvnmyfk9mvg1wvlg4g4qix9gg4iyz5rhw969"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.13"; + version = "6.1.14"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f7f0eba8f6d..c688ca380e5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6151,6 +6151,8 @@ in { pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; + pybalboa = callPackage ../development/python-modules/pybalboa { }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; pybids = callPackage ../development/python-modules/pybids { }; @@ -6570,6 +6572,8 @@ in { pylatexenc = callPackage ../development/python-modules/pylatexenc { }; + pylaunches = callPackage ../development/python-modules/pylaunches { }; + PyLD = callPackage ../development/python-modules/PyLD { }; pylev = callPackage ../development/python-modules/pylev { };