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

veusz: init at 3.3.1 #93897

Merged
merged 1 commit into from Jun 20, 2021
Merged

veusz: init at 3.3.1 #93897

merged 1 commit into from Jun 20, 2021

Conversation

laikq
Copy link
Contributor

@laikq laikq commented Jul 26, 2020

Motivation for this change

A friend of mine uses this program for everyday scientific plotting :)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

SuperSandro2000
SuperSandro2000 requested changes Nov 29, 2020
View reviewed changes
pkgs/applications/graphics/veusz/default.nix Outdated Show resolved Hide resolved
pkgs/applications/graphics/veusz/default.nix Outdated Show resolved Hide resolved
pkgs/applications/graphics/veusz/default.nix Outdated Show resolved Hide resolved
pkgs/applications/graphics/veusz/default.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Nov 29, 2020 •
edited

Result of nixpkgs-review pr 93897 run on x86_64-linux 1

1 package failed to build:
  • veusz
/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ld: cannot find -lQt5Gui
/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ld: cannot find -lQt5Core
/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ld: cannot find -lQt5Xml
/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ld: cannot find -lQt5Widgets
collect2: error: ld returned 1 exit status
error: command 'g++' failed with exit status 1

@laikq
Copy link
Contributor Author

laikq commented Dec 4, 2020

I implemented your changes and rebased onto master. nixpkgs-review pr 93897 works without any errors on my x86_64 machine.

@SuperSandro2000
Copy link
Member

Fails to build on linux:

these derivations will be built:
  /nix/store/yqhqq712n4jkzp1n6r6w4clxh4mhwqin-python3.8-astropy-4.2.drv
  /nix/store/xx1zamvhzni1k25j8ydmigy2nhbxav8p-veusz-3.3.drv
building '/nix/store/yqhqq712n4jkzp1n6r6w4clxh4mhwqin-python3.8-astropy-4.2.drv'...
Sourcing python-remove-tests-dir-hook
Sourcing python-catch-conflicts-hook.sh
Sourcing python-remove-bin-bytecode-hook.sh
Sourcing setuptools-build-hook
Using setuptoolsBuildPhase
Using setuptoolsShellHook
Sourcing pip-install-hook
Using pipInstallPhase
Sourcing python-imports-check-hook.sh
Using pythonImportsCheckPhase
Sourcing python-namespaces-hook
unpacking sources
unpacking source archive /nix/store/97p1snwyary26glch3i0i9mkd0m4p7vp-astropy-4.2.tar.gz
source root is astropy-4.2
setting SOURCE_DATE_EPOCH to timestamp 1606289346 of file astropy-4.2/setup.cfg
patching sources
substituteStream(): WARNING: pattern 'auto_use = True' doesn't match anything in file 'setup.cfg'
configuring
no configure script, doing nothing
building
Executing setuptoolsBuildPhase
Traceback (most recent call last):
  File "nix_run_setup", line 8, in <module>
    exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
  File "setup.py", line 67, in <module>
    from extension_helpers import get_extensions  # noqa
ModuleNotFoundError: No module named 'extension_helpers'
builder for '/nix/store/yqhqq712n4jkzp1n6r6w4clxh4mhwqin-python3.8-astropy-4.2.drv' failed with exit code 1
cannot build derivation '/nix/store/xx1zamvhzni1k25j8ydmigy2nhbxav8p-veusz-3.3.drv': 1 dependencies couldn't be built
error: build of '/nix/store/xx1zamvhzni1k25j8ydmigy2nhbxav8p-veusz-3.3.drv' failed

@laikq laikq changed the title veusz: init at 3.2.1 veusz: init at 3.3.1 Dec 11, 2020
@laikq
Copy link
Contributor Author

laikq commented Dec 11, 2020

Updated veusz to 3.3.1 and removed astropy as a dependency, as it currently fails to build (it's also an optional dependency, so veusz will still work without astropy). I couldn't run nixpkgs-review this time (not enough memory on my machine), but nix-build worked fine for me.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 93897 run on x86_64-linux 1

1 package built:
  • veusz

@vale981
Copy link
Contributor

vale981 commented Jun 12, 2021

@SuperSandro2000 Any blockers here?
:)

@SuperSandro2000
Copy link
Member

@ofborg eval

@SuperSandro2000
Copy link
Member

@SuperSandro2000 Any blockers here?
:)

The build now fails with RuntimeError: Could not find sip executable. Can you take a look at this if you want the PR to get merged?

@laikq
Copy link
Contributor Author

laikq commented Jun 13, 2021

It seems that a change in sip caused the error, I added a patch in the package (for some reason, the build script ignores one command line option if the sip executable is called sip5).

Hmm, can I call ofborg myself?

@ofborg eval

SuperSandro2000
SuperSandro2000 requested changes Jun 15, 2021
View reviewed changes
pkgs/applications/graphics/veusz/default.nix Outdated
# For some reason, if sip5 is found on the PATH, the option --sip-dir is
# ignored in setupPyBuildFlags, see
# https://github.com/veusz/veusz/blob/53b99dffa999f2bc41fdc5335d7797ae857c761f/pyqtdistutils.py#L292
patchPhase = ''
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
patchPhase = ''
postPatch = ''

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've added this change now. I guess it is better because one can still define patch files?

Copy link
Member

Choose a reason for hiding this comment

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

Yes

pkgs/applications/graphics/veusz/default.nix Show resolved Hide resolved
@laikq laikq force-pushed the veusz branch 2 times, most recently from 1ee8cf7 to 2e41bf4 Compare June 16, 2021 11:45
@laikq
Copy link
Contributor Author

laikq commented Jun 18, 2021

Implemented the changes you suggested!

@SuperSandro2000 SuperSandro2000 merged commit 0bdb57a into NixOS:master Jun 20, 2021
@laikq laikq mentioned this pull request Jun 20, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@laikq @SuperSandro2000 @vale981