c1fac0a · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge master into staging-next

commitc1fac0a1c0361f697a345f8a408717becd6ad193 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateSat 8 Jan 2022, 12:01 (5 years ago) parentad484cc a801c31

24 files changed+201−141

compare with master

unifiedsplit

pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix+7

@@ -2,6 +2,8 @@

22, trivialBuild

33, fetchFromGitHub

44, emacs

5+, popup

6+, ess

57}:

79trivialBuild rec {

@@ -15,6 +17,11 @@ trivialBuild rec {

1517 hash = "sha256-YN8ZLXEbwTFdFfovkV2IXV9v6y/PTgCdiRQqbpRaF2E=";

1618 };

1719

20+ packageRequires = [

21+ popup

22+ ess

23+ ];

24+

1825 meta = {

1926 homepage = "https://github.com/myuhe/ess-R-object-popup.el";

2027 description = "Popup descriptions of R objects";

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix−2

@@ -225,8 +225,6 @@

225225 };

226226 };

227227

228− railgun = callPackage ./railgun { };

229−

230228 structured-haskell-mode = self.shm;

231229

232230 sv-kalender = callPackage ./sv-kalender { };

pkgs/applications/editors/emacs/elisp-packages/railgun/default.nixdeleted−25

@@ -1,25 +0,0 @@

1−{ lib

2−, trivialBuild

3−, fetchFromGitHub

4−, emacs

5−}:

6−

7−trivialBuild {

8− pname = "railgun";

9− version= "0.pre+unstable=2012-10-17";

10−

11− src = fetchFromGitHub {

12− owner = "mbriggs";

13− repo = "railgun.el";

14− rev = "66aaa1b091baef53a69d0d7425f48d184b865fb8";

15− hash = "sha256-0L+jFgrXEPMTptx53RDdyH4BiA+7uInHceXL0eROoAM=";

16− };

17−

18− buildInputs = [ emacs ];

19−

20− meta = with lib; {

21− homepage = "https://github.com/mbriggs/railgun.el";

22− description = "Propel yourself through a rails project with the power of magnets";

23− inherit (emacs.meta) platforms;

24− };

25−}

pkgs/applications/misc/josm/default.nix+4−4

@@ -3,20 +3,20 @@

33}:

44let

55 pname = "josm";

6− version = "18303";

6+ version = "18360";

77 srcs = {

88 jar = fetchurl {

99 url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";

10− sha256 = "sha256-+gUJsx238iQKrYx/rdtd8ESVXI0u/kW2s0p33T4MSWU=";

10+ sha256 = "sha256-1OMEPMtUGkxQCgpmyVP1h25gSDa2MKF7l1rodr61O5s=";

1111 };

1212 macosx = fetchurl {

1313 url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";

14− sha256 = "sha256-s8MuXcDl+DwjXOtf6ltpxYSeCE9R2/x9iJs2BoZHgXM=";

14+ sha256 = "sha256-ZCybgaLwPfQVG2gJ+dtElIY7bGZUe9R8a/0B6QK8yK8=";

1515 };

1616 pkg = fetchsvn {

1717 url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

1818 rev = version;

19− sha256 = "sha256-+zsbksfQPwzVPpKlXdRWachWwjVuhExlyiEKDMkaxp8=";

19+ sha256 = "sha256-GbIWZTJmmUT8r9L63/6mcnRt7dvavqGAVbozxlbF89g=";

2020 };

2121 };

2222in

pkgs/applications/misc/obsidian/default.nix+2−2

@@ -31,11 +31,11 @@ let

3131

3232in stdenv.mkDerivation rec {

3333 pname = "obsidian";

34− version = "0.13.14";

34+ version = "0.13.19";

3535

3636 src = fetchurl {

3737 url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";

38− sha256 = "0d55lk643yqjz4s6j5lbrdkf9f7wmwlz9ahjx760rzqpzy5190nr";

38+ sha256 = "1jx1raynr0dgffqwya7cp4yr3szdn9bfwrhzk09bkmn8ys7d426r";

3939 };

4040

4141 nativeBuildInputs = [ makeWrapper graphicsmagick ];

pkgs/development/python-modules/awscrt/default.nix+2−2

@@ -2,7 +2,7 @@

33buildPythonPackage rec {

44 pname = "awscrt";

5− version = "0.12.6";

5+ version = "0.13.0";

77 buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];

@@ -22,7 +22,7 @@ buildPythonPackage rec {

2222

2323 src = fetchPypi {

2424 inherit pname version;

25− sha256 = "65d71b4cd78165bea962dfbda361b47b9b5a6198d8074046b8667da9653d0752";

25+ sha256 = "f8c46335bdf94a5e48d3df2018edbd07c4c903635501c62c1bea4153f407531a";

2626 };

2727

2828 meta = with lib; {

pkgs/development/python-modules/diskcache/default.nix+28−16

@@ -1,50 +1,62 @@

1−{ stdenv

2−, lib

1+{ lib

2+, stdenv

33, buildPythonPackage

44, fetchFromGitHub

5−, pytestCheckHook

6−, pytest-cov

7−, pytest-xdist

85, pytest-django

9−, mock

6+, pytest-xdist

7+, pytestCheckHook

8+, pythonOlder

109}:

1110

1211buildPythonPackage rec {

1312 pname = "diskcache";

14− version = "5.2.1";

13+ version = "5.4.0";

14+ format = "setuptools";

15+

16+ disabled = pythonOlder "3.6";

1517

1618 src = fetchFromGitHub {

1719 owner = "grantjenks";

1820 repo = "python-diskcache";

1921 rev = "v${version}";

20− sha256 = "sha256-dWtEyyWpg0rxEwyhBdPyApzgS9o60HVGbtY76ELHvX8=";

22+ hash = "sha256-c/k8mx/T4RkseDobJ2gtcuom0A6Ewyw4aP2Bk9pxV+o=";

2123 };

2224

2325 checkInputs = [

24− pytestCheckHook

25− pytest-cov

26− pytest-xdist

2726 pytest-django

28− mock

27+ pytest-xdist

28+ pytestCheckHook

2929 ];

3030

31− # Darwin sandbox causes most tests to fail.

31+ postPatch = ''

32+ sed -i "/--cov/d" tox.ini

33+ '';

34+

35+ # Darwin sandbox causes most tests to fail

3236 doCheck = !stdenv.isDarwin;

33− pythonImportsCheck = [ "diskcache" ];

3437

3538 disabledTests = [

36− # very time sensitive, can fail on over subscribed machines

39+ # Very time sensitive, can fail on over subscribed machines

3740 "test_incr_update_keyerror"

41+ # AssertionError: 'default' is not None

42+ "test_decr_version"

43+ "test_incr_version"

44+ "test_get_or_set"

45+ "test_get_many"

3846 ];

3947

4048 pytestFlagsArray = [

4149 "-n $NIX_BUILD_CORES"

4250 ];

4351

52+ pythonImportsCheck = [

53+ "diskcache"

54+ ];

55+

4456 meta = with lib; {

4557 description = "Disk and file backed persistent cache";

4658 homepage = "http://www.grantjenks.com/docs/diskcache/";

4759 license = licenses.asl20;

48− maintainers = [ maintainers.costrouc ];

60+ maintainers = with maintainers; [ costrouc ];

4961 };

5062}

pkgs/development/python-modules/fastapi/default.nix+4−2

@@ -19,7 +19,7 @@

1919

2020buildPythonPackage rec {

2121 pname = "fastapi";

22− version = "0.70.1";

22+ version = "0.71.0";

2323 format = "flit";

2424

2525 disabled = pythonOlder "3.6";

@@ -28,7 +28,7 @@ buildPythonPackage rec {

2828 owner = "tiangolo";

2929 repo = pname;

3030 rev = version;

31− sha256 = "sha256-iwjxcAe8h38PPTTDGCxIJSB7zCS0FA0gOcKUjPpk3yg=";

31+ sha256 = "sha256-J4j7lQm22pbwfMkQGF1s2xyFU4MCwXrAqDmRJmLmKGg=";

3232 };

3333

3434 propagatedBuildInputs = [

@@ -64,6 +64,8 @@ buildPythonPackage rec {

6464 disabledTestPaths = [

6565 # Disabled tests require orjson which requires rust nightly

6666 "tests/test_default_response_class.py"

67+ # Don't test docs and examples

68+ "docs_src"

6769 ];

6870

6971 disabledTests = [

pkgs/development/python-modules/flux-led/default.nix+2−2

@@ -8,7 +8,7 @@

99buildPythonPackage rec {

1010 pname = "flux-led";

11− version = "0.27.40";

11+ version = "0.27.43";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.7";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "Danielhiversen";

1818 repo = "flux_led";

1919 rev = version;

20− sha256 = "sha256-imfdLomMjeGAyVBSygx+TV0DA9OrMreeSlzzrJ2B9cc=";

20+ sha256 = "sha256-g1K5NoZm9nd1M17who0LtRa5n1P7P/XRs6Qz63vmTxw=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/hahomematic/default.nix+2−2

@@ -13,7 +13,7 @@

1313

1414buildPythonPackage rec {

1515 pname = "hahomematic";

16− version = "0.14.0";

16+ version = "0.15.0";

1717 format = "setuptools";

1818

1919 disabled = pythonOlder "3.9";

@@ -22,7 +22,7 @@ buildPythonPackage rec {

2222 owner = "danielperna84";

2323 repo = pname;

2424 rev = version;

25− sha256 = "sha256-Olwol/DhsVJznxpiMB57zkPuco0RBxMy8cfzSQMZZrU=";

25+ sha256 = "sha256-jTUMnBtV0wVFWe+4MWOAvFDLvminM0gVTm0hkBOvnH8=";

2626 };

2727

2828 propagatedBuildInputs = [

pkgs/development/python-modules/jupyterlab/default.nix+20−8

@@ -10,29 +10,41 @@

1010

1111buildPythonPackage rec {

1212 pname = "jupyterlab";

13− version = "3.2.5";

14− disabled = pythonOlder "3.5";

13+ version = "3.2.6";

14+ format = "setuptools";

15+

16+ disabled = pythonOlder "3.7";

1517

1618 src = fetchPypi {

1719 inherit pname version;

18− sha256 = "31b28f473b0f5826d2020583973c385526f0559b5b26efac6b8035ac1562874a";

20+ sha256 = "04e763974010f0f424ee889238fa488ee11708d0546e6df6e2cad9e0fc724bdb";

1921 };

2022

21− nativeBuildInputs = [ jupyter-packaging ];

23+ nativeBuildInputs = [

24+ jupyter-packaging

25+ ];

2226

23− propagatedBuildInputs = [ jupyterlab_server notebook nbclassic ];

27+ propagatedBuildInputs = [

28+ jupyterlab_server

29+ notebook

30+ nbclassic

31+ ];

2432

2533 makeWrapperArgs = [

26− "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab"

34+ "--set"

35+ "JUPYTERLAB_DIR"

36+ "$out/share/jupyter/lab"

2737 ];

2838

2939 # Depends on npm

3040 doCheck = false;

3141

32− pythonImportsCheck = [ "jupyterlab" ];

42+ pythonImportsCheck = [

43+ "jupyterlab"

44+ ];

3345

3446 meta = with lib; {

35− description = "Jupyter lab environment notebook server extension.";

47+ description = "Jupyter lab environment notebook server extension";

3648 license = with licenses; [ bsd3 ];

3749 homepage = "https://jupyter.org/";

3850 maintainers = with maintainers; [ zimbatm costrouc ];

pkgs/development/python-modules/pixelmatch/default.nix+24−8

@@ -1,15 +1,26 @@

1−{ lib, buildPythonPackage, fetchgit, poetry-core, pytestCheckHook, pytest-benchmark, pytest-mypy, pillow }:

1+{ lib

2+, buildPythonPackage

3+, fetchgit

4+, pillow

5+, poetry-core

6+, pytest-benchmark

7+, pytest-mypy

8+, pytestCheckHook

9+, pythonOlder

10+}:

211

312buildPythonPackage rec {

413 pname = "pixelmatch";

5− version = "0.2.2";

14+ version = "0.2.3";

615 format = "pyproject";

716

8− # test fixtures are stored in LFS

17+ disabled = pythonOlder "3.6";

18+

19+ # Test fixtures are stored in LFS

920 src = fetchgit {

1021 url = "https://github.com/whtsky/pixelmatch-py";

1122 rev = "v${version}";

12− sha256 = "1dsix507dxqik9wvgzscvf2pifbg7gx74krrsalqbfcmm7d1i7xl";

23+ hash = "sha256-/zRQhwz+HjT0Hs4CunsqHxHWEtoIH9qMBowRb0Pps6Y=";

1324 fetchLFS = true;

1425 };

1526

@@ -18,19 +29,24 @@ buildPythonPackage rec {

1829 ];

1930

2031 checkInputs = [

21− pytestCheckHook

32+ pillow

2233 pytest-benchmark

2334 pytest-mypy

24− pillow

35+ pytestCheckHook

2536 ];

2637

2738 pytestFlagsArray = [

28− "--mypy"

39+ # Incompatible types in assignment

40+ #"--mypy"

2941 "--benchmark-disable"

3042 ];

3143

44+ pythonImportsCheck = [

45+ "pixelmatch"

46+ ];

47+

3248 meta = with lib; {

33− description = "A pixel-level image comparison library.";

49+ description = "Pixel-level image comparison library";

3450 homepage = "https://github.com/whtsky/pixelmatch-py";

3551 license = licenses.isc;

3652 maintainers = with maintainers; [ petabyteboy ];

pkgs/development/python-modules/ppscore/default.nix+17−9

@@ -1,33 +1,41 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4−, isPy27

54, pandas

6−, scikit-learn

75, pytestCheckHook

6+, pythonOlder

7+, scikit-learn

88}:

1010buildPythonPackage rec {

1111 pname = "ppscore";

12− version = "1.1.1";

13− disabled = isPy27;

12+ version = "unstable-2021-11-25";

13+ format = "setuptools";

14+

15+ disabled = pythonOlder "3.6";

1416

1517 src = fetchFromGitHub {

1618 owner = "8080labs";

1719 repo = pname;

18− rev = version;

19− sha256 = "11y6axhj0nlagf7ax6gas1g06krrmddb1jlmf0mmrmyi7z0vldk2";

20+ rev = "c9268c16b6305c5c38e2fe2fd84f43d97ec1aaca";

21+ hash = "sha256-qiogjUgcLFauAMpVf2CKNC27c9xR9q7nY69n8/go1ms=";

2022 };

2123

22− checkInputs = [ pytestCheckHook ];

23−

2424 propagatedBuildInputs = [

2525 pandas

2626 scikit-learn

2727 ];

2828

29+ checkInputs = [

30+ pytestCheckHook

31+ ];

32+

33+ pythonImportsCheck = [

34+ "ppscore"

35+ ];

36+

2937 meta = with lib; {

30− description = "A Python implementation of the Predictive Power Score (PPS)";

38+ description = "Python implementation of the Predictive Power Score (PPS)";

3139 homepage = "https://github.com/8080labs/ppscore/";

3240 license = licenses.mit;

3341 maintainers = with maintainers; [ evax ];

pkgs/development/python-modules/pykeyatome/default.nix+2−2

@@ -13,7 +13,7 @@

1313

1414buildPythonPackage rec {

1515 pname = "pykeyatome";

16− version = "1.3.0";

16+ version = "1.3.1";

1717 format = "setuptools";

1818

1919 disabled = pythonOlder "3.8";

@@ -22,7 +22,7 @@ buildPythonPackage rec {

2222 owner = "jugla";

2323 repo = "pyKeyAtome";

2424 rev = "V${version}";

25− sha256 = "1brcfgqj0bana6yii4083kppz822fgk9xf4mg141b0zfvx2gyjw9";

25+ sha256 = "1lvwxcr2ay8h5sr4lmjgs7xgszl1q8ciaqdn6cmrlra27jssl5ax";

2626 };

2727

2828 propagatedBuildInputs = [

pkgs/development/python-modules/types-decorator/default.nix+2−2

@@ -5,12 +5,12 @@

66buildPythonPackage rec {

77 pname = "types-decorator";

8− version = "5.1.2";

8+ version = "5.1.3";

99 format = "setuptools";

1010

1111 src = fetchPypi {

1212 inherit pname version;

13− sha256 = "b3dd9027af1131b4e55ccd09248b7accc7a02d567139e2009ed20db13cf90600";

13+ sha256 = "15d859bec0adca9edd948e94a5773c32710ee5dd4ad14ec983f08f979a821610";

1414 };

1515

1616 # Modules doesn't have tests

pkgs/development/python-modules/types-protobuf/default.nix+2−2

@@ -6,12 +6,12 @@

77buildPythonPackage rec {

88 pname = "types-protobuf";

9− version = "3.18.3";

9+ version = "3.18.4";

1010 format = "setuptools";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "d3e253ebc1ba5e78932fef703dc4316afb7e5facd0ce8661b3921c9d541e16a7";

14+ sha256 = "2aed45e5257e9adebce306637179bfa111d42ecdd523e2a13d30cf8b2ee3cc84";

1515 };

1616

1717 propagatedBuildInputs = [

pkgs/development/python-modules/types-requests/default.nix+2−2

@@ -5,12 +5,12 @@

66buildPythonPackage rec {

77 pname = "types-requests";

8− version = "2.27.0";

8+ version = "2.27.2";

99 format = "setuptools";

1010

1111 src = fetchPypi {

1212 inherit pname version;

13− sha256 = "sha256-vFztDc8GdOPx+d7XNM7p+kXFfPZEsInmLI+xLKKOshU=";

13+ sha256 = "c902c5433ad103053011c6ac036317ac6f6a8e8a6926fc470a8d2ef791236da7";

1414 };

1515

1616 # Module doesn't have tests

pkgs/development/python-modules/types-toml/default.nix+2−2

@@ -5,12 +5,12 @@

66buildPythonPackage rec {

77 pname = "types-toml";

8− version = "0.10.1";

8+ version = "0.10.2";

99 format = "setuptools";

1010

1111 src = fetchPypi {

1212 inherit pname version;

13− sha256 = "1jqh0vki1hccj391gnxpblim429sj56npgq2z749f8v9ay6qy7sw";

13+ sha256 = "cd38b802e9c84c7a2e9b61e99a217e794bc01874586b292222e9764c6c7ca75c";

1414 };

1515

1616 # Module doesn't have tests

pkgs/development/python-modules/urlextract/default.nix+11−5

@@ -1,27 +1,31 @@

11{ lib

2−, appdirs

32, buildPythonPackage

43, dnspython

54, fetchPypi

65, filelock

76, idna

7+, platformdirs

88, pytestCheckHook

9+, pythonOlder

910, uritools

1011}:

1112

1213buildPythonPackage rec {

1314 pname = "urlextract";

14− version = "1.4.0";

15+ version = "1.5.0";

16+ format = "setuptools";

17+

18+ disabled = pythonOlder "3.7";

1519

1620 src = fetchPypi {

1721 inherit pname version;

18− sha256 = "669f07192584b841b49ba8868fbd6b00e7ddc28367d36a3d8ca8c8e429420748";

22+ hash = "sha256-QKXIQ9HXJTdY9W8NZ0jF6iekoUVl46kvJakW3cTB5B8=";

1923 };

2024

2125 propagatedBuildInputs = [

22− appdirs

2326 filelock

2427 idna

28+ platformdirs

2529 uritools

2630 ];

2731

@@ -39,7 +43,9 @@ buildPythonPackage rec {

3943 "test_dns_cache_reuse"

4044 ];

4145

42− pythonImportsCheck = [ "urlextract" ];

46+ pythonImportsCheck = [

47+ "urlextract"

48+ ];

4349

4450 meta = with lib; {

4551 description = "Collects and extracts URLs from given text";

pkgs/tools/security/gitleaks/default.nix+3−3

@@ -5,16 +5,16 @@

66buildGoModule rec {

77 pname = "gitleaks";

8− version = "8.2.5";

8+ version = "8.2.7";

1010 src = fetchFromGitHub {

1111 owner = "zricethezav";

1212 repo = pname;

1313 rev = "v${version}";

14− sha256 = "sha256-lHKdIQyGbQt6PmMaTRIUx1q/81Q4KOfQ8zLnpt9aGbk=";

14+ sha256 = "sha256-kCKkPx0JEzmQn0y6UbVuwZXre7rDd4vKTudh6J3AxYA=";

1515 };

1616

17− vendorSha256 = "sha256-cIwte59AdVOWMBUWE4gKZSHhU37HgEW4k0v+jUUyj1Q=";

17+ vendorSha256 = "sha256-zJ9Xl4tRUWntQwco+EHzqmL1aVcOjp70LCCmRsboxQ4=";

1818

1919 ldflags = [

2020 "-s"

pkgs/tools/security/metasploit/Gemfile+1−1

@@ -1,4 +1,4 @@

11# frozen_string_literal: true

22source "https://rubygems.org"

4−gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.22"

4+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.23"

pkgs/tools/security/metasploit/Gemfile.lock+21−17

@@ -1,9 +1,9 @@

11GIT

22 remote: https://github.com/rapid7/metasploit-framework

3− revision: 3bfd2d8eeab3f8ab7efd7a46f8125a7a3bb5f2f0

4− ref: refs/tags/6.1.22

3+ revision: 7682d9ab9c404b55cfc4a221db22f74a740a6f7f

4+ ref: refs/tags/6.1.23

55 specs:

6− metasploit-framework (6.1.22)

6+ metasploit-framework (6.1.23)

77 actionpack (~> 6.0)

88 activerecord (~> 6.0)

99 activesupport (~> 6.0)

@@ -75,7 +75,7 @@ GIT

7575 rex-text

7676 rex-zip

7777 ruby-macho

78− ruby_smb (~> 2.0)

78+ ruby_smb (~> 3.0)

7979 rubyntlm

8080 rubyzip

8181 sinatra

@@ -128,13 +128,13 @@ GEM

128128 arel-helpers (2.14.0)

129129 activerecord (>= 3.1.0, < 8)

130130 aws-eventstream (1.2.0)

131− aws-partitions (1.543.0)

132− aws-sdk-core (3.125.0)

131+ aws-partitions (1.547.0)

132+ aws-sdk-core (3.125.1)

133133 aws-eventstream (~> 1, >= 1.0.2)

134134 aws-partitions (~> 1, >= 1.525.0)

135135 aws-sigv4 (~> 1.1)

136136 jmespath (~> 1.0)

137− aws-sdk-ec2 (1.288.0)

137+ aws-sdk-ec2 (1.290.0)

138138 aws-sdk-core (~> 3, >= 3.125.0)

139139 aws-sigv4 (~> 1.1)

140140 aws-sdk-iam (1.65.0)

@@ -143,7 +143,7 @@ GEM

143143 aws-sdk-kms (1.53.0)

144144 aws-sdk-core (~> 3, >= 3.125.0)

145145 aws-sigv4 (~> 1.1)

146− aws-sdk-s3 (1.110.0)

146+ aws-sdk-s3 (1.111.1)

147147 aws-sdk-core (~> 3, >= 3.125.0)

148148 aws-sdk-kms (~> 1)

149149 aws-sigv4 (~> 1.4)

@@ -175,25 +175,29 @@ GEM

175175 eventmachine (1.2.7)

176176 faker (2.19.0)

177177 i18n (>= 1.6, < 2)

178− faraday (1.8.0)

178+ faraday (1.9.3)

179179 faraday-em_http (~> 1.0)

180180 faraday-em_synchrony (~> 1.0)

181181 faraday-excon (~> 1.1)

182− faraday-httpclient (~> 1.0.1)

182+ faraday-httpclient (~> 1.0)

183+ faraday-multipart (~> 1.0)

183184 faraday-net_http (~> 1.0)

184− faraday-net_http_persistent (~> 1.1)

185+ faraday-net_http_persistent (~> 1.0)

185186 faraday-patron (~> 1.0)

186187 faraday-rack (~> 1.0)

187− multipart-post (>= 1.2, < 3)

188+ faraday-retry (~> 1.0)

188189 ruby2_keywords (>= 0.0.4)

189190 faraday-em_http (1.0.0)

190191 faraday-em_synchrony (1.0.0)

191192 faraday-excon (1.1.0)

192193 faraday-httpclient (1.0.1)

194+ faraday-multipart (1.0.2)

195+ multipart-post (>= 1.2, < 3)

193196 faraday-net_http (1.0.1)

194197 faraday-net_http_persistent (1.2.0)

195198 faraday-patron (1.0.0)

196199 faraday-rack (1.0.0)

200+ faraday-retry (1.0.3)

197201 faye-websocket (0.11.1)

198202 eventmachine (>= 0.12.0)

199203 websocket-driver (>= 0.5.1)

@@ -260,7 +264,7 @@ GEM

260264 webrick

261265 metasploit_payloads-mettle (1.0.17)

262266 method_source (1.0.0)

263− mini_portile2 (2.6.1)

267+ mini_portile2 (2.7.1)

264268 minitest (5.15.0)

265269 mqtt (0.5.0)

266270 msgpack (1.4.2)

@@ -274,8 +278,8 @@ GEM

274278 network_interface (0.0.2)

275279 nexpose (7.3.0)

276280 nio4r (2.5.8)

277− nokogiri (1.12.5)

278− mini_portile2 (~> 2.6.1)

281+ nokogiri (1.13.0)

282+ mini_portile2 (~> 2.7.0)

279283 racc (~> 1.4)

280284 nori (2.6.0)

281285 octokit (4.21.0)

@@ -375,7 +379,7 @@ GEM

375379 ruby-macho (2.5.1)

376380 ruby-rc4 (0.1.5)

377381 ruby2_keywords (0.0.5)

378− ruby_smb (2.0.13)

382+ ruby_smb (3.0.0)

379383 bindata

380384 openssl-ccm

381385 openssl-cmac

@@ -400,7 +404,7 @@ GEM

400404 daemons (~> 1.0, >= 1.0.9)

401405 eventmachine (~> 1.0, >= 1.0.4)

402406 rack (>= 1, < 3)

403− thor (1.1.0)

407+ thor (1.2.1)

404408 tilt (2.0.10)

405409 ttfunk (1.7.0)

406410 tzinfo (2.0.4)

pkgs/tools/security/metasploit/default.nix+2−2

@@ -15,13 +15,13 @@ let

1515 };

1616in stdenv.mkDerivation rec {

1717 pname = "metasploit-framework";

18− version = "6.1.22";

18+ version = "6.1.23";

1919

2020 src = fetchFromGitHub {

2121 owner = "rapid7";

2222 repo = "metasploit-framework";

2323 rev = version;

24− sha256 = "sha256-D3OmkXEqOgDOf1fvMtWiFT4bLw38SNHp2A25xAkq7Ew=";

24+ sha256 = "sha256-um2WDbc7SHhbPSTamOTB0tRWl0tkkNGnY0lm+dU7iIA=";

2525 };

2626

2727 nativeBuildInputs = [ makeWrapper ];

pkgs/tools/security/metasploit/gemset.nix+41−21

@@ -104,30 +104,30 @@

104104 platforms = [];

105105 source = {

106106 remotes = ["https://rubygems.org"];

107− sha256 = "07ydbhiyncl0l1dwy09z8inf72x1k961qlcwwg62l4yacv0a74wq";

107+ sha256 = "1fi4irlxam3bmvafm6iiqj0vlzqg10vc4bzznl4c5w6zmg0lzp6b";

108108 type = "gem";

109109 };

110− version = "1.543.0";

110+ version = "1.547.0";

111111 };

112112 aws-sdk-core = {

113113 groups = ["default"];

114114 platforms = [];

115115 source = {

116116 remotes = ["https://rubygems.org"];

117− sha256 = "06mkw688mrhz4j2d2ajzigr87041hxczy2w45j0iv1mnvs5yrhan";

117+ sha256 = "17v517dkrazxs9n64c8qdkwhb5fj9flnc2lp99gph6307ciz47w1";

118118 type = "gem";

119119 };

120− version = "3.125.0";

120+ version = "3.125.1";

121121 };

122122 aws-sdk-ec2 = {

123123 groups = ["default"];

124124 platforms = [];

125125 source = {

126126 remotes = ["https://rubygems.org"];

127− sha256 = "0s67sgpv7b6asg3am157brsclq15p8r3fm2gc741zz546xfbfpm3";

127+ sha256 = "147z6prv5cj5scnd3rpjqw0pvbj7yvp9b7lzl786c0jil1pvjm0p";

128128 type = "gem";

129129 };

130− version = "1.288.0";

130+ version = "1.290.0";

131131 };

132132 aws-sdk-iam = {

133133 groups = ["default"];

@@ -154,10 +154,10 @@

154154 platforms = [];

155155 source = {

156156 remotes = ["https://rubygems.org"];

157− sha256 = "1587v0xh0hcrxn0ki0ahx70kkpny4pm32fj4bh7500wzvjki6d6v";

157+ sha256 = "1pgh6zd07r9sfzkdz4bf6piq4n8gzl0f76h68l2zxchc1g9z4lqw";

158158 type = "gem";

159159 };

160− version = "1.110.0";

160+ version = "1.111.1";

161161 };

162162 aws-sigv4 = {

163163 groups = ["default"];

@@ -344,10 +344,10 @@

344344 platforms = [];

345345 source = {

346346 remotes = ["https://rubygems.org"];

347− sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";

347+ sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";

348348 type = "gem";

349349 };

350− version = "1.8.0";

350+ version = "1.9.3";

351351 };

352352 faraday-em_http = {

353353 groups = ["default"];

@@ -389,6 +389,16 @@

389389 };

390390 version = "1.0.1";

391391 };

392+ faraday-multipart = {

393+ groups = ["default"];

394+ platforms = [];

395+ source = {

396+ remotes = ["https://rubygems.org"];

397+ sha256 = "0ih6nkjx4ph00iybicn0ssjkjnhnjd2xsl9g83lkg64w8q5s0i87";

398+ type = "gem";

399+ };

400+ version = "1.0.2";

401+ };

392402 faraday-net_http = {

393403 groups = ["default"];

394404 platforms = [];

@@ -429,6 +439,16 @@

429439 };

430440 version = "1.0.0";

431441 };

442+ faraday-retry = {

443+ groups = ["default"];

444+ platforms = [];

445+ source = {

446+ remotes = ["https://rubygems.org"];

447+ sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";

448+ type = "gem";

449+ };

450+ version = "1.0.3";

451+ };

432452 faye-websocket = {

433453 groups = ["default"];

434454 platforms = [];

@@ -664,12 +684,12 @@

664684 platforms = [];

665685 source = {

666686 fetchSubmodules = false;

667− rev = "3bfd2d8eeab3f8ab7efd7a46f8125a7a3bb5f2f0";

668− sha256 = "0k7c584w9f8dv3lx2j7w1lpinghmlbak5vspgz700fiaf68scwqg";

687+ rev = "7682d9ab9c404b55cfc4a221db22f74a740a6f7f";

688+ sha256 = "10487gazjrj9cfkx34349fbmdm6jq7j9ini47mdphj1vnw6rcvds";

669689 type = "git";

670690 url = "https://github.com/rapid7/metasploit-framework";

671691 };

672− version = "6.1.22";

692+ version = "6.1.23";

673693 };

674694 metasploit-model = {

675695 groups = ["default"];

@@ -726,10 +746,10 @@

726746 platforms = [];

727747 source = {

728748 remotes = ["https://rubygems.org"];

729− sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";

749+ sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z";

730750 type = "gem";

731751 };

732− version = "2.6.1";

752+ version = "2.7.1";

733753 };

734754 minitest = {

735755 groups = ["default"];

@@ -857,10 +877,10 @@

857877 platforms = [];

858878 source = {

859879 remotes = ["https://rubygems.org"];

860− sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";

880+ sha256 = "1cvx23d8z1nf5nsr5cv55m5dhr3f1bnvgdfqqfnjvhcd8cfnkgcd";

861881 type = "gem";

862882 };

863− version = "1.12.5";

883+ version = "1.13.0";

864884 };

865885 nori = {

866886 groups = ["default"];

@@ -1337,10 +1357,10 @@

13371357 platforms = [];

13381358 source = {

13391359 remotes = ["https://rubygems.org"];

1340− sha256 = "1bjsh4qi6ii4zl0g0na004ylk991ar9rg5kz9rq1q7r5crxy2rw7";

1360+ sha256 = "1klfrp56qid5fr1kzsi62bkhpp2yn6pbv0yg4ikf0lgzg5nq781w";

13411361 type = "gem";

13421362 };

1343− version = "2.0.13";

1363+ version = "3.0.0";

13441364 };

13451365 rubyntlm = {

13461366 groups = ["default"];

@@ -1437,10 +1457,10 @@

14371457 platforms = [];

14381458 source = {

14391459 remotes = ["https://rubygems.org"];

1440− sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";

1460+ sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";

14411461 type = "gem";

14421462 };

1443− version = "1.1.0";

1463+ version = "1.2.1";

14441464 };

14451465 tilt = {

14461466 groups = ["default"];