From 2be34138b7ea3ec8c1e604bc6dded069425d3014 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 05:53:12 +0000 Subject: [PATCH 01/19] system76-keyboard-configurator: 1.2.0 -> 1.3.0 --- .../misc/system76-keyboard-configurator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 1afb5117a4bf..9738b273de29 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-N7faWyM2KExnKr6foO6KIxkFD/pGzw9RJDnADwK/fYU="; + sha256 = "sha256-/RIpnbwLoNDdts18qhYqc8lDqsPoA5GW6z7LaZc5dos="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoSha256 = "sha256-h5kqm3ZyqzJhTjBcuOvaHkwPvF1xerN2eEDFwZAah6g="; + cargoSha256 = "sha256-hxHWfxNGmpX4mWj1ozOhhOyZI9J3aQzv3yvWFst81aU="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; From c5ddc80848c6721c1764fabdd692a457c91d8585 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 16:44:16 +0000 Subject: [PATCH 02/19] python310Packages.dpath: 2.1.3 -> 2.1.4 --- pkgs/development/python-modules/dpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index acc8d75e000e..508af9270d36 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.1.3"; + version = "2.1.4"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-0aeg5kJ9CkFWx5LILK8fAQlgP2is55LjbKRZb9LLjZ0="; + sha256 = "sha256-M4CnfQ20q/EEElhg/260vQfJfGW4Gq1CpglxcImhvtA="; }; # use pytest as nosetests hangs From 896eae0bb70ea978cb81fe03019b61b0fad30831 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 17:16:00 +0000 Subject: [PATCH 03/19] python310Packages.lxmf: 0.2.8 -> 0.2.9 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 229d3dfdaa9e..e3a061b63783 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.2.8"; + version = "0.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-JSr9qLyRg0pMZHuvfo/ZO9/Hwl7ZHTrMGkrcejVRweY="; + hash = "sha256-etmQNUjxrJeRRWy2znkJ0slbODiRrTB/bABGFB1e9xc="; }; propagatedBuildInputs = [ From 119fb25fbf47d897bc110014a247ea65081910c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 10:02:17 +0000 Subject: [PATCH 04/19] python310Packages.aioesphomeapi: 13.0.4 -> 13.1.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 33247ba3fe4f..06c7cde04a00 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.0.4"; + version = "13.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pqCg4LAFIr5BEDqRWMaNc3M36bUmou5cZdarQ/0W77Y="; + hash = "sha256-slPYf7H8vwgSlqm7H7JnJnU17nL2Hwg9hHO0le33IqU="; }; postPatch = '' From ef0e6c58286e6cf53f61bf737af39dfb53932e09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 10:53:51 +0100 Subject: [PATCH 05/19] python310Packages.types-retry: 0.9.9 -> 0.9.9.1 --- pkgs/development/python-modules/types-retry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix index 53323d950cbf..29652179d2f1 100644 --- a/pkgs/development/python-modules/types-retry/default.nix +++ b/pkgs/development/python-modules/types-retry/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-retry"; - version = "0.9.9"; + version = "0.9.9.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sQh7J0aAtULHllSehIiJjQsizYmYjvEBbvVtQ2f/T0E="; + hash = "sha256-NE6tQ4fg6YxtYDdYwTGO5OWwRCnOy5o0Khz4c947UQ0="; }; # Modules doesn't have tests From 0e6e5de21e2ee9f47b53cd5e4c492e74a2300d28 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 06/19] yarn: install bash completions --- pkgs/development/tools/yarn/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index b3bc6bc62b95..9bd4c3c3a24a 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, nodejs, fetchzip, testers, yarn }: +{ lib, stdenv, nodejs, fetchFromGitHub, fetchzip, testers, yarn }: +let + completion = fetchFromGitHub { + owner = "dsifford"; + repo = "yarn-completion"; + rev = "v0.17.0"; + hash = "sha256-z7KPXeYPPRuaEPxgY6YqsLt9n8cSsW3n2FhOzVde1HU="; + }; +in stdenv.mkDerivation rec { pname = "yarn"; version = "1.22.19"; @@ -12,10 +20,11 @@ stdenv.mkDerivation rec { buildInputs = [ nodejs ]; installPhase = '' - mkdir -p $out/{bin,libexec/yarn/} + mkdir -p $out/{bin,libexec/yarn/,share/bash-completion/completions/} cp -R . $out/libexec/yarn ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarn ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarnpkg + ln -s ${completion}/yarn-completion.bash $out/share/bash-completion/completions/yarn.bash ''; passthru.tests = testers.testVersion { package = yarn; }; From 481cf831fedac9a041e0b2ea05f72f6fd8cdc541 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 07/19] yarn: use stdenvNoCC --- pkgs/development/tools/yarn/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 9bd4c3c3a24a..7bfaa88f38b1 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nodejs, fetchFromGitHub, fetchzip, testers, yarn }: +{ lib, fetchFromGitHub, fetchzip, nodejs, stdenvNoCC, testers }: let completion = fetchFromGitHub { @@ -8,12 +8,12 @@ let hash = "sha256-z7KPXeYPPRuaEPxgY6YqsLt9n8cSsW3n2FhOzVde1HU="; }; in -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "yarn"; version = "1.22.19"; src = fetchzip { - url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; + url = "https://github.com/yarnpkg/yarn/releases/download/v${finalAttrs.version}/yarn-v${finalAttrs.version}.tar.gz"; sha256 = "sha256-12wUuWH+kkqxAgVYkyhIYVtexjv8DFP9kLpFLWg+h0o="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ln -s ${completion}/yarn-completion.bash $out/share/bash-completion/completions/yarn.bash ''; - passthru.tests = testers.testVersion { package = yarn; }; + passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { homepage = "https://yarnpkg.com/"; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ offline screendriver ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) From 4369da19c9f1904fda639b4645c46335cf04984d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 08/19] yarn: update meta --- pkgs/development/tools/yarn/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 7bfaa88f38b1..084dc277cb75 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -30,10 +30,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { - homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management for javascript"; + homepage = "https://classic.yarnpkg.com/"; + changelog = "https://github.com/yarnpkg/yarn/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ offline screendriver ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = nodejs.meta.platforms; }; }) From 4601848ff37d03e6677ca71875d205c102033382 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 09/19] yarn: add marsam to maintainers --- pkgs/development/tools/yarn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 084dc277cb75..f642b22ef279 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://classic.yarnpkg.com/"; changelog = "https://github.com/yarnpkg/yarn/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = with maintainers; [ offline screendriver ]; + maintainers = with maintainers; [ offline screendriver marsam ]; platforms = nodejs.meta.platforms; }; }) From f7b5073a153c0878878a971a654322511ffe5dae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 10/19] twilio-cli: 5.3.2 -> 5.3.3 https://github.com/twilio/twilio-cli/releases/tag/5.3.3 --- pkgs/development/tools/twilio-cli/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index c9dabfffe0ff..983e91e62e66 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenvNoCC, nodejs, fetchzip, makeBinaryWrapper, testers }: +{ lib, stdenvNoCC, nodejs, fetchzip, testers }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.3.2"; + version = "5.3.3"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-Ld7drg2N+4XUtpsA7Jpg7BrrSWTWBVa1QhuJ+FNOIGw="; + sha256 = "sha256-4ZgPytpv2yxKXADGR4I5+U0YjsvGEvcaF0cGrCJ21aI="; }; - nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ nodejs ]; installPhase = '' From fcef54dff06d4b64411889cfb103861fbfdb5adb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 11/19] python310Packages.sphinx-thebe: 0.2.0 -> 0.2.1 https://github.com/executablebooks/sphinx-thebe/releases/tag/v0.2.1 --- pkgs/development/python-modules/sphinx-thebe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-thebe/default.nix b/pkgs/development/python-modules/sphinx-thebe/default.nix index d031faa90c2a..1bf8685282ee 100644 --- a/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinx-thebe"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CHZ6WacLlFhpGyujW7b2KkRSlGmUR3rlg5ulPMsKUoc="; + sha256 = "f4c8c1542054f991b73fcb28c4cf21697e42aba2f83f22348c1c851b82766583"; }; propagatedBuildInputs = [ sphinx ]; From 6644beb1f10ac412c29ee0b6d6b2dd6d97517ee5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jan 2023 17:34:14 +0000 Subject: [PATCH 12/19] python310Packages.aio-geojson-usgs-earthquakes: 0.1 -> 0.2 --- .../python-modules/aio-geojson-usgs-earthquakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 04ffcf6b384d..728a666447d3 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-usgs-earthquakes"; - version = "0.1"; + version = "0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-usgs-earthquakes"; rev = "refs/tags/v${version}"; - hash = "sha256-Hb0/BdK/jjxlPl9WJJpFdOCzZpZDCguXoGreGIyN8oo="; + hash = "sha256-ET8wcOep4tSZJXyL+XvfW2j9eKp6LrBk/g18ZlgLIzc="; }; propagatedBuildInputs = [ From 5f5779e2136559609c10d3c51dffa2eba1e17d4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jan 2023 18:47:53 +0000 Subject: [PATCH 13/19] python310Packages.requests-aws4auth: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/requests-aws4auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 9819c3df60e8..d67f8f364ea2 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "requests-aws4auth"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tedder"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-a3OY0Z5GGr3gYa5m4V6ukqQmjZuqtgZjmLGJxmFOPqU="; + hash = "sha256-Dr3i+5xTKLKOMjGkCdKhkK2BCV8/FgTGMtGsYtvB5s8="; }; propagatedBuildInputs = [ From 63ef758151c7edb219398dd6b649ceabd0ce5fe2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jan 2023 20:28:28 +0000 Subject: [PATCH 14/19] python310Packages.pydevccu: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/pydevccu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index 75643d0874e4..62754bdd18ee 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.4"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VneuAnt9HkIRBeK2T71MIHbZbz6zY1vVy5vOYZ+82gM="; + hash = "sha256-scgWD40jjt8qPGygV11Rfd4Z1voBlErScabLLcmQqGg="; }; # Module has no tests From bc3526fd9f039d0a0e94155cd6439ca528fbf02d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jan 2023 20:59:26 +0000 Subject: [PATCH 15/19] deno: 1.29.4 -> 1.30.0 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index e3e7481dff1f..7d570f07aca1 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.29.4"; + version = "1.30.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oCBtqOm/d5dpIv70/Ht0M6izxdvm59LCiDHgcMcwLek="; + sha256 = "sha256-He8RgzmiL8Zp+klm0JPNeqbyjK/5CsE7HB2Hco7GZss="; }; - cargoSha256 = "sha256-Y/1yfCeWleNrk5MgkIoAtkH8e6YSZWa+GF5RgLaZXQA="; + cargoSha256 = "sha256-lPgVivYsR3SljPkjRRkb3qM3ZO7RALfk1KGPd7cwSYQ="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From 31c5693838211ffc13058eba126f1240cd7316c7 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Fri, 27 Jan 2023 22:35:03 +0100 Subject: [PATCH 16/19] herbstluftwm: fix hang during tests Fixes #212470 Incidentally, font-related tests now work --- pkgs/applications/window-managers/herbstluftwm/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index ed6b9fd4aac7..f1d7c585c443 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -77,10 +77,9 @@ stdenv.mkDerivation rec { pytestFlagsArray = [ "../tests" ]; disabledTests = [ - "test_title_different_letters_are_drawn" # font problems - "test_completable_commands" # font problems "test_autostart" # $PATH problems "test_wmexec_to_other" # timeouts in sandbox + "test_rules" # timeouts ]; passthru = { From 35ca8382c68ae5c9c92b51387f26226dc0e94217 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jan 2023 22:35:02 +0000 Subject: [PATCH 17/19] libgbinder: 1.1.31 -> 1.1.32 --- pkgs/development/libraries/libgbinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index fef8ad6da4ef..69166ab33feb 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.31"; + version = "1.1.32"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-TrIBI72ammruYbDb46ZfjJ9p8hoqqlApC7ZvnUHK3S8="; + sha256 = "sha256-/sOshlPcqKEdH5muusXg6Q9QfSgRYyCJMmtRM5mT/kQ="; }; outputs = [ "out" "dev" ]; From b55e98200e9d96c7914fbbc54b71fcca3db1e6ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jan 2023 22:46:51 +0000 Subject: [PATCH 18/19] powerstat: 0.02.27 -> 0.03.00 --- pkgs/os-specific/linux/powerstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 86f2e124ed29..5f03c5faabc3 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.27"; + version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-P6DhsHnB+ak35JpUfD8Q8XbgMhI1QKKe31B8uMT2ZcY="; + hash = "sha256-eiFzWKY4LrudfjMKDk4clmvCqYOGvWFokn6jEryMYBo="; }; installFlags = [ From 94da0240d2ba4ad4be2a02adee5d297941aa4acc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 28 Jan 2023 00:24:50 +0100 Subject: [PATCH 19/19] tmux: apply patch for CVE-2022-47016 Upstream issues: https://github.com/tmux/tmux/issues/3312 https://github.com/tmux/tmux/issues/3447 Upstream patch does not apply cleanly on top of 3.3a. --- pkgs/tools/misc/tmux/CVE-2022-47016.patch | 72 +++++++++++++++++++++++ pkgs/tools/misc/tmux/default.nix | 5 ++ 2 files changed, 77 insertions(+) create mode 100644 pkgs/tools/misc/tmux/CVE-2022-47016.patch diff --git a/pkgs/tools/misc/tmux/CVE-2022-47016.patch b/pkgs/tools/misc/tmux/CVE-2022-47016.patch new file mode 100644 index 000000000000..e6ced830421e --- /dev/null +++ b/pkgs/tools/misc/tmux/CVE-2022-47016.patch @@ -0,0 +1,72 @@ +From 01f753df5dc269cf054b94c3f210aa880872d602 Mon Sep 17 00:00:00 2001 +From: nicm +Date: Wed, 24 Aug 2022 07:22:30 +0000 +Subject: [PATCH] Check for NULL returns from bufferevent_new. + +(cherry picked from commit e86752820993a00e3d28350cbe46878ba95d9012) +--- + control.c | 4 ++++ + file.c | 4 ++++ + window.c | 2 ++ + 3 files changed, 10 insertions(+) + +diff --git a/control.c b/control.c +index 73286e00..6183a006 100644 +--- a/control.c ++++ b/control.c +@@ -775,6 +775,8 @@ control_start(struct client *c) + + cs->read_event = bufferevent_new(c->fd, control_read_callback, + control_write_callback, control_error_callback, c); ++ if (cs->read_event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cs->read_event, EV_READ); + + if (c->flags & CLIENT_CONTROLCONTROL) +@@ -782,6 +784,8 @@ control_start(struct client *c) + else { + cs->write_event = bufferevent_new(c->out_fd, NULL, + control_write_callback, control_error_callback, c); ++ if (cs->write_event == NULL) ++ fatalx("out of memory"); + } + bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW, + 0); +diff --git a/file.c b/file.c +index b2f155fe..04a907bf 100644 +--- a/file.c ++++ b/file.c +@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer, + + cf->event = bufferevent_new(cf->fd, NULL, file_write_callback, + file_write_error_callback, cf); ++ if (cf->event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cf->event, EV_WRITE); + goto reply; + +@@ -744,6 +746,8 @@ file_read_open(struct client_files *files, struct tmuxpeer *peer, + + cf->event = bufferevent_new(cf->fd, file_read_callback, NULL, + file_read_error_callback, cf); ++ if (cf->event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cf->event, EV_READ); + return; + +diff --git a/window.c b/window.c +index c0cd9bdc..294a1f08 100644 +--- a/window.c ++++ b/window.c +@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane *wp) + + wp->event = bufferevent_new(wp->fd, window_pane_read_callback, + NULL, window_pane_error_callback, wp); ++ if (wp->event == NULL) ++ fatalx("out of memory"); + wp->ictx = input_init(wp, wp->event, &wp->palette); + + bufferevent_enable(wp->event, EV_READ|EV_WRITE); +-- +2.39.1 + diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 139cadc70642..a630dbc37411 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , bison , libevent @@ -35,6 +36,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-SygHxTe7N4y7SdzKixPFQvqRRL57Fm8zWYHfTpW+yVY="; }; + patches = [ + ./CVE-2022-47016.patch + ]; + nativeBuildInputs = [ pkg-config autoreconfHook