Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-18 06:16:42 +00:00 committed by GitHub
commit 45dc900af9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 299 additions and 154 deletions

View file

@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
version = "4600";
version = "4601";
src = fetchurl {
url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
sha256 = "1xnqbyrf5cbxmggkk1pjcj5d1767kbp15v12zy2fpbbn3yf0k3sh";
sha256 = "TQ2Ee0sy9q4PUvY3TD6zaQ9oy1xgsw5OAw4RQ7ecCUM=";
};
patches = [

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "nwg-launchers";
version = "0.4.3";
version = "0.4.4";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vuvYL9N9xdg27uhiTe2OqxZ3/n/9EjlqPxtNMXpqpE8=";
sha256 = "sha256-krhFtFQZSwfKPHmVxPGNySPL2Y9+kA0fxjZ/D+mNks4=";
};
nativeBuildInputs = [

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
{ mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols2
, qtsvg, qttools, qtquick1, qtcharts
, qmake
}:
@ -13,7 +13,7 @@ let
in
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "redis-desktop-manager";
version = "0.9.1";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [
libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
qtquick1 qtquickcontrols qtsvg qttools qtcharts
qtquick1 qtquickcontrols2 qtsvg qttools qtcharts
];
dontUseQmakeConfigure = true;
@ -77,7 +77,7 @@ EOF
meta = with lib; {
description = "Cross-platform open source Redis DB management tool";
homepage = "https://redisdesktop.com/";
license = licenses.lgpl21;
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
};

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook, writeShellScript
{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook
, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "upwork";
version = "5.4.9.6";
version = "5.5.0.1";
src = fetchurl {
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_4_9_6_2565cdd0547940a2/${pname}_${version}_amd64.deb";
sha256 = "ff6246b3b4a1ed79cc9bca2934652fefb40bdac4b7e95997f3a46e354ce52456";
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_1_291c031686ed44ff/${pname}_${version}_amd64.deb";
sha256 = "49192ecfb10929b5b51cf8899186059649c894109ec172695cd7cfaa50923f6a";
};
dontWrapGApps = true;
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
runHook preInstall
mv usr $out
mv opt $out
sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop
@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
$out/bin/upwork \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : ${libPath}
runHook postInstall
'';
meta = with lib; {

View file

@ -2,7 +2,6 @@
, poetry2nix
, lib
, overrides ? (self: super: {})
, stdenv
}:
let

View file

@ -1,8 +1,12 @@
{ callPackage, luaPackages, python3Packages }:
{ callPackage, luaPackages, perlPackages, python3Packages }:
{
colorize_nicks = callPackage ./colorize_nicks { };
multiline = callPackage ./multiline {
inherit (perlPackages) PodParser;
};
weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
inherit (luaPackages) cjson luaffi;
};

View file

@ -0,0 +1,40 @@
{ stdenv, lib, fetchurl, substituteAll, PodParser }:
stdenv.mkDerivation {
pname = "multiline";
version = "0.6.3";
src = fetchurl {
url = "https://raw.githubusercontent.com/weechat/scripts/945315bed4bc2beaf1e47f9b946ffe8f638f77fe/perl/multiline.pl";
sha256 = "1smialb21ny7brhij4sbw46xvsmrdv6ig2da0ip63ga2afngwsy4";
};
dontUnpack = true;
prePatch = ''
cp $src multiline.pl
'';
patches = [
# The script requires a special Perl environment.
(substituteAll {
src = ./libpath.patch;
env = PodParser;
})
];
passthru.scripts = [ "multiline.pl" ];
installPhase = ''
runHook preInstall
install -D multiline.pl $out/share/multiline.pl
runHook postInstall
'';
meta = with lib; {
description = "Multi-line edit box";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ oxzi ];
};
}

View file

@ -0,0 +1,9 @@
diff --git a/multiline.pl b/multiline.pl
index 54474d4..42fbef8 100644
--- a/multiline.pl
+++ b/multiline.pl
@@ -1,3 +1,4 @@
+use lib '@env@/lib/perl5/site_perl';
use strict; use warnings;
$INC{'Encode/ConfigLocal.pm'}=1;
require Encode;

View file

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "filebot";
version = "4.9.2";
version = "4.9.3";
src = fetchurl {
url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
sha256 = "0hcyam8l0fzc9fnp1dpawk0s3rwhfph78w99y7zlcv5l4l4h04lz";
sha256 = "sha256-R1FnHgSziJ7eGL8GrUmheVZxOnUgn9TK6gObSSKe9j0=";
};
unpackPhase = "tar xvf $src";

View file

@ -2,7 +2,7 @@
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
, alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch
, alsaLib, curl, libvpx, nettools, dbus, substituteAll
# If open-watcom-bin is not passed, VirtualBox will fall back to use
# the shipped alternative sources (assembly).
, open-watcom-bin ? null

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus
, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala
, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2
, desktop-file-utils, itstool, wrapGAppsHook, pcre2
, libxslt, docbook-xsl-nons }:
stdenv.mkDerivation rec {

View file

@ -15,7 +15,6 @@
, gnome3
, gjs
, nixosTests
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {

View file

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Userspace library for the Linux Restartable Sequence API";
homepage = "https://github.com/compudj/librseq";
license = licenses.lgpl21;
license = licenses.lgpl21Only;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ];
};

View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, isPy3k
, fetchPypi
@ -72,5 +73,7 @@ buildPythonPackage rec {
description = "A modular, fast, simple, static website and blog generator";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jluttine ];
# all tests fail
broken = stdenv.isDarwin;
};
}

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, fetchpatch
, alembic
@ -47,10 +46,7 @@
, tzlocal
, unicodecsv
, zope_deprecation
, enum34
, typing
, nose
, python
, pythonOlder
, pythonAtLeast
}:

View file

@ -6,7 +6,6 @@
, six
# test dependencies
, coverage
, flake8
, mock
, nose
, pycodestyle

View file

@ -24,7 +24,6 @@
buildPythonPackage rec {
pname = "intake";
version = "0.6.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
@ -73,7 +72,7 @@ buildPythonPackage rec {
"http"
# broken test
"test_read_pattern_with"
"test_read_pattern"
];
meta = with lib; {

View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, pythonOlder
, fetchPypi
@ -155,5 +156,7 @@ buildPythonPackage rec {
homepage = "https://jupyter.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ ixxie cstrahan ];
# E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found
broken = stdenv.isDarwin;
};
}

View file

@ -49,7 +49,7 @@ buildPythonPackage rec {
"test_filter_cmd_invalid_filter"
"test_inline_merge"
"test_interrogate_filter_no_repo"
"test_merge_input_strategy_inline_source_conflict"
"test_merge"
];
nativeBuildInputs = [ setuptools_scm ];

View file

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
, future, python-language-server, mypy, configparser
, pytestCheckHook, mock, isPy3k, pytestcov, coverage
, pytestCheckHook, mock, pytestcov, coverage
, fetchpatch
}:

View file

@ -1,6 +1,5 @@
{ lib
, aiohttp
, async-timeout
, aresponses
, buildPythonPackage
, fetchFromGitHub

View file

@ -3,7 +3,6 @@
, fetchFromGitHub
, maturin
, buildPythonPackage
, isPy38
, python
}:
let

View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
}:
@ -16,6 +17,7 @@ buildPythonPackage rec {
homepage = "http://yapsy.sourceforge.net/";
description = "Yet another plugin system";
license = licenses.bsd0;
# tests fail and are not using pytest to easily disable them
broken = stdenv.isDarwin;
};
}

View file

@ -1,12 +1,12 @@
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:
stdenv.mkDerivation rec {
version = "2.0.5";
version = "2.0.6";
pname = "visualvm";
src = fetchzip {
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
sha256 = "19xf79rbilslpibi1mi31jplrgf8anpm06s6sxqh8v1qs84vkxdm";
sha256 = "sha256-HoDV8Z024+WnECw1ZVwA3dEfbKtuTd4he40UwQnpiGQ=";
};
desktopItem = makeDesktopItem {

View file

@ -1,38 +1,35 @@
{
pkgs
, stdenv
{ stdenv
, libusb-compat-0_1
, fetchFromGitHub
, lib
}:
stdenv.mkDerivation rec {
pname = "micronucleus";
version = "2.04";
pname = "micronucleus";
version = "2.04";
sourceRoot = "source/commandline";
sourceRoot = "source/commandline";
src = fetchFromGitHub {
owner = "micronucleus";
repo = "micronucleus";
rev = version;
sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
};
src = fetchFromGitHub {
owner = "micronucleus";
repo = "micronucleus";
rev = version;
sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
};
buildInputs = [ libusb-compat-0_1 ];
makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
buildInputs = [ libusb-compat-0_1 ];
makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/lib/udev
cp micronucleus $out/bin
cp 49-micronucleus.rules $out/lib/udev
'';
meta = with lib; {
description = "Upload tool for micronucleus";
homepage = "https://github.com/micronucleus/micronucleus";
license = licenses.gpl3;
maintainers = [ maintainers.cab404 ];
};
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/lib/udev
cp micronucleus $out/bin
cp 49-micronucleus.rules $out/lib/udev
'';
meta = with lib; {
description = "Upload tool for micronucleus";
homepage = "https://github.com/micronucleus/micronucleus";
license = licenses.gpl3;
maintainers = [ maintainers.cab404 ];
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KxYGXwK6wF5MDY+zrSdcQqBYkSdnxOCYudTh+TwTkm8=";
sha256 = "sha256-sdTDBEdBl+IM2HB4hIrAijG4dF3OU7+CjPpGWD8HQm8=";
};
vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30=";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tracy";
version = "0.7.5";
version = "0.7.6";
src = fetchFromGitHub {
owner = "wolfpld";
repo = "tracy";
rev = "v${version}";
sha256 = "0qfb30k6a8vi8vn65vv927wd9nynwwvc9crbmi7a55kp20hzg06r";
sha256 = "sha256-Fk/Kuc7DwmdoyLx/YjdEHQ7S0M+ksAXl9QqeSPH2vJ8=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -357,6 +357,8 @@ let
};
};
hashicorp.terraform = callPackage ./terraform {};
hookyqr.beautify = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "beautify";

View file

@ -0,0 +1,25 @@
{ lib, fetchurl, vscode-utils, terraform-ls }:
vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
version = "2.6.0";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
sha256 = "1zg90x2asl6gakd2w8fn4imllqgrzdb1dn3728s63blmml42a1xp";
};
patches = [ ./fix-terraform-ls.patch ];
postPatch = ''
substituteInPlace out/extension.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
'';
meta = with lib; {
license = licenses.mit;
maintainers = with maintainers; [ rhoriguchi ];
};
}

View file

@ -0,0 +1,25 @@
diff --git a/out/extension.js b/out/extension.js
index 1de8aab..e2b3a3e 100644
--- a/out/extension.js
+++ b/out/extension.js
@@ -204,19 +204,7 @@ function pathToBinary() {
if (!_pathToBinaryPromise) {
let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
if (!command) { // Skip install/upgrade if user has set custom binary path
- const installDir = `${extensionPath}/lsp`;
- const installer = new languageServerInstaller_1.LanguageServerInstaller();
- try {
- yield installer.install(installDir);
- }
- catch (err) {
- vscode.window.showErrorMessage(err);
- throw err;
- }
- finally {
- yield installer.cleanupZips(installDir);
- }
- command = `${installDir}/terraform-ls`;
+ command = 'TERRAFORM-LS-PATH';
}
_pathToBinaryPromise = Promise.resolve(command);
}

View file

@ -13,14 +13,14 @@
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.16-hardened1.patch",
"sha256": "0qd38hrc5qhm1gkk7rdlsf897cw7srs0ibz3xqdbl2zvwxrk1f1w",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.16-hardened1/linux-hardened-5.10.16-hardened1.patch"
"name": "linux-hardened-5.10.17-hardened1.patch",
"sha256": "0c3q7a85vfcq8yc2ig4qv7ix7v5wrj3968cj9j4zgg5537da6cp5",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.17-hardened1/linux-hardened-5.10.17-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.98-hardened1.patch",
"sha256": "0nwj49rb87agkbsv9qfi8wc6mv31a40zdbvl2wp316qxhb1d5n9c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.98-hardened1/linux-hardened-5.4.98-hardened1.patch"
"name": "linux-hardened-5.4.99-hardened1.patch",
"sha256": "0a70n90757kk79wva72ywkn4yy7d2mp6rq1x4cnk0mgpf80lsrdr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.99-hardened1/linux-hardened-5.4.99-hardened1.patch"
}
}

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook269, util-linux, nukeReferences, coreutils
, perl, buildPackages, nixosTests
, perl, nixosTests
, configFile ? "all"
# Userspace dependencies
@ -9,7 +9,7 @@
, nfs-utils
, gawk, gnugrep, gnused, systemd
, smartmontools, enableMail ? false
, sysstat, sudo, pkg-config
, sysstat, pkg-config
# Kernel dependencies
, kernel ? null

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio";
version = "2021-02-11T08-23-43Z";
version = "2021-02-14T04-01-33Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-Y2iyi+bdBCLV/MWPPsrrJFEayuQVGsvrs63kOuFljJ8=";
sha256 = "sha256-Su3BkVZJ4c5T829/1TNQi7b0fZhpG/Ly80ynt5Po+Qs=";
};
vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc=";
vendorSha256 = "sha256-r0QtgpIfDYu2kSy6/wSAExc3Uwd62sDEi1UZ8XzTBoU=";
doCheck = false;

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, zfs
, perlPackages, procps, which, openssh, sudo, mbuffer, pv, lzop, gzip, pigz }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, zfs
, perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }:
with lib;

View file

@ -0,0 +1,31 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "zrepl";
version = "0.3.1";
src = fetchFromGitHub {
owner = "zrepl";
repo = "zrepl";
rev = "v${version}";
sha256 = "sha256-wtUL8GGSJxn9yEdyTWKtkHODfxxLOxojNPlPLRjI9xo=";
};
vendorSha256 = "sha256-4LBX0bD8qirFaFkV52QFU50lEW4eae6iObIa5fFT/wA=";
subPackages = [ "." ];
postInstall = ''
mkdir -p $out/lib/systemd/system
substitute dist/systemd/zrepl.service $out/lib/systemd/system/zrepl.service \
--replace /usr/local/bin/zrepl $out/bin/zrepl
'';
meta = with lib; {
homepage = "https://zrepl.github.io/";
description = "A one-stop, integrated solution for ZFS replication";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ cole-h danderson ];
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "6.5.1";
version = "6.5.2";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5S9mKmnrycrL7DFq8duWVbzEHQfiXAXQYcc3bdiVu1k=";
sha256 = "sha256-7tgYVxZ4E6qi/HLgfC0ZreHuXgtd3JMg4ENQL50YWr4=";
};
cargoSha256 = "0sbkqdwfsfb7q52a9vh5lmggrc8ny2l0xr4qx3m42xm0h64f3y6n";
cargoSha256 = "sha256-xxJfNFegvtHJno7o54Rqai9DvvffrkxTFci673Yq/NI=";
buildInputs = lib.optional stdenv.isDarwin Foundation;

View file

@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ];
enableParallelBuilding = true;
pythonPath = [ yubikey-manager ];
dontWrapQtApps = true;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2021-02-10T07-32-57Z";
version = "2021-02-14T04-28-06Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-dwgQ322KV1aR1RYSowHkb7Q0Pn7vuiV6Me1s6cMyaEs=";
sha256 = "sha256-Wef8HyJVffDb+ZdVPZOxguIFBC0B9s/1u39j7uXWSnw=";
};
vendorSha256 = "sha256-MXCZZZ7NGDu8NMBzfIiNdRduvj7d7nboN2r8ObGx4dQ=";
vendorSha256 = "sha256-V/fsFfc1QbPR/ouW/9AqGeVhLSbDg6NHPqZYa4Fpx6I=";
doCheck = false;

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

View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: f54a838fa686f495854a71cb32fadcb1853b6201
ref: refs/tags/6.0.29
revision: f444c3995f21f9e9eaba63d465fac7d60ba88ebb
ref: refs/tags/6.0.30
specs:
metasploit-framework (6.0.29)
metasploit-framework (6.0.30)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -93,26 +93,26 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.0)
actionpack (5.2.4.4)
actionview (= 5.2.4.4)
activesupport (= 5.2.4.4)
actionpack (5.2.4.5)
actionview (= 5.2.4.5)
activesupport (= 5.2.4.5)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.4)
activesupport (= 5.2.4.4)
actionview (5.2.4.5)
activesupport (= 5.2.4.5)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (5.2.4.4)
activesupport (= 5.2.4.4)
activerecord (5.2.4.4)
activemodel (= 5.2.4.4)
activesupport (= 5.2.4.4)
activemodel (5.2.4.5)
activesupport (= 5.2.4.5)
activerecord (5.2.4.5)
activemodel (= 5.2.4.5)
activesupport (= 5.2.4.5)
arel (>= 9.0)
activesupport (5.2.4.4)
activesupport (5.2.4.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@ -124,22 +124,22 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.0)
aws-partitions (1.424.0)
aws-partitions (1.427.0)
aws-sdk-core (3.112.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.224.0)
aws-sdk-ec2 (1.225.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.47.0)
aws-sdk-iam (1.48.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.42.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.88.0)
aws-sdk-s3 (1.88.1)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@ -149,7 +149,7 @@ GEM
bcrypt_pbkdf (1.1.0)
bindata (2.4.8)
bit-struct (0.16)
bson (4.11.1)
bson (4.12.0)
builder (3.2.4)
concurrent-ruby (1.0.5)
cookiejar (0.3.3)
@ -168,7 +168,7 @@ GEM
eventmachine (>= 1.0.0.beta.4)
erubi (1.10.0)
eventmachine (1.2.7)
faker (2.15.1)
faker (2.16.0)
i18n (>= 1.6, < 2)
faraday (1.3.0)
faraday-net_http (~> 1.0)
@ -183,9 +183,9 @@ GEM
hrr_rb_ssh (0.3.0.pre2)
ed25519 (~> 1.2)
http_parser.rb (0.6.0)
i18n (1.8.8)
i18n (1.8.9)
concurrent-ruby (~> 1.0)
io-console (0.5.7)
io-console (0.5.8)
irb (1.3.3)
reline (>= 0.1.5)
jmespath (1.4.0)
@ -273,9 +273,9 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.4.4)
actionpack (= 5.2.4.4)
activesupport (= 5.2.4.4)
railties (5.2.4.5)
actionpack (= 5.2.4.5)
activesupport (= 5.2.4.5)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@ -294,17 +294,18 @@ GEM
rex-core
rex-struct2
rex-text
rex-core (0.1.15)
rex-core (0.1.16)
rex-encoder (0.1.5)
metasm
rex-arch
rex-text
rex-exploitation (0.1.26)
rex-exploitation (0.1.27)
jsobfu
metasm
rex-arch
rex-encoder
rex-text
rexml
rex-java (0.1.6)
rex-mime (0.1.6)
rex-text
@ -333,6 +334,7 @@ GEM
rex-text (0.2.31)
rex-zip (0.1.4)
rex-text
rexml (3.2.4)
rkelly-remix (0.0.7)
ruby-macho (2.5.0)
ruby-rc4 (0.1.5)

View file

@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.29";
version = "6.0.30";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-QDgInLW/uOBGf0ioPPBMUZv/c9tA7OtTOfp2CEAjf24=";
sha256 = "sha256-DD/nFbSNs3nVNe+W+5zAmDlvMCseYuWWpKX9Dp+9Etc=";
};
buildInputs = [ makeWrapper ];

View file

@ -4,50 +4,50 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d8gxymshjhva5fyv33iy2hzp4jm3i44asdbma9pv9wzpl5fwhn0";
sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq";
type = "gem";
};
version = "5.2.4.4";
version = "5.2.4.5";
};
actionview = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k8dgkplqj76i3q1f8897m8svj2xggd1knhy3bcwfl4nh7998kw6";
sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c";
type = "gem";
};
version = "5.2.4.4";
version = "5.2.4.5";
};
activemodel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g79l7v0ddpxcj5r2s9kii6h4r4nbpy5bksbqi5lxvivrb3pkz1m";
sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m";
type = "gem";
};
version = "5.2.4.4";
version = "5.2.4.5";
};
activerecord = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05b9l85a31cq6g7v4b4ifrj798q49rlidcvvfasmb3bk412wlp03";
sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg";
type = "gem";
};
version = "5.2.4.4";
version = "5.2.4.5";
};
activesupport = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
type = "gem";
};
version = "5.2.4.4";
version = "5.2.4.5";
};
addressable = {
groups = ["default"];
@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dxyx3pnih7g23hq794ldapsszddcmldxf6pq3z99q4d8rg8rrqp";
sha256 = "1v7dwyqkwdbp4f627y459lj22vimjzwhk2z987bcncq2ml7ldrfz";
type = "gem";
};
version = "1.424.0";
version = "1.427.0";
};
aws-sdk-core = {
groups = ["default"];
@ -134,20 +134,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9";
sha256 = "1x2f3jp8p7ag9kw7glkiq60ypqq26ra79qnhms4apqz5www86d4d";
type = "gem";
};
version = "1.224.0";
version = "1.225.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1";
sha256 = "02xsqb66r7a53a9nnwrhpvd5s9n7wdrvd51c56gs1hlb38j45y0j";
type = "gem";
};
version = "1.47.0";
version = "1.48.0";
};
aws-sdk-kms = {
groups = ["default"];
@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v";
sha256 = "01zlv2icx3m0pq94z9fcsp1r9ivdqhfpnpbrv63fpr6m7yqww24y";
type = "gem";
};
version = "1.88.0";
version = "1.88.1";
};
aws-sigv4 = {
groups = ["default"];
@ -224,10 +224,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12v95l3v7n7lh3mk8k1jdrkpn2vjnkb8k636hcygaczzv4jdsdfp";
sha256 = "0gny4n34gwfc6x04x7vli5my6cdl90n4i0wsxm758q81hfmkqxd7";
type = "gem";
};
version = "4.11.1";
version = "4.12.0";
};
builder = {
groups = ["default"];
@ -344,10 +344,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l0dvswigzxaz9558wmfix3v8cmwwkgdvrx1fmpd3qnr5hky1qrk";
sha256 = "1jc6wffxnl7rbhg4hpj572f38fkxgrkgvv5imgzamrdmw55h206b";
type = "gem";
};
version = "2.15.1";
version = "2.16.0";
};
faraday = {
groups = ["default"];
@ -424,20 +424,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs";
sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
type = "gem";
};
version = "1.8.8";
version = "1.8.9";
};
io-console = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gp1xx2g1x81wsh929x7rzsm0c8qgkhr2mkjn79fbdwyfnk4s04l";
sha256 = "0prpvq05wzp8n7vk44zcwmn53p1akn4r105n5py6bmbxsmmkvyhr";
type = "gem";
};
version = "0.5.7";
version = "0.5.8";
};
irb = {
groups = ["default"];
@ -524,12 +524,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "f54a838fa686f495854a71cb32fadcb1853b6201";
sha256 = "0vkz4d00hxps759ypv20vdrzz6si9kq3ra28gx3f1f5znnf0hf20";
rev = "f444c3995f21f9e9eaba63d465fac7d60ba88ebb";
sha256 = "1mqjpnghxzd5ljbfaqhy5cq6yfcqq2fgp5pg6papkcwdnhayfgqc";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.29";
version = "6.0.30";
};
metasploit-model = {
groups = ["default"];
@ -886,10 +886,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "089kiwmv8fxyfk0zp57q74nyd5i6d5x5ihlrzbzwl041v94s2zx9";
sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd";
type = "gem";
};
version = "5.2.4.4";
version = "5.2.4.5";
};
rake = {
groups = ["default"];
@ -966,10 +966,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bjz0mhxijvfq535hpzswr83yrq3ghkkmqna63yjsabh61qpxx16";
sha256 = "08krnf05mbq6x2d92fv34bl8xdz1d3yq2m0mp8bfbq5kd6a13l2w";
type = "gem";
};
version = "0.1.15";
version = "0.1.16";
};
rex-encoder = {
groups = ["default"];
@ -986,10 +986,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z4dn579mxl22qdxcnbmxp0diia6kr7c20giv0bn4r0viavz49gc";
sha256 = "1b10rcrw52nj2aswsn0kwv0s601rbn077k0r6n5lblip6fbrqz9i";
type = "gem";
};
version = "0.1.26";
version = "0.1.27";
};
rex-java = {
groups = ["default"];
@ -1121,6 +1121,16 @@
};
version = "0.1.4";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
type = "gem";
};
version = "3.2.4";
};
rkelly-remix = {
groups = ["default"];
platforms = [];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bpytop";
version = "1.0.61";
version = "1.0.62";
src = fetchFromGitHub {
owner = "aristocratos";
repo = pname;
rev = "v${version}";
sha256 = "sha256-E6blMhDkZa3Wbdbsw7f8jdHwHFINOQ48XC5pQdkVPtQ=";
sha256 = "sha256-ds+N0z7Vfw7xv+nE8RIfFjel81mJgIo1u1KspOHLxKc=";
};
buildInputs = [ makeWrapper ];

View file

@ -29968,6 +29968,8 @@ in
zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
zrepl = callPackage ../tools/backup/zrepl { };
runwayml = callPackage ../applications/graphics/runwayml {};
uhubctl = callPackage ../tools/misc/uhubctl {};