Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mbrola: 3.3 -> 3.3-unstable-2024-01-29 #375038

Merged
merged 1 commit into from
Feb 2, 2025
Merged

mbrola: 3.3 -> 3.3-unstable-2024-01-29 #375038

merged 1 commit into from
Feb 2, 2025

Conversation

pitkling
Copy link
Member

Version bump to include fixes (specifically numediart/MBROLA@d0119cc and numediart/MBROLA@19f31eb) that enable compilation on Darwin.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@pitkling
mbrola: 3.3 -> 3.3-unstable-2024-01-29
39c15b3 
To include fixes (specifically numediart/MBROLA@d0119cc and numediart/MBROLA@19f31eb) that enable compilation on Darwin.
@nix-owners nix-owners bot requested a review from davidak January 19, 2025 12:36
@pitkling pitkling mentioned this pull request Jan 21, 2025
Open
13 tasks
jtojnar
jtojnar approved these changes Jan 21, 2025
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream diff looks okay: numediart/MBROLA@3.3...bf17e9e

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/5121

@booxter
Copy link
Contributor

booxter commented Jan 21, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 375038

aarch64-linux

⏩ 2 packages marked as broken and skipped:
  • piper-train
  • piper-train.dist
❌ 7 packages failed to build:
  • calibre
  • local-ai
  • python313Packages.gruut
  • python313Packages.gruut.dist
  • python313Packages.phonemizer
  • python313Packages.phonemizer.dist
  • unbook
✅ 42 packages built:
  • arcan
  • arcan-all-wrapped
  • arcan-wrapped
  • arcan.dev
  • arcan.lib
  • arcan.man
  • cat9-wrapped
  • chickenPackages_5.chickenEggs.espeak
  • durden-wrapped
  • ekho
  • emacspeak (emacsPackages.emacspeak)
  • espeak (espeak-ng)
  • espeakup
  • gruut (python312Packages.gruut)
  • gruut-ipa (python312Packages.gruut-ipa)
  • gruut-ipa.dist (python312Packages.gruut-ipa.dist)
  • gruut.dist (python312Packages.gruut.dist)
  • jogger
  • klavaro
  • mbrola
  • mob
  • phonemizer (python312Packages.phonemizer)
  • phonemizer.dist (python312Packages.phonemizer.dist)
  • piper-phonemize
  • piper-tts
  • pipeworld-wrapped
  • prio-wrapped
  • python312Packages.espeak-phonemizer
  • python312Packages.espeak-phonemizer.dist
  • python312Packages.piper-phonemize
  • python312Packages.piper-phonemize.dist
  • python313Packages.espeak-phonemizer
  • python313Packages.espeak-phonemizer.dist
  • python313Packages.gruut-ipa
  • python313Packages.gruut-ipa.dist
  • python313Packages.piper-phonemize
  • python313Packages.piper-phonemize.dist
  • speechd
  • tts
  • tts.dist
  • wordbook
  • xarcan

x86_64-darwin

⏩ 6 packages marked as broken and skipped:
  • phonemizer
  • phonemizer.dist
  • python312Packages.phonemizer
  • python312Packages.phonemizer.dist
  • python313Packages.phonemizer
  • python313Packages.phonemizer.dist
❌ 2 packages failed to build:
  • python313Packages.gruut
  • python313Packages.gruut.dist
✅ 16 packages built:
  • chickenPackages_5.chickenEggs.espeak
  • ekho
  • espeak (espeak-ng)
  • gruut (python312Packages.gruut)
  • gruut-ipa (python312Packages.gruut-ipa)
  • gruut-ipa.dist (python312Packages.gruut-ipa.dist)
  • gruut.dist (python312Packages.gruut.dist)
  • mbrola
  • piper-phonemize
  • piper-tts
  • python312Packages.piper-phonemize
  • python312Packages.piper-phonemize.dist
  • python313Packages.gruut-ipa
  • python313Packages.gruut-ipa.dist
  • python313Packages.piper-phonemize
  • python313Packages.piper-phonemize.dist

aarch64-darwin

⏩ 6 packages marked as broken and skipped:
  • phonemizer
  • phonemizer.dist
  • python312Packages.phonemizer
  • python312Packages.phonemizer.dist
  • python313Packages.phonemizer
  • python313Packages.phonemizer.dist
❌ 4 packages failed to build:
  • python313Packages.gruut
  • python313Packages.gruut.dist
  • tts
  • tts.dist
✅ 16 packages built:
  • chickenPackages_5.chickenEggs.espeak
  • ekho
  • espeak (espeak-ng)
  • gruut (python312Packages.gruut)
  • gruut-ipa (python312Packages.gruut-ipa)
  • gruut-ipa.dist (python312Packages.gruut-ipa.dist)
  • gruut.dist (python312Packages.gruut.dist)
  • mbrola
  • piper-phonemize
  • piper-tts
  • python312Packages.piper-phonemize
  • python312Packages.piper-phonemize.dist
  • python313Packages.gruut-ipa
  • python313Packages.gruut-ipa.dist
  • python313Packages.piper-phonemize
  • python313Packages.piper-phonemize.dist

@pitkling pitkling mentioned this pull request Jan 21, 2025
Merged
13 tasks
@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Jan 22, 2025
@mweinelt mweinelt merged commit 417be88 into NixOS:master Feb 2, 2025
26 of 28 checks passed
@spiage
Copy link

spiage commented Feb 2, 2025 

note: keeping build directory '/tmp/nix-build-mbrola-bin-3.3-unstable-2024-01-29.drv-8/build'
error: builder for '/nix/store/6d38h7db3appp11h3hc4d823dhzcp47w-mbrola-bin-3.3-unstable-2024-01-29.drv' failed with exit code 1;
       last 5 log lines:
       > Running phase: unpackPhase
       > unpacking source archive /nix/store/2yd3q8b7ff98zafhy73ymrc7n6q78s8a-source
       > source root is source
       > Running phase: patchPhase
       > substituteStream() in derivation mbrola-bin-3.3-unstable-2024-01-29: ERROR: pattern O6 doesn't match anything in file 'Makefile'
       For full logs, run 'nix log /nix/store/6d38h7db3appp11h3hc4d823dhzcp47w-mbrola-bin-3.3-unstable-2024-01-29.drv'.
error: 1 dependencies of derivation '/nix/store/6927x9z785q6yi59vrsgrrxv01nkx2vn-mbrola-3.3-unstable-2024-01-29.drv' failed to build
error: 1 dependencies of derivation '/nix/store/4kr95k4vr5jdlagvfa5m7af6s9r8bcrv-mbrola.patch.drv' failed to build

@spiage
Copy link

spiage commented Feb 2, 2025

@mweinelt

@mweinelt
Copy link
Member

mweinelt commented Feb 2, 2025

Conflicting with the changes made in 479d878

@mweinelt
Copy link
Member

mweinelt commented Feb 2, 2025

Fixed in #378884

@spiage
Copy link

spiage commented Feb 2, 2025

I can confirm it, thank you

Version 27529 -> 27530:
  mbrola: 3.3 → 3.3-unstable-2024-01-29
  mbrola-bin: 3.3 → 3.3-unstable-2024-01-29
  nixos-system-a7: 25.05.20250202.a608eba → 25.05.20250202.8532db2
<<< /run/booted-system

@pitkling pitkling deleted the updates/mbrola branch February 3, 2025 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@booxter booxter booxter approved these changes

@jtojnar jtojnar jtojnar approved these changes

@davidak davidak Awaiting requested review from davidak

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@pitkling @nixos-discourse @booxter @spiage @mweinelt @jtojnar @wegank