From ce8a55eb34b8876dbca588aedba88439da5ca0b3 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 11 Feb 2025 17:59:00 +0100 Subject: [PATCH 1/5] lpcnetfreedv: provide update script --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index ea1815a5731e..50860d1335cd 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchurl, cmake, + nix-update-script, }: let @@ -31,6 +32,10 @@ stdenv.mkDerivation rec { ln -s ${data} build/lpcnet_${dataVersion}.tgz ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = with lib; { homepage = "https://freedv.org/"; description = "Experimental Neural Net speech coding for FreeDV"; From 18ad364f55eff8f310780e618fa99013246af02b Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:25:01 +0100 Subject: [PATCH 2/5] lpcnetfreedv: remove unnecessary rec --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index 50860d1335cd..37d40ebada4e 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -14,7 +14,7 @@ let sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lpcnetfreedv"; version = "unstable-2022-08-22"; From 9e1a6426bf2fcdeaf0cf28be2c3279860cac81c2 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:25:43 +0100 Subject: [PATCH 3/5] lpcnetfreedv: remove use of with lib; --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index 37d40ebada4e..a4c37279f2ee 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation { extraArgs = [ "--version=branch" ]; }; - meta = with lib; { + meta = { homepage = "https://freedv.org/"; description = "Experimental Neural Net speech coding for FreeDV"; - license = licenses.bsd3; - maintainers = with maintainers; [ mvs ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mvs ]; + platforms = lib.platforms.all; }; } From 7e8cf0e3fdaf4fdd49cbcbf1742e1c96e8c0d53a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:27:26 +0100 Subject: [PATCH 4/5] lpcnetfreedv: unstable-2022-08-22 -> 0.5-unstable-2025-01-19 --- pkgs/by-name/lp/lpcnetfreedv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index a4c37279f2ee..3a6ed87b37da 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation { pname = "lpcnetfreedv"; - version = "unstable-2022-08-22"; + version = "0.5-unstable-2025-01-19"; src = fetchFromGitHub { owner = "drowe67"; repo = "LPCNet"; - rev = "67a6eb74d0c07faddcdce199856862cc45779d25"; - sha256 = "sha256-eHYZoDgoZBuuLvQn9X7H/zmK5onOAniOgY1/8RVn8gk="; + rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246"; + sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA="; }; nativeBuildInputs = [ cmake ]; From 09eec57ad12da10666dad2252f127c663a74d2f6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:40:34 +0100 Subject: [PATCH 5/5] lpcnetfreedv: fix darwin build --- pkgs/by-name/lp/lpcnetfreedv/darwin.patch | 13 +++++++++++++ pkgs/by-name/lp/lpcnetfreedv/package.nix | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/lp/lpcnetfreedv/darwin.patch diff --git a/pkgs/by-name/lp/lpcnetfreedv/darwin.patch b/pkgs/by-name/lp/lpcnetfreedv/darwin.patch new file mode 100644 index 000000000000..a82ac9b330d5 --- /dev/null +++ b/pkgs/by-name/lp/lpcnetfreedv/darwin.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1600871..1536c55 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,7 +158,7 @@ elseif(${SSE} AND (${SSE_PRESENT} OR ${SSE_PRESENT} GREATER 0)) + # AVX and AVX2 machines will also match on SSE + message(STATUS "sse processor flags found or enabled.") + set(LPCNET_C_PROC_FLAGS -msse4.1) +-elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0)) ++elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0) AND NOT APPLE) + # RPi / ARM 32bit + message(STATUS "neon processor flags found or enabled.") + set(LPCNET_C_PROC_FLAGS -mfpu=neon -march=armv8-a -mtune=cortex-a53) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix index 3a6ed87b37da..bfc773ad47cd 100644 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ b/pkgs/by-name/lp/lpcnetfreedv/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; + patches = [ + # extracted from https://github.com/drowe67/LPCNet/pull/59 + ./darwin.patch + ]; + postPatch = '' mkdir build ln -s ${data} build/lpcnet_${dataVersion}.tgz