From 9b0efed679379cf43bd1eadc9b1d0f8897def0af Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sun, 29 Sep 2024 23:54:14 +0200 Subject: [PATCH 1/5] grafanaPlugins.marcusolsson-dynamictext-panel: init at 5.4.0 (cherry picked from commit 7fbdbc6850aba5a953ffadd66eaaac64fea04603) --- .../marcusolsson-dynamictext-panel/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix new file mode 100644 index 000000000000..55b5f39d90ad --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "marcusolsson-dynamictext-panel"; + version = "5.4.0"; + zipHash = "sha256-IgPON60oRqO52W64UvHuwYoa6UG2NfDWIA4S2HfkGQs="; + meta = with lib; { + description = "Dynamic, data-driven text panel for Grafana"; + license = licenses.asl20; + maintainers = with maintainers; [ herbetom ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index bd1e775243f7..94352fc12210 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -12,6 +12,7 @@ grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; + marcusolsson-dynamictext-panel = callPackage ./marcusolsson-dynamictext-panel { }; redis-app = callPackage ./redis-app { }; redis-datasource = callPackage ./redis-datasource { }; redis-explorer-app = callPackage ./redis-explorer-app { }; From 943743dadd713562b3c22552b66d9d553cb26676 Mon Sep 17 00:00:00 2001 From: Tali Auster Date: Wed, 9 Oct 2024 12:27:34 -0700 Subject: [PATCH 2/5] alire: 2.0.1 -> 2.0.2 (cherry picked from commit ec6f7710bf4cddfc6d832665a88f1ab40929cf37) --- pkgs/development/tools/build-managers/alire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/alire/default.nix b/pkgs/development/tools/build-managers/alire/default.nix index b7613fe6e045..36851de94471 100644 --- a/pkgs/development/tools/build-managers/alire/default.nix +++ b/pkgs/development/tools/build-managers/alire/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "alire"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "alire-project"; repo = "alire"; rev = "v${finalAttrs.version}"; - hash = "sha256-fJXt3mM/v87hWumML6L3MH1O/uKkzmpE58B9nDRohzM="; + hash = "sha256-m4EPiqh7KCeNgq4G727jrW5ABb+uecvvpmZyskqtml4="; fetchSubmodules = true; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gprbuild gnat ]; postPatch = '' - patchShebangs ./dev/build.sh + patchShebangs ./dev/build.sh ./scripts/version-patcher.sh ''; buildPhase = '' From 0c3b089b4095e91a12fdde1a24b2d75b14e680b0 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Fri, 11 Oct 2024 07:52:31 +0530 Subject: [PATCH 3/5] tailscale: 1.74.1 -> 1.76.0 Diff: https://github.com/tailscale/tailscale/compare/v1.74.1...v1.76.0 Changelog: https://github.com/tailscale/tailscale/releases/tag/v1.76.0 Signed-off-by: Muhammad Falak R Wani (cherry picked from commit abe002700418aff554951070430928ae28893870) --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 63195df7d2e8..af9bd5cb3fdb 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -14,7 +14,7 @@ }: let - version = "1.74.1"; + version = "1.76.0"; in buildGoModule { pname = "tailscale"; @@ -24,7 +24,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-672FtDKgz7Nmoufoe4Xg/b8sA8EuKH8X+3n9PAKYjFk="; + hash = "sha256-fCUrZ+rrNJ9+XYjCtgaTUWmWczBbavtPe1pFM3L913w="; }; patches = [ @@ -36,7 +36,7 @@ buildGoModule { }) ]; - vendorHash = "sha256-HJEgBs2GOzXvRa95LdwySQmG4/+QwupFDBGrQT6Y2vE="; + vendorHash = "sha256-xCZ6YMJ0fqVzO+tKbCzF0ftV05NOB+lJbJBovLqlrtQ="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; From a1a2ad1e5bae89c83c4d9dd35d265e2f97028237 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 11 Oct 2024 21:18:47 +0200 Subject: [PATCH 4/5] fop: apply patch for CVE-2024-28168 https://www.openwall.com/lists/oss-security/2024/10/09/1 (cherry picked from commit 562995272c6557ab647a16ab76330e21623a3e86) --- pkgs/tools/typesetting/fop/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 94a24211f9a3..4981ec2a7a0c 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , ant , jdk , jre @@ -17,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-b7Av17wu6Ar/npKOiwYqzlvBFSIuXTpqTacM1sxtBvc="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-28168.patch"; + url = "https://github.com/apache/xmlgraphics-fop/commit/d96ba9a11710d02716b6f4f6107ebfa9ccec7134.patch"; + hash = "sha256-zmUA1Tq6iZtvNECCiXebXodp6AikBn10NTZnVHpPMlw="; + }) + ]; + nativeBuildInputs = [ ant jdk From 268c0ddc1f1e47476bfc90c7ac6f2266d701b885 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 9 Oct 2024 23:10:07 +0300 Subject: [PATCH 5/5] alt-tab-macos: 6.71.0 -> 6.73.0 Changelog: https://github.com/lwouis/alt-tab-macos/releases/tag/v6.73.0 Diff: https://github.com/lwouis/alt-tab-macos/compare/v6.71.0...v6.73.0 (cherry picked from commit 2ad2617af48425ef7e8705a8364484e0c19a6373) --- pkgs/by-name/al/alt-tab-macos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index 17d216e3efdf..9b32c6180ba4 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "6.71.0"; + version = "6.73.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-46K9ePNqZyaV5Da6VRCT6PvG+Ad0vsuvs7sfNRUbKB4="; + hash = "sha256-l/Nuyr5jYBR6LtScgM2LP0mq1NEMkRNVGWZDhiZkAa8="; }; sourceRoot = ".";