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

pkgs: some speech-related things #37068

Merged
merged 6 commits into from Mar 18, 2018
Merged

pkgs: some speech-related things #37068

merged 6 commits into from Mar 18, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Mar 15, 2018

Motivation for this change

An easy to port from SLNOS.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: eflite, flite, speech-tools

Partial log (click to expand)

patching script interpreter paths in /nix/store/f0fnriw93d8h7rgnj2951qa7j5rlvy92-speech_tools-2.4
/nix/store/f0fnriw93d8h7rgnj2951qa7j5rlvy92-speech_tools-2.4/bin/resynth: interpreter directive changed from "/bin/sh -eu" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eu"
/nix/store/f0fnriw93d8h7rgnj2951qa7j5rlvy92-speech_tools-2.4/bin/make_wagon_desc: interpreter directive changed from "/bin/sh" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh"
/nix/store/f0fnriw93d8h7rgnj2951qa7j5rlvy92-speech_tools-2.4/bin/est_program: interpreter directive changed from " /bin/sh -eu" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eu"
/nix/store/f0fnriw93d8h7rgnj2951qa7j5rlvy92-speech_tools-2.4/bin/est_gdb: interpreter directive changed from "/bin/sh -eux" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eux"
/nix/store/f0fnriw93d8h7rgnj2951qa7j5rlvy92-speech_tools-2.4/bin/est_examples: interpreter directive changed from " /bin/sh -eu" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eu"
checking for references to /build in /nix/store/f0fnriw93d8h7rgnj2951qa7j5rlvy92-speech_tools-2.4...
/nix/store/60wrfkss8499wvac68gwg11wha4jsmgg-eflite-0.4.1
/nix/store/5a9hs7nlsj6vj2jcwf8g5b9hkm7h23p4-flite-2.1.0
/nix/store/f0fnriw93d8h7rgnj2951qa7j5rlvy92-speech_tools-2.4

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: eflite, flite, speech-tools

Partial log (click to expand)

patching script interpreter paths in /nix/store/95d157129x79zzfzvcz4h2yq8l3m288x-speech_tools-2.4
/nix/store/95d157129x79zzfzvcz4h2yq8l3m288x-speech_tools-2.4/bin/make_wagon_desc: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
/nix/store/95d157129x79zzfzvcz4h2yq8l3m288x-speech_tools-2.4/bin/est_examples: interpreter directive changed from " /bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
/nix/store/95d157129x79zzfzvcz4h2yq8l3m288x-speech_tools-2.4/bin/est_program: interpreter directive changed from " /bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
/nix/store/95d157129x79zzfzvcz4h2yq8l3m288x-speech_tools-2.4/bin/est_gdb: interpreter directive changed from "/bin/sh -eux" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eux"
/nix/store/95d157129x79zzfzvcz4h2yq8l3m288x-speech_tools-2.4/bin/resynth: interpreter directive changed from "/bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
checking for references to /build in /nix/store/95d157129x79zzfzvcz4h2yq8l3m288x-speech_tools-2.4...
/nix/store/i64l98m03xdi5ba0vd02kgggzh9zymxd-eflite-0.4.1
/nix/store/in8j4h4wf00isfypv7kyp7wwc0nkg72y-flite-2.1.0
/nix/store/95d157129x79zzfzvcz4h2yq8l3m288x-speech_tools-2.4

@dtzWill
Copy link
Member

dtzWill commented Mar 15, 2018

Overall LGTM. Please consider adding the top three commits here (all for speech-tools): https://github.com/dtzWill/nixpkgs/commits/speech

  • 2.4 -> 2.5
  • run tests
  • fix w/musl

@oxij
Copy link
Member Author

oxij commented Mar 15, 2018 via email

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: speech-tools

Partial log (click to expand)

strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/lib  /nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin 
patching script interpreter paths in /nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/est_gdb: interpreter directive changed from "/bin/sh -eux" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eux"
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/resynth: interpreter directive changed from "/bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/make_wagon_desc: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/est_examples: interpreter directive changed from " /bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/est_program: interpreter directive changed from " /bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
checking for references to /tmp/nix-build-speech_tools-2.5.0.drv-0 in /nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0...
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0

@dtzWill
Copy link
Member

dtzWill commented Mar 15, 2018

doCheck is true by default

Happy to have you amend it, glad you liked it overall :D.

However I'm not sure doCheck is true by default, maybe that's an SLNOS-ism?
(I rather like it, though! 👍)

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: eflite, flite, speech-tools

Partial log (click to expand)

patching script interpreter paths in /nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/make_wagon_desc: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/est_examples: interpreter directive changed from " /bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/est_program: interpreter directive changed from " /bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/est_gdb: interpreter directive changed from "/bin/sh -eux" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eux"
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0/bin/resynth: interpreter directive changed from "/bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
checking for references to /build in /nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0...
/nix/store/i64l98m03xdi5ba0vd02kgggzh9zymxd-eflite-0.4.1
/nix/store/in8j4h4wf00isfypv7kyp7wwc0nkg72y-flite-2.1.0
/nix/store/ak435380g9sw4y95p4jz5fi4dpbgcqil-speech_tools-2.5.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: speech-tools

Partial log (click to expand)

strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0/lib  /nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0/bin
patching script interpreter paths in /nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0
/nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0/bin/resynth: interpreter directive changed from "/bin/sh -eu" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eu"
/nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0/bin/make_wagon_desc: interpreter directive changed from "/bin/sh" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh"
/nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0/bin/est_program: interpreter directive changed from " /bin/sh -eu" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eu"
/nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0/bin/est_gdb: interpreter directive changed from "/bin/sh -eux" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eux"
/nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0/bin/est_examples: interpreter directive changed from " /bin/sh -eu" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eu"
checking for references to /build in /nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0...
/nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: eflite, flite, speech-tools

Partial log (click to expand)

these derivations will be built:
  /nix/store/wcnqngzfs9fdcnhzhfnqlsp0kayf7cny-speech_tools-2.5.0.drv
waiting for locks or build slots...
/nix/store/60wrfkss8499wvac68gwg11wha4jsmgg-eflite-0.4.1
/nix/store/5a9hs7nlsj6vj2jcwf8g5b9hkm7h23p4-flite-2.1.0
/nix/store/nzr3cvqwjwf23hzf1kwy1hvxq4rsy7yi-speech_tools-2.5.0

@oxij
Copy link
Member Author

oxij commented Mar 15, 2018 via email

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: eflite, flite, speech-tools

Partial log (click to expand)

patching script interpreter paths in /nix/store/f0bm829j9ahyjpb7gfn37jspklbs8c1l-speech_tools-2.5.0
/nix/store/f0bm829j9ahyjpb7gfn37jspklbs8c1l-speech_tools-2.5.0/bin/make_wagon_desc: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
/nix/store/f0bm829j9ahyjpb7gfn37jspklbs8c1l-speech_tools-2.5.0/bin/est_examples: interpreter directive changed from " /bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
/nix/store/f0bm829j9ahyjpb7gfn37jspklbs8c1l-speech_tools-2.5.0/bin/est_program: interpreter directive changed from " /bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
/nix/store/f0bm829j9ahyjpb7gfn37jspklbs8c1l-speech_tools-2.5.0/bin/est_gdb: interpreter directive changed from "/bin/sh -eux" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eux"
/nix/store/f0bm829j9ahyjpb7gfn37jspklbs8c1l-speech_tools-2.5.0/bin/resynth: interpreter directive changed from "/bin/sh -eu" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -eu"
checking for references to /build in /nix/store/f0bm829j9ahyjpb7gfn37jspklbs8c1l-speech_tools-2.5.0...
/nix/store/i64l98m03xdi5ba0vd02kgggzh9zymxd-eflite-0.4.1
/nix/store/in8j4h4wf00isfypv7kyp7wwc0nkg72y-flite-2.1.0
/nix/store/f0bm829j9ahyjpb7gfn37jspklbs8c1l-speech_tools-2.5.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: eflite, flite, speech-tools

Partial log (click to expand)

patching script interpreter paths in /nix/store/84sfbmjmbsqgjasfcnaw36l5rp4x5p87-speech_tools-2.5.0
/nix/store/84sfbmjmbsqgjasfcnaw36l5rp4x5p87-speech_tools-2.5.0/bin/resynth: interpreter directive changed from "/bin/sh -eu" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eu"
/nix/store/84sfbmjmbsqgjasfcnaw36l5rp4x5p87-speech_tools-2.5.0/bin/make_wagon_desc: interpreter directive changed from "/bin/sh" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh"
/nix/store/84sfbmjmbsqgjasfcnaw36l5rp4x5p87-speech_tools-2.5.0/bin/est_program: interpreter directive changed from " /bin/sh -eu" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eu"
/nix/store/84sfbmjmbsqgjasfcnaw36l5rp4x5p87-speech_tools-2.5.0/bin/est_gdb: interpreter directive changed from "/bin/sh -eux" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eux"
/nix/store/84sfbmjmbsqgjasfcnaw36l5rp4x5p87-speech_tools-2.5.0/bin/est_examples: interpreter directive changed from " /bin/sh -eu" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -eu"
checking for references to /build in /nix/store/84sfbmjmbsqgjasfcnaw36l5rp4x5p87-speech_tools-2.5.0...
/nix/store/60wrfkss8499wvac68gwg11wha4jsmgg-eflite-0.4.1
/nix/store/5a9hs7nlsj6vj2jcwf8g5b9hkm7h23p4-flite-2.1.0
/nix/store/84sfbmjmbsqgjasfcnaw36l5rp4x5p87-speech_tools-2.5.0

@Mic92 Mic92 merged commit 38c3df5 into NixOS:master Mar 18, 2018
@oxij oxij deleted the pkgs/speech branch September 8, 2018 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@oxij @GrahamcOfBorg @dtzWill @Mic92