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.

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

cozy-audiobooks: init at 0.6.3 #47631

Merged
merged 2 commits into from Oct 14, 2018
Merged

Conversation

makefu
Copy link
Contributor

@makefu makefu commented Oct 1, 2018

Motivation for this change

add the cozy-audiobook package

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: cozy-audiobooks

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cozy-audiobooks

Partial log (click to expand)

post-installation fixup
Wrapping program /nix/store/3aqw5bil2h5y2pga8mhjp7rqid374lph-cozy-0.6.3/bin/cozy-audiobooks
Wrapping program /nix/store/3aqw5bil2h5y2pga8mhjp7rqid374lph-cozy-0.6.3/bin/com.github.geigi.cozy
Wrapping program /nix/store/3aqw5bil2h5y2pga8mhjp7rqid374lph-cozy-0.6.3/bin/.com.github.geigi.cozy-wrapped
shrinking RPATHs of ELF executables and libraries in /nix/store/3aqw5bil2h5y2pga8mhjp7rqid374lph-cozy-0.6.3
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3aqw5bil2h5y2pga8mhjp7rqid374lph-cozy-0.6.3/lib  /nix/store/3aqw5bil2h5y2pga8mhjp7rqid374lph-cozy-0.6.3/bin
patching script interpreter paths in /nix/store/3aqw5bil2h5y2pga8mhjp7rqid374lph-cozy-0.6.3
checking for references to /build in /nix/store/3aqw5bil2h5y2pga8mhjp7rqid374lph-cozy-0.6.3...
/nix/store/3aqw5bil2h5y2pga8mhjp7rqid374lph-cozy-0.6.3

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: cozy-audiobooks

Partial log (click to expand)

post-installation fixup
Wrapping program /nix/store/7wb35lh0nyzyl1j0fdz6fr137ada3rn0-cozy-0.6.3/bin/.com.github.geigi.cozy-wrapped
Wrapping program /nix/store/7wb35lh0nyzyl1j0fdz6fr137ada3rn0-cozy-0.6.3/bin/com.github.geigi.cozy
Wrapping program /nix/store/7wb35lh0nyzyl1j0fdz6fr137ada3rn0-cozy-0.6.3/bin/cozy-audiobooks
shrinking RPATHs of ELF executables and libraries in /nix/store/7wb35lh0nyzyl1j0fdz6fr137ada3rn0-cozy-0.6.3
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/7wb35lh0nyzyl1j0fdz6fr137ada3rn0-cozy-0.6.3/lib  /nix/store/7wb35lh0nyzyl1j0fdz6fr137ada3rn0-cozy-0.6.3/bin
patching script interpreter paths in /nix/store/7wb35lh0nyzyl1j0fdz6fr137ada3rn0-cozy-0.6.3
checking for references to /build in /nix/store/7wb35lh0nyzyl1j0fdz6fr137ada3rn0-cozy-0.6.3...
/nix/store/7wb35lh0nyzyl1j0fdz6fr137ada3rn0-cozy-0.6.3

, gnome3
}:

stdenv.mkDerivation rec {
Copy link
Contributor

Choose a reason for hiding this comment

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

buildPythonApplication seems to be better for this. See gnome-music.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i don't see how this would work as there is no setup.py

Copy link
Contributor

Choose a reason for hiding this comment

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

buildPythonApplication takes a parameter format which should be set to other in this case

This defaults to "setuptools" which is for when there's a setup.py

Copy link
Contributor Author

Choose a reason for hiding this comment

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

okay, i changed that. who knew!

, appstream-glib
, desktop-file-utils
, gtk3
, glib
Copy link
Contributor

Choose a reason for hiding this comment

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

gtk3 propagates glib so can drop glib.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

seems to work, however i am not sure how anyone would know arcane wisdom this when packaging if not explicitly being told.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, we're trying to get some docs 🤣

postInstall = ''
wrapProgram $out/bin/com.github.geigi.cozy \
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy-audiobooks
Copy link
Contributor

Choose a reason for hiding this comment

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

The author intended for the executable to be rddn'd and I think this won't match the Exec in the .desktop file either.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

you mean renamed to cozy? i can do that

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i just checked, com.github.geigi.cozy is inside the .desktop file, i still think symlinking it to something you can actually find in your path is a good idea.

cairo
gettext
gnome3.defaultIconTheme
gnome3.gsettings-desktop-schemas
Copy link
Contributor

Choose a reason for hiding this comment

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

gnome3.gsettings-desktop-schemas is also propagated by gtk3.

A modern audio book player for Linux using GTK+ 3
'';
maintainers = [ maintainers.makefu ];
license = licenses.mit;
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this should be mit and gpl3 because of this and this

@@ -653,6 +653,8 @@ with pkgs;

chkcrontab = callPackage ../tools/admin/chkcrontab { };

cozy-audiobooks = callPackage ../applications/audio/cozy-audiobooks { };
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be just cozy.

@makefu
Copy link
Contributor Author

makefu commented Oct 10, 2018

@worldofpeace thanks for the review!

gst-plugins-good
gst-plugins-ugly
gst-plugins-base
]) ++ (with python3Packages; [
Copy link
Contributor

Choose a reason for hiding this comment

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

If you use buildPythonApplication these buildInputs

++ (with python3Packages; [...

should be propagatedBuildInputs.

@worldofpeace
Copy link
Contributor

Make sure to also change the directory from pkgs/applications/audio/cozy-audiobooks -> pkgs/applications/audio/cozy.

Also the attribute name in the commit message.

]);

propagatedBuildInputs = with python3Packages; [
python
Copy link
Contributor

Choose a reason for hiding this comment

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

You can drop this python.

@makefu
Copy link
Contributor Author

makefu commented Oct 11, 2018

Make sure to also change the directory from pkgs/applications/audio/cozy-audiobooks -> pkgs/applications/audio/cozy.

Also the attribute name in the commit message.

I followed the archlinux packaging naming ( https://aur.archlinux.org/packages/cozy-audiobooks/ ), also there is a python package called cozy in ./pkgs/development/python-modules/cozy/ and having audiobooks in the name makes clear what is about listening to audiobooks and what is about synthesizer.
i will change the name in the commit though.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: cozy

Partial log (click to expand)

post-installation fixup
Wrapping program /nix/store/snx5s4pyyq21m0gggvb0yz97wk5hdn4m-cozy-0.6.3/bin/com.github.geigi.cozy
Wrapping program /nix/store/snx5s4pyyq21m0gggvb0yz97wk5hdn4m-cozy-0.6.3/bin/cozy
shrinking RPATHs of ELF executables and libraries in /nix/store/snx5s4pyyq21m0gggvb0yz97wk5hdn4m-cozy-0.6.3
strip is /nix/store/dxf1m7dhc4qb655bdljc1fsd74v1nag3-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/snx5s4pyyq21m0gggvb0yz97wk5hdn4m-cozy-0.6.3/lib  /nix/store/snx5s4pyyq21m0gggvb0yz97wk5hdn4m-cozy-0.6.3/bin
patching script interpreter paths in /nix/store/snx5s4pyyq21m0gggvb0yz97wk5hdn4m-cozy-0.6.3
checking for references to /build in /nix/store/snx5s4pyyq21m0gggvb0yz97wk5hdn4m-cozy-0.6.3...
wrapping `/nix/store/snx5s4pyyq21m0gggvb0yz97wk5hdn4m-cozy-0.6.3/bin/.com.github.geigi.cozy-wrapped'...
/nix/store/snx5s4pyyq21m0gggvb0yz97wk5hdn4m-cozy-0.6.3

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: cozy

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cozy

Partial log (click to expand)

post-installation fixup
Wrapping program /nix/store/9qfnpqc6sw229bcsvrv28yiqskj118r9-cozy-0.6.3/bin/cozy
Wrapping program /nix/store/9qfnpqc6sw229bcsvrv28yiqskj118r9-cozy-0.6.3/bin/com.github.geigi.cozy
shrinking RPATHs of ELF executables and libraries in /nix/store/9qfnpqc6sw229bcsvrv28yiqskj118r9-cozy-0.6.3
strip is /nix/store/428gs2z4b8f9byvghzlpbjwjb3a7jwxx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/9qfnpqc6sw229bcsvrv28yiqskj118r9-cozy-0.6.3/lib  /nix/store/9qfnpqc6sw229bcsvrv28yiqskj118r9-cozy-0.6.3/bin
patching script interpreter paths in /nix/store/9qfnpqc6sw229bcsvrv28yiqskj118r9-cozy-0.6.3
checking for references to /build in /nix/store/9qfnpqc6sw229bcsvrv28yiqskj118r9-cozy-0.6.3...
wrapping `/nix/store/9qfnpqc6sw229bcsvrv28yiqskj118r9-cozy-0.6.3/bin/.com.github.geigi.cozy-wrapped'...
/nix/store/9qfnpqc6sw229bcsvrv28yiqskj118r9-cozy-0.6.3

@worldofpeace
Copy link
Contributor

LGTM but I'm not the best person to review peewee here.

cc @FRidh @dotlambda for pythonPackages.peewee

@makefu
Copy link
Contributor Author

makefu commented Oct 13, 2018

@GrahamcOfBorg build python2Packages.peewee

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2Packages.peewee

Partial log (click to expand)

Ran 619 tests in 13.469s

OK (skipped=56)
Unable to import APSW extension tests, skipping.
Unable to import sqlite C extension tests, skipping.
Unable to import mysql-connector, skipping mysql_ext tests.
Unable to import postgres extension tests, skipping.
Unable to import SQLCipher extension tests, skipping.
Unable to import sqlite extension tests, skipping.
/nix/store/vh7s30lvvbv815m71iwprxn76z0l2syi-python2.7-peewee-3.7.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: python2Packages.peewee

Partial log (click to expand)

Ran 619 tests in 6.799s

OK (skipped=56)
Unable to import APSW extension tests, skipping.
Unable to import sqlite C extension tests, skipping.
Unable to import mysql-connector, skipping mysql_ext tests.
Unable to import postgres extension tests, skipping.
Unable to import SQLCipher extension tests, skipping.
Unable to import sqlite extension tests, skipping.
/nix/store/v9ixkxd3bj9radp8acvc2kfp1y8a28fv-python2.7-peewee-3.7.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2Packages.peewee

Partial log (click to expand)

Ran 619 tests in 5.148s

OK (skipped=56)
Unable to import APSW extension tests, skipping.
Unable to import sqlite C extension tests, skipping.
Unable to import mysql-connector, skipping mysql_ext tests.
Unable to import postgres extension tests, skipping.
Unable to import SQLCipher extension tests, skipping.
Unable to import sqlite extension tests, skipping.
/nix/store/m02dghpyd5r509b2p0qjygm8fm5mdvp9-python2.7-peewee-3.7.0

buildPythonPackage rec {

pname = "peewee";
version = "3.7.0";
Copy link
Contributor

Choose a reason for hiding this comment

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

They're at 3.7.1 now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i cross fingers that they do not release a new version until tomorrow


pname = "peewee";
version = "3.7.0";
src = fetchFromGitHub {
Copy link
Contributor

Choose a reason for hiding this comment

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

probably should use fetchPypi

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the pypi package is missing the tests

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe a comment like that then.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: cozy

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: cozy

Partial log (click to expand)

post-installation fixup
Wrapping program /nix/store/cjh1b72q8rl4dzhg97ngjvzq7zw1zps1-cozy-0.6.3/bin/com.github.geigi.cozy
Wrapping program /nix/store/cjh1b72q8rl4dzhg97ngjvzq7zw1zps1-cozy-0.6.3/bin/cozy
shrinking RPATHs of ELF executables and libraries in /nix/store/cjh1b72q8rl4dzhg97ngjvzq7zw1zps1-cozy-0.6.3
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/cjh1b72q8rl4dzhg97ngjvzq7zw1zps1-cozy-0.6.3/lib  /nix/store/cjh1b72q8rl4dzhg97ngjvzq7zw1zps1-cozy-0.6.3/bin
patching script interpreter paths in /nix/store/cjh1b72q8rl4dzhg97ngjvzq7zw1zps1-cozy-0.6.3
checking for references to /build in /nix/store/cjh1b72q8rl4dzhg97ngjvzq7zw1zps1-cozy-0.6.3...
wrapping `/nix/store/cjh1b72q8rl4dzhg97ngjvzq7zw1zps1-cozy-0.6.3/bin/.com.github.geigi.cozy-wrapped'...
/nix/store/cjh1b72q8rl4dzhg97ngjvzq7zw1zps1-cozy-0.6.3

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cozy

Partial log (click to expand)

post-installation fixup
Wrapping program /nix/store/3gsprd940yyip4rvrl7riirsiw599kv1-cozy-0.6.3/bin/cozy
Wrapping program /nix/store/3gsprd940yyip4rvrl7riirsiw599kv1-cozy-0.6.3/bin/com.github.geigi.cozy
shrinking RPATHs of ELF executables and libraries in /nix/store/3gsprd940yyip4rvrl7riirsiw599kv1-cozy-0.6.3
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3gsprd940yyip4rvrl7riirsiw599kv1-cozy-0.6.3/lib  /nix/store/3gsprd940yyip4rvrl7riirsiw599kv1-cozy-0.6.3/bin
patching script interpreter paths in /nix/store/3gsprd940yyip4rvrl7riirsiw599kv1-cozy-0.6.3
checking for references to /build in /nix/store/3gsprd940yyip4rvrl7riirsiw599kv1-cozy-0.6.3...
wrapping `/nix/store/3gsprd940yyip4rvrl7riirsiw599kv1-cozy-0.6.3/bin/.com.github.geigi.cozy-wrapped'...
/nix/store/3gsprd940yyip4rvrl7riirsiw599kv1-cozy-0.6.3

@FRidh FRidh merged commit 49b9959 into NixOS:master Oct 14, 2018
@worldofpeace
Copy link
Contributor

@makefu Thanks for your contribution ❇️ 🎆

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants