From abdc77e7d5c1fe413d1bff591a97a4b276798335 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 09:15:22 +0200 Subject: [PATCH 1/7] python3Packages.motioneye-client: 0.3.9 -> 0.3.10 --- pkgs/development/python-modules/motioneye-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index a769128fd861..a7981feb2055 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.9"; + version = "0.3.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pLdAxBipmr+HUr9NSupm7h/68PK95r3zY/qZTBs1m54="; + sha256 = "0ilh9wfzggnbfz068vkz66g64ar6isl3m2vcp7jf2zbaj0bqsjax"; }; nativeBuildInputs = [ From 2be2b75dec148156f8f4da0fba53ffe7a1f10ec6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jul 2021 22:24:30 +0200 Subject: [PATCH 2/7] nuclei: 2.4.1 -> 2.4.2 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 3a205ebdb1e0..24ab55900f97 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A="; + sha256 = "0qgpkxb3wm5lwg8kvhfnirw60l81nrs0qv4z07740amnqzd6by4b"; }; - vendorSha256 = "0q6vwh809bfa5ns62zg6vika588199zl3nq26xx5m1ka1d9rak9s"; + vendorSha256 = "1ddr986rqmd57m8k4x78c4xkbja580ix6xdj5rbysfkr6g073qmq"; modRoot = "./v2"; subPackages = [ From b5e7e053969e4aa983934a23ba4ae4537383a133 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 10:31:36 +0200 Subject: [PATCH 3/7] python3Packages.pyupgrade: 2.23.0 -> 2.23.1 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 202c8254f6b9..3d37dcae8720 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.23.0"; + version = "2.23.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "0w1r9s3kr539vwfb7ld7jmr8q4jkr7jsnk51x50wji7jzs627a8i"; + sha256 = "1jc0gh0y5fz02wab50v6m4x0pfycdkjvf1vw05d8d0yqsv7ld7fw"; }; checkInputs = [ pytestCheckHook ]; From 0ddbf92e95b705633d8edc577e019febb130a4d8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 30 Jul 2021 14:32:56 -0300 Subject: [PATCH 4/7] algol68g: Trivial fix in patch --- .../compilers/algol68g/0001-plotutils-png-support.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff index beb3cb1c8bbe..14e7ccd56244 100644 --- a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff +++ b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff @@ -9,7 +9,7 @@ diff -Naur algol68g-2.8.4-old/source/plotutils.c algol68g-2.8.4-new/source/plotu -/*------------------------------------+ -| Supported plotter type - pseudo GIF | -+------------------------------------*/ -+ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "gif")) { ++ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "png")) { +/*-------------------------------------------+ +| Supported plotter type - pseudo GIF or PNG | ++-------------------------------------------*/ From 2293303660461756a2003fe25c4dc8b9de3bac31 Mon Sep 17 00:00:00 2001 From: pmenke Date: Fri, 30 Jul 2021 18:20:24 +0200 Subject: [PATCH 5/7] soapysdr: 0.8.0 -> 0.8.1 --- pkgs/applications/radio/soapysdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index ccd4b8799cef..c6335b51c416 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -8,7 +8,7 @@ let - version = "0.8.0"; + version = "0.8.1"; modulesVersion = with lib; versions.major version + "." + versions.minor version; modulesPath = "lib/SoapySDR/modules" + modulesVersion; extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapySDR"; rev = "soapy-sdr-${version}"; - sha256 = "1dy25zxk7wmg7ik82dx7h3bbbynvalbz1dxsl7kgm3374yxhnixv"; + sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2"; }; nativeBuildInputs = [ cmake makeWrapper pkg-config ]; From 988c12faed96159fd5902f3bc372739c111206ef Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 30 Jul 2021 15:12:46 -0400 Subject: [PATCH 6/7] linux/common-config.nix: disable LPAE on armv7l-linux LPAE was enabled to support native armv7l builders running in QEMU on aarch64, but this option disables support for processors which don't support LPAE, which are still relatively common. In particular, Beaglebones use the Cortex-A8, which doesn't support LPAE. Also, if you attempt to boot an LPAE kernel on a CPU that doesn't support it, it fails before even earlycon is initialized. This makes the problem difficult to debug without enabling CONFIG_DEBUG_LL or using a hardware debugger. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fce451ee889f..3fec8d38ac99 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -880,8 +880,6 @@ let # Keeping it a built-in ensures it will be used if possible. FB_SIMPLE = yes; - } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux") { - ARM_LPAE = yes; }; }; in From ecead7ce510fa177275f9d8521a7431efc6fa688 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 23:04:02 +0200 Subject: [PATCH 7/7] metasploit: 6.0.54 -> 6.0.55 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 30 +++++++++--------- pkgs/tools/security/metasploit/default.nix | 4 +-- pkgs/tools/security/metasploit/gemset.nix | 34 ++++++++++----------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 5fa9ad3b4d6d..d9ca1bb29a87 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -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.54" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.55" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index e23841b82a55..eb3c1b2ee0d2 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 0d6c0cfe63f494a04b46700a4317d52484f3a398 - ref: refs/tags/6.0.54 + revision: bdf054bcc84e23bba81c387cc9247bf3c4052afb + ref: refs/tags/6.0.55 specs: - metasploit-framework (6.0.54) + metasploit-framework (6.0.55) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -127,23 +127,23 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.479.0) - aws-sdk-core (3.117.0) + aws-partitions (1.482.0) + aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.251.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ec2 (1.254.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-iam (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.2) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.98.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.4) @@ -279,7 +279,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.3.2) + puma (5.4.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -416,4 +416,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 6bee3ddf81c4..c0a4d5857475 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.54"; + version = "6.0.55"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-Aoj0KTp8WiY5a5YxssGjvFlVkVHb6ERVFGhyHS7GZ7o="; + sha256 = "sha256-Wf6Aj/mYHs7KdAYWjNzoD+Q5xK9DOsPiRTIEY7lac8M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index e1ebae7da237..0295e7a5c6fe 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,60 +114,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090s6b7lz9wz6rclklshxbksgvdf4wji7yy2vha6cz8vg6lbz1xh"; + sha256 = "14l1w0ka4r54rx18c856dpn5dg1fnqlriiscjj89ap6vzg8r5pl4"; type = "gem"; }; - version = "1.479.0"; + version = "1.482.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mcagbyzy7l39lxm9g85frvjwlv3yfd9x8jddd1pfc0xsy9y0rax"; + sha256 = "1azyn5hj41q1r9wcr0k12xb9j3v1v9ikyxnzjpizhsla44lg3270"; type = "gem"; }; - version = "3.117.0"; + version = "3.119.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs4k390h8sqv6zcmrgixsc8z1smpglrxvnzl1ci522w9jcn6az7"; + sha256 = "1i06ml61fr7qlxfbi98dg4lg40skjj5abfpz60jx7ml5dma13qma"; type = "gem"; }; - version = "1.251.0"; + version = "1.254.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmd4g0cdvb38z9mpx13z6mwgbyyn84vj8wn0yf5y4kfzmi47q4y"; + sha256 = "16am0mpagfzi5n6gsnd4yyiwy8ni312b3kxswq0jvr3wh8ab0r5h"; type = "gem"; }; - version = "1.57.0"; + version = "1.59.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0407yggwsy89fzh387vq3af5azplci5v0a8y97h7r6da4jrv1ksm"; + sha256 = "0h70lz5pblw0sy82j6kv4q4d8h2rb1p6v650kaq8lh6iyjc6il9a"; type = "gem"; }; - version = "1.44.0"; + version = "1.46.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgr1x2ykkbbfh6krv4wb97ihjq6w785gh21qrk77s9xjq4lcfqw"; + sha256 = "0799n1j8cxcn79k5zhy8vcpbh4q8vyi1fxqqs20sxh7yhyhrybw9"; type = "gem"; }; - version = "1.96.2"; + version = "1.98.0"; }; aws-sigv4 = { groups = ["default"]; @@ -594,12 +594,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "0d6c0cfe63f494a04b46700a4317d52484f3a398"; - sha256 = "1fk7qqp1swk82ial9s6va68mandwlg0v4ccndcwjcnkw78lz9202"; + rev = "bdf054bcc84e23bba81c387cc9247bf3c4052afb"; + sha256 = "1hvkbawn611j8pic6fj3mz23kr0gx3f8q5h6fk5cw7lqz67q1zjr"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.54"; + version = "6.0.55"; }; metasploit-model = { groups = ["default"]; @@ -886,10 +886,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj"; + sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; type = "gem"; }; - version = "5.3.2"; + version = "5.4.0"; }; racc = { groups = ["default"];