From 5ac6c5261dfcf80a295f2e41ebf7d6919d5f0c46 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 5 Sep 2024 14:05:27 +0200 Subject: [PATCH 01/10] doc: Add missing debian12 attribute names Fixes 7ec994050c91e, which added the debian12* attributes, but did not update the documentation Signed-off-by: Matthias Beyer --- doc/build-helpers/special/vm-tools.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/build-helpers/special/vm-tools.section.md b/doc/build-helpers/special/vm-tools.section.md index 8feab04902d8..46ced7cd9990 100644 --- a/doc/build-helpers/special/vm-tools.section.md +++ b/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} From 69f95d6231957a538975532fe401250aac3ca330 Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Tue, 22 Oct 2024 15:13:43 +0200 Subject: [PATCH 02/10] lldpd: build on macOS --- pkgs/tools/networking/lldpd/default.nix | 22 ++++++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index d9f9ae45ad13..e627b12d7331 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab4e0b8b7236..beed1df45183 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9157,7 +9157,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; From e81121612c9caf587f23b92b0e9cc837f0321d1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Oct 2024 05:50:35 +0000 Subject: [PATCH 03/10] pdfcpu: 0.8.1 -> 0.9.0 --- pkgs/applications/graphics/pdfcpu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 5d3e2d6abcc2..5721fcf7bc0b 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-NrR7qjVlac4on3pUde6Au8xlnU0wxWrRRh4QdviNPt4="; + hash = "sha256-HC8CR33/pDNHJpbLC04JDR4vSHkET4528AEjzvUaoCs="; # 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" From 7ba1c530eef65f338a5bf296f60998d7d4ebe647 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 24 Oct 2024 16:41:39 +0200 Subject: [PATCH 04/10] prismlauncher-unwrapped: 9.0 -> 9.1 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/pr/prismlauncher-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index b09f342e2076..19dc354aee92 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/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 = '' From be43e12f915f739b7bddca423e409ffe4f1306ed Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 24 Oct 2024 15:13:36 +0000 Subject: [PATCH 05/10] vencord: 1.10.4 -> 1.10.5 Diff: https://github.com/Vendicated/Vencord/compare/v1.10.4...v1.10.5 --- pkgs/by-name/ve/vencord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 58b5d8da8aea..c98129527775 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/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 { From 71fc5743a87cbbc0effb44764761205bed7bc5c7 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 24 Oct 2024 18:26:15 +0300 Subject: [PATCH 06/10] vencord: add maintainer donteatoreo --- pkgs/by-name/ve/vencord/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index c98129527775..981e5d08a4a9 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { FlafyDev NotAShelf Scrumplex + donteatoreo ]; }; }) From 4d2ea7ff45d81992cd4680522b3aca2c6c1211db Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 25 Oct 2024 00:25:43 +0300 Subject: [PATCH 07/10] pdfcpu: 0.9.0 -> 0.9.1 Diff: https://github.com/pdfcpu/pdfcpu/compare/v0.9.0...v0.9.1 --- pkgs/applications/graphics/pdfcpu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 5721fcf7bc0b..55525022162d 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-HC8CR33/pDNHJpbLC04JDR4vSHkET4528AEjzvUaoCs="; + 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 From 1d53554f151e5eed345903c3551b1b022bd6d51f Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Thu, 24 Oct 2024 00:44:37 -0400 Subject: [PATCH 08/10] ghidra-extensions.ghidra-golanganalyzerextension: init at 1.2.4 --- pkgs/tools/security/ghidra/extensions.nix | 2 ++ .../default.nix | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix diff --git a/pkgs/tools/security/ghidra/extensions.nix b/pkgs/tools/security/ghidra/extensions.nix index 60070a316a0f..762154dc45e4 100644 --- a/pkgs/tools/security/ghidra/extensions.nix +++ b/pkgs/tools/security/ghidra/extensions.nix @@ -19,6 +19,8 @@ lib.makeScope newScope (self: { inherit ghidra; }; + ghidra-golanganalyzerextension = self.callPackage ./extensions/ghidra-golanganalyzerextension { }; + gnudisassembler = self.callPackage ./extensions/gnudisassembler { inherit ghidra; }; lightkeeper = self.callPackage ./extensions/lightkeeper { }; diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix new file mode 100644 index 000000000000..34baf6c971f5 --- /dev/null +++ b/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 ]; + }; +} From ff947ad0d267bcf1b53b2592e1bd2edae2714129 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Fri, 25 Oct 2024 12:54:35 +1100 Subject: [PATCH 09/10] ghidra-extensions: fix package sorting --- pkgs/tools/security/ghidra/extensions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ghidra/extensions.nix b/pkgs/tools/security/ghidra/extensions.nix index 762154dc45e4..a94d6d290e50 100644 --- a/pkgs/tools/security/ghidra/extensions.nix +++ b/pkgs/tools/security/ghidra/extensions.nix @@ -13,14 +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 { }; From e1fb60b6d6d853224c4d4a33009d4e1fb380a1b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 24 Oct 2024 23:07:32 -0600 Subject: [PATCH 10/10] obs-studio: add `-Wno-error=deprecated-declarations` due to build failure --- pkgs/applications/video/obs-studio/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 4ca4f675bbd7..ebe293597606 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/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=" ];