Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-06-12 12:07:06 +00:00 committed by GitHub
commit b9b43d5872
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 107 additions and 55 deletions

View file

@ -0,0 +1,9 @@
import ./generic.nix {
major_version = "4";
minor_version = "13";
patch_version = "0-alpha1";
src = fetchTarball {
url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha1.tar.xz";
sha256 = "071k12q8m2w9bcwvfclyc46pwd9r49v6av36fhjdlqq29niyq915";
};
}

View file

@ -31,15 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://savannah.nongnu.org/projects/attr/";
description = "Library and tools for manipulating extended attributes";
platforms = platforms.unix;
platforms = platforms.linux;
license = licenses.gpl2Plus;
# The build failure on Darwin will likely be solved after upgrading the
# macOS SDK in nixpkgs. Check the current SDK version in
# ../../../../os-specific/darwin/apple-sdk/default.nix to see if it has
# been updated to 10.13 or later. Once the requirements are met, building
# it should be straightforward as Homebrew was able to build it without
# patching.
broken = stdenv.isDarwin;
};
}

View file

@ -0,0 +1,39 @@
{ lib, stdenv, fetchFromGitHub, kernel, bc }:
stdenv.mkDerivation {
pname = "rtl8188eus-aircrack";
version = "${kernel.version}-unstable-2021-05-04";
src = fetchFromGitHub {
owner = "aircrack-ng";
repo = "rtl8188eus";
rev = "6146193406b62e942d13d4d43580ed94ac70c218";
sha256 = "sha256-85STELbFB7QmTaM8GvJNlWvAg6KPAXeYRiMb4cGA6RY=";
};
nativeBuildInputs = [ bc ];
buildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
prePatch = ''
substituteInPlace ./Makefile \
--replace /lib/modules/ "${kernel.dev}/lib/modules/" \
--replace '$(shell uname -r)' "${kernel.modDirVersion}" \
--replace /sbin/depmod \# \
--replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
preInstall = ''
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
meta = with lib; {
description = "RealTek RTL8188eus WiFi driver with monitor mode & frame injection support";
homepage = "https://github.com/aircrack-ng/rtl8188eus";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fortuneteller2k ];
broken = kernel.isHardened;
};
}

View file

@ -265,7 +265,7 @@
"fixer" = ps: with ps; [ fixerio ];
"fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist
"flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit
"flic" = ps: with ps; [ ]; # missing inputs: pyflic
"flic" = ps: with ps; [ pyflic ];
"flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick
"flo" = ps: with ps; [ aioflo ];
"flock" = ps: with ps; [ ];

View file

@ -40,17 +40,17 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "materialize";
version = "0.7.1";
rev = "f4bd159fa73d37d44f8ed3f1db13c0c2ff85566f";
version = "0.8.0";
rev = "b2fe225f1afcfec4912976bdaa4a44caf3ca0842";
src = fetchFromGitHub {
owner = "MaterializeInc";
repo = pname;
inherit rev;
hash = "sha256-8nonB/KRv4qOGvJhh0v3UwlBzAXfzb3afeCm/7/E0AU=";
hash = "sha256:09q1bfgsp6j8l8wv2abgibndwfkg2w3nm4dif4qgdkd52fdg0kc5";
};
cargoSha256 = "sha256-5slgICqLZFqxPymgHvq98BtcD70hfJMr36pvAoQKEJ4=";
cargoSha256 = "sha256:0y2r4980dyajf2ql9vb2jxcsn0a2q0gd3f8v932fgjqw13ysmi0s";
nativeBuildInputs = [ cmake perl pkg-config ]
# Provides the mig command used by the krb5-src build script
@ -65,6 +65,7 @@ rustPlatform.buildRustPackage rec {
"--skip test_client"
"--skip test_client_errors"
"--skip test_no_block"
"--skip test_safe_mode"
];
postPatch = ''

View file

@ -24,6 +24,8 @@ common =
, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
, enableStatic ? stdenv.hostPlatform.isStatic
, enableDocumentation ? lib.versionOlder version "2.4pre" ||
stdenv.hostPlatform == stdenv.buildPlatform
, pname, version, suffix ? "", src
, patches ? [ ]
}:
@ -36,16 +38,20 @@ common =
VERSION_SUFFIX = suffix;
outputs = [ "out" "dev" "man" "doc" ];
outputs =
[ "out" "dev" ]
++ lib.optionals enableDocumentation [ "man" "doc" ];
nativeBuildInputs =
[ pkg-config ]
++ lib.optionals stdenv.isLinux [ util-linuxMinimal ]
++ lib.optionals (is24 && enableDocumentation) [
(lib.getBin lowdown) mdbook
]
++ lib.optionals is24
[ autoreconfHook
autoconf-archive
bison flex
(lib.getBin lowdown) mdbook
jq
];
@ -118,6 +124,7 @@ common =
"--sysconfdir=${confDir}"
"--enable-gc"
]
++ lib.optional (!enableDocumentation) "--disable-doc-gen"
++ lib.optionals (!is24) [
# option was removed in 2.4
"--disable-init-state"
@ -160,7 +167,7 @@ common =
license = lib.licenses.lgpl2Plus;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.unix;
outputsToInstall = [ "out" "man" ];
outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man";
};
passthru = {

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

View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 6416bc1a2867938dd39705a3daef25bc5dedfd16
ref: refs/tags/6.0.47
revision: 4ec1009a615521371dd98576c456f62f63190ad9
ref: refs/tags/6.0.48
specs:
metasploit-framework (6.0.47)
metasploit-framework (6.0.48)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -31,9 +31,9 @@ GIT
metasploit-concern (~> 3.0.0)
metasploit-credential (~> 4.0.0)
metasploit-model (~> 3.1.0)
metasploit-payloads (= 2.0.45)
metasploit-payloads (= 2.0.47)
metasploit_data_models (~> 4.1.0)
metasploit_payloads-mettle (= 1.0.9)
metasploit_payloads-mettle (= 1.0.10)
mqtt
msgpack
nessus_rest
@ -125,13 +125,13 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
aws-partitions (1.465.0)
aws-sdk-core (3.114.1)
aws-partitions (1.467.0)
aws-sdk-core (3.114.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.240.0)
aws-sdk-ec2 (1.242.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.55.0)
@ -140,7 +140,7 @@ GEM
aws-sdk-kms (1.43.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.96.0)
aws-sdk-s3 (1.96.1)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@ -192,7 +192,7 @@ GEM
hashery (2.1.2)
hrr_rb_ssh (0.3.0.pre2)
ed25519 (~> 1.2)
http-cookie (1.0.3)
http-cookie (1.0.4)
domain_name (~> 0.5)
http_parser.rb (0.6.0)
i18n (1.8.10)
@ -204,7 +204,7 @@ GEM
jsobfu (0.4.2)
rkelly-remix
json (2.5.1)
loofah (2.9.1)
loofah (2.10.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
metasm (1.0.4)
@ -226,7 +226,7 @@ GEM
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
metasploit-payloads (2.0.45)
metasploit-payloads (2.0.47)
metasploit_data_models (4.1.4)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -237,7 +237,7 @@ GEM
railties (~> 5.2.2)
recog (~> 2.0)
webrick
metasploit_payloads-mettle (1.0.9)
metasploit_payloads-mettle (1.0.10)
method_source (1.0.0)
mini_portile2 (2.5.3)
minitest (5.14.4)
@ -265,7 +265,7 @@ GEM
pcaprub
patch_finder (1.0.2)
pcaprub (0.13.0)
pdf-reader (2.4.2)
pdf-reader (2.5.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)

View file

@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.47";
version = "6.0.48";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-lK8FtHc4VLvp6bEYAw7cqHgbjQP2RS5+XxtjaVMiVWg=";
sha256 = "sha256-E7vuuQ4vxm+pUi95d5rnz8Rgp0DmV08sgtswfzUaa0o=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -114,30 +114,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fs3fy6k4wmzh0z6c4rl313f5px81pj0viqxj1prksza4j7iymmi";
sha256 = "18j2m4i70zinxvwib53kclyvgl5j474nm230yy15bqsfhmhm5qqc";
type = "gem";
};
version = "1.465.0";
version = "1.467.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09ksnsj7jqb339fy4nh6v8zn9gy77vbyjpsiv33r35q82ivi32z2";
sha256 = "09ybqvdmxcw0jgyjy99c5nr0jirs1yyp0lqy95hl0wgvxhvck001";
type = "gem";
};
version = "3.114.1";
version = "3.114.2";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wqrvs49nzr2n9ilbjz61ac61d4d8wwpmzfaawhhq7l4hmwm4pdr";
sha256 = "0zbhgfd4x70ikajximd4s4ni6rd9bvylxwqzh84iwmjngf2sa5fi";
type = "gem";
};
version = "1.240.0";
version = "1.242.0";
};
aws-sdk-iam = {
groups = ["default"];
@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g46v19n6pxa60x7fih2y9zc18q23kdjkb1p2qr33zmi6cz76cc4";
sha256 = "0q28bdmpm2c2fw9wh00zhqxnb8p2nzdfi5l6wwa6bl63fm28816h";
type = "gem";
};
version = "1.96.0";
version = "1.96.1";
};
aws-sigv4 = {
groups = ["default"];
@ -454,10 +454,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
type = "gem";
};
version = "1.0.3";
version = "1.0.4";
};
"http_parser.rb" = {
groups = ["default"];
@ -534,10 +534,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly";
type = "gem";
};
version = "2.9.1";
version = "2.10.0";
};
metasm = {
groups = ["default"];
@ -574,12 +574,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "6416bc1a2867938dd39705a3daef25bc5dedfd16";
sha256 = "0s2m499njqqvbxz2wign0f6iny58vh70665ix7lvnm1qfys0bbwl";
rev = "4ec1009a615521371dd98576c456f62f63190ad9";
sha256 = "0jkb38spyc6vh8n4ymz682kn1i6gwyd7fy9gaalnziig1swyxfqk";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.47";
version = "6.0.48";
};
metasploit-model = {
groups = ["default"];
@ -596,10 +596,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09w5r7g19n845h9ii66h8cx9ikgv69d59ry67183h7c76mhzvm9c";
sha256 = "0jxa9q8jzfy91i4khnzmd36p3g2sq7df34csgwbmv6caarzs7732";
type = "gem";
};
version = "2.0.45";
version = "2.0.47";
};
metasploit_data_models = {
groups = ["default"];
@ -616,10 +616,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07l2ahb4c5ay6s5vbcfmipmya2qdj8i29blxk9vdmvs27yzkc8jk";
sha256 = "12mm3bqcirbzn7337zg96w79i6in49z2gmg41cwjywi1p2iawk61";
type = "gem";
};
version = "1.0.9";
version = "1.0.10";
};
method_source = {
groups = ["default"];
@ -836,10 +836,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cxladxy18dhk4a3b263crq8hyxb3q0c7ifxrb5nr1bs6y0pk8i6";
sha256 = "14cxj3ra9nnn334qpm2vsx9s0zk3095s8ih6cwcp47h3hv03c73y";
type = "gem";
};
version = "2.4.2";
version = "2.5.0";
};
pg = {
groups = ["default"];

View file

@ -20769,6 +20769,8 @@ in
r8168 = callPackage ../os-specific/linux/r8168 { };
rtl8188eus-aircrack = callPackage ../os-specific/linux/rtl8188eus-aircrack { };
rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { };
rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { };

View file

@ -1511,6 +1511,8 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_4_12 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.12.nix { });
ocamlPackages_4_13 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.13.nix { });
ocamlPackages_latest = ocamlPackages_4_12;
ocamlPackages = ocamlPackages_4_12;