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

Poezio bump #48545

Merged
merged 4 commits into from Oct 17, 2018
Merged

Poezio bump #48545

merged 4 commits into from Oct 17, 2018

Conversation

lheckemann
Copy link
Member

Motivation for this change

New upstream version. cc maintainer @lsix

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 distrib utions
  • 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: poezio

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: poezio

Partial log (click to expand)

test/test_logger.py ..                                                   [ 51%]
test/test_poopt.py .                                                     [ 53%]
test/test_tabs.py ........                                               [ 71%]
test/test_theming.py ..                                                  [ 75%]
test/test_windows.py ......                                              [ 88%]
test/test_xhtml.py .....                                                 [100%]

========================== 45 passed in 1.42 seconds ===========================
pytestcachePhase
/nix/store/8n1kpjzjcd3r56vsfiqv7kz89bx2mjck-poezio-0.12

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: poezio

Partial log (click to expand)

test/test_logger.py ..                                                   [ 51%]
test/test_poopt.py .                                                     [ 53%]
test/test_tabs.py ........                                               [ 71%]
test/test_theming.py ..                                                  [ 75%]
test/test_windows.py ......                                              [ 88%]
test/test_xhtml.py .....                                                 [100%]

========================== 45 passed in 2.55 seconds ===========================
pytestcachePhase
/nix/store/fypfg0ar92ijlm27bl1ynprhrs34yzc3-poezio-0.12

@lheckemann lheckemann requested a review from lsix October 16, 2018 10:16
lsix
lsix requested changes Oct 16, 2018
View reviewed changes
Copy link
Member

@lsix lsix left a comment

Choose a reason for hiding this comment

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

Hi,

Thanks for the PR,

Can the slixmpp declaration be moved outside of the python-packages.nix file while it is being updated? (it should go into pkgs/development/python-modules/slixmpp/default.nix).

On another subject, I guess (hope) we can depend on gnupg instead of gnupg1. This will require some investigation and tests, but it would be nice to rely on the main maintained branch instead of the old 1 branch.

I have built and launched your updated version of poezio and it works as expected! Thanks

@lheckemann
Copy link
Member Author

I've tentatively switched the references to gnupg rather than gnupg1, but I don't use the gpg functionality myself so I haven't tested it.

@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: poezio

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: poezio

Partial log (click to expand)

test/test_logger.py ..                                                   [ 51%]
test/test_poopt.py .                                                     [ 53%]
test/test_tabs.py ........                                               [ 71%]
test/test_theming.py ..                                                  [ 75%]
test/test_windows.py ......                                              [ 88%]
test/test_xhtml.py .....                                                 [100%]

========================== 45 passed in 1.51 seconds ===========================
pytestcachePhase
/nix/store/9zslb6j626r76ki565hgzfq91givfavr-poezio-0.12

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: poezio

Partial log (click to expand)

test/test_logger.py ..                                                   [ 51%]
test/test_poopt.py .                                                     [ 53%]
test/test_tabs.py ........                                               [ 71%]
test/test_theming.py ..                                                  [ 75%]
test/test_windows.py ......                                              [ 88%]
test/test_xhtml.py .....                                                 [100%]

========================== 45 passed in 2.56 seconds ===========================
pytestcachePhase
/nix/store/58sw554d4nxa8h0xlaaj1mczs97mxgq0-poezio-0.12

@lsix
Copy link
Member

lsix commented Oct 17, 2018

I also do not use GPG with poesio on my side, but apparently, archlinux uses the main gnupg (no version requirement mentionned: https://aur.archlinux.org/packages/poezio/). I think we can do that on our side.

I did not realized on my first read, but could you also move the declaration of poezio outside of python-packages.nix as well?

@lheckemann
Copy link
Member Author

could you also move the declaration of poezio outside of python-packages.nix as well?

🤦‍♂️ of course

@FRidh
Copy link
Member

FRidh commented Oct 17, 2018 •
edited

please rebase onto/target staging due to the large changes in python-packages.nix in there

@lheckemann
Copy link
Member Author

@FRidh only slixmpp and poezio are affected, and poezio is the only thing that depends on slixmpp. I've just moved them out, so this shouldn't cause much in the way of rebuilds, so I think master is still the appropriate target.

@FRidh
Copy link
Member

FRidh commented Oct 17, 2018

It's not about rebuilds, but to prevent merge conflicts.

@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: poezio

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: poezio

Partial log (click to expand)

test/test_config.py .........                                            [ 46%]
test/test_logger.py ..                                                   [ 51%]
test/test_poopt.py .                                                     [ 53%]
test/test_tabs.py ........                                               [ 71%]
test/test_theming.py ..                                                  [ 75%]
test/test_windows.py ......                                              [ 88%]
test/test_xhtml.py .....                                                 [100%]

========================== 45 passed in 0.75 seconds ===========================
pytestcachePhase

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: poezio

Partial log (click to expand)

test/test_logger.py ..                                                   [ 51%]
test/test_poopt.py .                                                     [ 53%]
test/test_tabs.py ........                                               [ 71%]
test/test_theming.py ..                                                  [ 75%]
test/test_windows.py ......                                              [ 88%]
test/test_xhtml.py .....                                                 [100%]

========================== 45 passed in 1.41 seconds ===========================
pytestcachePhase
/nix/store/i0qx6d7wc2lkxjs7gmrdpsc8c9cciwlx-poezio-0.12

@lheckemann lheckemann changed the base branch from master to staging October 17, 2018 08:09
@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: poezio

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: poezio

Partial log (click to expand)

test/test_config.py .........                                            [ 46%]
test/test_logger.py ..                                                   [ 51%]
test/test_poopt.py .                                                     [ 53%]
test/test_tabs.py ........                                               [ 71%]
test/test_theming.py ..                                                  [ 75%]
test/test_windows.py ......                                              [ 88%]
test/test_xhtml.py .....                                                 [100%]

========================== 45 passed in 1.14 seconds ===========================
pytestcachePhase

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: poezio

Partial log (click to expand)

test/test_logger.py ..                                                   [ 51%]
test/test_poopt.py .                                                     [ 53%]
test/test_tabs.py ........                                               [ 71%]
test/test_theming.py ..                                                  [ 75%]
test/test_windows.py ......                                              [ 88%]
test/test_xhtml.py .....                                                 [100%]

========================== 45 passed in 1.40 seconds ===========================
pytestcachePhase
/nix/store/chmn51587cqxp909rmy4rnf8arakzh9y-poezio-0.12

@lheckemann lheckemann merged commit d968906 into NixOS:staging Oct 17, 2018
@lheckemann lheckemann deleted the poezio-bump branch October 17, 2018 16:10
@lheckemann lheckemann mentioned this pull request Oct 17, 2018
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lsix lsix lsix approved these changes

@globin globin globin approved these changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 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
5 participants
@lheckemann @GrahamcOfBorg @lsix @FRidh @globin