Merge staging-next-24.05 into staging-24.05

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 = ".";

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 = ''

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;
+  };
+}

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 { };

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 ];
 

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