Merge staging-next into staging

doc/build-helpers/special/vm-tools.section.md

@@ -125,6 +125,8 @@ A set of functions that build a predefined set of minimal Linux distributions im
   * `debian10x86_64`
   * `debian11i386`
   * `debian11x86_64`
+  * `debian12i386`
+  * `debian12x86_64`
 
 ### Attributes {#vm-tools-diskImageFuns-attributes}
 

pkgs/applications/graphics/pdfcpu/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pdfcpu";
-  version = "0.8.1";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-NrR7qjVlac4on3pUde6Au8xlnU0wxWrRRh4QdviNPt4=";
+    hash = "sha256-PJTEaWU/erqVJakvxfB0aYRsi/tcGxYYZjCdEvThmzM=";
     # Apparently upstream requires that the compiled executable will know the
     # commit hash and the date of the commit. This information is also presented
     # in the output of `pdfcpu version` which we use as a sanity check in the
@@ -31,7 +31,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-EGQd2hMf3eWswQ6a2GMqbkf7bE8HVMEqjY6fmWNHmBo=";
+  vendorHash = "sha256-x5EXv2LkJg2LAdml+1I4MzgTvNo6Gl+6e6UHVQ+Z9rU=";
 
   ldflags = [
     "-s"

pkgs/applications/video/obs-studio/default.nix

@@ -171,6 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=deprecated-declarations"
     "-Wno-error=sign-compare" # https://github.com/obsproject/obs-studio/issues/10200
     "-Wno-error=stringop-overflow="
   ];

pkgs/by-name/pr/prismlauncher-unwrapped/package.nix

@@ -35,13 +35,13 @@ assert lib.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prismlauncher-unwrapped";
-  version = "9.0";
+  version = "9.1";
 
   src = fetchFromGitHub {
     owner = "PrismLauncher";
     repo = "PrismLauncher";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-EFpZ3V8wm7q7iwUJg0kKdZzOviWKsCji0jgYrrrKSI0=";
+    hash = "sha256-LVrWFBsI4+BOY5hlevfzqfRXQM6AFd5bMnXbBqTrxzA=";
   };
 
   postUnpack = ''

pkgs/by-name/ve/vencord/package.nix

@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.10.4";
+  version = "1.10.5";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lAMcvJzKFpIvA4QzCnhJddu8EL2SE4iYNvkqesHzsb8=";
+    hash = "sha256-pzb2x5tTDT6yUNURbAok5eQWZHaxP/RUo8T0JECKHJ4=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
@@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
       FlafyDev
       NotAShelf
       Scrumplex
+      donteatoreo
     ];
   };
 })

pkgs/tools/networking/lldpd/default.nix

@@ -1,5 +1,13 @@
-{ stdenv, lib, fetchurl, pkg-config, removeReferencesTo
-, libevent, readline, net-snmp, openssl
+{ stdenv
+, Foundation
+, fetchurl
+, lib
+, libevent
+, net-snmp
+, openssl
+, pkg-config
+, readline
+, removeReferencesTo
 }:
 
 stdenv.mkDerivation rec {
@@ -16,10 +24,16 @@ stdenv.mkDerivation rec {
     "--enable-pie"
     "--with-snmp"
     "--with-systemdsystemunitdir=\${out}/lib/systemd/system"
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--with-launchddaemonsdir=no"
+    "--with-privsep-chroot=/var/empty"
+    "--with-privsep-group=nogroup"
+    "--with-privsep-user=nobody"
   ];
 
   nativeBuildInputs = [ pkg-config removeReferencesTo ];
-  buildInputs = [ libevent readline net-snmp openssl ];
+  buildInputs = [ libevent readline net-snmp openssl ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ];
 
   enableParallelBuilding = true;
 
@@ -34,6 +48,6 @@ stdenv.mkDerivation rec {
     homepage = "https://lldpd.github.io/";
     license = licenses.isc;
     maintainers = with maintainers; [ fpletz ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

pkgs/tools/security/ghidra/extensions.nix

@@ -13,12 +13,14 @@ lib.makeScope newScope (self: {
 
   findcrypt = self.callPackage ./extensions/findcrypt { };
 
-  ghidraninja-ghidra-scripts = self.callPackage ./extensions/ghidraninja-ghidra-scripts { };
-
   ghidra-delinker-extension = self.callPackage ./extensions/ghidra-delinker-extension {
     inherit ghidra;
   };
 
+  ghidra-golanganalyzerextension = self.callPackage ./extensions/ghidra-golanganalyzerextension { };
+
+  ghidraninja-ghidra-scripts = self.callPackage ./extensions/ghidraninja-ghidra-scripts { };
+
   gnudisassembler = self.callPackage ./extensions/gnudisassembler { inherit ghidra; };
 
   lightkeeper = self.callPackage ./extensions/lightkeeper { };

pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix

@@ -0,0 +1,24 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGhidraExtension,
+}:
+buildGhidraExtension rec {
+  pname = "Ghidra-GolangAnalyzerExtension";
+  version = "1.2.4";
+
+  src = fetchFromGitHub {
+    owner = "mooncat-greenpy";
+    repo = "Ghidra_GolangAnalyzerExtension";
+    rev = version;
+    hash = "sha256-uxozIJ+BLcP1vBnLOCZD9ueY10hd37fON/Miii3zabo=";
+  };
+
+  meta = {
+    description = "Facilitates the analysis of Golang binaries using Ghidra";
+    homepage = "https://github.com/mooncat-greenpy/Ghidra_GolangAnalyzerExtension";
+    downloadPage = "https://github.com/mooncat-greenpy/Ghidra_GolangAnalyzerExtension/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ivyfanchiang ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -9152,7 +9152,9 @@ with pkgs;
 
   lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
 
-  lldpd = callPackage ../tools/networking/lldpd { };
+  lldpd = callPackage ../tools/networking/lldpd {
+    inherit (darwin.apple_sdk.frameworks) Foundation;
+  };
 
   llm = with python3Packages; toPythonApplication llm;