b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-10-19 18:09:25 +00:00 committed by GitHub
parent bbaff9a043 9be64ddaff
commit 958cbc7d51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 1261 additions and 1204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/continuous-integration/github-runner/options.nix
View file

@ -42,13 +42,14 @@ with lib;
type = types.path; type = types.path;
description = lib.mdDoc '' description = lib.mdDoc ''
The full path to a file which contains either a runner registration token or a The full path to a file which contains either a runner registration token or a
personal access token (PAT). (fine-grained) personal access token (PAT).
The file should contain exactly one line with the token without any newline. The file should contain exactly one line with the token without any newline.
If a registration token is given, it can be used to re-register a runner of the same If a registration token is given, it can be used to re-register a runner of the same
name but is time-limited. If the file contains a PAT, the service creates a new name but is time-limited. If the file contains a PAT, the service creates a new
registration token on startup as needed. Make sure the PAT has a scope of registration token on startup as needed. Make sure the PAT has a scope of
`admin:org` for organization-wide registrations or a scope of `admin:org` for organization-wide registrations or a scope of
`repo` for a single repository. `repo` for a single repository. Fine-grained PATs need read and write permission
to the "Adminstration" resources.
Changing this option or the file's content triggers a new runner registration. Changing this option or the file's content triggers a new runner registration.
''; '';

4
nixos/modules/services/continuous-integration/github-runner/service.nix
View file

@ -134,10 +134,10 @@ with lib;
${optionalString (cfg.runnerGroup != null) "--runnergroup ${escapeShellArg cfg.runnerGroup}"} ${optionalString (cfg.runnerGroup != null) "--runnergroup ${escapeShellArg cfg.runnerGroup}"}
${optionalString cfg.ephemeral "--ephemeral"} ${optionalString cfg.ephemeral "--ephemeral"}
) )
# If the token file contains a PAT (i.e., it starts with "ghp_"), we have to use the --pat option, # If the token file contains a PAT (i.e., it starts with "ghp_" or "github_pat_"), we have to use the --pat option,
# if it is not a PAT, we assume it contains a registration token and use the --token option # if it is not a PAT, we assume it contains a registration token and use the --token option
token=$(<"${newConfigTokenPath}") token=$(<"${newConfigTokenPath}")
if [[ "$token" =~ ^ghp_* ]]; then if [[ "$token" =~ ^ghp_* ]] || [[ "$token" =~ ^github_pat_* ]]; then
args+=(--pat "$token") args+=(--pat "$token")
else else
args+=(--token "$token") args+=(--token "$token")

2
nixos/modules/services/monitoring/prometheus/exporters/kea.nix
View file

@ -35,7 +35,7 @@ in {
${pkgs.prometheus-kea-exporter}/bin/kea-exporter \ ${pkgs.prometheus-kea-exporter}/bin/kea-exporter \
--address ${cfg.listenAddress} \ --address ${cfg.listenAddress} \
--port ${toString cfg.port} \ --port ${toString cfg.port} \
${concatStringsSep " \\n" cfg.controlSocketPaths} ${concatStringsSep " " cfg.controlSocketPaths}
''; '';
SupplementaryGroups = [ "kea" ]; SupplementaryGroups = [ "kea" ];
RestrictAddressFamilies = [ RestrictAddressFamilies = [

23
nixos/tests/prometheus-exporters.nix
View file

@ -374,25 +374,34 @@ let
}; };
kea = let kea = let
controlSocketPath = "/run/kea/dhcp6.sock"; controlSocketPathV4 = "/run/kea/dhcp4.sock";
controlSocketPathV6 = "/run/kea/dhcp6.sock";
in in
{ {
exporterConfig = { exporterConfig = {
enable = true; enable = true;
controlSocketPaths = [ controlSocketPaths = [
controlSocketPath controlSocketPathV4
controlSocketPathV6
]; ];
}; };
metricProvider = { metricProvider = {
systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6-server.service" ];
services.kea = { services.kea = {
dhcp4 = {
enable = true;
settings = {
control-socket = {
socket-type = "unix";
socket-name = controlSocketPathV4;
};
};
};
dhcp6 = { dhcp6 = {
enable = true; enable = true;
settings = { settings = {
control-socket = { control-socket = {
socket-type = "unix"; socket-type = "unix";
socket-name = controlSocketPath; socket-name = controlSocketPathV6;
}; };
}; };
}; };
@ -400,8 +409,10 @@ let
}; };
exporterTest = '' exporterTest = ''
wait_for_unit("kea-dhcp4-server.service")
wait_for_unit("kea-dhcp6-server.service") wait_for_unit("kea-dhcp6-server.service")
wait_for_file("${controlSocketPath}") wait_for_file("${controlSocketPathV4}")
wait_for_file("${controlSocketPathV6}")
wait_for_unit("prometheus-kea-exporter.service") wait_for_unit("prometheus-kea-exporter.service")
wait_for_open_port(9547) wait_for_open_port(9547)
succeed( succeed(

6
pkgs/applications/blockchains/polkadot/default.nix
View file

@ -10,13 +10,13 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "polkadot"; pname = "polkadot";
version = "0.9.29"; version = "0.9.30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paritytech"; owner = "paritytech";
repo = "polkadot"; repo = "polkadot";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/IJs3153KzhGf5I6LueljzRhDl/PYYlPseF6wCh+u3M="; sha256 = "sha256-lnClnra69vfszPjnrOldSkd3kgC34bgociicC6Kpupw=";
# the build process of polkadot requires a .git folder in order to determine # the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string. # the git commit hash that is being built and add it to the version string.
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
''; '';
}; };
cargoSha256 = "sha256-mI8VvTlM9ynstDBC0ubQkzg3D2ZXuWqJGS/Y23D6dU0="; cargoSha256 = "sha256-mnfA0ecfmMMAy1TZeydbep6hCIu9yZQY7/c5hb1OMGc=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ];

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/22.08.1/src -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/release-service/22.08.2/src -A '*.tar.xz' )

1864
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View file

@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then { versions = if stdenv.isLinux then {
stable = "0.0.20"; stable = "0.0.20";
ptb = "0.0.29"; ptb = "0.0.29";
canary = "0.0.139"; canary = "0.0.140";
} else { } else {
stable = "0.0.264"; stable = "0.0.264";
ptb = "0.0.59"; ptb = "0.0.59";
@ -22,7 +22,7 @@ let
}; };
canary = fetchurl { canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-/PfO0TWRxMrK+V1XkYmdaXQ6SfyJNBFETaR9oV90itI="; sha256 = "sha256-AEbjkAMeOJ48RVgbVj35Rp26klCsCsDCX+VD5u1xCM0=";
}; };
}; };
aarch64-darwin = { aarch64-darwin = {

4
pkgs/applications/networking/nextcloud-client/default.nix
View file

@ -26,7 +26,7 @@
mkDerivation rec { mkDerivation rec {
pname = "nextcloud-client"; pname = "nextcloud-client";
version = "3.6.0"; version = "3.6.1";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -34,7 +34,7 @@ mkDerivation rec {
owner = "nextcloud"; owner = "nextcloud";
repo = "desktop"; repo = "desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-wAxq5xFlofn2xEguvewMvGcel9O+CN/1AycR3tv/xMA="; sha256 = "sha256-RCYiUxTZSuZbDocueW0d8PdsRTR9bTjDgx0H53UGDP4=";
}; };
patches = [ patches = [

7
pkgs/development/beam-modules/fetch-rebar-deps.nix
View file

@ -15,11 +15,12 @@ stdenv.mkDerivation ({
dontUnpack = true; dontUnpack = true;
dontConfigure = true; dontConfigure = true;
dontBuild = true;
dontFixup = true; dontFixup = true;
prePhases = '' buildPhase = ''
cp ${src} . cp -r ${src} src
chmod -R u+w src
cd src
HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps
''; '';

6
pkgs/development/compilers/hvm/default.nix
View file

@ -9,14 +9,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "hvm"; pname = "hvm";
version = "0.1.88"; version = "0.1.89";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-VnVyTUOtoplt0Zd5VkCe/h85/Mqcz7lgeIiZVD+Vrxk="; sha256 = "sha256-xPF8HW4QFXLLjg2HO5Pl+uQ44XCdAHc6koVpVXxN6dE=";
}; };
cargoSha256 = "sha256-4D63OEz7/2pJGPXiFEwl6ggaV2DNZcoN//BM7H0Sp7I="; cargoSha256 = "sha256-dDSmiMwDbVDfStXamQvOMBBO5MiuDFhgzWPx0oYwzcM=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

25
pkgs/development/compilers/kind2/default.nix
View file

@ -1,15 +1,32 @@
{ lib, rustPlatform, fetchCrate }: { lib
, rustPlatform
, fetchCrate
, pkg-config
, openssl
, stdenv
, Security
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "kind2"; pname = "kind2";
version = "0.2.77"; version = "0.2.79";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-drWAWiSALq8rb3J2phNE/dt4e6xmJY7Ob8cES1kYEPo="; sha256 = "sha256-QRPk7BpGVvhGHcDxCWJtJp5d3QOq72ESt5VbaSq5jBU=";
}; };
cargoSha256 = "sha256-rF0TvNWE90sUqslBGPnGmD6mZFPlCCkM1jyuFt8n8Nw="; cargoSha256 = "sha256-i7RAJmhUQzjMe9w7z7hPrpiap64L12Shu4DL+e5A6oc=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
# these tests are flaky
checkFlags = [
"--skip=test_checker"
"--skip=test_run_hvm"
];
meta = with lib; { meta = with lib; {
description = "A functional programming language and proof assistant"; description = "A functional programming language and proof assistant";

7
pkgs/development/python-modules/aioswitcher/default.nix
View file

@ -8,19 +8,22 @@
, pytest-resource-path , pytest-resource-path
, pytest-sugar , pytest-sugar
, pytestCheckHook , pytestCheckHook
, pythonOlder
, time-machine , time-machine
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioswitcher"; pname = "aioswitcher";
version = "3.0.3"; version = "3.1.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TomerFi"; owner = "TomerFi";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-CHyJuIqJpO7wUmOyeDXa4oBvxMthC96OCECtg13gqe0="; hash = "sha256-UnKi9/+BmQoJcv/Mlv9C9FYUgMy3J8KCGRrWPMGrM8Y=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/aiounifi/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiounifi"; pname = "aiounifi";
version = "39"; version = "40";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Kane610"; owner = "Kane610";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-FZ8Pu0PHSBC7azzVoSN+UM4UsVG/HRSS01Ys+DTfxRU="; hash = "sha256-PJ3AIoqu0cUs8IZqY9O2e+GuPd4vjLn9VruKyPxVe4A=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

9
pkgs/development/python-modules/atom/default.nix
View file

@ -5,18 +5,21 @@
, future , future
, cppy , cppy
, pytestCheckHook , pytestCheckHook
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "atom"; pname = "atom";
version = "0.8.1"; version = "0.8.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nucleic"; owner = "nucleic";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-odthydKmgbOXYT8YAIn5MlFfH/BD8MMkuRYaiI8OZD4="; hash = "sha256-45c17lewJPo39ZWMaE8kyOo6n0A9f0m58TbMAiNAqeg=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -43,8 +46,8 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Memory efficient Python objects"; description = "Memory efficient Python objects";
maintainers = [ maintainers.bhipple ];
homepage = "https://github.com/nucleic/atom"; homepage = "https://github.com/nucleic/atom";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ bhipple ];
}; };
} }

4
pkgs/development/python-modules/aws-lambda-builders/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aws-lambda-builders"; pname = "aws-lambda-builders";
version = "1.19.0"; version = "1.20.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "awslabs"; owner = "awslabs";
repo = "aws-lambda-builders"; repo = "aws-lambda-builders";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-mWb/24/9O8HvzblgudbVaLDR1igTkYpWZn53VqN2vbg="; hash = "sha256-+XOxz3xWIYacfUizztd4mH5kvBw/dkN9WiS38dONs7Y=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
View file

@ -11,15 +11,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-containerservice"; pname = "azure-mgmt-containerservice";
version = "20.4.0"; version = "20.5.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "sha256-X2Pz7Rx5utwOfiG2wLbdloQF7wM9bF80J5EOaB4k6jQ="; hash = "sha256-tSlupPxnMkvBDBXAvZUGlzUhkODPpL31jAPTvjrKUFg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

12
pkgs/development/python-modules/azure-storage-file-share/default.nix
View file

@ -2,30 +2,32 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pythonOlder , pythonOlder
# pythonPackages
, azure-core , azure-core
, cryptography , cryptography
, isodate
, msrest , msrest
, typing-extensions
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-storage-file-share"; pname = "azure-storage-file-share";
version = "12.10.0"; version = "12.10.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
hash = "sha256-ANp31hkDL4TGoeP6Or9fI0LjYGyVMQJfuzd8RLrYZxI="; hash = "sha256-Vnm72cdg/9P+J3Scnj5jcG6kLCdIVMGnxnU9an2oxGQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
azure-core azure-core
cryptography cryptography
isodate
msrest msrest
typing-extensions
]; ];
# requires checkout from monorepo # requires checkout from monorepo

46
pkgs/development/python-modules/dask-jobqueue/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, buildPythonPackage , buildPythonPackage
, cryptography
, dask , dask
, distributed , distributed
, docrep , docrep
@ -12,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dask-jobqueue"; pname = "dask-jobqueue";
version = "0.8.0"; version = "0.8.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-VCD6Oos9aSkbrzymQnqm2RV5uFzTj05VgPuhJ5PpyAk="; hash = "sha256-Fv0bZGoHOtPedd3hKg3+UpuDbyGjvbzuKoi+8k6REqc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -29,18 +30,47 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
cryptography
pytest-asyncio pytest-asyncio
pytestCheckHook pytestCheckHook
]; ];
pytestFlagsArray = [
# Do not run entire tests suite (requires slurm, sge, etc.)
"dask_jobqueue/tests/test_jobqueue_core.py"
];
disabledTests = [ disabledTests = [
# Tests have additional requirements (e.g., sge, etc.)
"test_adapt_parameters"
"test_adapt"
"test_adaptive_cores_mem"
"test_adaptive_grouped"
"test_adaptive"
"test_basic"
"test_basic_scale_edge_cases"
"test_cluster_error_scheduler_arguments_should_use_scheduler_options"
"test_cluster_has_cores_and_memory"
"test_cluster"
"test_command_template"
"test_complex_cancel_command"
"test_config"
"test_dashboard_link"
"test_default_number_of_worker_processes"
"test_deprecation_env_extra"
"test_deprecation_extra"
"test_deprecation_job_extra"
"test_different_interfaces_on_scheduler_and_workers"
"test_docstring_cluster"
"test_extra_args_broken_cancel"
"test_forward_ip"
"test_import_scheduler_options_from_config" "test_import_scheduler_options_from_config"
"test_job"
"test_log_directory"
"test_scale_cores_memory"
"test_scale_grouped"
"test_scheduler_options_interface"
"test_scheduler_options"
"test_security" "test_security"
"test_shebang_settings"
"test_use_stdin"
"test_worker_name_uses_cluster_name"
"test_wrong_parameter_error"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

15
pkgs/development/python-modules/django-celery-beat/default.nix
View file

@ -9,15 +9,20 @@
, pytest-timeout , pytest-timeout
, pytest-django , pytest-django
, case , case
, pytestCheckHook }: , pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-celery-beat"; pname = "django-celery-beat";
version = "2.3.0"; version = "2.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-uiT4btlWug7itDI3pJMD6/Wqfg+wzLfgVCt+MaRj3Lo="; hash = "sha256-WO/pRg5Dc6JBwrPYOVGPKaKK4ZvICo26INogTH6lBhM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -40,7 +45,9 @@ buildPythonPackage rec {
"t/unit/test_schedulers.py" "t/unit/test_schedulers.py"
]; ];
pythonImportsCheck = [ "django_celery_beat" ]; pythonImportsCheck = [
"django_celery_beat"
];
meta = with lib; { meta = with lib; {
description = "Celery Periodic Tasks backed by the Django ORM"; description = "Celery Periodic Tasks backed by the Django ORM";

30
pkgs/development/python-modules/dnspythonchia/default.nix
View file

@ -1,30 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
pname = "dnspythonchia";
version = "2.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-iYaPYqOZ33R2DUXgIHxsewLi79iB5ja0WHOGkamffZk=";
};
nativeBuildInputs = [ setuptools-scm ];
# needs networking for some tests
doCheck = false;
pythonImportsCheck = [ "dns" ];
meta = with lib; {
description = "A DNS toolkit for Python (Chia Network fork)";
homepage = "https://www.chia.net/";
license = with licenses; [ isc ];
maintainers = teams.chia.members;
};
}

6
pkgs/development/python-modules/niaarm/default.nix
View file

@ -11,16 +11,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "NiaARM"; pname = "NiaARM";
version = "0.2.0"; version = "0.2.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "firefly-cpp"; owner = "firefly-cpp";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-tO/9dDgPPL5fkFm/U9AhyydXW+dtem+Q3H2uKPAXzno="; hash = "sha256-IY72hDklPkGjb2zo7Wf0MBiPn/jHtyUKW9D0jxA0P54=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

14
pkgs/development/python-modules/pyupgrade/default.nix
View file

@ -8,26 +8,26 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyupgrade"; pname = "pyupgrade";
version = "3.0.0"; version = "3.1.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "asottile"; owner = "asottile";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-x85bu0dnhYwQU1l7mPH6lr9p6aO7AHG0wLvI/6MYe88="; hash = "sha256-OzU3Qv6qdEw0hJdbQ7Q3T6zOGpUt2uZyfy1Fxm3GT0Q=";
}; };
checkInputs = [
pytestCheckHook
];
propagatedBuildInputs = [ propagatedBuildInputs = [
tokenize-rt tokenize-rt
]; ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ pythonImportsCheck = [
"pyupgrade" "pyupgrade"
]; ];

37
pkgs/development/python-modules/runway-python/default.nix
View file

@ -19,8 +19,8 @@
, urllib3 , urllib3
, wget , wget
, deepdiff , deepdiff
, pytestCheckHook
, pytest-cov , pytest-cov
, pytestCheckHook
, pythonOlder , pythonOlder
, websocket-client , websocket-client
}: }:
@ -28,13 +28,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "runway-python"; pname = "runway-python";
version = "0.6.1"; version = "0.6.1";
format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "runwayml"; owner = "runwayml";
repo = "model-sdk"; repo = "model-sdk";
rev = version; rev = version;
sha256 = "1ww2wai1qnly8i7g42vhkkbs4yp7wi9x4fjdxsg9fl3izjra0zs2"; hash = "sha256-Qn+gsvxxUJee7k060lPk53qi15xwC/JORJ5aHKLigvM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -54,32 +56,39 @@ buildPythonPackage rec {
unidecode unidecode
urllib3 urllib3
wget wget
]; ] ++ urllib3.optional-dependencies.secure;
pythonImportsCheck = [
"runway"
];
checkInputs = [ checkInputs = [
deepdiff deepdiff
pytestCheckHook
pytest-cov pytest-cov
pytestCheckHook
websocket-client websocket-client
]; ];
postPatch = ''
# Build fails with:
# ERROR: No matching distribution found for urllib3-secure-extra; extra == "secure"
substituteInPlace requirements.txt \
--replace "urllib3[secure]>=1.25.7" "urllib3"
'';
disabledTests = [ disabledTests = [
# these tests require network # These tests require network
"test_file_deserialization_remote" "test_file_deserialization_remote"
"test_file_deserialization_absolute_directory" "test_file_deserialization_absolute_directory"
"test_file_deserialization_remote_directory" "test_file_deserialization_remote_directory"
# Fails with a decoding error at the moment # Fails with a decoding error at the moment
"test_inference_async" "test_inference_async"
] ++ lib.optionals (pythonAtLeast "3.9") [ ] ++ lib.optionals (pythonAtLeast "3.9") [
# AttributeError: module 'base64' has no attribute 'decodestring # AttributeError: module 'base64' has no attribute 'decodestring
# https://github.com/runwayml/model-sdk/issues/99 # https://github.com/runwayml/model-sdk/issues/99
"test_image_serialize_and_deserialize" "test_image_serialize_and_deserialize"
"test_segmentation_serialize_and_deserialize_colormap" "test_segmentation_serialize_and_deserialize_colormap"
"test_segmentation_serialize_and_deserialize_labelmap" "test_segmentation_serialize_and_deserialize_labelmap"
];
pythonImportsCheck = [
"runway"
]; ];
meta = { meta = {

6
pkgs/development/tools/build-managers/sbt-extras/default.nix
View file

@ -3,14 +3,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sbt-extras"; pname = "sbt-extras";
rev = "52fa7de64091bc687fe11e3a8c660bbbfb42742f"; rev = "14623b935766e11a0a3f6ab1f686bb1c5d244b21";
version = "2022-10-03"; version = "2022-10-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paulp"; owner = "paulp";
repo = "sbt-extras"; repo = "sbt-extras";
inherit rev; inherit rev;
sha256 = "TMp5qxUf7U3re8HKXvtArEJMtn4iZy4zs4SqFTxX5X4="; sha256 = "nwhNevyLOzkYdpm1AK5I4ByJ7VdnlgwcSjXV11pzZkw=";
}; };
dontBuild = true; dontBuild = true;

6
pkgs/development/tools/gosec/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gosec"; pname = "gosec";
version = "2.13.1"; version = "2.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "securego"; owner = "securego";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-a7SZe6n3MQIjkOtFPavFYmBadHwsShjWdzMzOGZIb9s="; sha256 = "sha256-OPMXU24INpdeQrNlRIPJBag6TtHFFIdxlBTfMgRZc2U=";
}; };
vendorSha256 = "sha256-D4wWofYz63c0yXIg4xnolXzWudG17dRqdjUHYhMrtt4="; vendorSha256 = "sha256-F/wtDYPF4qUujU+fJx2v9uwlkxQ1LMPECKxHR4EB1zk=";
subPackages = [ subPackages = [
"cmd/gosec" "cmd/gosec"

6
pkgs/development/tools/rust/cargo-make/default.nix
View file

@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-make"; pname = "cargo-make";
version = "0.36.1"; version = "0.36.2";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-kezwewPdHGcATPaU7wvbunVQ9a2Orf5CuVCue8Ux84I="; sha256 = "sha256-QhXBlGt8PFAsweYHxqk6y/BRsOURXUHU7QWQpNcFMyk=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
cargoSha256 = "sha256-ZGNR2xAGsdv4lNnGckB/n5mhzetz6Gn3z2TpAvnvsjU="; cargoSha256 = "sha256-JUdzgHSlCCelPFXdeUCrt8LntsnrgjuLah0+m5ll1oo=";
# Some tests fail because they need network access. # Some tests fail because they need network access.
# However, Travis ensures a proper build. # However, Travis ensures a proper build.

20
pkgs/development/tools/rust/cargo-modules/default.nix
View file

@ -1,30 +1,28 @@
{ lib, rustPlatform, fetchFromGitHub, stdenv, CoreFoundation, CoreServices }: { lib, rustPlatform, fetchCrate, stdenv, CoreFoundation, CoreServices }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-modules"; pname = "cargo-modules";
version = "0.5.11"; version = "0.5.12";
src = fetchFromGitHub { src = fetchCrate {
owner = "regexident"; inherit pname version;
repo = pname; sha256 = "sha256-Fm3D1VnudZhXpH7ymQNpViwwODvXYeO/e2xT3XXfclk=";
rev = version;
sha256 = "sha256-dxy46ls0n7j2uax+djqB9Zy/uGgV37w5K1Zc8Wzd1Vc=";
}; };
cargoSha256 = "sha256-2Q4pGnMo4FiPPGz2XXOv6+zB5DxHA8oEqztidO2Vvyw="; cargoSha256 = "sha256-PiYonf+aD+Q3mWtP+7NDu9wu3vKrMRAlYh94fXLMWD8=";
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
CoreFoundation CoreFoundation
CoreServices CoreServices
]; ];
# the crate version doesn't include all the files required to run tests
doCheck = false;
meta = with lib; { meta = with lib; {
description = "A cargo plugin for showing a tree-like overview of a crate's modules"; description = "A cargo plugin for showing a tree-like overview of a crate's modules";
homepage = "https://github.com/regexident/cargo-modules"; homepage = "https://github.com/regexident/cargo-modules";
license = with licenses; [ mpl20 ]; license = with licenses; [ mpl20 ];
# all tests fail with:
# thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: "tests run with disabled concurrency, automatic snapshot name generation is not supported. Consider using the \"backtrace\" feature of insta which tries to recover test names from the call stack."', /private/tmp/nix-build-cargo-modules-0.5.9.drv-0/cargo-modules-0.5.9-vendor.tar.gz/insta/src/runtime.rs:908:22
broken = (stdenv.isDarwin && stdenv.isx86_64);
maintainers = with maintainers; [ figsoda rvarago ]; maintainers = with maintainers; [ figsoda rvarago ];
}; };
} }

13
pkgs/misc/drivers/sc-controller/default.nix
View file

@ -1,5 +1,6 @@
{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook { lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook
, pytestCheckHook , pytestCheckHook
, fetchpatch
, gtk3, gobject-introspection, libappindicator-gtk3, librsvg , gtk3, gobject-introspection, libappindicator-gtk3, librsvg
, evdev, pygobject3, pylibacl, bluez, vdf , evdev, pygobject3, pylibacl, bluez, vdf
, linuxHeaders , linuxHeaders
@ -8,13 +9,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "sc-controller"; pname = "sc-controller";
version = "0.4.8.7"; version = "0.4.8.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ryochan7"; owner = "Ryochan7";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "03514sb1spaxdr7x1gq7b54z74in4kd060adj6sq1xjj6d9b297i"; sha256 = "sha256-ym5fkOTRhibBaUqT0+p/jyqqKOVsyMz5INgfkoz0IJA=";
}; };
# see https://github.com/NixOS/nixpkgs/issues/56943 # see https://github.com/NixOS/nixpkgs/issues/56943
@ -28,6 +29,14 @@ buildPythonApplication rec {
checkInputs = [ pytestCheckHook ]; checkInputs = [ pytestCheckHook ];
patches = [
# Fix a broken test
(fetchpatch {
url = "https://github.com/Ryochan7/sc-controller/pull/73.patch";
sha256 = "sha256-qU8hIReZE3cEPCMOFc4RCUCIhiS0gJ3PushMkfDlPns=";
})
];
postPatch = '' postPatch = ''
substituteInPlace scc/paths.py --replace sys.prefix "'$out'" substituteInPlace scc/paths.py --replace sys.prefix "'$out'"
substituteInPlace scc/uinput.py --replace /usr/include ${linuxHeaders}/include substituteInPlace scc/uinput.py --replace /usr/include ${linuxHeaders}/include

9
pkgs/servers/invidious/default.nix
View file

@ -68,7 +68,14 @@ crystal.buildCrystalPackage rec {
shardsFile = ./shards.nix; shardsFile = ./shards.nix;
crystalBinaries.invidious = { crystalBinaries.invidious = {
src = "src/invidious.cr"; src = "src/invidious.cr";
options = [ "--release" "--progress" "--verbose" "--no-debug" "-Dskip_videojs_download" ]; options = [
"--release"
"--progress"
"--verbose"
"--no-debug"
"-Dskip_videojs_download"
"-Ddisable_quic"
];
}; };
postConfigure = '' postConfigure = ''

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View file

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2022-10-14"; version = "2022-10-19";
pname = "oh-my-zsh"; pname = "oh-my-zsh";
rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; rev = "a7d910c3a61d8599f748a8ddae59ecdd9424022a";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
owner = "ohmyzsh"; owner = "ohmyzsh";
repo = "ohmyzsh"; repo = "ohmyzsh";
sha256 = "qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw="; sha256 = "BWpvRkUXQhP1VLrlTBqqXvycyPFZaIZmgMfrkqIugSY=";
}; };
strictDeps = true; strictDeps = true;

4
pkgs/tools/networking/dnsproxy/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "dnsproxy"; pname = "dnsproxy";
version = "0.45.4"; version = "0.46.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AdguardTeam"; owner = "AdguardTeam";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AHsbp9eWLzIJZtn1CNBUE2dwAmBfNmWZ926jB84PEoQ="; sha256 = "sha256-2Oa94dOvvNyrm0CA8rjVPo4smkGpK6yTQFRewNvHYdY=";
}; };
vendorSha256 = null; vendorSha256 = null;

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.16" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.22"

100
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: 0a155b3db11d611a08e58861bafdf7c66720b119 revision: 655933e55b2cb2d8541777d1070b445a7bbae0cf
ref: refs/tags/6.2.16 ref: refs/tags/6.2.22
specs: specs:
metasploit-framework (6.2.16) metasploit-framework (6.2.22)
actionpack (~> 6.0) actionpack (~> 6.0)
activerecord (~> 6.0) activerecord (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
@ -32,9 +32,9 @@ GIT
metasploit-concern metasploit-concern
metasploit-credential metasploit-credential
metasploit-model metasploit-model
metasploit-payloads (= 2.0.94) metasploit-payloads (= 2.0.97)
metasploit_data_models metasploit_data_models
metasploit_payloads-mettle (= 1.0.18) metasploit_payloads-mettle (= 1.0.20)
mqtt mqtt
msgpack msgpack
nessus_rest nessus_rest
@ -99,25 +99,25 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
Ascii85 (1.1.0) Ascii85 (1.1.0)
actionpack (6.1.6.1) actionpack (6.1.7)
actionview (= 6.1.6.1) actionview (= 6.1.7)
activesupport (= 6.1.6.1) activesupport (= 6.1.7)
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.1) actionview (6.1.7)
activesupport (= 6.1.6.1) activesupport (= 6.1.7)
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.1) activemodel (6.1.7)
activesupport (= 6.1.6.1) activesupport (= 6.1.7)
activerecord (6.1.6.1) activerecord (6.1.7)
activemodel (= 6.1.6.1) activemodel (= 6.1.7)
activesupport (= 6.1.6.1) activesupport (= 6.1.7)
activesupport (6.1.6.1) activesupport (6.1.7)
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)
@ -129,16 +129,16 @@ 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.626.0) aws-partitions (1.647.0)
aws-sdk-core (3.140.0) aws-sdk-core (3.161.0)
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.329.0) aws-sdk-ec2 (1.341.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.70.0) aws-sdk-iam (1.71.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-kms (1.58.0) aws-sdk-kms (1.58.0)
@ -148,18 +148,17 @@ GEM
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4) aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.1) aws-sigv4 (1.5.2)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.18) bcrypt (3.1.18)
bcrypt_pbkdf (1.1.0) bcrypt_pbkdf (1.1.0)
bindata (2.4.10) bindata (2.4.13)
bson (4.15.0) bson (4.15.0)
builder (3.2.4) builder (3.2.4)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
cookiejar (0.3.3) cookiejar (0.3.3)
crass (1.0.6) crass (1.0.6)
daemons (1.4.1) daemons (1.4.1)
digest (3.1.0)
dnsruby (1.61.9) dnsruby (1.61.9)
simpleidn (~> 0.1) simpleidn (~> 0.1)
domain_name (0.5.20190701) domain_name (0.5.20190701)
@ -177,10 +176,10 @@ GEM
eventmachine (1.2.7) eventmachine (1.2.7)
faker (2.23.0) faker (2.23.0)
i18n (>= 1.8.11, < 2) i18n (>= 1.8.11, < 2)
faraday (2.5.2) faraday (2.6.0)
faraday-net_http (>= 2.0, < 3.1) faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4) ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.0) faraday-net_http (3.0.1)
faraday-retry (2.0.0) faraday-retry (2.0.0)
faraday (~> 2.0) faraday (~> 2.0)
faye-websocket (0.11.1) faye-websocket (0.11.1)
@ -205,7 +204,7 @@ GEM
i18n (1.12.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.4.1) irb (1.4.2)
reline (>= 0.3.0) reline (>= 0.3.0)
jmespath (1.6.1) jmespath (1.6.1)
jsobfu (0.4.2) jsobfu (0.4.2)
@ -215,7 +214,7 @@ GEM
logging (2.3.1) logging (2.3.1)
little-plugger (~> 1.1) little-plugger (~> 1.1)
multi_json (~> 1.14) multi_json (~> 1.14)
loofah (2.18.0) loofah (2.19.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
metasm (1.0.5) metasm (1.0.5)
@ -237,7 +236,7 @@ GEM
activemodel (~> 6.0) activemodel (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
railties (~> 6.0) railties (~> 6.0)
metasploit-payloads (2.0.94) metasploit-payloads (2.0.97)
metasploit_data_models (5.0.5) metasploit_data_models (5.0.5)
activerecord (~> 6.0) activerecord (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
@ -248,28 +247,26 @@ GEM
railties (~> 6.0) railties (~> 6.0)
recog (~> 2.0) recog (~> 2.0)
webrick webrick
metasploit_payloads-mettle (1.0.18) metasploit_payloads-mettle (1.0.20)
method_source (1.0.0) method_source (1.0.0)
mini_portile2 (2.8.0) mini_portile2 (2.8.0)
minitest (5.16.3) minitest (5.16.3)
mqtt (0.5.0) mqtt (0.5.0)
msgpack (1.5.6) msgpack (1.6.0)
multi_json (1.15.0) multi_json (1.15.0)
mustermann (2.0.2) mustermann (3.0.0)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
nessus_rest (0.1.6) nessus_rest (0.1.6)
net-ldap (0.17.1) net-ldap (0.17.1)
net-protocol (0.1.3) net-protocol (0.1.3)
timeout timeout
net-smtp (0.3.1) net-smtp (0.3.2)
digest
net-protocol net-protocol
timeout
net-ssh (7.0.1) 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.8) nokogiri (1.13.9)
mini_portile2 (~> 2.8.0) mini_portile2 (~> 2.8.0)
racc (~> 1.4) racc (~> 1.4)
nori (2.6.0) nori (2.6.0)
@ -289,13 +286,13 @@ GEM
hashery (~> 2.0) hashery (~> 2.0)
ruby-rc4 ruby-rc4
ttfunk ttfunk
pg (1.4.3) pg (1.4.4)
public_suffix (5.0.0) public_suffix (5.0.0)
puma (5.6.5) puma (6.0.0)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.6.0) racc (1.6.0)
rack (2.2.4) rack (2.2.4)
rack-protection (2.2.2) rack-protection (3.0.2)
rack rack
rack-test (2.0.2) rack-test (2.0.2)
rack (>= 1.3) rack (>= 1.3)
@ -304,9 +301,9 @@ GEM
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.1) railties (6.1.7)
actionpack (= 6.1.6.1) actionpack (= 6.1.7)
activesupport (= 6.1.6.1) activesupport (= 6.1.7)
method_source method_source
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0)
@ -355,14 +352,14 @@ GEM
metasm metasm
rex-core rex-core
rex-text rex-text
rex-socket (0.1.42) rex-socket (0.1.43)
rex-core rex-core
rex-sslscan (0.1.8) rex-sslscan (0.1.8)
rex-core rex-core
rex-socket rex-socket
rex-text rex-text
rex-struct2 (0.1.3) rex-struct2 (0.1.3)
rex-text (0.2.44) rex-text (0.2.45)
rex-zip (0.1.4) rex-zip (0.1.4)
rex-text rex-text
rexml (3.2.5) rexml (3.2.5)
@ -383,12 +380,13 @@ GEM
faraday (>= 0.17.3, < 3) faraday (>= 0.17.3, < 3)
simpleidn (0.2.1) simpleidn (0.2.1)
unf (~> 0.1.4) unf (~> 0.1.4)
sinatra (2.2.2) sinatra (3.0.2)
mustermann (~> 2.0) mustermann (~> 3.0)
rack (~> 2.2) rack (~> 2.2, >= 2.2.4)
rack-protection (= 2.2.2) rack-protection (= 3.0.2)
tilt (~> 2.0) tilt (~> 2.0)
sqlite3 (1.4.4) sqlite3 (1.5.3)
mini_portile2 (~> 2.8.0)
sshkey (2.0.0) sshkey (2.0.0)
swagger-blocks (3.0.0) swagger-blocks (3.0.0)
thin (1.8.1) thin (1.8.1)
@ -401,7 +399,7 @@ GEM
ttfunk (1.7.0) ttfunk (1.7.0)
tzinfo (2.0.5) tzinfo (2.0.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.3) tzinfo-data (1.2022.5)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
@ -429,7 +427,7 @@ GEM
activesupport (>= 4.2, < 8.0) activesupport (>= 4.2, < 8.0)
xmlrpc (0.3.2) xmlrpc (0.3.2)
webrick webrick
zeitwerk (2.6.0) zeitwerk (2.6.1)
PLATFORMS PLATFORMS
ruby ruby
@ -438,4 +436,4 @@ DEPENDENCIES
metasploit-framework! metasploit-framework!
BUNDLED WITH BUNDLED WITH
2.3.20 2.3.22

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.16"; version = "6.2.22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "sha256-9zrtNoxj8gBEzqOlA3wpEh5f8XEEM3tuJUs5Zd+/Dbw="; sha256 = "sha256-I+Taz2o2V7v/OhxcTC7ZfoHw/yUWBHe1tVpwPrCNXRk=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

141
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 = "1m5x42s72mik9xkrgbway4ra139k71p2dfxcvg5gwdmac8maiq7k"; sha256 = "0dygq5fxbrgynd2g7r51asyrap1d6cxravwh509kfmqpfbiq119s";
type = "gem"; type = "gem";
}; };
version = "6.1.6.1"; version = "6.1.7";
}; };
actionview = { actionview = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0syh8jwih5qvv87zfyzl37rz6sc1prhy6gia95bn76zyqk9cfzx8"; sha256 = "1m68my4dnj7q7986jwlb7gir0f7hahdsqbiaxfvgngwksa8fhrn1";
type = "gem"; type = "gem";
}; };
version = "6.1.6.1"; version = "6.1.7";
}; };
activemodel = { activemodel = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1qm3whcaiv5kkgp6plyxi6xa6n3sap18m6w1lfwvr93xb8v57693"; sha256 = "183d7laxvwrw1d02qgm8rg9ljjihfiyh4vzi58xm42z3fr3bbhky";
type = "gem"; type = "gem";
}; };
version = "6.1.6.1"; version = "6.1.7";
}; };
activerecord = { activerecord = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1c6hcy2affwkkggd49v1g1j6ahijikbcxrcksngm9silmc24ixw2"; sha256 = "1dsxi813wyhx2d0bbyc0nla4ck6nmmi3z3765gdqf6xl3dha5r2j";
type = "gem"; type = "gem";
}; };
version = "6.1.6.1"; version = "6.1.7";
}; };
activesupport = { activesupport = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vb0xi7yvgfqky9h4clyncb886mr1wvz9amk7d9ffmgpwrpzvjaz"; sha256 = "0k5pq2swzgddmwwr6x1phbspk1vw8cl88ci8jbi18mrirjjfippr";
type = "gem"; type = "gem";
}; };
version = "6.1.6.1"; version = "6.1.7";
}; };
addressable = { addressable = {
groups = ["default"]; groups = ["default"];
@ -104,40 +104,40 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xnljfcxvrb5h5r5ri14635syd3q8wwkawa69gx9yfk96g6pwbbd"; sha256 = "1yrc8c531vap8gmjjnfqclzp729cl0kppfq02csmj5w2y1v68087";
type = "gem"; type = "gem";
}; };
version = "1.626.0"; version = "1.647.0";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1m83xyasynybmb16cvg2njfpkpz2qam3j5sd571z6mc43l55mknv"; sha256 = "1vhbmvwq77bj30dxgj6cg6m4ynqk1yj6l8njn97q6393g0169rd0";
type = "gem"; type = "gem";
}; };
version = "3.140.0"; version = "3.161.0";
}; };
aws-sdk-ec2 = { aws-sdk-ec2 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ici0pvy5050flp8v8rcd71cn09waa9wb42jpc93nn8qns5yhs44"; sha256 = "198w8vxwqmrc1mqyklvfmz4yqwfp4f4v227vin70jq8pxqi0cyc6";
type = "gem"; type = "gem";
}; };
version = "1.329.0"; version = "1.341.0";
}; };
aws-sdk-iam = { aws-sdk-iam = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1xb1wdjdy91ybf0zrnny3kw7s076mcvhamikn1v5n6mgaypnkzw3"; sha256 = "109qqrxhwpjvv1gf94cf4dphbh38n91kq8l5xkcz058gkgfn5nlx";
type = "gem"; type = "gem";
}; };
version = "1.70.0"; version = "1.71.0";
}; };
aws-sdk-kms = { aws-sdk-kms = {
groups = ["default"]; groups = ["default"];
@ -164,10 +164,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n"; sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
type = "gem"; type = "gem";
}; };
version = "1.5.1"; version = "1.5.2";
}; };
bcrypt = { bcrypt = {
groups = ["default"]; groups = ["default"];
@ -194,10 +194,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; sha256 = "0gbwv05hlpqrz483zd8kbsgf4i62n1gzh7rnk6nl4ik4swkdmxwa";
type = "gem"; type = "gem";
}; };
version = "2.4.10"; version = "2.4.13";
}; };
bson = { bson = {
groups = ["default"]; groups = ["default"];
@ -259,16 +259,6 @@
}; };
version = "1.4.1"; version = "1.4.1";
}; };
digest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39";
type = "gem";
};
version = "3.1.0";
};
dnsruby = { dnsruby = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -354,20 +344,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1a6q8k82vfqyzlnrs6r6d82fyz5fminc8p57mr5xkdabs0m2y3mx"; sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv";
type = "gem"; type = "gem";
}; };
version = "2.5.2"; version = "2.6.0";
}; };
faraday-net_http = { faraday-net_http = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0yicplzlh5da8pr64286zga3my86cjsb2y9dqlzsacpw8hbkmjvw"; sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq";
type = "gem"; type = "gem";
}; };
version = "3.0.0"; version = "3.0.1";
}; };
faraday-retry = { faraday-retry = {
groups = ["default"]; groups = ["default"];
@ -514,10 +504,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1a7hkcvnyfcmzxz36qnfk84grl7m4xrv2vzg5pyhzqwxmgcrhrja"; sha256 = "1g2xhrjjgbix2acss59kwzfzgcwf450j91paz7vqa578g95i32my";
type = "gem"; type = "gem";
}; };
version = "1.4.1"; version = "1.4.2";
}; };
jmespath = { jmespath = {
groups = ["default"]; groups = ["default"];
@ -574,10 +564,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh";
type = "gem"; type = "gem";
}; };
version = "2.18.0"; version = "2.19.0";
}; };
metasm = { metasm = {
groups = ["default"]; groups = ["default"];
@ -614,12 +604,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "0a155b3db11d611a08e58861bafdf7c66720b119"; rev = "655933e55b2cb2d8541777d1070b445a7bbae0cf";
sha256 = "1g0dpzgnafab4mp7ncq4f7qmy7hj55y079d3rr201wk3ihvfsfpp"; sha256 = "06axinq3ww2snnspf10n4pzz10byv4p4qp0w7bzvnmrndb7xmr13";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.2.16"; version = "6.2.22";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -636,10 +626,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1azr70qfq14wpki61hnljqnxnxlx9ifa4p92wh29cnak8v697v69"; sha256 = "1c3ymwqm3paa0sqpnbd2mfz6gwqskv3mg1nphaqns7s1kx1za5nm";
type = "gem"; type = "gem";
}; };
version = "2.0.94"; version = "2.0.97";
}; };
metasploit_data_models = { metasploit_data_models = {
groups = ["default"]; groups = ["default"];
@ -656,10 +646,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "09mm8wbp7yaaqpz16bhsag3q5xd4aqx5l1n2p06zg55nph1dgy0s"; sha256 = "1qpnpj6qpzgn8ga9p4i3ifnixy86cm32z1y43r50jnk6p534xj84";
type = "gem"; type = "gem";
}; };
version = "1.0.18"; version = "1.0.20";
}; };
method_source = { method_source = {
groups = ["default"]; groups = ["default"];
@ -706,10 +696,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "01sw335w8wl6rjz8raa8xkxnk36d7ib7zqkc9gdibmplar4x1fqg"; sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3";
type = "gem"; type = "gem";
}; };
version = "1.5.6"; version = "1.6.0";
}; };
multi_json = { multi_json = {
groups = ["default"]; groups = ["default"];
@ -726,10 +716,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0m70qz27mlv2rhk4j1li6pw797gmiwwqg02vcgxcxr1rq2v53rnb"; sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd";
type = "gem"; type = "gem";
}; };
version = "2.0.2"; version = "3.0.0";
}; };
nessus_rest = { nessus_rest = {
groups = ["default"]; groups = ["default"];
@ -766,10 +756,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1s358kfv9mnfxcjbpr1d5a2gs1q7wkw7ffpn86mf1b3s9p31bw9s"; sha256 = "0d1y3nkgwypfsivip8vzphs3a01a40ds4ng8i314fpr9fdk48dad";
type = "gem"; type = "gem";
}; };
version = "0.3.1"; version = "0.3.2";
}; };
net-ssh = { net-ssh = {
groups = ["default"]; groups = ["default"];
@ -817,10 +807,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn";
type = "gem"; type = "gem";
}; };
version = "1.13.8"; version = "1.13.9";
}; };
nori = { nori = {
groups = ["default"]; groups = ["default"];
@ -917,10 +907,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3";
type = "gem"; type = "gem";
}; };
version = "1.4.3"; version = "1.4.4";
}; };
public_suffix = { public_suffix = {
groups = ["default"]; groups = ["default"];
@ -937,10 +927,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; sha256 = "1yabmxmqprb2x58awiasidsiwpplscmyar9dzwh5l8jgaw4i3wra";
type = "gem"; type = "gem";
}; };
version = "5.6.5"; version = "6.0.0";
}; };
racc = { racc = {
groups = ["default"]; groups = ["default"];
@ -967,10 +957,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; sha256 = "0jmixih0qrsdz60dhznkk29v50ks55cqq51jjf0yn3amqghh4bhk";
type = "gem"; type = "gem";
}; };
version = "2.2.2"; version = "3.0.2";
}; };
rack-test = { rack-test = {
groups = ["default"]; groups = ["default"];
@ -1007,10 +997,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0cwpjj9inak65cvs9wyhpjdsx1xajzbiy25p397a8kmyvkrcvzms"; sha256 = "1iwziqrzk7f7r3w5pkfnbh1mqsfsywy7lvz2blqds3nval79dw2x";
type = "gem"; type = "gem";
}; };
version = "6.1.6.1"; version = "6.1.7";
}; };
rake = { rake = {
groups = ["default"]; groups = ["default"];
@ -1197,10 +1187,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0hh6izmxym6qjgs5n1jmqr5bvmhk17sqfi33a19pny2rxhbsfacp"; sha256 = "1dx4lq6iw5w4q545vhj8bn7gm51kkc6qqhfpv24y3mb4gwys4zmc";
type = "gem"; type = "gem";
}; };
version = "0.1.42"; version = "0.1.43";
}; };
rex-sslscan = { rex-sslscan = {
groups = ["default"]; groups = ["default"];
@ -1227,10 +1217,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10bhagqrc930w8q23sgvjgz5gnwmwrllc6bd7jbmpnaxyfr0lnwp"; sha256 = "0x7ppwzvwz8fag1n2j231wxvb0vl4qbbsqw7v8y0hx8vrfs3k5km";
type = "gem"; type = "gem";
}; };
version = "0.2.44"; version = "0.2.45";
}; };
rex-zip = { rex-zip = {
groups = ["default"]; groups = ["default"];
@ -1347,20 +1337,21 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0mbjp75dy35q796iard8izsy7gk55g2c3q864r2p13my3yjmlcvz"; sha256 = "0c2vmy0j5amy9fihs2gz2ssm4bdpqqh4llyjfl6qqqry7f87c6xz";
type = "gem"; type = "gem";
}; };
version = "2.2.2"; version = "3.0.2";
}; };
sqlite3 = { sqlite3 = {
dependencies = ["mini_portile2"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1z1wa639c278bsipczn6kv8b13fj85pi8gk7x462chqx6k0wm0ax"; sha256 = "1i95rgfxdj2rhxifps27dz7fjfdih5iyl7b01di9gdmh9m04ylk6";
type = "gem"; type = "gem";
}; };
version = "1.4.4"; version = "1.5.3";
}; };
sshkey = { sshkey = {
groups = ["default"]; groups = ["default"];
@ -1447,10 +1438,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0k62nrh30sinsfbs17w8cahydf3vm3j14l0l0ba78vfh429cv4i3"; sha256 = "1w2qlazh0r23bz9qf2d4smvlv4a1yin8kprkqqxwkiwfs5v1n55s";
type = "gem"; type = "gem";
}; };
version = "1.2022.3"; version = "1.2022.5";
}; };
unf = { unf = {
groups = ["default"]; groups = ["default"];
@ -1577,9 +1568,9 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; sha256 = "18hihq3hxs2ywxh3ixm366cawwy4k733mh680ldaa1vxjiraxj58";
type = "gem"; type = "gem";
}; };
version = "2.6.0"; version = "2.6.1";
}; };
} }

4
pkgs/top-level/all-packages.nix
View file

@ -14367,7 +14367,9 @@ with pkgs;
jwasm = callPackage ../development/compilers/jwasm { }; jwasm = callPackage ../development/compilers/jwasm { };
kind2 = callPackage ../development/compilers/kind2 { }; kind2 = callPackage ../development/compilers/kind2 {
inherit (darwin.apple_sdk.frameworks) Security;
};
knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; knightos-genkfs = callPackage ../development/tools/knightos/genkfs { };

2
pkgs/top-level/python-packages.nix
View file

@ -2773,8 +2773,6 @@ in {
dnspython = callPackage ../development/python-modules/dnspython { }; dnspython = callPackage ../development/python-modules/dnspython { };
dnspythonchia = callPackage ../development/python-modules/dnspythonchia { };
doc8 = callPackage ../development/python-modules/doc8 { }; doc8 = callPackage ../development/python-modules/doc8 { };
docformatter = callPackage ../development/python-modules/docformatter { }; docformatter = callPackage ../development/python-modules/docformatter { };