0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-01-31 12:01:50 +00:00 committed by GitHub
commit 87efa4e516
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 344 additions and 202 deletions

View file

@ -235,6 +235,23 @@
removed due to it being an outdated version. removed due to it being an outdated version.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The DHCP server (<literal>services.dhcpd4</literal>,
<literal>services.dhcpd6</literal>) has been hardened. The
service is now using the systemds
<literal>DynamicUser</literal> mechanism to run as an
unprivileged dynamically-allocated user with limited
capabilities. The dhcpd state files are now always stored in
<literal>/var/lib/dhcpd{4,6}</literal> and the
<literal>services.dhcpd4.stateDir</literal> and
<literal>service.dhcpd6.stateDir</literal> options have been
removed. If you were depending on root privileges or
set{uid,gid,cap} binaries in dhcpd shell hooks, you may give
dhcpd more capabilities with e.g.
<literal>systemd.services.dhcpd6.serviceConfig.AmbientCapabilities</literal>.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The <literal>mailpile</literal> email webclient The <literal>mailpile</literal> email webclient
@ -435,6 +452,20 @@
directly. directly.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The existing <literal>pkgs.opentelemetry-collector</literal>
has been moved to
<literal>pkgs.opentelemetry-collector-contrib</literal> to
match the actual source being the <quote>contrib</quote>
edition. <literal>pkgs.opentelemetry-collector</literal> is
now the actual core release of opentelemetry-collector. If you
use the community contributions you should change the package
you refer to. If you dont need them update your commands from
<literal>otelcontribcol</literal> to
<literal>otelcorecol</literal> and enjoy a 7x smaller binary.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
<literal>pkgs.noto-fonts-cjk</literal> is now deprecated in <literal>pkgs.noto-fonts-cjk</literal> is now deprecated in

View file

@ -81,6 +81,11 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. - `services.kubernetes.addons.dashboard` was removed due to it being an outdated version.
- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened.
The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities.
The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed.
If you were depending on root privileges or set{uid,gid,cap} binaries in dhcpd shell hooks, you may give dhcpd more capabilities with e.g. `systemd.services.dhcpd6.serviceConfig.AmbientCapabilities`.
- The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2. - The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2.
- The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs. - The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs.
@ -133,11 +138,20 @@ In addition to numerous new and upgraded packages, this release has the followin
- MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.
- The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under - The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under
`$out/libexec/terraform-providers/<registry>/<owner>/<name>/<version>/<os>_<arch>/terraform-provider-<name>_v<version>` (which mkProvider does). `$out/libexec/terraform-providers/<registry>/<owner>/<name>/<version>/<os>_<arch>/terraform-provider-<name>_v<version>` (which mkProvider does).
This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly. This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly.
- The existing `pkgs.opentelemetry-collector` has been moved to
`pkgs.opentelemetry-collector-contrib` to match the actual source being the
"contrib" edition. `pkgs.opentelemetry-collector` is now the actual core
release of opentelemetry-collector. If you use the community contributions
you should change the package you refer to. If you don't need them update your
commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary.
- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` - `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`
and `pkgs.noto-fonts-cjk-serif` because they each have different release and `pkgs.noto-fonts-cjk-serif` because they each have different release
schedules. To maintain compatibility with prior releases of Nixpkgs, schedules. To maintain compatibility with prior releases of Nixpkgs,

View file

@ -57,7 +57,6 @@ in {
rtl8723bs-firmware rtl8723bs-firmware
rtl8761b-firmware rtl8761b-firmware
rtw88-firmware rtw88-firmware
rtw89-firmware
zd1211fw zd1211fw
alsa-firmware alsa-firmware
sof-firmware sof-firmware
@ -65,6 +64,8 @@ in {
] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
rtl8723bs-firmware rtl8723bs-firmware
] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [
rtw89-firmware
]; ];
hardware.wirelessRegulatoryDatabase = true; hardware.wirelessRegulatoryDatabase = true;
}) })

View file

@ -28,38 +28,45 @@ let
} }
''; '';
dhcpdService = postfix: cfg: optionalAttrs cfg.enable { dhcpdService = postfix: cfg:
"dhcpd${postfix}" = { let
description = "DHCPv${postfix} server"; configFile =
wantedBy = [ "multi-user.target" ]; if cfg.configFile != null
after = [ "network.target" ]; then cfg.configFile
else writeConfig cfg;
leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases";
args = [
"@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"
"-pf" "/run/dhcpd${postfix}/dhcpd.pid"
"-cf" configFile
"-lf" leaseFile
] ++ cfg.extraFlags
++ cfg.interfaces;
in
optionalAttrs cfg.enable {
"dhcpd${postfix}" = {
description = "DHCPv${postfix} server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
preStart = '' preStart = "touch ${leaseFile}";
mkdir -m 755 -p ${cfg.stateDir} serviceConfig = {
chown dhcpd:nogroup ${cfg.stateDir} ExecStart = concatMapStringsSep " " escapeShellArg args;
touch ${cfg.stateDir}/dhcpd.leases Type = "forking";
''; Restart = "always";
DynamicUser = true;
serviceConfig = User = "dhcpd";
let Group = "dhcpd";
configFile = if cfg.configFile != null then cfg.configFile else writeConfig cfg; AmbientCapabilities = [
args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" "CAP_NET_RAW" # to send ICMP messages
"-pf" "/run/dhcpd${postfix}/dhcpd.pid" "CAP_NET_BIND_SERVICE" # to bind on DHCP port (67)
"-cf" "${configFile}" ];
"-lf" "${cfg.stateDir}/dhcpd.leases" StateDirectory = "dhcpd${postfix}";
"-user" "dhcpd" "-group" "nogroup" RuntimeDirectory = "dhcpd${postfix}";
] ++ cfg.extraFlags PIDFile = "/run/dhcpd${postfix}/dhcpd.pid";
++ cfg.interfaces; };
in {
ExecStart = concatMapStringsSep " " escapeShellArg args;
Type = "forking";
Restart = "always";
RuntimeDirectory = [ "dhcpd${postfix}" ];
PIDFile = "/run/dhcpd${postfix}/dhcpd.pid";
}; };
}; };
};
machineOpts = { ... }: { machineOpts = { ... }: {
@ -102,15 +109,6 @@ let
''; '';
}; };
stateDir = mkOption {
type = types.path;
# We use /var/lib/dhcp for DHCPv4 to save backwards compatibility.
default = "/var/lib/dhcp${if postfix == "4" then "" else postfix}";
description = ''
State directory for the DHCP server.
'';
};
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines; type = types.lines;
default = ""; default = "";
@ -194,7 +192,13 @@ in
imports = [ imports = [
(mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ]) (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ])
]; ] ++ flip map [ "4" "6" ] (postfix:
mkRemovedOptionModule [ "services" "dhcpd${postfix}" "stateDir" ] ''
The DHCP server state directory is now managed with the systemd's DynamicUser mechanism.
This means the directory is named after the service (dhcpd${postfix}), created under
/var/lib/private/ and symlinked to /var/lib/.
''
);
###### interface ###### interface
@ -210,15 +214,6 @@ in
config = mkIf (cfg4.enable || cfg6.enable) { config = mkIf (cfg4.enable || cfg6.enable) {
users = {
users.dhcpd = {
isSystemUser = true;
group = "dhcpd";
description = "DHCP daemon user";
};
groups.dhcpd = {};
};
systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6; systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6;
}; };

View file

@ -36,19 +36,10 @@ import ./make-test-python.nix ({pkgs, ...}: {
}; };
# Since we want to program the routes that we delegate to the "customer" # Since we want to program the routes that we delegate to the "customer"
# into our routing table we must have a way to gain the required privs. # into our routing table we must give dhcpd the required privs.
# This security wrapper will do in our test setup. systemd.services.dhcpd6.serviceConfig.AmbientCapabilities =
# [ "CAP_NET_ADMIN" ];
# DO NOT COPY THIS TO PRODUCTION AS IS. Think about it at least twice.
# Everyone on the "isp" machine will be able to add routes to the kernel.
security.wrappers.add-dhcpd-lease = {
owner = "root";
group = "root";
source = pkgs.writeShellScript "add-dhcpd-lease" ''
exec ${pkgs.iproute2}/bin/ip -6 route replace "$1" via "$2"
'';
capabilities = "cap_net_admin+ep";
};
services = { services = {
# Configure the DHCPv6 server # Configure the DHCPv6 server
# #
@ -80,7 +71,7 @@ import ./make-test-python.nix ({pkgs, ...}: {
set Prefix = pick-first-value(binary-to-ascii(16, 16, ":", suffix(option dhcp6.ia-pd, 16)), "n/a"); set Prefix = pick-first-value(binary-to-ascii(16, 16, ":", suffix(option dhcp6.ia-pd, 16)), "n/a");
set PrefixLength = pick-first-value(binary-to-ascii(10, 8, ":", substring(suffix(option dhcp6.ia-pd, 17), 0, 1)), "n/a"); set PrefixLength = pick-first-value(binary-to-ascii(10, 8, ":", substring(suffix(option dhcp6.ia-pd, 17), 0, 1)), "n/a");
log(concat(IP, " ", Prefix, " ", PrefixLength)); log(concat(IP, " ", Prefix, " ", PrefixLength));
execute("/run/wrappers/bin/add-dhcpd-lease", concat(Prefix,"/",PrefixLength), IP); execute("${pkgs.iproute2}/bin/ip", "-6", "route", "replace", concat(Prefix,"/",PrefixLength), "via", IP);
} }
''; '';
}; };

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0l0w1badhvlh1rgqzvlmy5k7xhb1nf4f5dmhkl935a5ila08aak3"; sha256 = "0l0w1badhvlh1rgqzvlmy5k7xhb1nf4f5dmhkl935a5ila08aak3";
}; };
vendorSha256 = "sha256-kA7pOSP4wkzKuFmUqhZmjXJ0ao64cIgZMrQtQ0bQ++U="; vendorSha256 = "sha256-i8BaT9C39tmHU3GGgd0hUB1PHXnoAdNYRIqZA1ggbjQ=";
proxyVendor = true; proxyVendor = true;
# Build errors in mdbx when format hardening is enabled: # Build errors in mdbx when format hardening is enabled:

View file

@ -16,7 +16,7 @@ buildGoModule rec {
sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0="; sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0=";
}; };
vendorSha256 = "sha256-Ac3f17Ws3Ne8Zo0vT+qlaMm/rhak9ua2jh5jlT6jF2Y="; vendorSha256 = "sha256-rIcwZUOi6bdfiWZEsRF4kl1reNPPQNuBPHDOo7RQgYo=";
# package does not contain any tests as of v0.2.3 # package does not contain any tests as of v0.2.3
doCheck = false; doCheck = false;

View file

@ -5,32 +5,28 @@
, zig , zig
, curl , curl
, SDL2 , SDL2
, SDL2_gfx
, SDL2_image , SDL2_image
, SDL2_ttf , SDL2_ttf
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mepo"; pname = "mepo";
version = "0.2"; version = "0.3";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~mil"; owner = "~mil";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-ECq748GpjOjvchzAWlGA7H7HBvKNxY9d43+PTOWopiM="; hash = "sha256-B7BOAFhiOTILUdzh49hTMrNNHZpCNRDLW2uekXyptqQ=";
}; };
nativeBuildInputs = [ pkg-config zig ]; nativeBuildInputs = [ pkg-config zig ];
buildInputs = [ curl SDL2 SDL2_image SDL2_ttf ]; buildInputs = [ curl SDL2 SDL2_gfx SDL2_image SDL2_ttf ];
buildPhase = ''
runHook preBuild
preBuild = ''
export HOME=$TMPDIR export HOME=$TMPDIR
zig build -Drelease-safe=true -Dcpu=baseline
runHook postBuild
''; '';
doCheck = true; doCheck = true;
@ -45,8 +41,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -Dm755 zig-out/bin/mepo -t $out/bin zig build -Drelease-safe=true -Dcpu=baseline --prefix $out install
install -Dm755 scripts/mepo_* $out/bin
runHook postInstall runHook postInstall
''; '';

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "rmapi"; pname = "rmapi";
version = "0.0.18"; version = "0.0.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "juruen"; owner = "juruen";
repo = "rmapi"; repo = "rmapi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Yrq21eiyNem9P219FxuQMHpagKQDaNsASwi2REaDAgk="; sha256 = "sha256-HXWE6688jhRQQEiZuPfuJStSQeueqoWwwa+PfneHprw=";
}; };
vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU="; vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU=";

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE="; sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE=";
}; };
vendorSha256 = "sha256-P7gHCyFafjWOYLEtK9Eh2S2KA0e2hzc1G/ZqVaEWWB0="; vendorSha256 = "sha256-hGpJXCs5lZ6QQHr6LW1fCT+CVtOaUpYXJPchDPDdbaM=";
ldflags = [ ldflags = [
"-X main.version=${version}" "-X main.version=${version}"

View file

@ -827,6 +827,8 @@ rec {
# this on, but tooling may disable this to insert the store paths more # this on, but tooling may disable this to insert the store paths more
# efficiently via other means, such as bind mounting the host store. # efficiently via other means, such as bind mounting the host store.
includeStorePaths ? true includeStorePaths ? true
, # Passthru arguments for the underlying derivation.
passthru ? {}
, ,
}: }:
assert assert
@ -987,7 +989,7 @@ rec {
result = runCommand "stream-${baseName}" result = runCommand "stream-${baseName}"
{ {
inherit (conf) imageName; inherit (conf) imageName;
passthru = { passthru = passthru // {
inherit (conf) imageTag; inherit (conf) imageTag;
# Distinguish tarballs and exes at the Nix level so functions that # Distinguish tarballs and exes at the Nix level so functions that

View file

@ -20,11 +20,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tali"; pname = "tali";
version = "40.4"; version = "40.5";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "AsrMdvTuQjD2eqAK2hlOnFSPidJ6DnLyANi9U67nGhc="; sha256 = "Y6CcVeRqGhl1a/XglXyvmUMA+tq9umvaYC5mjfzfcSI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "afsapi"; pname = "afsapi";
version = "0.2.1"; version = "0.2.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "wlcrs"; owner = "wlcrs";
repo = "python-afsapi"; repo = "python-afsapi";
rev = version; rev = version;
hash = "sha256-LBK32CwiYEa+R5VhcpVzMYklPAgombxl05rM/KWRyIU="; hash = "sha256-C4rxlkylWGsDsnMPuecrC2ELj1PvP6EelZ/kzTn4Brk=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "environs"; pname = "environs";
version = "9.4.0"; version = "9.5.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "sloria"; owner = "sloria";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-LPD46kxzQ/oTC7XjJn/SXaLQgX613ZoCrJuaRng57Gw="; sha256 = "sha256-hucApIn7ul7+MC2W811VTxZNO8Pqb6HDXz9VRcEdmIc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -26,7 +26,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "exchangelib"; pname = "exchangelib";
version = "4.7.1"; version = "4.7.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "ecederstrand"; owner = "ecederstrand";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1kwb5ixlmxg0xxm4wms5r4kym220vbncr9afi9qc25g8npkbs860"; sha256 = "sha256-fdYc+fJEePgCzAkUWz7pmL/CI/O9zm5G9xh1f4bhrH4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "lupupy"; pname = "lupupy";
version = "0.1.1"; version = "0.1.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-bWBiM+u5wl9fWqL8k+R2IaYXSNnc4IxgWgUzyJVxkKk="; sha256 = "sha256-oKc2x0T8KSSv9OB6U79QacBbvATDPecZFFKhFeBG39E=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "md-toc"; pname = "md-toc";
version = "8.1.0"; version = "8.1.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "frnmst"; owner = "frnmst";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo="; sha256 = "sha256-Dlqia+B7WJZlFGlIhgUWdND1qhSS/FOPoFH+uim6i8I=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "meross-iot"; pname = "meross-iot";
version = "0.4.4.3"; version = "0.4.4.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "albertogeniola"; owner = "albertogeniola";
repo = "MerossIot"; repo = "MerossIot";
rev = version; rev = version;
sha256 = "sha256-qff8dB8q4NS7ZYQDIzD1dXOZL/UBGACSBuPDla1okA8="; sha256 = "sha256-bazAhCsxr8UNV51UnaGbP7kTC6mcDNM7N78f0jy26ew=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "meshtastic"; pname = "meshtastic";
version = "1.2.77"; version = "1.2.78";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic"; owner = "meshtastic";
repo = "Meshtastic-python"; repo = "Meshtastic-python";
rev = version; rev = version;
sha256 = "sha256-Z5YwZccyQ3LOuOf9NFuRQc8lYr6mbPp38Y4iIpD02CI="; sha256 = "sha256-8P6K8sQ91kbd4o3mlHel12BFPFODcG/U0EnXJaxmknk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -7,12 +7,13 @@
, colorful , colorful
, tomlkit , tomlkit
, git , git
, packaging
, requests , requests
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pontos"; pname = "pontos";
version = "22.1.1"; version = "22.1.3";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "greenbone"; owner = "greenbone";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-p7E86McHeijsXpaByD5qLHYQLnSImLwHn15INyxWiZc="; hash = "sha256-u/Mvk2/Wg0dB0OyTXllgV5sEV1h01HGZKLacPUxmeMA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -31,6 +32,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
colorful colorful
tomlkit tomlkit
packaging
requests requests
]; ];
@ -39,6 +41,11 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'packaging = "^20.3"' 'packaging = "*"'
'';
disabledTests = [ disabledTests = [
# Signing fails # Signing fails
"test_find_no_signing_key" "test_find_no_signing_key"
@ -48,7 +55,9 @@ buildPythonPackage rec {
"test_missing_cmd" "test_missing_cmd"
]; ];
pythonImportsCheck = [ "pontos" ]; pythonImportsCheck = [
"pontos"
];
meta = with lib; { meta = with lib; {
description = "Collection of Python utilities, tools, classes and functions"; description = "Collection of Python utilities, tools, classes and functions";

View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff"; pname = "sqlfluff";
version = "0.9.3"; version = "0.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-Cg85NdbbZs0tkBy2kq5ZRKDuQwLIixdhggOBSFpUM04="; hash = "sha256-KNYxHBtPRsxEFrBJsfz5G7ZRZpVQxOph9UUKKhbHA9Y=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

View file

@ -19,7 +19,7 @@
version: hashes: version: hashes:
let let
name = "electron-${version}"; pname = "electron";
meta = with lib; { meta = with lib; {
description = "Cross platform desktop application shell"; description = "Cross platform desktop application shell";
@ -54,7 +54,7 @@ let
"Unsupported system: ${platform.system}"; "Unsupported system: ${platform.system}";
common = platform: { common = platform: {
inherit name version meta; inherit pname version meta;
src = fetcher version (get tags platform) (get hashes platform); src = fetcher version (get tags platform) (get hashes platform);
passthru.headers = headersFetcher version hashes.headers; passthru.headers = headersFetcher version hashes.headers;
}; };

View file

@ -13,7 +13,7 @@ buildGoModule rec {
subPackages = [ "." ]; subPackages = [ "." ];
vendorSha256 = "sha256-bFTmr/xQ12cboH1MGvHDUpLM0dMkxMeLgwG0VbhMEnc="; vendorSha256 = "sha256-ICGnjI9sFwt81rZCnap/rggfSs4+pZNmLouoTY7CYKw=";
meta = with lib; { meta = with lib; {
description = "More expressive universal gRPC client"; description = "More expressive universal gRPC client";

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-sahInHXv1GtylsY8kpw1dDjKiENmq4myx+7mq60vJAI="; sha256 = "sha256-sahInHXv1GtylsY8kpw1dDjKiENmq4myx+7mq60vJAI=";
}; };
vendorSha256 = "sha256-DL2eN277cXfsw1dDvIbzkJRuKThgqFOzIufPQVpUzmU="; vendorSha256 = "sha256-KLV6ABo1K+KtAzAQ4FcFiK1LAZEsKup+BtgjRJfonAY=";
doCheck = false; doCheck = false;

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gokart"; pname = "gokart";
version = "0.3.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "praetorian-inc"; owner = "praetorian-inc";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-iXdPQkKTRE2BE2yG2KKThpj7HrxXWwBFv2TobEwGLQQ="; sha256 = "sha256-HsjLNY5Z5UidsLDWSP+1bu3jrfn3oAERPrPV/AkTH8I=";
}; };
vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd"; vendorSha256 = "sha256-S3RukCKAJnPH1KGVdnkgAJQKEDTZYpcMMdoQ4OnHZVg=";
# Would need files to scan which are not shipped by the project # Would need files to scan which are not shipped by the project
doCheck = false; doCheck = false;

View file

@ -1,19 +1,19 @@
{ lib, fetchFromGitHub, rustPlatform, nix }: { stdenv, lib, fetchFromGitHub, rustPlatform, nix }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rnix-lsp"; pname = "rnix-lsp";
version = "0.2.3"; version = "0.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = "rnix-lsp"; repo = "rnix-lsp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-D2ItR8z4LqEH1IL53vq/wPh9Pfe3eB0KsA79aLM/BWM="; sha256 = "sha256-MfD07ugYYbcRaNoLxOcH9+SPbRewNxbHJA5blCSb4EM=";
}; };
cargoSha256 = "sha256-71vH8oc8DmwbwM2PgxjGmWAbyC4AByx7waHxLsr2koI="; cargoSha256 = "sha256-23TJrJyfCuoOOOjZeWQnF/Ac0Xv2k6tZduuzapKvsgg=";
checkInputs = [ nix ]; checkInputs = lib.optional (!stdenv.isDarwin) nix;
meta = with lib; { meta = with lib; {
description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; description = "A work-in-progress language server for Nix, with syntax checking and basic completion";

View file

@ -17,11 +17,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cypress"; pname = "cypress";
version = "9.2.0"; version = "9.3.1";
src = fetchzip { src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "sha256-NxmGMHAEVuFl/3YgcHSbg+yWHB2tRpVTWlP5p5nGtPc="; sha256 = "0626i5nxymh9hh9kf1mkky165cynsrkfw402xqmf69pnyzbzn0h7";
}; };
# don't remove runtime deps # don't remove runtime deps

View file

@ -10,10 +10,10 @@
}: }:
let let
version = "1.21"; version = "1.22";
prebuilt_server = fetchurl { prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
sha256 = "sha256-28zKtSPuJnluVeozZSZJ5LevSY7a6ap15NTXhpwKuEg="; sha256 = "sha256-wF0nPux1M8DhBiguAlTPBOf16PDCkgyjlEiGX6sqQZs=";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile"; owner = "Genymobile";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9MzOaQj+lR1F+E/yoxbL/HMOOuKOU82zkPVq7x6AH3c="; sha256 = "sha256-bYLvrCw6NNCZqgLWIEObnytgD74cE9pm/Z7dgB8S5x0=";
}; };
# postPatch: # postPatch:

View file

@ -1494,6 +1494,18 @@ let
}; };
}; };
roman.ayu-next = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "ayu-next";
publisher = "roman";
version = "1.2.9";
sha256 = "sha256-rwZnqvHRmMquNq9PnU176vI4g8PtS6wSNvQaZ1BMa4I=";
};
meta = {
license = lib.licenses.mit;
};
};
rubbersheep.gi = buildVscodeMarketplaceExtension { rubbersheep.gi = buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "gi"; name = "gi";

View file

@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-GSdVwpYmJ3VnZaMQ8SjzcHpeefFjSaZXRcUAXEI9PKo="; sha256 = "sha256-GSdVwpYmJ3VnZaMQ8SjzcHpeefFjSaZXRcUAXEI9PKo=";
}; };
vendorSha256 = "sha256-RZ4cy9XHpWRP85G4A1/qYPjt/4CZ7pgECf+rsViPjGE="; vendorSha256 = "sha256-4iQxqhXMGeMgHarjVY/rCLr7Am1mniqxTkMxbcp3fGI=";
meta = with lib; { meta = with lib; {
description = "Command-line client for FI-TS Finance Cloud Native services"; description = "Command-line client for FI-TS Finance Cloud Native services";

View file

@ -16,18 +16,18 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kime"; pname = "kime";
version = "2.5.5"; version = "2.5.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Riey"; owner = "Riey";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs="; sha256 = "sha256-r5luI6B4IjNTbh2tzpqabokgwkmbyXrA61+F2HDEWuo=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4="; sha256 = "sha256-GvBnNPY51RPt+I73oet5tB/EE2UsEPKbelJZkSY3xNw=";
}; };
# Replace autostart path # Replace autostart path

View file

@ -0,0 +1,45 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "opentelemetry-collector-contrib";
version = "0.43.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector-contrib";
rev = "v${version}";
sha256 = "sha256-ktzP+ugG2sa0v8B1Zp47o8Bmpxv98zQyFyWf9QfQRoQ=";
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
vendorSha256 = "sha256-0E52YSWlq1ebHA3kR9Qo/6ufug9R+z1cSD9AfbN/Mi0=";
subPackages = [ "cmd/otelcontribcol" ];
ldflags = [
"-s"
"-w"
"-X github.com/open-telemetry/opentelemetry-collector-contrib/internal/version.Version=v${version}"
];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib";
changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md";
description = "OpenTelemetry Collector superset with additional community collectors";
longDescription = ''
The OpenTelemetry Collector offers a vendor-agnostic implementation on how
to receive, process and export telemetry data. In addition, it removes the
need to run, operate and maintain multiple agents/collectors in order to
support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.)
sending to multiple open-source or commercial back-ends. The Contrib
edition provides aditional vendor specific receivers/exporters and/or
components that are only useful to a relatively small number of users and
is multiple times larger as a result.
'';
license = licenses.asl20;
maintainers = with maintainers; [ uri-canva jk ];
};
}

View file

@ -1,30 +1,52 @@
{ buildGoModule { buildGoModule
, fetchFromGitHub , fetchFromGitHub
, lib , lib
, writeScript
}: }:
let
otelcontribcol = writeScript "otelcontribcol" ''
echo 'ERROR: otelcontribcol is now in `pkgs.opentelemetry-collector-contrib`, call the collector with `otelcorecol` or move to `pkgs.opentelemetry-collector-contrib`' >&2
exit 1
'';
in
buildGoModule rec { buildGoModule rec {
pname = "opentelemetry-collector"; pname = "opentelemetry-collector";
version = "0.40.0"; version = "0.43.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-telemetry"; owner = "open-telemetry";
repo = "opentelemetry-collector-contrib"; repo = "opentelemetry-collector";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YFgAS4WReyMnzb6FOeRUXHf1LUgknH5gWObiZNKMbv8="; sha256 = "sha256-hYhJv5LbebUA9Sp8/admfKWXBoOVvXdr3Mzc3qG8GlM=";
}; };
# there is a nested go.mod
sourceRoot = "source/cmd/otelcorecol";
vendorSha256 = "sha256-w5uyAVZ1TrurD4CEWTTk1fWmdlQn8eAFWZrNpISB5Rk=";
vendorSha256 = "sha256-DTZLYF3BoQGou59KaL56pkxySsoQ0xeJ5aF/SkewziE="; preBuild = ''
proxyVendor = true; # set the build version, can't be done via ldflags
sed -i -E 's/Version:(\s*)".*"/Version:\1"${version}"/' main.go
'';
CGO_ENABLED = 0; ldflags = [ "-s" "-w" ];
subPackages = [ "cmd/otelcontribcol" ]; postInstall = ''
cp ${otelcontribcol} $out/bin/otelcontribcol
'';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-collector"; homepage = "https://github.com/open-telemetry/opentelemetry-collector";
description = "OpenTelemetry Collector"; changelog = "https://github.com/open-telemetry/opentelemetry-collector/blob/v${version}/CHANGELOG.md";
description = "OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data";
longDescription = ''
The OpenTelemetry Collector offers a vendor-agnostic implementation on how
to receive, process and export telemetry data. In addition, it removes the
need to run, operate and maintain multiple agents/collectors in order to
support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.)
sending to multiple open-source or commercial back-ends.
'';
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.uri-canva ]; maintainers = with maintainers; [ uri-canva jk ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-U8fmjcPeTcKlf721UIbA4/JYeM4l+OIyAPGNp8IPvSk="; sha256 = "sha256-U8fmjcPeTcKlf721UIbA4/JYeM4l+OIyAPGNp8IPvSk=";
}; };
vendorSha256 = "sha256-8fluCDKrMNnIAlJFlDAisk/P+IYHBCdl7hkSbQtgy1A="; vendorSha256 = "sha256-OyqkjA90zcfqRL6pfISR/6WXbv5LwVhKDECBtlqords=";
# Some tests require internet access, broken in sandbox # Some tests require internet access, broken in sandbox
doCheck = false; doCheck = false;

View file

@ -15,7 +15,7 @@ buildGoModule rec {
sha256 = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI="; sha256 = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI=";
}; };
vendorSha256 = "sha256-MCr1ShhkxM9CeSmqqtgAW0qv0QaIPRSOzASj8gt2ZAg="; vendorSha256 = "sha256-DCDAuKvov4tkf77nJNo9mQU/bAeQasp4VBQRtLX+U6c=";
buildInputs = [ buildInputs = [
libpcap libpcap

View file

@ -14,7 +14,7 @@ buildGoModule rec {
hash = "sha256-7gCEBhnNU5CqC5n0KP4Dd/fmddPRwNqyMFXTrRrJjfU="; hash = "sha256-7gCEBhnNU5CqC5n0KP4Dd/fmddPRwNqyMFXTrRrJjfU=";
}; };
vendorSha256 = "sha256-auhRXKt5dcQ+gr3a9Wfen8/BISP17HVsIRP16sBmiZM="; vendorSha256 = "sha256-8qjIYPkWtYTvl7wAnefpZAjbNSQLQFqRnGGccYZ8ZmU=";
meta = with lib; { meta = with lib; {
description = "Tool to analyse binaries for missing security features"; description = "Tool to analyse binaries for missing security features";

View file

@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ="; sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ=";
}; };
vendorSha256 = "sha256-u5ketxHPwZN2mV0uTgwJbY+ImusGZ9GTTmFAGvdH5yA="; vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ=";
meta = with lib; { meta = with lib; {
description = "Tool to fetch known URLs"; description = "Tool to fetch known URLs";

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

View file

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: 4a1ba0f9095d5c6e954ba58bc71d02feefc411a5 revision: e8c59985fa8e2c65660f2103b75622018e99f6b3
ref: refs/tags/6.1.25 ref: refs/tags/6.1.27
specs: specs:
metasploit-framework (6.1.25) metasploit-framework (6.1.27)
actionpack (~> 6.0) actionpack (~> 6.0)
activerecord (~> 6.0) activerecord (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
@ -31,9 +31,9 @@ GIT
metasploit-concern metasploit-concern
metasploit-credential metasploit-credential
metasploit-model metasploit-model
metasploit-payloads (= 2.0.66) metasploit-payloads (= 2.0.70)
metasploit_data_models metasploit_data_models
metasploit_payloads-mettle (= 1.0.17) metasploit_payloads-mettle (= 1.0.18)
mqtt mqtt
msgpack msgpack
nessus_rest nessus_rest
@ -47,7 +47,7 @@ GIT
openvas-omp openvas-omp
packetfu packetfu
patch_finder patch_finder
pcaprub (= 0.12.4) pcaprub
pdf-reader pdf-reader
pg pg
puma puma
@ -128,13 +128,13 @@ GEM
arel-helpers (2.14.0) arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8) activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.549.0) aws-partitions (1.551.0)
aws-sdk-core (3.125.5) aws-sdk-core (3.125.5)
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.0) jmespath (~> 1.0)
aws-sdk-ec2 (1.294.0) aws-sdk-ec2 (1.296.0)
aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-iam (1.65.0) aws-sdk-iam (1.65.0)
@ -143,7 +143,7 @@ GEM
aws-sdk-kms (1.53.0) aws-sdk-kms (1.53.0)
aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.111.1) aws-sdk-s3 (1.111.3)
aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-core (~> 3, >= 3.125.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4) aws-sigv4 (~> 1.4)
@ -216,7 +216,7 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
http_parser.rb (0.8.0) http_parser.rb (0.8.0)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.8.11) i18n (1.9.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
io-console (0.5.11) io-console (0.5.11)
irb (1.3.6) irb (1.3.6)
@ -251,7 +251,7 @@ GEM
activemodel (~> 6.0) activemodel (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
railties (~> 6.0) railties (~> 6.0)
metasploit-payloads (2.0.66) metasploit-payloads (2.0.70)
metasploit_data_models (5.0.4) metasploit_data_models (5.0.4)
activerecord (~> 6.0) activerecord (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
@ -262,12 +262,12 @@ GEM
railties (~> 6.0) railties (~> 6.0)
recog (~> 2.0) recog (~> 2.0)
webrick webrick
metasploit_payloads-mettle (1.0.17) metasploit_payloads-mettle (1.0.18)
method_source (1.0.0) method_source (1.0.0)
mini_portile2 (2.7.1) mini_portile2 (2.7.1)
minitest (5.15.0) minitest (5.15.0)
mqtt (0.5.0) mqtt (0.5.0)
msgpack (1.4.3) msgpack (1.4.4)
multi_json (1.15.0) multi_json (1.15.0)
multipart-post (2.1.1) multipart-post (2.1.1)
mustermann (1.1.1) mustermann (1.1.1)
@ -291,16 +291,16 @@ GEM
packetfu (1.1.13) packetfu (1.1.13)
pcaprub pcaprub
patch_finder (1.0.2) patch_finder (1.0.2)
pcaprub (0.12.4) pcaprub (0.13.1)
pdf-reader (2.8.0) pdf-reader (2.9.0)
Ascii85 (~> 1.0) Ascii85 (~> 1.0)
afm (~> 0.2.1) afm (~> 0.2.1)
hashery (~> 2.0) hashery (~> 2.0)
ruby-rc4 ruby-rc4
ttfunk ttfunk
pg (1.2.3) pg (1.3.0)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.5.2) puma (5.6.1)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.6.0) racc (1.6.0)
rack (2.2.3) rack (2.2.3)
@ -334,7 +334,7 @@ GEM
rex-core rex-core
rex-struct2 rex-struct2
rex-text rex-text
rex-core (0.1.20) rex-core (0.1.25)
rex-encoder (0.1.6) rex-encoder (0.1.6)
metasm metasm
rex-arch rex-arch
@ -379,12 +379,12 @@ GEM
ruby-macho (3.0.0) ruby-macho (3.0.0)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
ruby_smb (3.0.0) ruby_smb (3.0.1)
bindata bindata
openssl-ccm openssl-ccm
openssl-cmac openssl-cmac
rubyntlm rubyntlm
windows_error windows_error (>= 0.1.3)
rubyntlm (0.6.3) rubyntlm (0.6.3)
rubyzip (2.3.2) rubyzip (2.3.2)
sawyer (0.8.2) sawyer (0.8.2)
@ -437,7 +437,7 @@ GEM
activesupport (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0)
xmlrpc (0.3.2) xmlrpc (0.3.2)
webrick webrick
zeitwerk (2.5.3) zeitwerk (2.5.4)
PLATFORMS PLATFORMS
ruby ruby

View file

@ -15,13 +15,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.1.25"; version = "6.1.27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "sha256-lfTueN3s7wsyQRrulsx7TKVMhOu6//4Z6DDjR/Lm6Vw="; sha256 = "sha256-nc9Oxl5dLGU60jaQdkaErW51s4QsuD977bJubd9BA3A=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -104,10 +104,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "02d86hv5jfs27hszd9d92q31dz3wl3s1racimkhb7nx8xg0l9ldj"; sha256 = "0shhwh5wra3h5vibabdkx422vzs4bwp8kmvn1x46sqscmqk8hw9p";
type = "gem"; type = "gem";
}; };
version = "1.549.0"; version = "1.551.0";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
@ -124,10 +124,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0rzbd111n7pgzpgjabcxi2mpnkxf3fcxkvy4rqidyf80m4633gwy"; sha256 = "0f45py2sgai3d7k67kp4hb9ljf8khfz6wd33sj1pdvj55pcg7zai";
type = "gem"; type = "gem";
}; };
version = "1.294.0"; version = "1.296.0";
}; };
aws-sdk-iam = { aws-sdk-iam = {
groups = ["default"]; groups = ["default"];
@ -154,10 +154,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pgh6zd07r9sfzkdz4bf6piq4n8gzl0f76h68l2zxchc1g9z4lqw"; sha256 = "085nizd80w75djrch1c38g0xchw6hsyfcg039qp27aalwhxd44b4";
type = "gem"; type = "gem";
}; };
version = "1.111.1"; version = "1.111.3";
}; };
aws-sigv4 = { aws-sigv4 = {
groups = ["default"]; groups = ["default"];
@ -564,10 +564,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8";
type = "gem"; type = "gem";
}; };
version = "1.8.11"; version = "1.9.1";
}; };
io-console = { io-console = {
groups = ["default"]; groups = ["default"];
@ -684,12 +684,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "4a1ba0f9095d5c6e954ba58bc71d02feefc411a5"; rev = "e8c59985fa8e2c65660f2103b75622018e99f6b3";
sha256 = "0p79wvr4gqrhx0czxzxsxf24r9acgg69dvhs84r0pvzcvmwfxx4m"; sha256 = "0w0387gnsvmjxmxkzf1chjrpavmdhi37d41ns8x6ab2xbv34xkwx";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.1.25"; version = "6.1.27";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -706,10 +706,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0gpsxysd6lg4falybci1fwlxjmxazjx5birqppdyc9wkqha58j9r"; sha256 = "07vjb7kdgr2wi9b5jk7a9niapvbwi7xk4jx9a521fm6p1fhrnlnn";
type = "gem"; type = "gem";
}; };
version = "2.0.66"; version = "2.0.70";
}; };
metasploit_data_models = { metasploit_data_models = {
groups = ["default"]; groups = ["default"];
@ -726,10 +726,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "06v72lyj08haqzs5a12ds6vadq6r2kxy50s7jxp1vxq5i2j4p2gm"; sha256 = "09mm8wbp7yaaqpz16bhsag3q5xd4aqx5l1n2p06zg55nph1dgy0s";
type = "gem"; type = "gem";
}; };
version = "1.0.17"; version = "1.0.18";
}; };
method_source = { method_source = {
groups = ["default"]; groups = ["default"];
@ -776,10 +776,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "14kg9wdfls7s63lds9blrd77n8mx780bzyh05dj8kn0aimw3l9dx"; sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739";
type = "gem"; type = "gem";
}; };
version = "1.4.3"; version = "1.4.4";
}; };
multi_json = { multi_json = {
groups = ["default"]; groups = ["default"];
@ -957,30 +957,30 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz"; sha256 = "0886fcc5bi0kc0rbma5fj3wa3hbg2nl7ivnbi2j995yzg36zq7xy";
type = "gem"; type = "gem";
}; };
version = "0.12.4"; version = "0.13.1";
}; };
pdf-reader = { pdf-reader = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; sha256 = "1fh2pq3gk5fh18g71wir98k4bz4rvihhx8qmn8zi9fz6yfqx39qj";
type = "gem"; type = "gem";
}; };
version = "2.8.0"; version = "2.9.0";
}; };
pg = { pg = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; sha256 = "0y16aa24ljnyhszqr6g3m0369rmx5xw6dgglipwhi6pn8dl678mr";
type = "gem"; type = "gem";
}; };
version = "1.2.3"; version = "1.3.0";
}; };
public_suffix = { public_suffix = {
groups = ["default"]; groups = ["default"];
@ -997,10 +997,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; sha256 = "03blhf8snz59433zsv7apwqy1hg92yhkb5am9x2dpqr0c4i6hscs";
type = "gem"; type = "gem";
}; };
version = "5.5.2"; version = "5.6.1";
}; };
racc = { racc = {
groups = ["default"]; groups = ["default"];
@ -1147,10 +1147,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0hy7xrd3pwyfk2199zkgfa6kz1fsx7ngf6s512gpk8gadjc8hq6j"; sha256 = "04w1pknswnjs02fgsqcr8dx6cz3qjmx7hs83kbhn836s4yfpyv6a";
type = "gem"; type = "gem";
}; };
version = "0.1.20"; version = "0.1.25";
}; };
rex-encoder = { rex-encoder = {
groups = ["default"]; groups = ["default"];
@ -1357,10 +1357,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1klfrp56qid5fr1kzsi62bkhpp2yn6pbv0yg4ikf0lgzg5nq781w"; sha256 = "0mf3mzxq83y7i8nr6bcl5yacvfz6y5p3hdmvr1m6xq0l0i9a9axy";
type = "gem"; type = "gem";
}; };
version = "3.0.0"; version = "3.0.1";
}; };
rubyntlm = { rubyntlm = {
groups = ["default"]; groups = ["default"];
@ -1627,9 +1627,9 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem"; type = "gem";
}; };
version = "2.5.3"; version = "2.5.4";
}; };
} }

View file

@ -325,7 +325,9 @@ with pkgs;
eclipse-mat = callPackage ../development/tools/eclipse-mat { }; eclipse-mat = callPackage ../development/tools/eclipse-mat { };
evans = callPackage ../development/tools/evans { }; evans = callPackage ../development/tools/evans {
buildGoModule = buildGo117Module;
};
firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
@ -1019,9 +1021,13 @@ with pkgs;
gofu = callPackage ../applications/misc/gofu { }; gofu = callPackage ../applications/misc/gofu { };
godns = callPackage ../tools/networking/godns { }; godns = callPackage ../tools/networking/godns {
buildGoModule = buildGo117Module;
};
godspeed = callPackage ../tools/networking/godspeed { }; godspeed = callPackage ../tools/networking/godspeed {
buildGoModule = buildGo117Module;
};
fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { };
@ -3010,7 +3016,9 @@ with pkgs;
eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; eternal-terminal = callPackage ../tools/networking/eternal-terminal {};
extrude = callPackage ../tools/security/extrude { }; extrude = callPackage ../tools/security/extrude {
buildGoModule = buildGo117Module;
};
f3 = callPackage ../tools/filesystems/f3 { }; f3 = callPackage ../tools/filesystems/f3 { };
@ -3058,7 +3066,9 @@ with pkgs;
firestarter = callPackage ../applications/misc/firestarter { }; firestarter = callPackage ../applications/misc/firestarter { };
fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; fits-cloudctl = callPackage ../tools/admin/fits-cloudctl {
buildGoModule = buildGo117Module;
};
flitter = callPackage ../tools/misc/flitter { }; flitter = callPackage ../tools/misc/flitter { };
@ -5605,7 +5615,9 @@ with pkgs;
garmintools = callPackage ../development/libraries/garmintools {}; garmintools = callPackage ../development/libraries/garmintools {};
gau = callPackage ../tools/security/gau { }; gau = callPackage ../tools/security/gau {
buildGoModule = buildGo117Module;
};
gauge = callPackage ../development/tools/gauge { }; gauge = callPackage ../development/tools/gauge { };
@ -5920,7 +5932,9 @@ with pkgs;
gl2ps = callPackage ../development/libraries/gl2ps { }; gl2ps = callPackage ../development/libraries/gl2ps { };
glab = callPackage ../applications/version-management/git-and-tools/glab { }; glab = callPackage ../applications/version-management/git-and-tools/glab {
buildGoModule = buildGo117Module;
};
glitter = callPackage ../applications/version-management/git-and-tools/glitter { }; glitter = callPackage ../applications/version-management/git-and-tools/glitter { };
@ -8530,7 +8544,12 @@ with pkgs;
opae = callPackage ../development/libraries/opae { }; opae = callPackage ../development/libraries/opae { };
opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector {
buildGoModule = buildGo117Module;
};
opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix {
buildGoModule = buildGo117Module;
};
opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };
@ -25359,7 +25378,9 @@ with pkgs;
exercism = callPackage ../applications/misc/exercism { }; exercism = callPackage ../applications/misc/exercism { };
expenses = callPackage ../applications/misc/expenses { }; expenses = callPackage ../applications/misc/expenses {
buildGoModule = buildGo117Module;
};
fnott = callPackage ../applications/misc/fnott { }; fnott = callPackage ../applications/misc/fnott { };
@ -30334,7 +30355,9 @@ with pkgs;
ergo = callPackage ../applications/blockchains/ergo { }; ergo = callPackage ../applications/blockchains/ergo { };
erigon = callPackage ../applications/blockchains/erigon.nix { }; erigon = callPackage ../applications/blockchains/erigon.nix {
buildGoModule = buildGo117Module;
};
exodus = callPackage ../applications/blockchains/exodus { }; exodus = callPackage ../applications/blockchains/exodus { };
@ -33806,7 +33829,9 @@ with pkgs;
go-swag = callPackage ../development/tools/go-swag { }; go-swag = callPackage ../development/tools/go-swag { };
go-swagger = callPackage ../development/tools/go-swagger { }; go-swagger = callPackage ../development/tools/go-swagger {
buildGoModule = buildGo117Module;
};
jx = callPackage ../applications/networking/cluster/jx {}; jx = callPackage ../applications/networking/cluster/jx {};