-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
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.
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
nerd-dictation: init at unstable-2022-07-12 #185148
base: master
Are you sure you want to change the base?
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
3b40915
to
3127fbd
Compare
Appears to work now. |
I do not like how it is rewriting the existing text, trying #185255 as an alternative. |
# No tests. | ||
doCheck = false; | ||
|
||
# Broken for some reason. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you paste the log?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pythonCatchConflictsPhase
Found duplicated packages in closure for dependency 'nerd-dictation':
nerd-dictation 0.0.0 (/nix/store/3dc8q0l76p27nnyv8b8aijfhs6ssifk7-nerd-dictation-unstable-2022-07-12/lib/python3.10/site-packages)
nerd-dictation 0.0.0 (/nix/store/3dc8q0l76p27nnyv8b8aijfhs6ssifk7-nerd-dictation-unstable-2022-07-12/lib/python3.10/site-packages)
Package duplicates found in closure, see above. Usually this happens if two packages depend on different version of the same dependency.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nerd_dictation-0.0.0.dist-info
The version number is not set correct.
https://github.com/ideasman42/nerd-dictation/blob/master/package/python/setup.py#L43
The version number is hardcoded to 0.0.0
which is the default value and should be treated as an error.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The layout in site-packages is really strange and very custom.
Anything installed under site-packages should be importable and it is frowned upon to files directly under site-packages.
I expect this to cause more trouble in the future.
Compared to a standard python package:
➜ tree result
result ⇒ /nix/store/3qfd3gwpar83k89wdnw8pab7xr3bfv52-nerd-dictation-unstable-2022-07-12
├── bin
│ └── nerd-dictation
├── lib
│ └── python3.10
│ └── site-packages
│ ├── __pycache__
│ │ └── setup.cpython-310.pyc
│ ├── doc
│ │ └── readme.rst
│ ├── nerd-dictation
│ ├── nerd_dictation-0.0.0.dist-info
│ │ ├── direct_url.json
│ │ ├── INSTALLER
│ │ ├── METADATA
│ │ ├── RECORD
│ │ ├── REQUESTED
│ │ ├── top_level.txt
│ │ └── WHEEL
│ ├── nerd_dictation.egg-info
│ │ ├── dependency_links.txt
│ │ ├── PKG-INFO
│ │ ├── requires.txt
│ │ ├── SOURCES.txt
│ │ └── top_level.txt
│ ├── nix_run_setup
│ └── setup.py
├── nerd-dictation
│ ├── nerd-dictation
│ └── readme.rst
└── nix-support
└── propagated-build-inputs
➜ tree result
result ⇒ /nix/store/k38smakhffi54jgpj21d4l51w5va85ly-python3.10-jsonschema-4.7.2
├── bin
│ └── jsonschema
├── lib
│ └── python3.10
│ └── site-packages
│ ├── jsonschema
│ │ ├── __init__.py
│ │ ├── __main__.py
│ │ ├── __pycache__
│ │ │ ├── __init__.cpython-310.pyc
│ │ │ ├── __main__.cpython-310.pyc
│ │ │ ├── _format.cpython-310.pyc
│ │ │ ├── _legacy_validators.cpython-310.pyc
│ │ │ ├── _reflect.cpython-310.pyc
│ │ │ ├── _types.cpython-310.pyc
│ │ │ ├── _utils.cpython-310.pyc
│ │ │ ├── _validators.cpython-310.pyc
│ │ │ ├── cli.cpython-310.pyc
│ │ │ ├── exceptions.cpython-310.pyc
│ │ │ ├── protocols.cpython-310.pyc
│ │ │ └── validators.cpython-310.pyc
│ │ ├── _format.py
│ │ ├── _legacy_validators.py
│ │ ├── _reflect.py
│ │ ├── _types.py
│ │ ├── _utils.py
│ │ ├── _validators.py
│ │ ├── benchmarks
│ │ │ ├── __init__.py
│ │ │ ├── __pycache__
│ │ │ │ ├── __init__.cpython-310.pyc
│ │ │ │ ├── issue232.cpython-310.pyc
│ │ │ │ └── json_schema_test_suite.cpython-310.pyc
│ │ │ ├── issue232
│ │ │ │ └── issue.json
│ │ │ ├── issue232.py
│ │ │ └── json_schema_test_suite.py
│ │ ├── cli.py
│ │ ├── exceptions.py
│ │ ├── protocols.py
│ │ ├── schemas
│ │ │ ├── draft2019-09.json
│ │ │ ├── draft2020-12.json
│ │ │ ├── draft3.json
│ │ │ ├── draft4.json
│ │ │ ├── draft6.json
│ │ │ ├── draft7.json
│ │ │ └── vocabularies.json
│ │ ├── tests
│ │ │ ├── __init__.py
│ │ │ ├── __pycache__
│ │ │ │ ├── __init__.cpython-310.pyc
│ │ │ │ ├── _helpers.cpython-310.pyc
│ │ │ │ ├── _suite.cpython-310.pyc
│ │ │ │ ├── fuzz_validate.cpython-310.pyc
│ │ │ │ ├── test_cli.cpython-310.pyc
│ │ │ │ ├── test_deprecations.cpython-310.pyc
│ │ │ │ ├── test_exceptions.cpython-310.pyc
│ │ │ │ ├── test_format.cpython-310.pyc
│ │ │ │ ├── test_jsonschema_test_suite.cpython-310.pyc
│ │ │ │ ├── test_types.cpython-310.pyc
│ │ │ │ ├── test_utils.cpython-310.pyc
│ │ │ │ └── test_validators.cpython-310.pyc
│ │ │ ├── _helpers.py
│ │ │ ├── _suite.py
│ │ │ ├── fuzz_validate.py
│ │ │ ├── test_cli.py
│ │ │ ├── test_deprecations.py
│ │ │ ├── test_exceptions.py
│ │ │ ├── test_format.py
│ │ │ ├── test_jsonschema_test_suite.py
│ │ │ ├── test_types.py
│ │ │ ├── test_utils.py
│ │ │ └── test_validators.py
│ │ └── validators.py
│ └── jsonschema-4.7.2.dist-info
│ ├── direct_url.json
│ ├── entry_points.txt
│ ├── INSTALLER
│ ├── licenses
│ │ └── COPYING
│ ├── METADATA
│ ├── RECORD
│ ├── REQUESTED
│ └── WHEEL
└── nix-support
└── propagated-build-inputs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like there is something for that here: ideasman42/nerd-dictation#79
@jtojnar I'd be interested in having |
On Wed, Sep 28 2022 at 15:31:41 -07:00:00, reivilibre ***@***.***> wrote:
@jtojnar I'd be interested in having vosk-api packaged in NixOS if
nothing else; assuming you're too busy to continue with this PR at
the moment(?), would it be acceptable to you if I took your work
packaging vosk-api and opened a PR with just that?
Feel free, but IIRC there is already another PR for that.
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/speech-to-text-virtual-keyboard-in-nixos/22684/2 |
cc3ccca
to
614ace9
Compare
It looks like after a bump, CMake started passing `--git-dir=.git` as the first argument of `git rev-parse`. But we do not really need to spoof `git` program now that Kaldi uses CMake’s `FetchContent` module. We can just pass the path using configure flag directly: https://cmake.org/cmake/help/latest/module/FetchContent.html#variable:FETCHCONTENT_SOURCE_DIR_%3CuppercaseName%3E Git was also inadvertently used for generating `KALDI_PATCH_NUMBER` in `VersionHelper`, to be potentially appended to `KALDI_VERSION` but it was not actually being done by default. We can set the variable directly to skip `VersionHelper`. Also remove redundant `enableParallelBuild` since CMake enables it. And drop separate `dev` output since Kaldi currently hardcodes the `include/` directory so consumers would not be able to find them. Splitting it out only removes 7 out of 303 MB.
It is shadowed by fetchgit source and can only be used vendored.
Also switch to finalAttrs so that the values can be easily overridden.
Co-Authored-By: Reuben Steenekamp <[email protected]>
b230bb8
to
afa4cda
Compare
Co-Authored-By: Reuben Steenekamp <[email protected]>
Co-Authored-By: Reuben Steenekamp <[email protected]>
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/assistance-needed-in-packaging-python-program/33420/3 |
Description of changes
Depends on #236313
Fixes: #176121
cc @guy-who-googles
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes