From 936429d6efd5e11eece1711e6c75f1e90bd13012 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Thu, 17 Mar 2022 14:49:30 +0100 Subject: [PATCH 1/7] openvpn: 2.5.2 -> 2.5.6, 2.4.11 -> 2.4.12 (security, CVE-2022-0547) Release Notes: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst https://github.com/OpenVPN/openvpn/blob/release/2.4/Changes.rst#version-2412 Fixes: CVE-2022-0547 (cherry picked from commit 448d02ec22fb1abe298bc2a36a44ac96465ea23c) --- pkgs/tools/networking/openvpn/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 46375b60fe46..c649c6541270 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -32,7 +32,7 @@ let inherit version; src = fetchurl { - url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; + url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.gz"; inherit sha256; }; @@ -78,12 +78,12 @@ let in { openvpn_24 = generic { - version = "2.4.11"; - sha256 = "06s4m0xvixjhd3azrzbsf4j86kah4xwr2jp6cmcpc7db33rfyyg5"; + version = "2.4.12"; + sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6"; }; openvpn = generic { - version = "2.5.2"; - sha256 = "sha256-sSdDg2kB82Xvr4KrJJOWfhshwh60POmo2hACoXycHcg="; + version = "2.5.6"; + sha256 = "0gdd88rcan9vfiwkzsqn6fxxdim7kb1bsxrcra59c5xksprpwfik"; }; } From cd6e8501e998d742357ec68d742f9f6c7f13f09c Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 20 Mar 2022 12:04:39 +0100 Subject: [PATCH 2/7] tor-browser-bundle-bin: 11.0.7 -> 11.0.9 (cherry picked from commit 9bffd90af89201264cf02a6e2bf03692750725c3) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 5c17bf67a0fc..d9cf630aacf0 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.7"; + version = "11.0.9"; lang = "en-US"; @@ -97,7 +97,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "197yf0abcb98kqds0xvki0b52rlhzyzdc98zmhrn7y8gmahc84cz"; + sha256 = "0cl01bx64d6bmajknj7085nzc6841adkp65fz531r3y6nnpwr9ds"; }; i686-linux = fetchurl { @@ -105,7 +105,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0yylfsgmnfn6zww0r6kp1d1wmmb0lfa4lqwkgr7d8rzi6q9spmqk"; + sha256 = "0j6alhm1pqp7fb6nk55vzvr1qjz6gyd3vn6v2dkkvj9mgm57x1j5"; }; }; in From f48dcc56366d3da409ba05b83b7998272d9fc467 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 4 Feb 2022 07:01:45 +1000 Subject: [PATCH 3/7] yt-dlp: 2022.1.21 -> 2022.2.3 https://github.com/yt-dlp/yt-dlp/releases/tag/2022.02.03 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 3534769b86f9..02670e878308 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.1.21"; + version = "2022.2.3"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-Ig7EBzibXqcuJd/BHDDlQ0ibkAdcVTEdUlXiBF24qeI="; + sha256 = "sha256-lV3RgUq9F4uv8jg9FULv7kit/J3p4vXIZ4SwnNb1omI="; }; propagatedBuildInputs = [ websockets mutagen ] From 8dc6e60042dfb66b1cd05481af6486d39d36ec68 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 4 Feb 2022 17:30:37 +1000 Subject: [PATCH 4/7] yt-dlp: 2022.2.3 -> 2022.2.4 https://github.com/yt-dlp/yt-dlp/releases/tag/2022.02.04 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 02670e878308..b73b41acd88d 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.2.3"; + version = "2022.2.4"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-lV3RgUq9F4uv8jg9FULv7kit/J3p4vXIZ4SwnNb1omI="; + sha256 = "sha256-gbUO18+c/MBC2PWhrS0c17E8SLNsB/rxiAaW6sCn3bU="; }; propagatedBuildInputs = [ websockets mutagen ] From f9b4fdbcdb75839a0d86fc02554def449524b1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 9 Mar 2022 22:36:12 +0100 Subject: [PATCH 5/7] yt-dlp: 2022.2.4 -> 2022.3.8.2, remove hlsEncrypt option, add SuperSandro200 as maintainer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The hlsEncrypt option was removed because it didn't work. Co-authored-by: Samuel Gräfenstein --- pkgs/tools/misc/yt-dlp/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index b73b41acd88d..5e3411129e26 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, brotli , ffmpeg , rtmpdump , phantomjs2 @@ -11,7 +12,7 @@ , ffmpegSupport ? true , rtmpSupport ? true , phantomjsSupport ? false -, hlsEncryptedSupport ? true +, hlsEncryptedSupport ? true # Keep this attribute, so we don't break configs that override it. , withAlias ? false # Provides bin/youtube-dl for backcompat }: @@ -20,16 +21,15 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.2.4"; + version = "2022.3.8.2"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-gbUO18+c/MBC2PWhrS0c17E8SLNsB/rxiAaW6sCn3bU="; + sha256 = "sha256-aFRleMGObOh0ULU3adXVt/WiPlIJeEl222x8y/eVSyE="; }; - propagatedBuildInputs = [ websockets mutagen ] - ++ lib.optional hlsEncryptedSupport pycryptodomex; + propagatedBuildInputs = [ brotli mutagen pycryptodomex websockets ]; # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support @@ -52,7 +52,7 @@ buildPythonPackage rec { doCheck = false; postInstall = lib.optionalString withAlias '' - ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" + ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" ''; meta = with lib; { @@ -68,6 +68,6 @@ buildPythonPackage rec { you can modify it, redistribute it or use it however you like. ''; license = licenses.unlicense; - maintainers = with maintainers; [ mkg20001 ]; + maintainers = with maintainers; [ mkg20001 SuperSandro2000 ]; }; } From efb4f3ffab787fb36f69fdaf4bb0ee251d102281 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 22 Mar 2022 15:47:35 +0100 Subject: [PATCH 6/7] isso: 0.12.5 -> 0.12.6.1 (cherry picked from commit de096b7c8331acfea75f4d97717e25a1cd03c721) --- pkgs/servers/isso/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 6550659898e0..9f376b1f4779 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -16,13 +16,13 @@ in with python3Packages; buildPythonApplication rec { pname = "isso"; - version = "0.12.5"; + version = "0.12.6.1"; src = fetchFromGitHub { owner = "posativ"; repo = pname; rev = version; - sha256 = "12ccfba2kwbfm9h4zhlxrcigi98akbdm4qi89iglr4z53ygzpay5"; + sha256 = "sha256-b2iJmOOsaI4lqJ5//jmHflXRx4yFDaAoKZixXoWIyZg="; }; propagatedBuildInputs = [ @@ -47,10 +47,13 @@ with python3Packages; buildPythonApplication rec { make js ''; - checkInputs = [ nose ]; + checkInputs = [ + pytest + pytest-cov + ]; checkPhase = '' - ${python.interpreter} setup.py nosetests + pytest ''; meta = with lib; { From fa80524e17a7b2cd83e4011a801fd7b2f72c2c7c Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 22 Mar 2022 23:20:06 +0200 Subject: [PATCH 7/7] plasma-systemmonitor: add required dependencies (cherry picked from commit 44d602cc8f13849187d5bdca9f0b1cb270ef97e4) --- pkgs/desktops/plasma-5/plasma-systemmonitor.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix index f69808bf4528..70002151d159 100644 --- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix +++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix @@ -11,6 +11,9 @@ , kitemviews , knewstuff , libksysguard +, kquickcharts +, ksystemstats +, qqc2-desktop-style , qtbase }: @@ -27,5 +30,8 @@ mkDerivation { knewstuff kiconthemes libksysguard + kquickcharts + ksystemstats + qqc2-desktop-style ]; }