Unverified Commit 595dedae authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 0d3c0181 b5a8c8e1

CONTRIBUTING.md

+6 −0
Original line number Diff line number Diff line
@@ -661,6 +661,12 @@ If you have any problems with formatting, please ping the [formatting team](http 
  As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.

  If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.



- Any style choices not covered here but that can be expressed as general rules should be left at the discretion of the authors of changes and _not_ commented in reviews.

  The purpose of this is:

   - to avoid churn as contributors with different style preferences undo each other's changes,

   - to ensure that style rules are written down and consistent (and can thus be followed when authoring changes, reducing review cycles),

   - and to encourage reviews to focus on more impactful considerations.



# Practical contributing advice



To contribute effectively and efficiently, you need to be aware of how the process generally works.

maintainers/maintainer-list.nix

+10 −1
Original line number Diff line number Diff line
@@ -10125,10 +10125,11 @@ 
    name = "Heisfer";

  };

  HeitorAugustoLN = {

    email = "IAm.HeitorALN@proton.me";

    email = "nixpkgs.woven713@passmail.net";

    github = "HeitorAugustoLN";

    githubId = 44377258;

    name = "Heitor Augusto";

    matrix = "@heitoraugusto:matrix.org";

  };

  heitorPB = {

    email = "heitorpbittencourt@gmail.com";
@@ -13331,6 +13332,14 @@ 
    matrix = "@kenran_:matrix.org";

    name = "Johannes Maier";

  };

  kenshineto = {

    name = "Freya Murphy";

    email = "contact@freyacat.org";

    matrix = "@freya:freya.cat";

    github = "kenshineto";

    githubId = 28487599;

    keys = [ { fingerprint = "D9AF 0A42 09B7 C2DE 11A8  84BF ACBC 5536 60D9 993D"; } ];

  };

  kentjames = {

    email = "jameschristopherkent@gmail.com";

    github = "KentJames";

nixos/modules/services/home-automation/wyoming/piper.nix

+0 −4
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ in 
            options = {

              enable = mkEnableOption "Wyoming Piper server";



              piper = mkPackageOption pkgs "piper-tts" { };



              voice = mkOption {

                type = str;

                example = "en-us-ryan-medium";
@@ -159,8 +157,6 @@ in 
                "/var/lib/wyoming/piper"

                "--uri"

                options.uri

                "--piper"

                (lib.getExe options.piper)

                "--voice"

                options.voice

                "--speaker"

pkgs/applications/audio/espeak-ng/default.nix

+17 −16
Original line number Diff line number Diff line
@@ -28,16 +28,17 @@ 
  sonicSupport ? true,

  speechPlayerSupport ? true,

  ucdSupport ? false,

  buildPackages,

}:



let

  version = "1.52.0";

  version = "1.52.0.1-unstable-2025-09-09";



  src = fetchFromGitHub {

    owner = "espeak-ng";

    repo = "espeak-ng";

    tag = version;

    hash = "sha256-mmh5QPSVD5YQ0j16R+bEL5vcyWLtTNOJ/irBNzWY3ro=";

    rev = "0d451f8c1c6ae837418b823bd9c4cbc574ea9ff5";

    hash = "sha256-wpPi+YjSLhsEWfE3KEbL4A7o48qtz9fLRZ/u4xGOM2g=";

  };



  ucd-tools = stdenv.mkDerivation {
@@ -59,22 +60,14 @@ in 


stdenv.mkDerivation rec {

  pname = "espeak-ng";

  version = "1.52.0";



  src = fetchFromGitHub {

    owner = "espeak-ng";

    repo = "espeak-ng";

    tag = version;

    hash = "sha256-mmh5QPSVD5YQ0j16R+bEL5vcyWLtTNOJ/irBNzWY3ro=";

  };

  inherit version src;



  patches = [

    # https://github.com/espeak-ng/espeak-ng/pull/2274

    ./libsonic.patch

    (fetchpatch {

      name = "espeak-ng-text-to-phonemes-with-terminator.patch";

      url = "https://github.com/espeak-ng/espeak-ng/commit/2108b1e8ae02f49cc909894a1024efdfde6682fd.patch";

      hash = "sha256-XjEc1r7F88xZOfeUey0R6Xv6vu4Wy8GtWxXFG2NTf9g=";

      name = "libsonic.patch";

      url = "https://github.com/espeak-ng/espeak-ng/commit/83e646e711af608fafa8c01dd812cd29e073f644.patch";

      hash = "sha256-UHuURyqRy/JVYYJH5EI5J2cpBfCNeTE24sMmheb+D2Q=";

    })

  ]

  ++ lib.optionals mbrolaSupport [
@@ -98,6 +91,10 @@ stdenv.mkDerivation rec { 
    ronn

    makeWrapper

    which

  ]

  # Provide a native espeak-ng when cross compiling so intonations can be built

  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

    buildPackages.espeak-ng

  ];



  buildInputs =
@@ -113,6 +110,10 @@ stdenv.mkDerivation rec { 
    (lib.cmakeBool "USE_LIBSONIC" sonicSupport)

    (lib.cmakeBool "USE_MBROLA" mbrolaSupport)

    (lib.cmakeBool "USE_SPEECHPLAYER" speechPlayerSupport)

  ]

  # Point CMake to the native build’s binary dir when cross compiling

  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

    "-DNativeBuild_DIR=${buildPackages.espeak-ng}/bin/"

  ];



  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -127,7 +128,7 @@ stdenv.mkDerivation rec { 
  meta = {

    description = "Speech synthesizer that supports more than hundred languages and accents";

    homepage = "https://github.com/espeak-ng/espeak-ng";

    changelog = "https://github.com/espeak-ng/espeak-ng/blob/${src.tag}/ChangeLog.md";

    changelog = "https://github.com/espeak-ng/espeak-ng/blob/${src.rev}/ChangeLog.md";

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ aske ];

    platforms = lib.platforms.all;

pkgs/applications/audio/espeak-ng/libsonic.patch

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
diff --git a/cmake/deps.cmake b/cmake/deps.cmake

index b63ced21..2cd1727b 100644

--- a/cmake/deps.cmake

+++ b/cmake/deps.cmake

@@ -13,20 +13,22 @@ endif(PTHREAD_LIB)

 if (MBROLA_BIN)

   set(HAVE_MBROLA ON)

 endif(MBROLA_BIN)

-if (SONIC_LIB AND SONIC_INC)

-  set(HAVE_LIBSONIC ON)

-else()

-  FetchContent_Declare(sonic-git

-    GIT_REPOSITORY https://github.com/waywardgeek/sonic.git

-    GIT_TAG fbf75c3d6d846bad3bb3d456cbc5d07d9fd8c104

-  )

-  FetchContent_MakeAvailable(sonic-git)

-  FetchContent_GetProperties(sonic-git)

-  add_library(sonic OBJECT ${sonic-git_SOURCE_DIR}/sonic.c)

-  target_include_directories(sonic PUBLIC ${sonic-git_SOURCE_DIR})

-  set(HAVE_LIBSONIC ON)

-  set(SONIC_LIB sonic)

-  set(SONIC_INC ${sonic-git_SOURCE_DIR})

+if (USE_LIBSONIC)

+  if (SONIC_LIB AND SONIC_INC)

+    set(HAVE_LIBSONIC ON)

+  else()

+    FetchContent_Declare(sonic-git

+      GIT_REPOSITORY https://github.com/waywardgeek/sonic.git

+      GIT_TAG fbf75c3d6d846bad3bb3d456cbc5d07d9fd8c104

+    )

+    FetchContent_MakeAvailable(sonic-git)

+    FetchContent_GetProperties(sonic-git)

+    add_library(sonic OBJECT ${sonic-git_SOURCE_DIR}/sonic.c)

+    target_include_directories(sonic PUBLIC ${sonic-git_SOURCE_DIR})

+    set(HAVE_LIBSONIC ON)

+    set(SONIC_LIB sonic)

+    set(SONIC_INC ${sonic-git_SOURCE_DIR})

+  endif()

 endif()

 if (PCAUDIO_LIB AND PCAUDIO_INC)

   set(HAVE_LIBPCAUDIO ON)