From a2e859b039b8b322f58e7f5bca3d12d97b0a93d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 12 Dec 2024 09:39:19 +0100 Subject: [PATCH 01/11] knot-dns: 3.3.9 -> 3.3.10 https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.3.10 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 1e3c3e864b4b..ce66f0d9b503 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.9"; + version = "3.3.10"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "7cf2bd93bf487179aca1d2acf7b462dc269e769944c3ea73c7f9a4570dde86ab"; + sha256 = "969ec9b56f52128ddb659ae3ecbe7897da4b3d499dd1c082cb2e90763f6ab989"; }; outputs = [ From dff631fd1e35d516b2be9690e678215cbdbeb896 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 9 Dec 2024 10:26:35 +0100 Subject: [PATCH 02/11] nextcloud30: 30.0.2 -> 30.0.4 Changelog: https://github.com/nextcloud/server/releases/tag/v30.0.4 Diff: https://github.com/nextcloud/server/compare/v30.0.2...v30.0.4 (cherry picked from commit 812125bbf57e16bd47036ea8b9c8534008b46a02) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index c5df24cfdf42..ec607fcad224 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -63,8 +63,8 @@ in { }; nextcloud30 = generic { - version = "30.0.2"; - hash = "sha256-kpu4BF6WIW/iKmXc1mJ55b17oauynZm/QB1CO2RqRF8="; + version = "30.0.4"; + hash = "sha256-62qrqazvRC8rPkqZa37ope0kRC+bumgSN/so7ZcOH6U="; packages = nextcloud30Packages; }; From a8b76182efefa1f5724bb721975a1c93b92c37d9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 13 Dec 2024 01:07:48 +0100 Subject: [PATCH 03/11] nextcloud28: 28.0.12 -> 28.0.14 Changelog: https://github.com/nextcloud/server/releases/tag/v28.0.14 Diff: https://github.com/nextcloud/server/compare/v28.0.12...v28.0.14 (cherry picked from commit f3df13265bdfba76d9963a566ae9dc7840a83de4) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index ec607fcad224..bcaf8b622490 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -51,8 +51,8 @@ in { }; nextcloud28 = generic { - version = "28.0.12"; - hash = "sha256-KgDKT3mTYPCYf8vIXZmywlj30sz35vfgxMzxehJ/AQU="; + version = "28.0.14"; + hash = "sha256-SpN/GIJIZCbJcD5Z7EspP2Ib6NCAt/hQFvYpkDw68zY="; packages = nextcloud28Packages; }; From db5660ad625b28d0d06535f5333b49b49877977d Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:37:22 +0000 Subject: [PATCH 04/11] discord-canary: 0.0.650 -> 0.0.653 (cherry picked from commit d76b937809195bece9246b13eafb948248cf53c1) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 665fc3427eba..525d3c387260 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -18,7 +18,7 @@ let { stable = "0.0.329"; ptb = "0.0.151"; - canary = "0.0.650"; + canary = "0.0.653"; development = "0.0.67"; }; version = versions.${branch}; @@ -52,7 +52,7 @@ let }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-QFeUeuJMZ9r7lqFhE51jQfpSw5v4+MgUoO2HEcKF4mI="; + hash = "sha256-uBnVz+d5Mp3fjICQQ/SZgFmkXVQGprf7VvUxv0hy00o="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From 0cf4d24efbdf08fae145a6a518572361b5cd0445 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:39:15 +0000 Subject: [PATCH 05/11] discord-development: 0.0.67 -> 0.0.68 (cherry picked from commit 23f2c4b56707ad2a211ebf1bbd3742ac1fd3ba78) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 525d3c387260..2f703c024b04 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -19,7 +19,7 @@ let stable = "0.0.329"; ptb = "0.0.151"; canary = "0.0.653"; - development = "0.0.67"; + development = "0.0.68"; }; version = versions.${branch}; srcs = rec { @@ -56,7 +56,7 @@ let }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-nyOQhSjlARvIjFc3uDi7IFtKxxIpO/V6M1eIg56dMdU="; + hash = "sha256-5sUkGN9ucyYArGkfbGBdJokoqpHKBrkwxH055LpMlrs="; }; }; aarch64-darwin = x86_64-darwin; From 405871505f378f7a0e26c444dcf4bf4b4120e41b Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:42:23 +0000 Subject: [PATCH 06/11] discord-canary: 0.0.538 -> 0.0.541 (cherry picked from commit ca8100a656164a61037d3837f001769b5cdbc75b) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2f703c024b04..d4802c9c4d6a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -11,7 +11,7 @@ let { stable = "0.0.77"; ptb = "0.0.121"; - canary = "0.0.538"; + canary = "0.0.541"; development = "0.0.53"; } else @@ -34,7 +34,7 @@ let }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-RYwHDoPj0TsraI/7dNpngCiB6Fiyhi5ec/iCZD7YMoQ="; + hash = "sha256-upT12C23Vkm+BZycKAufRzM5YHizpZJtEaJjHGzYtv4="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 250570614ad8f3bc030cf921b7acc826c8f96a81 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:44:34 +0000 Subject: [PATCH 07/11] discord-development: 0.0.53 -> 0.0.54 (cherry picked from commit dbbbe10a20aaf99a3ecbb448ab53fbb25a5deac3) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d4802c9c4d6a..646d1eee63b4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -12,7 +12,7 @@ let stable = "0.0.77"; ptb = "0.0.121"; canary = "0.0.541"; - development = "0.0.53"; + development = "0.0.54"; } else { @@ -38,7 +38,7 @@ let }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-4FxdZsVTQTr5yzuzV6IZYZ6qk7sa9WZ27zCtVA1/uOg="; + hash = "sha256-3Qhysb7QFE7W4nqAHffgz9hbud6n6PGcGN6xGBmD6ow="; }; }; x86_64-darwin = { From 6b44131a3da01b6258e6b5c3b4aab21c998832b0 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 3 Dec 2024 22:08:03 +0100 Subject: [PATCH 08/11] nifi: 1.28.0 -> 1.28.1 Fixes CVE-2024-52067. https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.28.1 (cherry picked from commit 3ee82eb5b43829fd7396a3712dfbdce67acef803) --- pkgs/servers/web-apps/nifi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index d8dc8b5c82c0..fabd567d3163 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.28.0"; + version = "1.28.1"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-EQqosdwNdaSUIcP3QlvzJZhDNu1JbHg08FlnZo6ogmQ="; + hash = "sha256-YFQIV2/B+8/fBmrWPs7Q3FkqaIxBqNBP0BIkIm4M7Zo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { mv $out/{LICENSE,NOTICE,README} $out/share/nifi substituteInPlace $out/bin/nifi.sh \ - --replace "/bin/sh" "${stdenv.shell}" + --replace-fail "/bin/sh" "${stdenv.shell}" substituteInPlace $out/bin/nifi-env.sh \ - --replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jdk11}" + --replace-fail "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jdk11}" ''; passthru = { From ca1ba2d9ddb4f1feb8c9102ec330484234604350 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 13 Dec 2024 22:53:28 -0500 Subject: [PATCH 09/11] [24.05] brave: 1.73.91 -> 1.73.101 (#365066) brave: 1.73.91 -> 1.73.101 https://community.brave.com/t/release-channel-1-73-101/586187 --- pkgs/by-name/br/brave/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index a818ee190721..e366ef811aed 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then rec { pname = "brave"; - version = "1.73.91"; + version = "1.73.101"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-q1Bb44JT6J/KX5zAfphH42s41ZyVkhUlypmd64G+1bs="; + hash = "sha256-0nV+NxiXM+m1GbAxECXC/8QWiOyVaMb63JmGtrIFcqM="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then rec { pname = "brave"; - version = "1.73.91"; + version = "1.73.101"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-Q0vM9CRuRl9G+L0G+1PT/HXXFm0qT+j6DduojPwjqtI="; + hash = "sha256-yz3EENDg0khJYVF/W6RAvO3qWoDqs9oFH22WxqWay78="; platform = "x86_64-linux"; } else From aef556059c1cf5e15c1a9427ac81fd0c8d207b92 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 11 Dec 2024 11:28:57 -0500 Subject: [PATCH 10/11] matrix-synapse: 1.120.2 -> 1.121.0 Diff: https://github.com/element-hq/synapse/compare/v1.120.2...v1.121.0 Changelog: https://github.com/element-hq/synapse/releases/tag/v1.121.0 (cherry picked from commit 09cbe2120f6dce6fdc0430f322113fa3cadfce1a) --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 74304abdd8d8..65afe064ae6d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -18,20 +18,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.120.2"; + version = "1.121.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-GW5ZcrVLLR2dPADHasdqhtV8HF+X+N4W3/OZCFBd2uI="; + hash = "sha256-lFtu/vANZj88A6Ak8TopowmNONvtKmUI2bQHwmrA6u0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-5x64eKFuiTWuzwbuhfJ38rksYowq9Nq3LTYCMwuXKzc="; + hash = "sha256-/sWUIxwY+ofQwW2CQsOEMcwpUqxoiBhuSpgVleXF8+A="; }; postPatch = '' From 9fd46d8dfe5b2a7332b6589e84fbc87e791748a3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Dec 2024 16:36:38 -0500 Subject: [PATCH 11/11] matrix-synapse: 1.121.0 -> 1.121.1 Diff: https://github.com/element-hq/synapse/compare/v1.121.0...v1.121.1 Changelog: https://github.com/element-hq/synapse/releases/tag/v1.121.1 (cherry picked from commit 36d4f4be04ddc390994f008bcf0fdddffa56429c) --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 65afe064ae6d..a56f68c56ee8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -18,20 +18,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.121.0"; + version = "1.121.1"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-lFtu/vANZj88A6Ak8TopowmNONvtKmUI2bQHwmrA6u0="; + hash = "sha256-0sLzngo6jBpKyqgw8XwgPzpmSWR7pjXT58XcDJCUq0s="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-/sWUIxwY+ofQwW2CQsOEMcwpUqxoiBhuSpgVleXF8+A="; + hash = "sha256-LGFuz3NtNqH+XumJOirvflH0fyfTtqz5qgYlJx2fmAU="; }; postPatch = ''