LPCNet: 0.5 -> 0.5-unstable-2025-01-19 (#404338)

pkgs/by-name/co/codec2/package.nix

···
   fetchFromGitHub,
   cmake,
   freedvSupport ? false,
-  lpcnetfreedv,
+  lpcnet,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
···
   ];
 
   buildInputs = lib.optionals freedvSupport [
-    lpcnetfreedv
+    lpcnet
   ];
 
   # we need to unset these variables from stdenv here and then set their equivalents in the cmake flags

pkgs/by-name/fr/freedv/package.nix

···
   libpulseaudio,
   libsamplerate,
   libsndfile,
-  lpcnetfreedv,
+  lpcnet,
   portaudio,
   speexdsp,
   hamlib_4,
···
     codec2
     libsamplerate
     libsndfile
-    lpcnetfreedv
+    lpcnet
     speexdsp
     hamlib_4
     wxGTK32

pkgs/by-name/lp/LPCNet/package.nix

···
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchurl,
-  cmake,
-  codec2,
-  # for tests
-  octave,
-  sox,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "LPCNet";
-  version = "0.5";
-
-  src = fetchFromGitHub {
-    owner = "drowe67";
-    repo = "LPCNet";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-tHZLKXmuM86A6OpfS3CRRjhFbqj1Q/w1w56msdgLHb0=";
-  };
-
-  passthru = {
-    # Prebuilt neural network model that is needed during the build - can be overwritten
-    nnmodel = fetchurl {
-      url = "http://rowetel.com/downloads/deep/lpcnet_191005_v1.0.tgz";
-      hash = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg=";
-    };
-  };
-
-  preConfigure = ''
-    mkdir build
-    cp \
-      ${finalAttrs.finalPackage.passthru.nnmodel} \
-      build/${finalAttrs.finalPackage.passthru.nnmodel.name}
-  '';
-
-  prePatch = ''
-    patchShebangs *.sh unittest/*.sh
-  '';
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  buildInputs = [
-    codec2
-  ];
-
-  cmakeFlags = lib.optionals (stdenv.cc.isClang && stdenv.hostPlatform.isAarch64) [
-    # unsupported option '-mfpu=' for target 'x86_64-apple-darwin'
-    "-DNEON=OFF"
-  ];
-
-  nativeCheckInputs = [
-    octave
-    sox
-  ];
-
-  disabledTests = lib.optionals (stdenv.cc.isClang && stdenv.hostPlatform.isAarch64) [
-    # disable tests that require NEON
-    "SIMD_functions"
-  ];
-
-  doCheck = true;
-  checkPhase = ''
-    runHook preCheck
-
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}/build/source/build/src"
-
-    ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$'
-
-    runHook postCheck
-  '';
-
-  meta = {
-    description = "Experimental Neural Net speech coding for FreeDV";
-    homepage = "https://github.com/drowe67/LPCNet";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ doronbehar ];
-    platforms = lib.platforms.all;
-  };
-})

pkgs/by-name/lp/lpcnet/package.nix

···
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  cmake,
+  codec2,
+  sox,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "LPCNet";
+  version = "0.5-unstable-2025-01-19";
+
+  src = fetchFromGitHub {
+    owner = "drowe67";
+    repo = "LPCNet";
+    rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246";
+    sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA=";
+  };
+
+  patches = [
+    # extracted from https://github.com/drowe67/LPCNet/pull/59
+    ./darwin.patch
+  ];
+
+  passthru = {
+    # Prebuilt neural network model that is needed during the build - can be overwritten
+    nnmodel = fetchurl {
+      url = "http://rowetel.com/downloads/deep/lpcnet_191005_v1.0.tgz";
+      hash = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg=";
+    };
+  };
+
+  preConfigure = ''
+    mkdir build
+    cp \
+      ${finalAttrs.finalPackage.passthru.nnmodel} \
+      build/${finalAttrs.finalPackage.passthru.nnmodel.name}
+  '';
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    codec2
+  ];
+
+  doCheck = true;
+  nativeCheckInputs = [
+    # NOTE: From some reason, the tests pass without this on x86_64-linux, but
+    # not on aarch64-linux, although the relevant test is not enabled
+    # conditionally, see:
+    # https://github.com/drowe67/LPCNet/blob/c8e51ac5e2fe674849cb53e7da44689b572cc246/CMakeLists.txt#L220-L225
+    sox
+  ];
+
+  meta = {
+    description = "Experimental Neural Net speech coding for FreeDV";
+    homepage = "https://github.com/drowe67/LPCNet";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      doronbehar
+      mvs
+    ];
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/lp/lpcnetfreedv/package.nix

···
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchurl,
-  cmake,
-  nix-update-script,
-}:
-
-let
-  dataVersion = "191005_v1.0";
-  data = fetchurl {
-    url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz";
-    sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg=";
-  };
-in
-stdenv.mkDerivation {
-  pname = "lpcnetfreedv";
-  version = "0.5-unstable-2025-01-19";
-
-  src = fetchFromGitHub {
-    owner = "drowe67";
-    repo = "LPCNet";
-    rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246";
-    sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  patches = [
-    # extracted from https://github.com/drowe67/LPCNet/pull/59
-    ./darwin.patch
-  ];
-
-  postPatch = ''
-    mkdir build
-    ln -s ${data} build/lpcnet_${dataVersion}.tgz
-  '';
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    homepage = "https://freedv.org/";
-    description = "Experimental Neural Net speech coding for FreeDV";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ mvs ];
-    platforms = lib.platforms.all;
-  };
-}

pkgs/top-level/aliases.nix

···
   libtransmission = lib.warnOnInstantiate (transmission3Warning {
     prefix = "lib";
   }) libtransmission_3; # Added 2024-06-10
+  lpcnetfreedv = throw "lpcnetfreedv was removed in favor of LPCNet"; # Added 2025-05-05
+  LPCNet = lpcnet; # Added 2025-05-05
   tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
   tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
   transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11