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

Jump to bottom

maestral-qt: 1.1.0 -> 1.2.0 #98113

Merged
merged 5 commits into from Sep 22, 2020
Merged

maestral-qt: 1.1.0 -> 1.2.0 #98113

merged 5 commits into from Sep 22, 2020

Conversation

SFrijters
Copy link
Member

@SFrijters SFrijters commented Sep 16, 2020 •
edited

Motivation for this change

New release https://github.com/SamSchott/maestral/releases/tag/v1.2.0

The first commit is a duplicate of #98073 to make sure this branch actually works. The PR that caused this issue has been reverted in a4e50bb.
This PR also includes necessary dependency updates for the maestral base package, and transitively dropbox. The updated maestral package also requires a new package dbus-next.

The dbus-next package has testing disabled at the moment because I get and I'm not sure what to do about this.

running install tests
no Makefile or custom buildPhase, doing nothing
pythonCatchConflictsPhase
pythonRemoveBinBytecodePhase
pythonImportsCheckPhase
Executing pythonImportsCheckPhase
setuptoolsCheckPhase
Executing setuptoolsCheckPhase
running test
WARNING: Testing via this command is deprecated and will be removed in a future version. Users looking for a generic test entry point independent of test runner are encouraged to use tox.
running egg_info
writing dbus_next.egg-info/PKG-INFO
writing dependency_links to dbus_next.egg-info/dependency_links.txt
writing top-level names to dbus_next.egg-info/top_level.txt
reading manifest file 'dbus_next.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'dbus_next.egg-info/SOURCES.txt'
running build_ext
error: [Errno 2] No such file or directory: '/build/dbus_next-0.1.4/test/data/introspection.xml'
note: keeping build directory '/tmp/nix-build-python3.8-dbus-next-0.1.4.drv-0'
error: --- Error --- nix-daemon
builder for '/nix/store/06g2adww93xpq9957frc5pqmfd5z01y3-python3.8-dbus-next-0.1.4.drv' failed with exit code 1; last 10 log lines:
  WARNING: Testing via this command is deprecated and will be removed in a future version. Users looking for a generic test entry point independent of test runner are encouraged to use tox.
  running egg_info
  writing dbus_next.egg-info/PKG-INFO
  writing dependency_links to dbus_next.egg-info/dependency_links.txt
  writing top-level names to dbus_next.egg-info/top_level.txt
  reading manifest file 'dbus_next.egg-info/SOURCES.txt'
  reading manifest template 'MANIFEST.in'
  writing manifest file 'dbus_next.egg-info/SOURCES.txt'
  running build_ext
  error: [Errno 2] No such file or directory: '/build/dbus_next-0.1.4/test/data/introspection.xml'
error: --- Error -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- nix-build
error: --- Error --- nix-daemon
1 dependencies of derivation '/nix/store/8p39zvlwmqm8kh6vinxzxii001pyisbg-maestral-qt-1.2.0.drv' failed to build
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.

@SFrijters SFrijters force-pushed the maestral-1.2.0 branch 2 times, most recently from 9639d01 to 87fc83b Compare September 16, 2020 18:46
@SFrijters SFrijters force-pushed the maestral-1.2.0 branch 2 times, most recently from a792fae to bdf7923 Compare September 16, 2020 20:05
@SFrijters
maestral-gui: Fix Qt by using libsForQt5
2afda28 
This is needed after c88f3ad to make sure the libs are consistent.
@SFrijters SFrijters force-pushed the maestral-1.2.0 branch 2 times, most recently from 7786dd6 to bda14ac Compare September 21, 2020 12:25
jonringer
jonringer reviewed Sep 22, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

NIT:
The maestral and dropbox commits should have the appropriate pythonPackages prefix to them (E.g):

pythonPackages.maestral: <subject>

@SFrijters
Copy link
Member Author

@jonringer Done

jonringer
jonringer approved these changes Sep 22, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 98113 1

9 packages built:
  • gitAndTools.git-annex-remote-dbx
  • maestral (python38Packages.maestral)
  • maestral-gui
  • python27Packages.dropbox
  • python37Packages.dbus-next
  • python37Packages.dropbox
  • python37Packages.maestral
  • python38Packages.dbus-next
  • python38Packages.dropbox

@jonringer jonringer merged commit 6dad7dd into NixOS:master Sep 22, 2020
@SFrijters SFrijters deleted the maestral-1.2.0 branch September 30, 2020 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh left review comments

@jonringer jonringer jonringer approved these changes

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 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
3 participants
@SFrijters @FRidh @jonringer