Skip to content

aws-mfa: fix script duplication when installing with installer#249821

Merged
natsukium merged 1 commit intoNixOS:masterfrom
tjni:aws-mfa
Aug 18, 2023
Merged

aws-mfa: fix script duplication when installing with installer#249821
natsukium merged 1 commit intoNixOS:masterfrom
tjni:aws-mfa

Conversation

@tjni
Copy link
Copy Markdown
Contributor

@tjni tjni commented Aug 17, 2023

Description of changes

I'm working on changing how we install Python packages from using pip to using installer. Unlike pip, it throws an error when it finds two files with the same name in a wheel archive, and that is the case because aws-mfa defines both a script and a console script entry point with the same name.

This PR pulls in a patch I submitted upstream to fix this.

I also made a few opportunistic changes (e.g. using SRI hash, adding format attribute, removing unnecessary list around the license).

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from rapenne-s August 17, 2023 22:16
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Aug 17, 2023
@natsukium
Copy link
Copy Markdown
Member

natsukium commented Aug 18, 2023

@ofborg build python310Packages.aws-mfa
Oops, it is an application.

@natsukium natsukium merged commit 0dc77a6 into NixOS:master Aug 18, 2023
@tjni tjni deleted the aws-mfa branch August 18, 2023 01:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants