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

xkcdpass: py2 -> py3, add manpage and run tests #110744

Merged
merged 1 commit into from Jan 27, 2021
Merged

xkcdpass: py2 -> py3, add manpage and run tests #110744

merged 1 commit into from Jan 27, 2021

Conversation

peterhoeg
Copy link
Member

Motivation for this change

Drive-by cleanup

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 Jan 25, 2021
View reviewed changes
pkgs/development/python-modules/xkcdpass/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/xkcdpass/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/xkcdpass/default.nix Outdated
pname = "xkcdpass";
version = "1.17.6";

src = fetchPypi {
src = python3Packages.fetchPypi {
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
src = python3Packages.fetchPypi {
src = fetchPypi {

pkgs/development/python-modules/xkcdpass/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/xkcdpass/default.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

Using python3Packages in python-modules is not allowed because it breaks multiple python versions. Use disabled = isPyXX; instead.

dotlambda
dotlambda requested changes Jan 25, 2021
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.

You need to change pkgs/top-level/all-packages.nix:

- xkcdpass = with pythonPackages; toPythonApplication xkcdpass;
+ xkcdpass = with python3Packages; toPythonApplication xkcdpass;

@peterhoeg
Copy link
Member Author

Thanks for the input guys.

@peterhoeg
Copy link
Member Author

@GrahamcOfBorg build xkcdpass

dotlambda
dotlambda reviewed Jan 25, 2021
View reviewed changes
pkgs/development/python-modules/xkcdpass/default.nix
description = "Generate secure multiword passwords/passphrases, inspired by XKCD";
homepage = "https://pypi.python.org/pypi/xkcdpass/";
Copy link
Member

Choose a reason for hiding this comment

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

Moving homepage seems unintentional.

@peterhoeg peterhoeg merged commit 6d489a3 into NixOS:master Jan 27, 2021
@peterhoeg peterhoeg deleted the f/xkcd branch January 27, 2021 03:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda dotlambda requested changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@peterhoeg @SuperSandro2000 @dotlambda