diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/cluster/kpt/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/science/astronomy/kstars/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/cdk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gperftools/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/python-modules/url-normalize/default.nix | 45 | ||||
-rw-r--r-- | pkgs/development/python-modules/virtualenv/default.nix | 51 | ||||
-rw-r--r-- | pkgs/os-specific/linux/cifs-utils/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/component-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/latex2html/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/Gemfile | 2 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/Gemfile.lock | 128 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/gemset.nix | 272 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
15 files changed, 314 insertions, 240 deletions
diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 712761eeef29..ae9380c5139a 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1b1sgwax67pazcs1lly3h3bb7ww91lcd3nr0w3r3f46d1c6iy8mn"; + sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM="; }; - vendorSha256 = "0dn6nryf3vn7r0xna02va4wbgkq0z6x8sj6g2mskfywrk0mfhadv"; + vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI="; subPackages = [ "." ]; diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index c32d671cb05d..33f00979c972 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "0fpkm75abn0hhdhfyvpfl6n0fr7gvw63xhb4hvwdrglhkf2nxam1"; + sha256 = "sha256-gf+yaXiYQFuO1/nvdP6OOuD4QrRtPAQTwQZAbYNKxUU="; }; patches = [ diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 4613eefd3b90..a95e22645cb8 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cdk"; - version ="5.0-20200923"; + version ="5.0-20210109"; buildInputs = [ ncurses @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0"; + sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY="; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 91b2c2929a48..ac5005254117 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }: +{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, libunwind }: stdenv.mkDerivation rec { name = "gperftools-2.8"; @@ -20,21 +20,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux - buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; + buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; # Disable general dynamic TLS on AArch to support dlopen()'ing the library: # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 - configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64) + configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64) "--disable-general-dynamic-tls"; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ substituteInPlace Makefile.in --replace stdc++ c++ substituteInPlace libtool --replace stdc++ c++ ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin - "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + "-D_XOPEN_SOURCE"; # some packages want to link to the static tcmalloc_minimal # to drop the runtime dependency on gperftools @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gperftools/gperftools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/python-modules/url-normalize/default.nix b/pkgs/development/python-modules/url-normalize/default.nix new file mode 100644 index 000000000000..ea7825d9ffd2 --- /dev/null +++ b/pkgs/development/python-modules/url-normalize/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytest-cov +, pytest-flakes +, pytest-mock +, pytest-socket +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "url-normalize"; + version = "1.4.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "niksite"; + repo = pname; + rev = version; + sha256 = "09nac5nh94x0n4bfazjfxk96b20mfsx6r1fnvqv85gkzs0rwqkaq"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ + pytest-cov + pytest-flakes + pytest-mock + pytest-socket + pytestCheckHook + ]; + + pythonImportsCheck = [ "url_normalize" ]; + + meta = with lib; { + description = "URL normalization for Python"; + homepage = "https://github.com/niksite/url-normalize"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 6869d16d5a46..233101728f85 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,35 +1,27 @@ { buildPythonPackage +, fetchPypi +, lib +, stdenv +, pythonOlder +, isPy27 , appdirs , contextlib2 -, cython , distlib -, fetchPypi , filelock -, fish -, flaky , importlib-metadata , importlib-resources -, isPy27 -, lib , pathlib2 -, pytest-freezegun -, pytest-mock -, pytest-timeout -, pytestCheckHook -, pythonOlder , setuptools_scm , six -, stdenv -, xonsh }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.3.1"; + version = "20.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DBEaIjaxkUIrN/6MKLjIKM7TmqtL9WJ/pcMxrv+1cNk="; + sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5"; }; nativeBuildInputs = [ @@ -55,33 +47,10 @@ buildPythonPackage rec { ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch ]; - checkInputs = [ - cython - fish - flaky - pytest-freezegun - pytest-mock - pytest-timeout - pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.9") [ - xonsh - ]; - - preCheck = "export HOME=$(mktemp -d)"; - - # Ignore tests which requires network access - pytestFlagsArray = [ - "--ignore tests/unit/create/test_creator.py" - "--ignore tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" - ]; - - disabledTests = [ "test_can_build_c_extensions" ]; - pythonImportsCheck = [ "virtualenv" ]; - - meta = with lib; { + meta = { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ goibhniu ]; }; } diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 026a20ddf9a1..dcffe770deea 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -3,27 +3,25 @@ stdenv.mkDerivation rec { pname = "cifs-utils"; - version = "6.9"; + version = "6.12"; src = fetchurl { url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; - sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"; + sha256 = "1vw570pvir73kl4y6fhd6ns936ankimkhb1ii43yh8lr0p1xqbcj"; }; nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; buildInputs = [ kerberos keyutils pam talloc ]; - configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - makeFlags = [ "root_sbindir=$(out)/sbin" ]; - meta = with lib; { - homepage = "http://www.samba.org/linux-cifs/cifs-utils/"; + homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils"; description = "Tools for managing Linux CIFS client filesystems"; platforms = platforms.linux; license = licenses.lgpl3; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a822cb4a623d..97cd133ade93 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -361,7 +361,7 @@ "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense - "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize + "huawei_lte" = ps: with ps; [ getmac stringcase url-normalize ]; # missing inputs: huawei-lte-api "huawei_router" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; "humidifier" = ps: with ps; [ ]; @@ -801,7 +801,7 @@ "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot "switcher_kis" = ps: with ps; [ aioswitcher ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate - "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize + "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru "synology" = ps: with ps; [ ]; # missing inputs: py-synology "synology_chat" = ps: with ps; [ ]; "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 0bc46849df27..c18a863c636e 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.14.4"; + version = "1.14.6"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk"; + sha256 = "1z6xipd7bgq7fc03x9j2dmg3yv59xyjf4ic5f1l6l6pw7w3q4sq7"; }; patches = [ diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 6f532533f99d..5bb4f41a5de8 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "latex2html"; - version = "2020.2"; + version = "2021"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1icyl6kl60wh7cavprgbd8q6lpjwr7wn24m34kpiif7ahknhcbcm"; + sha256 = "sha256-n7VbK/S9EkWxb4fbIXp3tIfX7N+9bvZ/odBylqTuzUU="; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4df0d2235a05..fcae2cf5d449 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.0.12" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.25" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 8ef6d3b3148a..f8eb110712f7 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: 8ba313ed85b03ef54bec32086c2a8708a7e1df58 - ref: refs/tags/6.0.12 + revision: 7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c + ref: refs/tags/6.0.25 specs: - metasploit-framework (6.0.12) + metasploit-framework (6.0.25) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.22) + metasploit-payloads (= 2.0.26) metasploit_data_models metasploit_payloads-mettle (= 1.0.2) mqtt @@ -50,6 +50,7 @@ GIT pcaprub pdf-reader pg + puma railties rb-readline recog @@ -86,6 +87,7 @@ GIT windows_error xdr xmlrpc + zeitwerk GEM remote: https://rubygems.org/ @@ -119,41 +121,41 @@ GEM public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) arel (9.0.0) - arel-helpers (2.11.0) + arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.385.0) - aws-sdk-core (3.109.1) + aws-partitions (1.415.0) + aws-sdk-core (3.110.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.202.0) + aws-sdk-ec2 (1.220.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.46.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.39.0) + aws-sdk-kms (1.40.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.1) + aws-sdk-s3 (1.87.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) - bcrypt_pbkdf (1.0.1) + bcrypt_pbkdf (1.1.0) bindata (2.4.8) bit-struct (0.16) - bson (4.11.0) + bson (4.11.1) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) crass (1.0.6) daemons (1.3.1) - dnsruby (1.61.4) + dnsruby (1.61.5) simpleidn (~> 0.1) ed25519 (1.2.4) em-http-request (1.1.7) @@ -164,13 +166,15 @@ GEM http_parser.rb (>= 0.6.0) em-socksify (0.3.2) eventmachine (>= 1.0.0.beta.4) - erubi (1.9.0) + erubi (1.10.0) eventmachine (1.2.7) - faker (2.14.0) + faker (2.15.1) i18n (>= 1.6, < 2) - faraday (1.1.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords + faraday-net_http (1.0.0) faye-websocket (0.11.0) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) @@ -179,24 +183,24 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) io-console (0.5.6) - irb (1.2.7) + irb (1.3.0) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.3.1) - loofah (2.7.0) + json (2.5.1) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.4) - metasploit-concern (3.0.0) + metasploit-concern (3.0.1) activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-credential (4.0.2) + metasploit-credential (4.0.3) metasploit-concern metasploit-model metasploit_data_models (>= 3.0.0) @@ -206,12 +210,12 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (3.1.2) + metasploit-model (3.1.3) activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.22) - metasploit_data_models (4.1.0) + metasploit-payloads (2.0.26) + metasploit_data_models (4.1.1) activerecord (~> 5.2.2) activesupport (~> 5.2.2) arel-helpers @@ -222,21 +226,23 @@ GEM recog (~> 2.0) metasploit_payloads-mettle (1.0.2) method_source (1.0.0) - mini_portile2 (2.4.0) - minitest (5.14.2) + mini_portile2 (2.5.0) + minitest (5.14.3) mqtt (0.5.0) msgpack (1.3.3) multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-ldap (0.16.3) + net-ldap (0.17.0) net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.2.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.19.0) + nio4r (2.5.4) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) openssl-ccm (1.2.2) @@ -254,6 +260,9 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) + puma (5.1.1) + nio4r (~> 2.0) + racc (1.5.2) rack (2.2.3) rack-protection (2.1.0) rack @@ -270,65 +279,65 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.1) + rake (13.0.3) rb-readline (0.5.5) - recog (2.3.15) + recog (2.3.18) nokogiri - redcarpet (3.5.0) - reline (0.1.6) + redcarpet (3.5.1) + reline (0.2.0) io-console (~> 0.5) - rex-arch (0.1.13) + rex-arch (0.1.14) rex-text - rex-bin_tools (0.1.6) + rex-bin_tools (0.1.7) metasm rex-arch rex-core rex-struct2 rex-text - rex-core (0.1.13) - rex-encoder (0.1.4) + rex-core (0.1.14) + rex-encoder (0.1.5) metasm rex-arch rex-text - rex-exploitation (0.1.24) + rex-exploitation (0.1.26) jsobfu metasm rex-arch rex-encoder rex-text - rex-java (0.1.5) - rex-mime (0.1.5) + rex-java (0.1.6) + rex-mime (0.1.6) rex-text - rex-nop (0.1.1) + rex-nop (0.1.2) rex-arch - rex-ole (0.1.6) + rex-ole (0.1.7) rex-text - rex-powershell (0.1.87) + rex-powershell (0.1.88) rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.4) + rex-random_identifier (0.1.5) rex-text - rex-registry (0.1.3) - rex-rop_builder (0.1.3) + rex-registry (0.1.4) + rex-rop_builder (0.1.4) metasm rex-core rex-text - rex-socket (0.1.24) + rex-socket (0.1.25) rex-core rex-sslscan (0.1.5) rex-core rex-socket rex-text - rex-struct2 (0.1.2) - rex-text (0.2.28) - rex-zip (0.1.3) + rex-struct2 (0.1.3) + rex-text (0.2.29) + rex-zip (0.1.4) rex-text rkelly-remix (0.0.7) - ruby-macho (2.3.0) + ruby-macho (2.5.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.2) - ruby_smb (2.0.6) + ruby_smb (2.0.7) bindata openssl-ccm openssl-cmac @@ -348,17 +357,17 @@ GEM tilt (~> 2.0) sqlite3 (1.4.2) sshkey (2.0.0) - thin (1.7.2) + thin (1.8.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) - ttfunk (1.6.2.1) - tzinfo (1.2.7) + ttfunk (1.7.0) + tzinfo (1.2.9) thread_safe (~> 0.1) - tzinfo-data (1.2020.4) + tzinfo-data (1.2020.6) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -372,7 +381,8 @@ GEM xdr (3.0.2) activemodel (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0) - xmlrpc (0.3.0) + xmlrpc (0.3.1) + zeitwerk (2.4.2) PLATFORMS ruby diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 1260584a3a7a..0e600e36414d 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.12"; + version = "6.0.25"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs"; + sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 4879eb922846..c360e42ad1e8 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -84,10 +84,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16irs6rai9pasv36yy31glijs3p2pvgry5g1lh03vnzg8xpb1msp"; + sha256 = "12wgkhajfsm3fgk43zf7xyxrx7q2kc4ggq459p1az6p0b9jscarx"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; Ascii85 = { groups = ["default"]; @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04i4bry59c3g1anbjpsz9g1pz7yy23kh4vvhg7z611amlcr48zvb"; + sha256 = "1348hdy6wf1av75nvlwp4b0pp4vshc9vrzic5vzrwnx9fg6cib08"; type = "gem"; }; - version = "1.385.0"; + version = "1.415.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmppcxq7jm8lffqibkhq257hfwfbv82zm2y1fbhwm3icgxzwlfx"; + sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4"; type = "gem"; }; - version = "3.109.1"; + version = "3.110.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fsf9qhlxczz8cz755xlcdpfqn384d4kr3ybx2p54n377wamdq08"; + sha256 = "1x3hw3ld27gxj0mmbaj4dw6aw90kr06mkjfx5wxxb807krp5giza"; type = "gem"; }; - version = "1.202.0"; + version = "1.220.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,20 +154,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a"; + sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4"; type = "gem"; }; - version = "1.39.0"; + version = "1.40.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "021yqghdb1i980vn249hv44jajr0v3hq4ik4r6fqh9kwp04fsbqv"; + sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; type = "gem"; }; - version = "1.83.1"; + version = "1.87.0"; }; aws-sigv4 = { groups = ["default"]; @@ -194,10 +194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; + sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; bindata = { groups = ["default"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bm64q413wrrm3pda6ha2kn1yipyl0qp5240fwsdw1hkqhbjdnjm"; + sha256 = "12v95l3v7n7lh3mk8k1jdrkpn2vjnkb8k636hcygaczzv4jdsdfp"; type = "gem"; }; - version = "4.11.0"; + version = "4.11.1"; }; builder = { groups = ["default"]; @@ -284,10 +284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4mq4zm8bqd0ik908gnn8nm3kph268af7q173wlq4krg3nw562x"; + sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx"; type = "gem"; }; - version = "1.61.4"; + version = "1.61.5"; }; ed25519 = { groups = ["default"]; @@ -324,10 +324,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; eventmachine = { groups = ["default"]; @@ -344,20 +344,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6"; + sha256 = "1l0dvswigzxaz9558wmfix3v8cmwwkgdvrx1fmpd3qnr5hky1qrk"; type = "gem"; }; - version = "2.14.0"; + version = "2.15.1"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d"; + type = "gem"; + }; + version = "1.0.0"; }; faye-websocket = { groups = ["default"]; @@ -414,10 +424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.7"; }; io-console = { groups = ["default"]; @@ -434,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10d9xr1hdpkqhljxhvdm44c2qbxdjfqm5x00d4v6aw0fym1w7r2g"; + sha256 = "0a7gkibv9485dbh64k3r5j20bf553dg0kmxy3hhgl2jsgqyvrl1y"; type = "gem"; }; - version = "1.2.7"; + version = "1.3.0"; }; jmespath = { groups = ["default"]; @@ -464,20 +474,20 @@ |