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

catfish: 1.4.2 -> 1.4.4 #34899

Merged
merged 1 commit into from Feb 14, 2018
Merged

catfish: 1.4.2 -> 1.4.4 #34899

merged 1 commit into from Feb 14, 2018

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Feb 12, 2018 •
edited

Motivation for this change

Update to version 1.4.4

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
    • 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/)
  • Fits CONTRIBUTING.md.

dotlambda
dotlambda reviewed Feb 12, 2018
View reviewed changes
pkgs/applications/search/catfish/default.nix Outdated
@@ -45,6 +45,9 @@ pythonPackages.buildPythonApplication rec {
done
'';

# Disable tests, they don't exist and break the builds (according to debian)
doCheck = false;
Copy link
Member

Choose a reason for hiding this comment

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

Better check yourself. Are there tests or are there no tests?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Testing gives the following errors:

running install tests
ERROR: Python module helpers not found
ERROR: Python module Window not found
ERROR: Python module catfishconfig not found
ERROR: Python module catfishconfig not found
ERROR: Python module Builder not found
ERROR: Python module helpers not found
ERROR: Python module catfishconfig not found
ERROR: Python module zeitgeist.client not found
ERROR: Python module zeitgeist.datamodel not found
ERROR: Python module zeitgeist not found
ERROR: Python module helpers not found

Those modules are installed at $out/lib/python2.7/site-packages/catfish_lib/.

Copy link
Member

Choose a reason for hiding this comment

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

Looking at the tarball, I don't see any test. Do you know what command needs to be run for the tests? If not, I think you can honestly say there are no tests. Please leave a comment why you disable them in this case.

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 also do not see any test in the tarball.

pkgs/applications/search/catfish/default.nix Outdated
@@ -3,13 +3,13 @@

pythonPackages.buildPythonApplication rec {
majorver = "1.4";
minorver = "2";
minorver = "4";
version = "${majorver}.${minorver}";
name = "catfish-${version}";
Copy link
Member

Choose a reason for hiding this comment

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

Please get rif of the name here and only specify pname.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What is the rationale behind that? I failed to find any documentation on it. Notice that name is used in the src attribute.

Copy link
Member

Choose a reason for hiding this comment

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

It's not necessary anymore for buildPython*. Without name, it easier to override the attributes for using a custom version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

And how should the url be written in this case? When I remove name and add pname, I get

error: undefined variable ‘name’ at /alt/nixpkgs/pkgs/applications/search/catfish/default.nix:11:84

Copy link
Member

Choose a reason for hiding this comment

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

Use ${pname}-${version}.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

dotlambda
dotlambda reviewed Feb 12, 2018
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

In the tarball, bin/catfish has a shebang of #!/usr/bin/python3. So, don't you think this should use Python 3?

pkgs/applications/search/catfish/default.nix Outdated
@@ -45,6 +45,9 @@ pythonPackages.buildPythonApplication rec {
done
'';

# Disable tests, they don't exist and break the builds (according to debian)
doCheck = false;
Copy link
Member

Choose a reason for hiding this comment

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

Looking at the tarball, I don't see any test. Do you know what command needs to be run for the tests? If not, I think you can honestly say there are no tests. Please leave a comment why you disable them in this case.

@dotlambda
Copy link
Member

What do you think about using Python 3?

@GrahamcOfBorg build catfish

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
Wrapping program /nix/store/zm6pkhrgsyif206n1g56n7mykfvninnj-catfish-1.4.4/bin/catfish
shrinking RPATHs of ELF executables and libraries in /nix/store/zm6pkhrgsyif206n1g56n7mykfvninnj-catfish-1.4.4
gzipping man pages under /nix/store/zm6pkhrgsyif206n1g56n7mykfvninnj-catfish-1.4.4/share/man/
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zm6pkhrgsyif206n1g56n7mykfvninnj-catfish-1.4.4/lib  /nix/store/zm6pkhrgsyif206n1g56n7mykfvninnj-catfish-1.4.4/bin 
patching script interpreter paths in /nix/store/zm6pkhrgsyif206n1g56n7mykfvninnj-catfish-1.4.4
checking for references to /tmp/nix-build-catfish-1.4.4.drv-0 in /nix/store/zm6pkhrgsyif206n1g56n7mykfvninnj-catfish-1.4.4...
/nix/store/zm6pkhrgsyif206n1g56n7mykfvninnj-catfish-1.4.4
wrapping `/nix/store/zm6pkhrgsyif206n1g56n7mykfvninnj-catfish-1.4.4/bin/.catfish-wrapped'...

@dotlambda
Copy link
Member

When running catfish, I get

$ /nix/store/w6b1s0083xbzykg3rp5cfj188d1vkyj2-catfish-1.4.4/bin/catfish 
Traceback (most recent call last):
  File "/nix/store/w6b1s0083xbzykg3rp5cfj188d1vkyj2-catfish-1.4.4/bin/..catfish-wrapped-wrapped", line 27, in <module>
    gi.require_version('Gtk', '3.0')
  File "/nix/store/fqh6kkiws3gll6z0afgk7mwwj9xkp694-python2.7-pygobject-3.26.1/lib/python2.7/site-packages/gi/__init__.py", line 130, in require_version
    raise ValueError('Namespace %s not available' % namespace)
ValueError: Namespace Gtk not available

@romildo
Copy link
Contributor Author

romildo commented Feb 12, 2018

When running catfish, it works for me:
screenshot_2018-02-12_18-35-44

@dotlambda
Copy link
Member

Maybe @FRidh can help.
But as this is just an update, it would be unfair to say this needs to be fixed right now.

@dotlambda
Copy link
Member

dotlambda commented Feb 12, 2018 •
edited

I made it work by adding gobjectIntrospection to buildInputs.
EDIT: It even works when it's in nativeBuildInputs.

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

   Compiling rustc_privacy v0.0.0 (file:///build/rustc-1.22.1-src/src/librustc_privacy)
   Compiling rustc_save_analysis v0.0.0 (file:///build/rustc-1.22.1-src/src/librustc_save_analysis)
   Compiling rustc_borrowck v0.0.0 (file:///build/rustc-1.22.1-src/src/librustc_borrowck)
   Compiling rustc_plugin v0.0.0 (file:///build/rustc-1.22.1-src/src/librustc_plugin)
building of '/nix/store/1q00yw9nphvwvxyk6imxny1rk76rwqy1-rustc-1.22.1.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/i63b6jfgcjz1qkbwsljw4y9vrdsq0qr3-cargo-0.23.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/54gwpxhrss33zvavc8qpv9kvca66ja7j-librsvg-2.42.2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/4sgr9nibc20a50wqj0m0slhxnb5wsy2d-hook.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/0wgb0wk0d0yxj5j2l62nxvw2xlqww0za-catfish-1.4.4.drv': 1 dependencies couldn't be built
error: build of '/nix/store/0wgb0wk0d0yxj5j2l62nxvw2xlqww0za-catfish-1.4.4.drv' failed

@romildo
Copy link
Contributor Author

romildo commented Feb 13, 2018

In the tarball, bin/catfish has a shebang of #!/usr/bin/python3. So, don't you think this should use Python 3?

Now it works with both Python 2 and Python 3.

@romildo
Copy link
Contributor Author

romildo commented Feb 13, 2018

I made it work by adding gobjectIntrospection to buildInputs.
EDIT: It even works when it's in nativeBuildInputs.

Done

@romildo
Copy link
Contributor Author

romildo commented Feb 13, 2018

Maybe it can be merged now.

@disassembler disassembler merged commit ac8a149 into NixOS:master Feb 14, 2018
@disassembler
Copy link
Member

merging! Thanks for the contribution!

@romildo romildo deleted the upd.catfish branch February 14, 2018 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda dotlambda approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@romildo @dotlambda @GrahamcOfBorg @disassembler