From 567f383bccd991d4435fd482ec739d2006f058e7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 20 Feb 2022 11:06:27 +0100 Subject: [PATCH 1/8] php74: 7.4.27 -> 7.4.28 (cherry picked from commit b1cd9254849b3a1a81d225f4a3025e1a53a7a481) --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 316b37f2e099..4bd00811b5fb 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.27"; - sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563"; + version = "7.4.28"; + sha256 = "sha256-IIUIaoY0RLDjlUfeGklp/RxAoMGI61j6spOLZJsMS1g="; }); in From 5ac02414825c9bfd06b702e9cebd2b723c3baacf Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 20 Feb 2022 11:06:46 +0100 Subject: [PATCH 2/8] php80: 8.0.14 -> 8.0.16 (cherry picked from commit 60dfe5bd6c173fe3e59273983b97b0a745b96f72) --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index b34f5974ff4e..1f1fa1dfbc45 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.14"; - sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v"; + version = "8.0.16"; + sha256 = "sha256-9J+Bge4pRjoNI6DGWWnpLVj+6KxWTfkXz/WOSNZeGEk="; }); in From 0978762fcd7bc48a4a97078a55ef29009c134470 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Tue, 22 Feb 2022 12:46:12 +0100 Subject: [PATCH 3/8] netdata: 1.32.1 -> 1.33.1 + protobuf support --- pkgs/tools/system/netdata/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 1b04abce0e0c..0ae4e77910ef 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests -, curl, libcap, libuuid, lm_sensors, zlib +, curl, libcap, libuuid, lm_sensors, zlib, protobuf , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -16,19 +16,19 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.32.1"; + version = "1.33.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-DbuR3x7d6synJELOxI+frK4LY9zFgPKmY7hGY8B5z7o="; + sha256 = "sha256-4rx8EHtOSd/lHcSHZCtiXkjJjL7B175cVGvFOZ9Bzi8="; fetchSubmodules = true; }; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; - buildInputs = [ curl.dev zlib.dev ] + buildInputs = [ curl.dev zlib.dev protobuf ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] ++ optionals withCups [ cups ] From 7376f6488161edba0eff64331eda0870bb06f90b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 23 Feb 2022 15:23:03 +0100 Subject: [PATCH 4/8] cassandra: Remove javadoc which is not shipped in new versions (cherry picked from commit 72ddd738f4ca72f2bbe1d61f6706e644d9ff5aa2) --- pkgs/servers/nosql/cassandra/generic.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 2d031ae9f5d2..4c1a9e89b7b0 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { $out/LICENSE.txt \ $out/NEWS.txt \ $out/NOTICE.txt \ - $out/javadoc \ $out/share/doc/${pname}-${version} if [[ -d $out/doc ]]; then From 90c3d98fd536b5c34c39f99712df7b7f21e0ba03 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 23 Feb 2022 15:18:58 +0100 Subject: [PATCH 5/8] cassandra_3_0: 3.0.24 -> 3.0.26 (cherry picked from commit 313acb6cc2cbe704f41d408ce5ae1f155e2ede28) --- pkgs/servers/nosql/cassandra/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index 7788e3ff381a..d9f5978f2649 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.24"; - sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz"; + version = "3.0.26"; + sha256 = "09wim1w2yizcqpja62jk64fhaw3jgnrgrjlrm4kgmcc3g3bsmw6i"; generation = "3_0"; }) From 7f442b5f54cd7adfa22412d5e6ca1814158898cf Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 23 Feb 2022 15:19:34 +0100 Subject: [PATCH 6/8] cassandra_3_11: 3.11.10 -> 3.11.12 (cherry picked from commit d806547debfbaa5a74ddf7533e45a83a455290ee) --- pkgs/servers/nosql/cassandra/3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index bcdfc8793db5..fc839fa8c356 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.10"; - sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv"; + version = "3.11.12"; + sha256 = "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw"; generation = "3_11"; }) From 35f897b79b040e724f11834ba06d4552b046e5a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Feb 2022 01:55:14 +0000 Subject: [PATCH 7/8] python310Packages.matrix-common: 1.0.0 -> 1.1.0 (cherry picked from commit b86b8a8a28686dd50736c328f1df265dcebc54c1) --- pkgs/development/python-modules/matrix-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index 44d37b988a7d..b1dd247987cf 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "matrix_common"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZmiKRoJ8hv1USuJBDzV2U1uIFt2lRxmT+iAOqOShJK4="; + sha256 = "sha256-qCOHSK/Cs3B5gYNn/tUVbzVXcbB8j/ChdZNPR+D/MnY="; }; propagatedBuildInputs = [ attrs ]; From 4275a321beab5a71872fb7a5fe5da511bb2bec73 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 22 Feb 2022 21:03:39 +0100 Subject: [PATCH 8/8] matrix-synapse: 1.52.0 -> 1.53.0 (cherry picked from commit f6956a44e1bbbdc498866b305deefc23c2b14385) --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 67b00a89d00c..578c5ec72285 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.52.0"; + version = "1.53.0"; src = fetchPypi { inherit pname version; - sha256 = "091z3rwd10n59andfy1pfjrf6q3n3yrjqrws13lqc02w23aaxzin"; + sha256 = "0pp9l3191rg9iildknm1s1phi896y7zh7b3a6m16f6bmchmn8jz3"; }; buildInputs = [ openssl ];