From 1f3e9d6140e045726c70cc3142ea03859bb98b07 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sun, 6 Aug 2023 16:57:02 +1000 Subject: [PATCH 1/6] act: 0.2.45 -> 0.2.49 (cherry picked from commit cc9aeeb518c246f1afff9af986ac34900003eea8) --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index e395645c9bce..2a1b656422e0 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.45"; + version = "0.2.49"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mp5+hDSZsp46WMCCqVoorKSHeoQY/+ORtj0fNrKsFWI="; + hash = "sha256-dJt8XrcB1rYt6os3enLQz0YuqXNIqQTh85BIJdXwi2A="; }; - vendorHash = "sha256-37fHVy4NLhWyk1yD9zSNnZoVVyd2QizzDCDbiNJCBlc="; + vendorHash = "sha256-QPpwYec2Y0x/VOsiTWvObKrNWGGE7dj8Cl5eM2l8ibk="; doCheck = false; From 2a274f32de138ae4dd3936d008b9dcb50fa01181 Mon Sep 17 00:00:00 2001 From: Babeuh Date: Fri, 25 Aug 2023 13:38:02 +0200 Subject: [PATCH 2/6] multiviewer-for-f1: 1.24.2 -> 1.26.1 (cherry picked from commit 99c0be37f6750f8b59206440667f3044bc888e5e) --- pkgs/applications/video/multiviewer-for-f1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/applications/video/multiviewer-for-f1/default.nix index 0c6dbe8e7a95..f888d77057fe 100644 --- a/pkgs/applications/video/multiviewer-for-f1/default.nix +++ b/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -24,15 +24,15 @@ }: let - id = "118976581"; + id = "123097753"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.24.2"; + version = "1.26.1"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-zll639fQFdrNvIj/4ECqEGxQw4VgfERGlti7opSmSi0="; + sha256 = "sha256-VS1oDqib0XCEVDVt72GGz1ikwZJYnn6enAylh54PrDI="; }; nativeBuildInputs = [ From 0496ab235e248e5bd9457f1c526b0b23f88495f9 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 23 Aug 2023 15:33:41 -0400 Subject: [PATCH 3/6] brave: 1.57.47 -> 1.57.53 https://community.brave.com/t/release-channel-1-57-53/502801/1 (cherry picked from commit 8b681cd6c3ae50c324e454c578f03bb70c307144) --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 46f9a0ba16d0..e04e35fdd81b 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.57.47"; + version = "1.57.53"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-u2xC+Q6tcg989S0zM2flRRiCu7kLSv1/y3N2EvFxiwM="; + sha256 = "sha256-vySznLCjEqol3FOZHvDpY9LY1UG2ExOu/shu8suKuoM="; }; dontConfigure = true; From 13f6a9832d5f30dbdfda56b17e63d9d26ead1f18 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 27 Aug 2023 12:45:05 +0200 Subject: [PATCH 4/6] haproxy: 2.7.8 -> 2.7.10 Fixes CVE-2023-40225. Changelog: https://www.haproxy.org/download/2.7/src/CHANGELOG --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index f41e48e1a59d..f38a5bf5aa55 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.7.8"; + version = "2.7.10"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-FfInaXG7uoxH2GzILr/G7DPjrvLkVlBYsuSVDAe451w="; + hash = "sha256-vhddzB9q1+oXQmJJODm/LmMqPdffE33MpKuIKuAMdJA="; }; buildInputs = [ openssl zlib libxcrypt ] From 7d86faca2dade15894fc94dca01cf9020cd63619 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Jul 2023 08:54:02 +0200 Subject: [PATCH 5/6] python311Packages.mechanicalsoup: add changelog to meta (cherry picked from commit c438e62013d4fab71a2d210fa8a5fa99146eaa91) --- .../python-modules/mechanicalsoup/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/mechanicalsoup/default.nix b/pkgs/development/python-modules/mechanicalsoup/default.nix index 4d68f71d2b06..f7200addb21f 100644 --- a/pkgs/development/python-modules/mechanicalsoup/default.nix +++ b/pkgs/development/python-modules/mechanicalsoup/default.nix @@ -21,10 +21,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MechanicalSoup"; repo = "MechanicalSoup"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Q5oDAgAZYYUYqjDByXNXFNVKmRyjzIGVE4LN9j8vk4c="; }; + postPatch = '' + # Is in setup_requires but not used in setup.py + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + substituteInPlace setup.cfg \ + --replace " --cov --cov-config .coveragerc --flake8" "" + ''; + propagatedBuildInputs = [ beautifulsoup4 lxml @@ -38,14 +46,6 @@ buildPythonPackage rec { requests-mock ]; - postPatch = '' - # Is in setup_requires but not used in setup.py - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - substituteInPlace setup.cfg \ - --replace " --cov --cov-config .coveragerc --flake8" "" - ''; - pythonImportsCheck = [ "mechanicalsoup" ]; @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for automating interaction with websites"; homepage = "https://github.com/hickford/MechanicalSoup"; + changelog = "https://github.com/MechanicalSoup/MechanicalSoup/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jgillich fab ]; }; From ac25a614fcf67008ca21c3fa1922ea49ca2613ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Jul 2023 08:54:44 +0200 Subject: [PATCH 6/6] python311Packages.mechanicalsoup: 1.2.0 -> 1.3.0 Diff: https://github.com/MechanicalSoup/MechanicalSoup/compare/refs/tags/v1.2.0...v1.3.0 Changelog: https://github.com/MechanicalSoup/MechanicalSoup/releases/tag/v1.3.0 Fixes CVE-2023-34457 (https://github.com/MechanicalSoup/MechanicalSoup/security/advisories/GHSA-x456-3ccm-m6j4) (cherry picked from commit 222778d599a542fa74efe8bd349da06b351e8f69) --- pkgs/development/python-modules/mechanicalsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mechanicalsoup/default.nix b/pkgs/development/python-modules/mechanicalsoup/default.nix index f7200addb21f..114efb9e0c82 100644 --- a/pkgs/development/python-modules/mechanicalsoup/default.nix +++ b/pkgs/development/python-modules/mechanicalsoup/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mechanicalsoup"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "MechanicalSoup"; repo = "MechanicalSoup"; rev = "refs/tags/v${version}"; - hash = "sha256-Q5oDAgAZYYUYqjDByXNXFNVKmRyjzIGVE4LN9j8vk4c="; + hash = "sha256-iZ2nwBxikf0cTTlxzcGvHJim4N6ZEqIhlK7t1WAYdms="; }; postPatch = ''