Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-01-20 01:20:12 +00:00 committed by GitHub
commit b27f238893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
178 changed files with 771 additions and 606 deletions

View File

@ -47,9 +47,10 @@ indent_style = space
insert_final_newline = unset
trim_trailing_whitespace = unset
[*.{key,ovpn}]
[*.{asc,key,ovpn}]
insert_final_newline = unset
end_of_line = unset
trim_trailing_whitespace = unset
[*.lock]
indent_size = unset

View File

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, perl, perlPackages }:
{ stdenv, lib, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation {
name = "nixpkgs-lint-1";
@ -15,9 +15,9 @@ stdenv.mkDerivation {
wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB
'';
meta = {
maintainers = [ stdenv.lib.maintainers.eelco ];
meta = with lib; {
maintainers = [ maintainers.eelco ];
description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors";
platforms = stdenv.lib.platforms.unix;
platforms = platforms.unix;
};
}

View File

@ -1,11 +1,9 @@
{ config, lib, pkgs, ... }:
with lib;
{
options = {
gnu = mkOption {
type = types.bool;
gnu = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
When enabled, GNU software is chosen by default whenever a there is
@ -15,7 +13,7 @@ with lib;
};
};
config = mkIf config.gnu {
config = lib.mkIf config.gnu {
environment.systemPackages = with pkgs;
# TODO: Adjust `requiredPackages' from `system-path.nix'.
@ -26,7 +24,7 @@ with lib;
nano zile
texinfo # for the stand-alone Info reader
]
++ stdenv.lib.optional (!stdenv.isAarch32) grub2;
++ lib.optional (!stdenv.isAarch32) grub2;
# GNU GRUB, where available.

View File

@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
src = ./.;
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ boost nix ];
meta = {
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ chkno ];
meta = with lib; {
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ chkno ];
};
}

View File

@ -19,18 +19,16 @@ nix-shell -E 'with import <nixpkgs> { }; brscan4-etc-files.override{netDevices=[
*/
with lib;
let
addNetDev = nd: ''
brsaneconfig4 -a \
name="${nd.name}" \
model="${nd.model}" \
${if (hasAttr "nodename" nd && nd.nodename != null) then
${if (lib.hasAttr "nodename" nd && nd.nodename != null) then
''nodename="${nd.nodename}"'' else
''ip="${nd.ip}"''}'';
addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs);
addAllNetDev = xs: lib.concatStringsSep "\n" (map addNetDev xs);
in
stdenv.mkDerivation {
@ -61,11 +59,11 @@ stdenv.mkDerivation {
dontStrip = true;
dontPatchELF = true;
meta = {
meta = with lib; {
description = "Brother brscan4 sane backend driver etc files";
homepage = "http://www.brother.com";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.unfree;
maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
platforms = platforms.linux;
license = licenses.unfree;
maintainers = with maintainers; [ jraygauthier ];
};
}

View File

@ -43,7 +43,7 @@ in
system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
name = "google-compute-image";
postVM = ''
PATH=$PATH:${with pkgs; stdenv.lib.makeBinPath [ gnutar gzip ]}
PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]}
pushd $out
mv $diskImage disk.raw
tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw

View File

@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{
name = "searx";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ rnhmjoj ];
};

View File

@ -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 = [ "." ];

View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "klog";
version = "1.3.2";
src = fetchurl {
url = "https://download.savannah.nongnu.org/releases/klog/${pname}-${version}.tar.gz";
sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
};
nativeBuildInputs = [ pkg-config wrapQtAppsHook qmake qttools ];
buildInputs = [ hamlib qtbase qtserialport qtcharts ];
qmakeFlags = [ "KLog.pro" ];
meta = with stdenv.lib; {
description = "A multiplatform free hamradio logger";
longDescription = ''
KLog provides QSO management, useful QSL management DX-Cluster client, DXCC management,
ClubLog integration, WSJT-X, DX-Marathon support and much more.
'';
homepage = "https://www.klog.xyz/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ pulsation ];
};
}

View File

@ -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 = [

View File

@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "SDL graphics drawing primitives and support functions";
longDescription =
'' The SDL_gfx library evolved out of the SDL_gfxPrimitives code
longDescription = ''
The SDL_gfx library evolved out of the SDL_gfxPrimitives code
which provided basic drawing routines such as lines, circles or
polygons and SDL_rotozoom which implemented a interpolating
rotozoomer for SDL surfaces.

View File

@ -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; {

View File

@ -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;

View File

@ -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 ];
};
}

View File

@ -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 ];
};
}

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "0.9.8";
version = "0.9.10";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk";
outputHash = "1i91jq1p27kkzxk57mm438sablnrx8j5pfyl0yg64wzrashba1xa";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -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;

View File

@ -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

View File

@ -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 = [

View File

@ -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 ];

View File

@ -12,11 +12,12 @@ let
]);
in
stdenv.mkDerivation rec {
name = "dnsmasq-2.82";
pname = "dnsmasq";
version = "2.83";
src = fetchurl {
url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz";
sha256 = "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4";
url = "http://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz";
sha256 = "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz";
};
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

View File

@ -0,0 +1,30 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "git-hound";
version = "1.3";
src = fetchFromGitHub {
owner = "tillson";
repo = pname;
rev = "v${version}";
sha256 = "1l2bif7qpc1yl93ih01g9jci7ba47rsnpq9js88rz216q93dzmsf";
};
vendorSha256 = "055hpfjbqng513c9rscb8jhnlxj7p82sr8cbsvwnzk569n71qwma";
meta = with lib; {
description = "Reconnaissance tool for GitHub code search";
longDescription = ''
GitHound pinpoints exposed API keys and other sensitive information
across all of GitHub using pattern matching, commit history searching,
and a unique result scoring system.
'';
homepage = "https://github.com/tillson/git-hound";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,29 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "gitleaks";
version = "7.2.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "1pdbkjx8h6ijypsxyv34lykymaqf8wnfyjk3ldp49apbx01bl34y";
};
vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9";
meta = with lib; {
description = "Scan git repos (or files) for secrets";
longDescription = ''
Gitleaks is a SAST tool for detecting hardcoded secrets like passwords,
API keys, and tokens in git repos.
'';
homepage = "https://github.com/zricethezav/gitleaks";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -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"

View File

@ -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

View File

@ -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 ];

View File

@ -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 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
version = "2.3.1";
version = "2.5.1";
};
loofah = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq";
sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
type = "gem";
};
version = "2.7.0";
version = "2.8.0";
};
metasm = {
groups = ["default"];
@ -494,62 +504,62 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10a9dr0pi25vsnk7x1bavx2ja62lqswdkym0hvhjsds6awvx1cf2";
sha256 = "19cz0g463wl35gpdy1630n88a9m7fhhlcylspvvwc0m01sipc33g";
type = "gem";
};
version = "3.0.0";
version = "3.0.1";
};
metasploit-credential = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03339i3v6lgz0cymn2i7y0sylpw2nihsc8h75c4yn3bq9p6wk6sx";
sha256 = "1f6cjvk68yypciycp8vdvhc5hrwmc8qi4y06s1cd77zj4m2skkmn";
type = "gem";
};
version = "4.0.2";
version = "4.0.3";
};
metasploit-framework = {
groups = ["default"];
platforms = [];
source = {
fetchSubmodules = false;
rev = "8ba313ed85b03ef54bec32086c2a8708a7e1df58";
sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
rev = "7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c";
sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.12";
version = "6.0.25";
};
metasploit-model = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0szwqs6djh882alpnmnnkx46s548jg3vb0ya61hibw3kqcw3i1ig";
sha256 = "0gmh23c3hc4my244m5lpd4kiysrsprag4rn6kvnnphxiflxvi4f7";
type = "gem";
};
version = "3.1.2";
version = "3.1.3";
};
metasploit-payloads = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yiwwyc12f9jln58l4j26yjbixij1v5h3spp4ci3ik4dxyk2r4zb";
sha256 = "1gpv327750b7g243w0dmynji1gabwk81kb424y5hlbq9vqpgamnb";
type = "gem";
};
version = "2.0.22";
version = "2.0.26";
};
metasploit_data_models = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n7vb6pg446jadjsgrc29kxnc9b6ga29hw8pg52dnrzhp7rwhiyl";
sha256 = "1czqg49b7n9n2iqp6r4f1cxh8kd39gbjvydq09hzmzdmkwxh3x1f";
type = "gem";
};
version = "4.1.0";
version = "4.1.1";
};
metasploit_payloads-mettle = {
groups = ["default"];
@ -576,20 +586,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem";
};
version = "2.4.0";
version = "2.5.0";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j";
type = "gem";
};
version = "5.14.2";
version = "5.14.3";
};
mqtt = {
groups = ["default"];
@ -646,10 +656,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";
sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n";
type = "gem";
};
version = "0.16.3";
version = "0.17.0";
};
net-ssh = {
groups = ["default"];
@ -681,25 +691,35 @@
};
version = "7.2.1";
};
nio4r = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk";
type = "gem";
};
version = "2.5.4";
};
nokogiri = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem";
};
version = "1.10.10";
version = "1.11.1";
};
octokit = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24";
sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
type = "gem";
};
version = "4.19.0";
version = "4.20.0";
};
openssl-ccm = {
groups = ["default"];
@ -791,6 +811,26 @@
};
version = "4.0.6";
};
puma = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b";
type = "gem";
};
version = "5.1.1";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
type = "gem";
};
version = "1.5.2";
};
rack = {
groups = ["default"];
platforms = [];
@ -856,10 +896,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
type = "gem";
};
version = "13.0.1";
version = "13.0.3";
};
rb-readline = {
groups = ["default"];
@ -876,170 +916,170 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vxnm9ld3rn8xxccq9jyhzz6558bqfxdb3sd4na20frg9f5pflb7";
sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69";
type = "gem";
};
version = "2.3.15";
version = "2.3.18";
};
redcarpet = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
type = "gem";
};
version = "3.5.0";
version = "3.5.1";
};
reline = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sspfd5x8aq80pmkdj0dzd20iclhrdjan1ibkrivgk7j8af23hbk";
sha256 = "109gpk4c9712cc3ilvidgks9i42y8gwnjpw6j4w4hci09pasz7i1";
type = "gem";
};
version = "0.1.6";
version = "0.2.0";
};
rex-arch = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cvdy2ysiphdig258lkicbxqq2y47bkl69kgj4kkj8w338rb5kwa";
sha256 = "1gi9641869pg30ij7ba3r2z89flvdqsma4spbpww6c8ph62iy4bp";
type = "gem";
};
version = "0.1.13";
version = "0.1.14";
};
rex-bin_tools = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19q4cj7cis29k3zx9j2gp4h3ib0zig2fa4rs56c1gjr32f192zzk";
sha256 = "16w219ashxrgrgb5via9k45h7whrib77rmwy0f7akqf409pzjdp7";
type = "gem";
};
version = "0.1.6";
version = "0.1.7";
};
rex-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b9pf7f8m2zjck65dpp8h8v4n0a05kfas6cn9adv0w8d9z58aqvv";
sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw";
type = "gem";
};
version = "0.1.13";
version = "0.1.14";
};
rex-encoder = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z";
sha256 = "0lnrlii8d3r35927wp42bpdzh37dx3jqgdxk6lk5d6xvz6h14kp7";
type = "gem";
};
version = "0.1.4";
version = "0.1.5";
};
rex-exploitation = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0inrf2vahmpxhjf84i8ak2b7gcirsrjrmb1rnvvqqr9kl0xw5xm3";
sha256 = "0z4dn579mxl22qdxcnbmxp0diia6kr7c20giv0bn4r0viavz49gc";
type = "gem";
};
version = "0.1.24";
version = "0.1.26";
};
rex-java = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j58k02p5g9snkpak64sb4aymkrvrh9xpqh8wsnya4w7b86w2y6i";
sha256 = "0g8xdj7ij4y51wgh6l29al6i107bqn6pwql6za7ahms75m8s9dys";
type = "gem";
};
version = "0.1.5";
version = "0.1.6";
};
rex-mime = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a";
sha256 = "0wzw1qcdgbn3iyskppy5038mcdrzplyai45pilm5qjj4fwvjdl6m";
type = "gem";
};
version = "0.1.5";
version = "0.1.6";
};
rex-nop = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny";
sha256 = "0yjlmgmaaa65lkd6jrm71g8yfn8xy91jl07nd1v90xp9jrzrrl92";
type = "gem";
};
version = "0.1.1";
version = "0.1.2";
};
rex-ole = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww";
sha256 = "0rlsy1a4lig7iqvb4zn60fpf125v8k4bjrjzakks74prjb2qmqnp";
type = "gem";
};
version = "0.1.6";
version = "0.1.7";
};
rex-powershell = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11wi8dpb2s8bvkqhbf80g16nyj2hscs3vz31ffzl1g0g6imcs0dl";
sha256 = "02bzkraz4722zkjkm5cn9kvhx2mbkrhd5g123bkqgfkd19kbfjif";
type = "gem";
};
version = "0.1.87";
version = "0.1.88";
};
rex-random_identifier = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fg94sczff5c2rlvqqgw2dndlqyzjil5rjk3p9f46ss2hc8zxlbk";
sha256 = "0pqd8pfcxqd44ql8dawk59k9s5jnhx7inc8wnpjhkbx0y0sldq8q";
type = "gem";
};
version = "0.1.4";
version = "0.1.5";
};
rex-registry = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wv812ghnz143vx10ixmv32ypj1xrzr4rh4kgam8d8wwjwxsgw1q";
sha256 = "09b6jhcih4srrh0j52v49vbffqz8ngki6qpmq9b2wdabqnw63d1v";
type = "gem";
};
version = "0.1.3";
version = "0.1.4";
};
rex-rop_builder = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy";
sha256 = "0ssynxq3kc86v3xnc6jx8pg5zh13q61wl2klqbi9hzn2n8lhdgvj";
type = "gem";
};
version = "0.1.3";
version = "0.1.4";
};
rex-socket = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y6p1sw0wiw4x4dk89lwhf7vzsb0cjgpbr8hf7m119lg2kzm5g8y";
sha256 = "1601b7vhp56sif21lk7mqcn3bbkhdrp6zz0vag8yzma3ji707pqg";
type = "gem";
};
version = "0.1.24";
version = "0.1.25";
};
rex-sslscan = {
groups = ["default"];
@ -1056,30 +1096,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nbdn53264a20cr2m2nq2v4mg0n33dvrd1jj1sixl37qjzw2k452";
sha256 = "1hp8yv55j995dl587hismwa7ydyprs03c75gia6rwp7v5bhshy4n";
type = "gem";
};
version = "0.1.2";
version = "0.1.3";
};
rex-text = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wx8pncrk7yb2zxxqaycm4ikvb577zj7rma8jdfi74a0c5119c44";
sha256 = "05s0izxlb4rrhr42d6dz6idxdj4hrb7bdkk22qfwnaqdppb4w536";
type = "gem";
};
version = "0.2.28";
version = "0.2.29";
};
rex-zip = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7";
sha256 = "0azm4g4dm9k6vrav769vn0gffrv7pgxknlj4dr9yav632920cvqj";
type = "gem";
};
version = "0.1.3";
version = "0.1.4";
};
rkelly-remix = {
groups = ["default"];
@ -1096,10 +1136,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12khgv5hx90a4dxqca2hzbksalx9czb51bsz0bhq0czsql9pwby8";
sha256 = "05nfdv5isk3g13qhzm6axg70bghg1z5nbsl04dwqqhaifjys0dhf";
type = "gem";
};
version = "2.3.0";
version = "2.5.0";
};
ruby-rc4 = {
groups = ["default"];
@ -1126,10 +1166,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fsdnvisswchk27knii6ijq8sjsc7qm9jiffdsf71q195ga2qi66";
sha256 = "0px84i3d9kqb40ff7nk3k7hb3w3kk80w5zsgi61svgddp1dbzh1n";
type = "gem";
};
version = "2.0.6";
version = "2.0.7";
};
rubyntlm = {
groups = ["default"];
@ -1206,10 +1246,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
type = "gem";
};
version = "1.7.2";
version = "1.8.0";
};
thor = {
groups = ["default"];
@ -1246,30 +1286,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w0bjn6k38xv46mr02p3038gwk5jj5hl398bv5kr625msxkdhqzn";
sha256 = "15iaxz9iak5643bq2bc0jkbjv8w2zn649lxgvh5wg48q9d4blw13";
type = "gem";
};
version = "1.6.2.1";
version = "1.7.0";
};
tzinfo = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
type = "gem";
};
version = "1.2.7";
version = "1.2.9";
};
tzinfo-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a";
sha256 = "131dgg2sz3j15vp71xaijlb72nlii9fn8v5dc4vr6q7hrdq4kjf4";
type = "gem";
};
version = "1.2020.4";
version = "1.2020.6";
};
unf = {
groups = ["default"];
@ -1346,9 +1386,19 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683";
sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1";
type = "gem";
};
version = "0.3.0";
version = "0.3.1";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
type = "gem";
};
version = "2.4.2";
};
}

View File

@ -1,14 +1,14 @@
{ fetchurl, lib, stdenv }:
stdenv.mkDerivation rec {
name = "diffstat-1.63";
name = "diffstat-1.64";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/diffstat/${name}.tgz"
"https://invisible-mirror.net/archives/diffstat/${name}.tgz"
];
sha256 = "0vyw200s5dv1257pmrh6c6fdkmw3slyz5szpqfx916xr04sdbpby";
sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w=";
};
meta = with lib; {

View File

@ -2432,6 +2432,8 @@ in
klipper = callPackage ../servers/klipper { };
klog = qt5.callPackage ../applications/radio/klog { };
lcdproc = callPackage ../servers/monitoring/lcdproc { };
languagetool = callPackage ../tools/text/languagetool { };
@ -4427,6 +4429,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
git-hound = callPackage ../tools/security/git-hound { };
git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { };
@ -4539,6 +4543,8 @@ in
gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };
gitleaks = callPackage ../tools/security/gitleaks { };
gitaly = callPackage ../applications/version-management/gitlab/gitaly {
ruby = ruby_2_7;
};

View File

@ -7932,6 +7932,8 @@ in {
uritools = callPackage ../development/python-modules/uritools { };
url-normalize = callPackage ../development/python-modules/url-normalize { };
urlgrabber = callPackage ../development/python-modules/urlgrabber { };
urllib3 = callPackage ../development/python-modules/urllib3 { };