From 0d669f4f6f17f84ac2bb983fef54cc1af8041223 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 23 Apr 2024 18:04:49 +0200 Subject: [PATCH 01/10] qmqtt: init at 1.0.3 --- pkgs/by-name/qm/qmqtt/package.nix | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/qm/qmqtt/package.nix diff --git a/pkgs/by-name/qm/qmqtt/package.nix b/pkgs/by-name/qm/qmqtt/package.nix new file mode 100644 index 000000000000..6ccf272f61e2 --- /dev/null +++ b/pkgs/by-name/qm/qmqtt/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qt5 +}: + +stdenv.mkDerivation rec { + pname = "qmqtt"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "emqx"; + repo = "qmqtt"; + rev = "v${version}"; + hash = "sha256-JLGwEF5e/IKzPzCQBzB710REGWbc/MW+r5AHmyYUkUI="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + qt5.qtbase + ]; + + meta = with lib; { + description = "MQTT client for Qt"; + homepage = "https://github.com/emqx/qmqtt"; + license = licenses.epl10; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.all; + }; +} From 11c244ced9c3c91d722966f829ab1bd9992b64a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 23 Apr 2024 18:08:40 +0200 Subject: [PATCH 02/10] mdns: init at 1.4.3 --- pkgs/by-name/md/mdns/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/md/mdns/package.nix diff --git a/pkgs/by-name/md/mdns/package.nix b/pkgs/by-name/md/mdns/package.nix new file mode 100644 index 000000000000..245b5a234c3e --- /dev/null +++ b/pkgs/by-name/md/mdns/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "mdns"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "mjansson"; + repo = "mdns"; + rev = version; + hash = "sha256-2uv+Ibnbl6hsdjFqPhcHXbv+nIEIT4+tgtwGndpZCqo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Public domain mDNS/DNS-SD library in C"; + homepage = "https://github.com/mjansson/mdns"; + changelog = "https://github.com/mjansson/mdns/blob/${src.rev}/CHANGELOG"; + license = licenses.unlicense; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.all; + }; +} From 5f795986395e82bd6eb6b9ab1adc4e1383ebd785 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 23 Apr 2024 18:26:51 +0200 Subject: [PATCH 03/10] hyperhdr: init at 20.0.0.0 --- pkgs/by-name/hy/hyperhdr/package.nix | 69 ++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 pkgs/by-name/hy/hyperhdr/package.nix diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix new file mode 100644 index 000000000000..1866e7212e1f --- /dev/null +++ b/pkgs/by-name/hy/hyperhdr/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, flatbuffers +, libjpeg_turbo +, mbedtls +, mdns +, pipewire +, qt6Packages +, qmqtt +, xz +}: + +let + inherit (lib) + cmakeBool + ; +in + +stdenv.mkDerivation rec { + pname = "hyperhdr"; + version = "20.0.0.0"; + + src = fetchFromGitHub { + owner = "awawa-dev"; + repo = "HyperHDR"; + rev = "refs/tags/v${version}"; + hash = "sha256-agIWtDlMwjD0sGX2ntFwqROzUsl8tY3nRbmFvvOVh4o="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt6Packages.wrapQtAppsHook + ]; + + cmakeFlags = [ + "-DPLATFORM=linux" + (cmakeBool "USE_SYSTEM_MQTT_LIBS" true) + (cmakeBool "USE_SYSTEM_FLATBUFFERS_LIBS" true) + (cmakeBool "USE_SYSTEM_MBEDTLS_LIBS" true) + ]; + + buildInputs = [ + alsa-lib + flatbuffers + libjpeg_turbo + mdns + mbedtls + pipewire + qmqtt + qt6Packages.qtbase + qt6Packages.qtserialport + xz + ]; + + meta = with lib; { + description = "Highly optimized open source ambient lighting implementation based on modern digital video and audio stream analysis for Windows, macOS and Linux (x86 and Raspberry Pi / ARM"; + homepage = "https://github.com/awawa-dev/HyperHDR"; + changelog = "https://github.com/awawa-dev/HyperHDR/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + mainProgram = "hyperhdr"; + platforms = platforms.linux; + }; +} From e229318f7d34f4988a815e6d10b8fb0f7e0e2974 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 10:45:25 +0000 Subject: [PATCH 04/10] alpaca: 2.0.3 -> 2.0.5 --- pkgs/by-name/al/alpaca/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index e55b0c106d48..13de92ee294e 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -17,14 +17,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "2.0.3"; + version = "2.0.5"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; - rev = version; - hash = "sha256-CXrnPhNu/doz145rvonuBXoJQolz7qgMdn5KgVio6J4="; + rev = "refs/tags/${version}"; + hash = "sha256-BLLcU2GESyHGFJJicE42V3nMFf/YfnYsXcAOPIHuCAg="; }; nativeBuildInputs = [ From 3516a83150bbdd9c0f9d435b4da748357be458d5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 3 Oct 2024 21:31:18 +0800 Subject: [PATCH 05/10] emacs: bump emacs2nix to handle more versions with non-digit chars Fixes https://github.com/NixOS/nixpkgs/issues/346034 --- pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 2879985e4b86..3838271d4924 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchFromGitHub { owner = "nix-community"; repo = "emacs2nix"; - rev = "8454f2857252f32621b8022f797fef9b96862204"; - hash = "sha256-UHHEkY+t/IzWe8jC8bm+p275sKfnL5/v5wbwRDw6FZw="; + rev = "9458961fc433a6c4cd91e7763f0aa1ef15f7b4aa"; + hash = "sha256-NJVKrYSF/22hrUJNJ3/znbcfHi/FtTePQ8Xzfp2eKAk="; fetchSubmodules = true; }; in From ac0a31d8320a577680d857b5b72b4acad80cb84d Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Thu, 3 Oct 2024 15:41:14 +0200 Subject: [PATCH 06/10] faudio: change platforms to unix --- pkgs/development/libraries/faudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index db62a88d7868..1cd4a0a748f6 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/FNA-XNA/FAudio"; changelog = "https://github.com/FNA-XNA/FAudio/releases/tag/${version}"; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.marius851000 ]; }; } From 85ab36bb84152ff154f5d9a0b05a8bc8b3d6c2f9 Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 3 Oct 2024 16:04:36 +0200 Subject: [PATCH 07/10] valkey: 7.2.6 -> 7.2.7 Fixes CVE-2024-31449 Fixes CVE-2024-31227 Fixes CVE-2024-31228 --- pkgs/by-name/va/valkey/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index d44232121660..6a8fd54173d2 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valkey"; - version = "7.2.6"; + version = "7.2.7"; src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey"; rev = finalAttrs.version; - hash = "sha256-nWeuWlP000DHEmIBzW1UmGqN+BggCjTS5plbQ/NV6wY="; + hash = "sha256-2kbhUg+rNuIUF/Bna6jFLI6Vhg9TlSi+OZEy6jKl2X0="; }; patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; From 48b4aa8eae376e140698bef3c754814e716701fb Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 3 Oct 2024 23:53:56 +0200 Subject: [PATCH 08/10] openwebrx: s/alsaUtils/alsa-utils/ allows running with allowAliases = false --- nixos/modules/services/web-apps/openwebrx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/openwebrx.nix b/nixos/modules/services/web-apps/openwebrx.nix index 614eb963b4a3..2ac187dc88c9 100644 --- a/nixos/modules/services/web-apps/openwebrx.nix +++ b/nixos/modules/services/web-apps/openwebrx.nix @@ -18,7 +18,7 @@ in codec2 js8call m17-cxx-demod - alsaUtils + alsa-utils netcat ]; serviceConfig = { From 6569728429ed9a4126e8b3a54d8d82a5a9220478 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Oct 2024 01:58:47 +0000 Subject: [PATCH 09/10] superfile: 1.1.4 -> 1.1.5 --- pkgs/by-name/su/superfile/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 9bb594a3751e..d788afe3e88e 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "superfile"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "yorukot"; repo = "superfile"; rev = "v${version}"; - hash = "sha256-ajLlXySf/YLHrwwacV5yIF8qU5pKvEoOwpDoxh49qaU="; + hash = "sha256-/MdcfZpYr7vvPIq0rqLrPRPPU+cyp2y0EyxQPf9znwQ="; }; - vendorHash = "sha256-vybe4KNj6ZhvXRTiN7e5+IhOewfK5L2jKPrcdCYGc4k="; + vendorHash = "sha256-8WGmksKH0rmfRH6Xxd0ACl1FS7YPphG7hsIB5/o38lQ="; ldflags = ["-s" "-w"]; From d77225b9f067feff3f2d34feffb9dd1e19f3bac4 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 4 Oct 2024 07:48:45 +0300 Subject: [PATCH 10/10] home-assistant-custom-lovelace-modules.universal-remote-card: 4.0.5 -> 4.0.6 Diff: https://github.com/Nerwyn/android-tv-card/compare/4.0.5...4.0.6 --- .../universal-remote-card/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index e9d67bd92d6c..1398dc0f2d7e 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-LuljLjAljDn2hCMvdGpN27EzAxPl5Vnq4kIDVZ/8GV8="; + hash = "sha256-daxuvbjbnB1OZbvVGrA/jRe65x3MCXGFQ3o4L17Bgjk="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-trFOW3iJUm7jFLhDEjKqAkCJz5Pk4LqF4M6au1LjLzc="; + npmDepsHash = "sha256-AQYsXaZ4TyL8QjxOfub24NBxp0U6WMe+Czq+ooXwkIw="; installPhase = '' runHook preInstall