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

Migrate qt515 #106742

Merged
merged 7 commits into from Jan 5, 2021
Merged

Migrate qt515 #106742

merged 7 commits into from Jan 5, 2021

Conversation

freezeboy
Copy link
Contributor

Motivation for this change

Migrate the packages without a maintainer from PR: #104474

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.

doronbehar
doronbehar requested changes Jan 1, 2021
View reviewed changes
Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM!

pkgs/misc/seafile-shared/default.nix Outdated Show resolved Hide resolved
pkgs/applications/office/scribus/default.nix Outdated Show resolved Hide resolved
@doronbehar
Copy link
Contributor

DAMN. Merge conflicts, from right now.

@freezeboy
Copy link
Contributor Author

I resolved the conflict

@doronbehar
Copy link
Contributor

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

9 packages built:
  • bibletime
  • dfilemanager
  • herqq
  • merkaartor
  • mindforger
  • seafile-client
  • seafile-shared
  • solarus
  • solarus-quest-editor

@doronbehar
Copy link
Contributor

doronbehar commented Jan 5, 2021 •
edited

No unfunctional executables besides:

(ins)[nix-shell:~/.cache/nixpkgs-review/pr-106742-1]$ ./results/seafile-shared/bin/seaf-cli --help
Traceback (most recent call last):
  File "/nix/store/bbp37c848krz0lnkarypkhrsnvjr5bkz-seafile-shared-8.0.1/bin/.seaf-cli-wrapped", line 99, in <module>
    import seafile
  File "/nix/store/bbp37c848krz0lnkarypkhrsnvjr5bkz-seafile-shared-8.0.1/lib/python3.8/site-packages/seafile/__init__.py", line 2, in <module>
    from .rpcclient import SeafileRpcClient as RpcClient
  File "/nix/store/bbp37c848krz0lnkarypkhrsnvjr5bkz-seafile-shared-8.0.1/lib/python3.8/site-packages/seafile/rpcclient.py", line 1, in <module>
    from pysearpc import searpc_func, SearpcError, NamedPipeClient
ModuleNotFoundError: No module named 'pysearpc'

Which is not a regression as a similar error happens on master:

Traceback (most recent call last):
  File "/nix/store/pihq9hv0knyw7rvlb6cvmf91iniyva0a-seafile-shared-7.0.10/bin/.seaf-cli-wrapped", line 93, in <module>
    import urllib.request, urllib.parse, urllib.error
ImportError: No module named request

@doronbehar
Copy link
Contributor

I'm merging since this is an improvement for all packages involved, and no worse situation for seafile-shared.

@doronbehar doronbehar merged commit d9dba88 into NixOS:master Jan 5, 2021
@freezeboy
Copy link
Contributor Author

Oh sorry, didn't see this situation, but as you say, the problem seems unrelated to qt

@freezeboy freezeboy deleted the migrate-qt515 branch January 6, 2021 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@doronbehar doronbehar doronbehar 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
2 participants
@freezeboy @doronbehar