nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 12:04:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-14 12:01:31 +00:00 committed by GitHub
commit 58eb752984
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 954 additions and 590 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nixos/tests/home-assistant.nix
View File

@ -7,8 +7,6 @@ in {
meta.maintainers = lib.teams.home-assistant.members; meta.maintainers = lib.teams.home-assistant.members;
nodes.hass = { pkgs, ... }: { nodes.hass = { pkgs, ... }: {
environment.systemPackages = with pkgs; [ mosquitto ];
services.postgresql = { services.postgresql = {
enable = true; enable = true;
ensureDatabases = [ "hass" ]; ensureDatabases = [ "hass" ];
@ -108,9 +106,7 @@ in {
# Cause a configuration change that requires a service restart as we added a new runtime dependency # Cause a configuration change that requires a service restart as we added a new runtime dependency
specialisation.newFeature = { specialisation.newFeature = {
inheritParentConfig = true; inheritParentConfig = true;
configuration.services.home-assistant.config.device_tracker = [ configuration.services.home-assistant.config.esphome = {};
{ platform = "bluetooth_tracker"; }
];
}; };
}; };
@ -119,6 +115,7 @@ in {
in in
'' ''
import re import re
import json
start_all() start_all()
@ -131,7 +128,19 @@ in {
assert match assert match
package = match.group('path') package = match.group('path')
def get_journal_cursor(host) -> str:
exit, out = host.execute("journalctl -u home-assistant.service -n1 -o json-pretty --output-fields=__CURSOR")
assert exit == 0
return json.loads(out)["__CURSOR"]
def wait_for_homeassistant(host, cursor):
host.wait_until_succeeds(f"journalctl --after-cursor='{cursor}' -u home-assistant.service | grep -q 'Home Assistant initialized in'")
hass.wait_for_unit("home-assistant.service") hass.wait_for_unit("home-assistant.service")
cursor = get_journal_cursor(hass)
with subtest("Check that YAML configuration file is in place"): with subtest("Check that YAML configuration file is in place"):
hass.succeed("test -L ${configDir}/configuration.yaml") hass.succeed("test -L ${configDir}/configuration.yaml")
@ -148,7 +157,7 @@ in {
hass.succeed(f"grep -q 'wake_on_lan' {package}/extra_components") hass.succeed(f"grep -q 'wake_on_lan' {package}/extra_components")
with subtest("Check that Home Assistant's web interface and API can be reached"): with subtest("Check that Home Assistant's web interface and API can be reached"):
hass.wait_until_succeeds("journalctl -u home-assistant.service | grep -q 'Home Assistant initialized in'") wait_for_homeassistant(hass, cursor)
hass.wait_for_open_port(8123) hass.wait_for_open_port(8123)
hass.succeed("curl --fail http://localhost:8123/lovelace") hass.succeed("curl --fail http://localhost:8123/lovelace")
@ -162,15 +171,19 @@ in {
with subtest("Check service reloads when configuration changes"): with subtest("Check service reloads when configuration changes"):
# store the old pid of the process # store the old pid of the process
pid = hass.succeed("systemctl show --property=MainPID home-assistant.service") pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
cursor = get_journal_cursor(hass)
hass.succeed("${system}/specialisation/differentName/bin/switch-to-configuration test") hass.succeed("${system}/specialisation/differentName/bin/switch-to-configuration test")
new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service") new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
assert pid == new_pid, "The PID of the process should not change between process reloads" assert pid == new_pid, "The PID of the process should not change between process reloads"
wait_for_homeassistant(hass, cursor)
with subtest("check service restarts when package changes"): with subtest("check service restarts when package changes"):
pid = new_pid pid = new_pid
cursor = get_journal_cursor(hass)
hass.succeed("${system}/specialisation/newFeature/bin/switch-to-configuration test") hass.succeed("${system}/specialisation/newFeature/bin/switch-to-configuration test")
new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service") new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
assert pid != new_pid, "The PID of the process shoudl change when the HA binary changes" assert pid != new_pid, "The PID of the process shoudl change when the HA binary changes"
wait_for_homeassistant(hass, cursor)
with subtest("Check that no errors were logged"): with subtest("Check that no errors were logged"):
output_log = hass.succeed("cat ${configDir}/home-assistant.log") output_log = hass.succeed("cat ${configDir}/home-assistant.log")

6
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -28,11 +28,11 @@ rec {
firefox-esr-102 = buildMozillaMach rec { firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr"; pname = "firefox-esr";
version = "102.0esr"; version = "102.0.1esr";
applicationName = "Mozilla Firefox ESR"; applicationName = "Mozilla Firefox ESR";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "76494363ffdbd33b61912ac72b5cc15450e4b2936898c84fcf3980ccfa6d7ecc05524a63a60827d6caba999ada5cfd6f121e893ba0587778ce11654d0daf21d7"; sha512 = "ce804fa4e5dda3b8c4c7937f18994a184b0eb7d8fb9484dc924d04d3213ee3daf018141f91703daed6d060a99bfc5d915186db10a4ddcf220c2ea43e369e58df";
}; };
meta = { meta = {
@ -48,6 +48,7 @@ rec {
tests = [ nixosTests.firefox-esr-102 ]; tests = [ nixosTests.firefox-esr-102 ];
updateScript = callPackage ./update.nix { updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-102-unwrapped"; attrPath = "firefox-esr-102-unwrapped";
versionPrefix = "102";
versionSuffix = "esr"; versionSuffix = "esr";
}; };
}; };
@ -74,6 +75,7 @@ rec {
tests = [ nixosTests.firefox-esr-91 ]; tests = [ nixosTests.firefox-esr-91 ];
updateScript = callPackage ./update.nix { updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-91-unwrapped"; attrPath = "firefox-esr-91-unwrapped";
versionPrefix = "91";
versionSuffix = "esr"; versionSuffix = "esr";
}; };
}; };

3
pkgs/applications/networking/browsers/firefox/update.nix
View File

@ -10,6 +10,7 @@
, attrPath , attrPath
, runtimeShell , runtimeShell
, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
, versionPrefix ? ""
, versionSuffix ? "" , versionSuffix ? ""
, versionKey ? "version" , versionKey ? "version"
}: }:
@ -32,7 +33,7 @@ writeScript "update-${attrPath}" ''
# - sorts everything with semver in mind # - sorts everything with semver in mind
# - picks up latest release # - picks up latest release
version=`xidel -s $url --extract "//a" | \ version=`xidel -s $url --extract "//a" | \
grep "^[0-9.]*${versionSuffix}/$" | \ grep "^${versionPrefix}[0-9.]*${versionSuffix}/$" | \
sed s/[/]$// | \ sed s/[/]$// | \
sort --version-sort | \ sort --version-sort | \
tail -n 1` tail -n 1`

4
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -21,13 +21,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubernetes"; pname = "kubernetes";
version = "1.23.8"; version = "1.23.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";
repo = "kubernetes"; repo = "kubernetes";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mu+jBSypoMNxOugLbS3foH4C4AqSZnlic4Bf1v9dYc8="; sha256 = "sha256-uuadINLKZ/hxewE9Qx5wBoGMWrpmTJPDgZh0djadAhc=";
}; };
vendorSha256 = null; vendorSha256 = null;

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -9,7 +9,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signal-desktop"; pname = "signal-desktop";
version = "5.49.0"; # Please backport all updates to the stable channel. version = "5.50.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release. # All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is # When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with: # applied. The expiration date for the current release can be extracted with:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "sha256-rrDUaFcqslSuJwTYx1exEfvuHKKnPZKh+RYerOcKGG0="; sha256 = "sha256-3/a0+FTRSI7MdI/4mAhKl/KEBoEM1rqTUUWTpNFJTSA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/terminal-emulators/gnome-console/default.nix
View File

@ -22,11 +22,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-console"; pname = "gnome-console";
version = "42.0"; version = "42.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "Fae8i72047ZZ//DFK2GdxilxkPhnRp2D4wOvSzibuaM="; sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk=";
}; };
buildInputs = [ buildInputs = [

4
pkgs/development/interpreters/python/default.nix
View File

@ -199,9 +199,9 @@ in {
major = "3"; major = "3";
minor = "11"; minor = "11";
patch = "0"; patch = "0";
suffix = "b3"; suffix = "b4";
}; };
sha256 = "sha256-ybmfUxXqMPjp/LzmgHo3Oeh1SA0pEk5tmUD2+ry3yQI="; sha256 = "sha256-HZO2EWB5A+CAQXwalWf1+79RJMxchvSvu6HI/TTF9vs=";
inherit (darwin) configd; inherit (darwin) configd;
inherit passthruFun; inherit passthruFun;
}; };

4
pkgs/development/python-modules/bellows/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bellows"; pname = "bellows";
version = "0.31.0"; version = "0.31.1";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zigpy"; owner = "zigpy";
repo = "bellows"; repo = "bellows";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-8pw139TNY7LE7x13JfgxcUVWFIXVj4FiEvqdUh+xcl8="; sha256 = "sha256-kjZL6N1VF3Rc26eB5fU1UEs9BEr4sfV4Hto6QdwqeqY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/django/3.nix
View File

@ -3,7 +3,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, substituteAll , substituteAll
, geos , geos39
, gdal , gdal
, asgiref , asgiref
, pytz , pytz
@ -27,7 +27,7 @@ buildPythonPackage rec {
patches = lib.optional withGdal patches = lib.optional withGdal
(substituteAll { (substituteAll {
src = ./django_3_set_geos_gdal_lib.patch; src = ./django_3_set_geos_gdal_lib.patch;
inherit geos; inherit geos39;
inherit gdal; inherit gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary; extension = stdenv.hostPlatform.extensions.sharedLibrary;
}); });

2
pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch
View File

@ -18,7 +18,7 @@ diff -Nur a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos
lib_path = settings.GEOS_LIBRARY_PATH lib_path = settings.GEOS_LIBRARY_PATH
except (AttributeError, ImportError, ImproperlyConfigured, OSError): except (AttributeError, ImportError, ImproperlyConfigured, OSError):
- lib_path = None - lib_path = None
+ lib_path = "@geos@/lib/libgeos_c@extension@" + lib_path = "@geos39@/lib/libgeos_c@extension@"
# Setting the appropriate names for the GEOS-C library. # Setting the appropriate names for the GEOS-C library.
if lib_path: if lib_path:

4
pkgs/development/python-modules/levenshtein/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "levenshtein"; pname = "levenshtein";
version = "0.19.1"; version = "0.19.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "maxbachmann"; owner = "maxbachmann";
repo = "Levenshtein"; repo = "Levenshtein";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-2/m9vn3yHDt5sjE/hY3s3gBCkZnehbk25+VReLo2jn8="; hash = "sha256-tedoSeCwMWHwPlZ8qvzIMjVj5W9qJVoLAsT35hQBc/g=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/tools/database/sqlfluff/default.nix
View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff"; pname = "sqlfluff";
version = "1.1.0"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-6nVNUVvTKwVAQ55y8IunJyEKHN1/pf1BxM3tBqvNFIc="; hash = "sha256-n5DprvSbli7wEV+oRA+U5UnaAGPit2Zd2gFb9fCgG8A=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

4
pkgs/development/web/nodejs/v18.nix
View File

@ -7,8 +7,8 @@ let
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "18.5.0"; version = "18.6.0";
sha256 = "0c50y6c52pmbxc8x1zhkzq608bwvcma4fj39cd1mvc40wfa5d2rn"; sha256 = "0k05phvlpwf467sbaxcvdzr4ncclm9fpldml8fbfrjigl4rhr2sz";
patches = [ patches = [
./disable-darwin-v8-system-instrumentation.patch ./disable-darwin-v8-system-instrumentation.patch
]; ];

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2022.7.3"; version = "2022.7.4";
components = { components = {
"abode" = ps: with ps; [ "abode" = ps: with ps; [
abodepy abodepy

17
pkgs/servers/home-assistant/default.nix
View File

@ -85,19 +85,6 @@ let
}); });
}) })
# Pinned due to API changes in pyruckus>0.12
(self: super: {
pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {
version = "0.12";
src = fetchFromGitHub {
owner = "gabe565";
repo = "pyruckus";
rev = version;
sha256 = "0ykv6r6blbj3fg9fplk9i7xclkv5d93rwvx0fm5s8ms9f2s9ih8z";
};
});
})
# Pinned due to API changes in 0.1.0 # Pinned due to API changes in 0.1.0
(mkOverride "poolsense" "0.0.8" "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=") (mkOverride "poolsense" "0.0.8" "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=")
@ -190,7 +177,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2022.7.3"; hassVersion = "2022.7.4";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -208,7 +195,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
hash = "sha256-e0vu3QUalFncWloNum92YLvMWkeuFF74vrNdfmsfEw0="; hash = "sha256-TQsIChMoIlTd8+gN4bxiWFId6V2wB1j3XfhXYpYMw9M=";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling

4
pkgs/servers/zigbee2mqtt/default.nix
View File

@ -3,14 +3,14 @@ let
package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package; package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package;
in in
package.override rec { package.override rec {
version = "1.25.2"; version = "1.26.0";
reconstructLock = true; reconstructLock = true;
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "Koenkk"; owner = "Koenkk";
repo = "zigbee2mqtt"; repo = "zigbee2mqtt";
rev = version; rev = version;
sha256 = "E7D2lAXEgi0Vy9sVUzsLxY6G06hnUQxergCAOcSvDng="; sha256 = "eK1Hk+P4pVfv5tk5Nl9GvUjGfcrYO+6mipkqFd8uA74=";
}; };
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

1285
pkgs/servers/zigbee2mqtt/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/servers/zigbee2mqtt/update.sh
View File

@ -13,18 +13,18 @@ fi
ZIGBEE2MQTT=https://github.com/Koenkk/zigbee2mqtt/raw/$TARGET_VERSION ZIGBEE2MQTT=https://github.com/Koenkk/zigbee2mqtt/raw/$TARGET_VERSION
curl -LO $ZIGBEE2MQTT/package.json curl -LO $ZIGBEE2MQTT/package.json
curl -LO $ZIGBEE2MQTT/npm-shrinkwrap.json curl -LO $ZIGBEE2MQTT/package-lock.json
node2nix \ node2nix \
--composition node.nix \ --composition node.nix \
--lock npm-shrinkwrap.json \ --lock package-lock.json \
--development \ --development \
--no-copy-node-env \ --no-copy-node-env \
--node-env ../../development/node-packages/node-env.nix \ --node-env ../../development/node-packages/node-env.nix \
--nodejs-14 \ --nodejs-14 \
--output node-packages.nix --output node-packages.nix
rm package.json npm-shrinkwrap.json rm package.json package-lock.json
( (
cd ../../../ cd ../../../

4
pkgs/tools/networking/godns/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "godns"; pname = "godns";
version = "2.8.3"; version = "2.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TimothyYe"; owner = "TimothyYe";
repo = "godns"; repo = "godns";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-EQ296oFb6C/xA9Ww45PbPyvQQjWxxd/9aDDcfZ4uFcw="; sha256 = "sha256-P3jmpyk53+N/7BhPfLmCiXOoGJv35eZcvrxGqejYin8=";
}; };
vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE="; vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE=";

6
pkgs/tools/nix/alejandra/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "alejandra"; pname = "alejandra";
version = "1.5.0"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kamadorueda"; owner = "kamadorueda";
repo = "alejandra"; repo = "alejandra";
rev = version; rev = version;
sha256 = "sha256-A0ruEdPeKIzGYxyXNACnzaKtQUVc30s2ExTUzdFTcWM="; sha256 = "sha256-imWi48JxT7l/1toc7NElP1/CBEbChTQ3n0gjBz6L7so=";
}; };
cargoSha256 = "sha256-BmpFyVF2fxV3rExI7rpOQlVwHEJNlof44dnUshaO/no="; cargoSha256 = "sha256-pcNU7Wk98LQuRg/ItsJ+dxXcSdYROJVYifF74jIrqEo=";
passthru.tests = { passthru.tests = {
version = testers.testVersion { package = alejandra; }; version = testers.testVersion { package = alejandra; };

2
pkgs/tools/security/metasploit/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
source "https://rubygems.org" source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.4" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.6"

60
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: ed772a23efa7e2a7d7ae6417939e900c66950fd9 revision: cb251272d8937b0b5bc92c5194a3617392b50625
ref: refs/tags/6.2.4 ref: refs/tags/6.2.6
specs: specs:
metasploit-framework (6.2.4) metasploit-framework (6.2.6)
actionpack (~> 6.0) actionpack (~> 6.0)
activerecord (~> 6.0) activerecord (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
@ -100,25 +100,25 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
Ascii85 (1.1.0) Ascii85 (1.1.0)
actionpack (6.1.6) actionpack (6.1.6.1)
actionview (= 6.1.6) actionview (= 6.1.6.1)
activesupport (= 6.1.6) activesupport (= 6.1.6.1)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.6) actionview (6.1.6.1)
activesupport (= 6.1.6) activesupport (= 6.1.6.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activemodel (6.1.6) activemodel (6.1.6.1)
activesupport (= 6.1.6) activesupport (= 6.1.6.1)
activerecord (6.1.6) activerecord (6.1.6.1)
activemodel (= 6.1.6) activemodel (= 6.1.6.1)
activesupport (= 6.1.6) activesupport (= 6.1.6.1)
activesupport (6.1.6) activesupport (6.1.6.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@ -130,13 +130,13 @@ GEM
arel-helpers (2.14.0) arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8) activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.601.0) aws-partitions (1.605.0)
aws-sdk-core (3.131.2) aws-sdk-core (3.131.2)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0) aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1, >= 1.6.1) jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.319.0) aws-sdk-ec2 (1.321.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-iam (1.69.0) aws-sdk-iam (1.69.0)
@ -203,7 +203,7 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
http_parser.rb (0.8.0) http_parser.rb (0.8.0)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.10.0) i18n (1.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
io-console (0.5.11) io-console (0.5.11)
irb (1.3.6) irb (1.3.6)
@ -252,9 +252,9 @@ GEM
metasploit_payloads-mettle (1.0.18) metasploit_payloads-mettle (1.0.18)
method_source (1.0.0) method_source (1.0.0)
mini_portile2 (2.8.0) mini_portile2 (2.8.0)
minitest (5.16.1) minitest (5.16.2)
mqtt (0.5.0) mqtt (0.5.0)
msgpack (1.5.2) msgpack (1.5.3)
multi_json (1.15.0) multi_json (1.15.0)
mustermann (1.1.1) mustermann (1.1.1)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
@ -266,15 +266,15 @@ GEM
digest digest
net-protocol net-protocol
timeout timeout
net-ssh (6.1.0) net-ssh (7.0.1)
network_interface (0.0.2) network_interface (0.0.2)
nexpose (7.3.0) nexpose (7.3.0)
nio4r (2.5.8) nio4r (2.5.8)
nokogiri (1.13.6) nokogiri (1.13.7)
mini_portile2 (~> 2.8.0) mini_portile2 (~> 2.8.0)
racc (~> 1.4) racc (~> 1.4)
nori (2.6.0) nori (2.6.0)
octokit (4.25.0) octokit (5.1.0)
faraday (>= 1, < 3) faraday (>= 1, < 3)
sawyer (~> 0.9) sawyer (~> 0.9)
openssl-ccm (1.2.2) openssl-ccm (1.2.2)
@ -295,19 +295,19 @@ GEM
puma (5.6.4) puma (5.6.4)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.6.0) racc (1.6.0)
rack (2.2.3.1) rack (2.2.4)
rack-protection (2.2.0) rack-protection (2.2.0)
rack rack
rack-test (2.0.0) rack-test (2.0.2)
rack (>= 1.3) rack (>= 1.3)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.4.3) rails-html-sanitizer (1.4.3)
loofah (~> 2.3) loofah (~> 2.3)
railties (6.1.6) railties (6.1.6.1)
actionpack (= 6.1.6) actionpack (= 6.1.6.1)
activesupport (= 6.1.6) activesupport (= 6.1.6.1)
method_source method_source
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0)
@ -331,7 +331,7 @@ GEM
metasm metasm
rex-arch rex-arch
rex-text rex-text
rex-exploitation (0.1.30) rex-exploitation (0.1.32)
jsobfu jsobfu
metasm metasm
rex-arch rex-arch
@ -363,7 +363,7 @@ GEM
rex-socket rex-socket
rex-text rex-text
rex-struct2 (0.1.3) rex-struct2 (0.1.3)
rex-text (0.2.37) rex-text (0.2.38)
rex-zip (0.1.4) rex-zip (0.1.4)
rex-text rex-text
rexml (3.2.5) rexml (3.2.5)
@ -371,7 +371,7 @@ GEM
ruby-macho (3.0.0) ruby-macho (3.0.0)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
ruby_smb (3.1.4) ruby_smb (3.1.6)
bindata bindata
openssl-ccm openssl-ccm
openssl-cmac openssl-cmac

4
pkgs/tools/security/metasploit/default.nix
View File

@ -15,13 +15,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.2.4"; version = "6.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "sha256-9JzavB6VMEM7UFa30WlHdZ/hajOly+JX75I+3DECOqM="; sha256 = "sha256-GppCjA35d4cvCuGE29czAu4JVCq3l2CHIRFkKWNSNH0=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

82
pkgs/tools/security/metasploit/gemset.nix
View File

@ -4,50 +4,50 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1walbq04v4qvgnz39cbfhz9bzhsf14q1h7gd0kgjy3frld6ysrhb"; sha256 = "1m5x42s72mik9xkrgbway4ra139k71p2dfxcvg5gwdmac8maiq7k";
type = "gem"; type = "gem";
}; };
version = "6.1.6"; version = "6.1.6.1";
}; };
actionview = { actionview = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "05r0h7pvc0szqmgnra0j3j8ap7dmiyw9s6qksx41v5cxknmfi0h3"; sha256 = "0syh8jwih5qvv87zfyzl37rz6sc1prhy6gia95bn76zyqk9cfzx8";
type = "gem"; type = "gem";
}; };
version = "6.1.6"; version = "6.1.6.1";
}; };
activemodel = { activemodel = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1f0ai51icvvx5q0jd1l89k0dlwzpsrkqlj6x43f8qc4bd1ya9glx"; sha256 = "1qm3whcaiv5kkgp6plyxi6xa6n3sap18m6w1lfwvr93xb8v57693";
type = "gem"; type = "gem";
}; };
version = "6.1.6"; version = "6.1.6.1";
}; };
activerecord = { activerecord = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0khjnkvmiyap1g3rvw9hp16mzai4smqcg5hxhq28pll25ljzxdbp"; sha256 = "1c6hcy2affwkkggd49v1g1j6ahijikbcxrcksngm9silmc24ixw2";
type = "gem"; type = "gem";
}; };
version = "6.1.6"; version = "6.1.6.1";
}; };
activesupport = { activesupport = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw"; sha256 = "0vb0xi7yvgfqky9h4clyncb886mr1wvz9amk7d9ffmgpwrpzvjaz";
type = "gem"; type = "gem";
}; };
version = "6.1.6"; version = "6.1.6.1";
}; };
addressable = { addressable = {
groups = ["default"]; groups = ["default"];
@ -104,10 +104,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ydlikjhhsiqk7v8k7q1f036fd7yrmimasw40rnwcj3f1747lygd"; sha256 = "15ff3d8ijqh7har1cgwv2aiq77gkp8jyb8km15vz4kbckf7jps2m";
type = "gem"; type = "gem";
}; };
version = "1.601.0"; version = "1.605.0";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
@ -124,10 +124,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0b42j6hdw62qz02j1llqp4c4y0dx39x3wfk1nprxwl27sdvy1mgk"; sha256 = "0a4j83p1a8x9zdrmlnvqr9g53wmrf1dcf7i5glyamsj4lmqxlnv1";
type = "gem"; type = "gem";
}; };
version = "1.319.0"; version = "1.321.0";
}; };
aws-sdk-iam = { aws-sdk-iam = {
groups = ["default"]; groups = ["default"];
@ -494,10 +494,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
type = "gem"; type = "gem";
}; };
version = "1.10.0"; version = "1.12.0";
}; };
io-console = { io-console = {
groups = ["default"]; groups = ["default"];
@ -614,12 +614,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "ed772a23efa7e2a7d7ae6417939e900c66950fd9"; rev = "cb251272d8937b0b5bc92c5194a3617392b50625";
sha256 = "18rs08qxqgljxxby5jx56dmf37vm8xlx3dsna0xl6c4m3sydm77l"; sha256 = "0z9la9ijjr0i463n15xp59a0kvh26gbxp17118pqfxzr1n6456hs";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.2.4"; version = "6.2.6";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -686,10 +686,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "08z6rgs1jgbc032843mwg3fayvzn4hihz8bl2gp87pf7z02kw5f3"; sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1";
type = "gem"; type = "gem";
}; };
version = "5.16.1"; version = "5.16.2";
}; };
mqtt = { mqtt = {
groups = ["default"]; groups = ["default"];
@ -706,10 +706,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1hpj9mm31a5aw5qys2kglfl8jv74bkwkc5pfrpp3als89hgkznqy"; sha256 = "0bqf9yp0kvcmqskixzhg66w922z280bkyfq41id6kk5nixlnmwg7";
type = "gem"; type = "gem";
}; };
version = "1.5.2"; version = "1.5.3";
}; };
multi_json = { multi_json = {
groups = ["default"]; groups = ["default"];
@ -776,10 +776,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; sha256 = "1qp3i8bi7ji1np0530bp2p9zrrn6galvmbsivxwpkjdpjdyn19sr";
type = "gem"; type = "gem";
}; };
version = "6.1.0"; version = "7.0.1";
}; };
network_interface = { network_interface = {
groups = ["default"]; groups = ["default"];
@ -817,10 +817,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; sha256 = "0lhhnqch8r9n1835p6pvmg4m2r4hb98nkfxrpr4yf6246d9xg8bc";
type = "gem"; type = "gem";
}; };
version = "1.13.6"; version = "1.13.7";
}; };
nori = { nori = {
groups = ["default"]; groups = ["default"];
@ -837,10 +837,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0yqs5cn07lwh7nhc6zh92rymk0aran90zfjgcbvpgsr2mjsyq8rc"; sha256 = "1jxx0pxm46vyrc3zp684m5b7xvw12ca2gnhnwizyvh15d65aribm";
type = "gem"; type = "gem";
}; };
version = "4.25.0"; version = "5.1.0";
}; };
openssl-ccm = { openssl-ccm = {
groups = ["default"]; groups = ["default"];
@ -957,10 +957,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa";
type = "gem"; type = "gem";
}; };
version = "2.2.3.1"; version = "2.2.4";
}; };
rack-protection = { rack-protection = {
groups = ["default"]; groups = ["default"];
@ -977,10 +977,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "01igqmm7xqw6vg6x28phivl044n2crq0bcfjrxr4979kzxydgh8h"; sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd";
type = "gem"; type = "gem";
}; };
version = "2.0.0"; version = "2.0.2";
}; };
rails-dom-testing = { rails-dom-testing = {
groups = ["default"]; groups = ["default"];
@ -1007,10 +1007,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16dyjmy42v51acmx1ba2xxncvx368ss5rww6bsf1lwgyk4vqn41h"; sha256 = "0cwpjj9inak65cvs9wyhpjdsx1xajzbiy25p397a8kmyvkrcvzms";
type = "gem"; type = "gem";
}; };
version = "6.1.6"; version = "6.1.6.1";
}; };
rake = { rake = {
groups = ["default"]; groups = ["default"];
@ -1107,10 +1107,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0x1gqdqvsgll1r5x6cz4ica24nb3ph8y36mf3hwabgb1a6y3s0zr"; sha256 = "0646y7nbc54ljgw28gmlsqbmwxs1hs5v3h24arj4jrnvqrq9bw71";
type = "gem"; type = "gem";
}; };
version = "0.1.30"; version = "0.1.32";
}; };
rex-java = { rex-java = {
groups = ["default"]; groups = ["default"];
@ -1227,10 +1227,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xzym86blrah88qyi1m9f7pc53m6ssmr4d1znc8izbh90z38y51y"; sha256 = "10jxl3p3ndhb5cfj5y5qbiv82d3zn9wn0sr8q32cqlib4wnwx254";
type = "gem"; type = "gem";
}; };
version = "0.2.37"; version = "0.2.38";
}; };
rex-zip = { rex-zip = {
groups = ["default"]; groups = ["default"];
@ -1297,10 +1297,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0cvavqvgwq2gcrg0gh8fdzyn9zzpkyh9g07jz6cn7zzxzgwxfn9v"; sha256 = "0yvm8qg4i6qgdgqh5j4k3vw5hz9zl8w06jxhmwx69l7gvjxqi2fr";
type = "gem"; type = "gem";
}; };
version = "3.1.4"; version = "3.1.6";
}; };
rubyntlm = { rubyntlm = {
groups = ["default"]; groups = ["default"];