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

awscli: 1.18.150 -> 1.18.185 #104816

Closed
wants to merge 1 commit into from
Closed

awscli: 1.18.150 -> 1.18.185 #104816

wants to merge 1 commit into from

Conversation

lovek323
Copy link
Member

Motivation for this change
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.

@lovek323
Copy link
Member Author

I'm not sure if I've done the different version of the colorama package correctly.

@SuperSandro2000
Copy link
Member

I'm not sure if I've done the different version of the colorama package correctly.

Is it possible to overwrite the version and hash of the original coloroma package or use an newer version without causing issues?

@lovek323
Copy link
Member Author

Is it possible to overwrite the version and hash of the original coloroma package or use an newer version without causing issues?

It seems that a quite a few other packages depend on it, and I'm moving backwards by a patch number, so I thought it was probably wise to do it only for this specific package. Using a newer version won't fit the requirements for the awscli tool.

@SuperSandro2000 SuperSandro2000 changed the base branch from master to staging November 26, 2020 02:01
@SuperSandro2000 SuperSandro2000 changed the base branch from staging to master November 26, 2020 02:01
@SuperSandro2000
Copy link
Member

That did not go as planned. Sorry about the pings.

@lukegb
Copy link
Contributor

lukegb commented Nov 27, 2020

It seems that a quite a few other packages depend on it, and I'm moving backwards by a patch number, so I thought it was probably wise to do it only for this specific package. Using a newer version won't fit the requirements for the awscli tool.

I'd be tempted to patch the setup.py in patchPhase to be less strict about the version of colorama that's in use rather than packaging a separate point release. It's not at all clear that awscli actually needs specifically 0.4.3, and it's easier on us if we don't have multiple disparate versions of packages floating around.

@lovek323
Copy link
Member Author

Thanks, @lukegb, I'll look into that.

FRidh
FRidh requested changes Dec 8, 2020
View reviewed changes
Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

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

1 commit per expressions/package modified

pkgs/top-level/python-packages.nix Outdated
@@ -1273,6 +1273,8 @@ in {

colorama = callPackage ../development/python-modules/colorama { };

colorama043 = callPackage ../development/python-modules/colorama/0.4.3.nix { };
Copy link
Member

Choose a reason for hiding this comment

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

please call this directly from awscli

pkgs/tools/admin/awscli/default.nix Outdated
@@ -38,7 +38,7 @@ in with py.pkgs; buildPythonApplication rec {
bcdoc
s3transfer
six
colorama
colorama043
Copy link
Member

Choose a reason for hiding this comment

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

I find it highly unlikely that it is incompatible with a different patch release version. Please test patching out the pinning first.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, will do, just waiting to have the time.

@SuperSandro2000
Copy link
Member

@lovek323 Please fix the merge conflict.

@jonringer
Copy link
Contributor

also please address @FRidh comments

@lovek323
Copy link
Member Author

Looks like this has already been fixed. Thanks for all your help, but I'm closing for now.

@lovek323 lovek323 closed this Dec 16, 2020
@lovek323 lovek323 deleted the awscli-185 branch December 16, 2020 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh requested changes

@jonringer jonringer Awaiting requested review from jonringer

@alyssais alyssais Awaiting requested review from alyssais

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@edolstra edolstra Awaiting requested review from edolstra

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@infinisil infinisil Awaiting requested review from infinisil

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@mmahut mmahut Awaiting requested review from mmahut

@nbp nbp Awaiting requested review from nbp

@peti peti Awaiting requested review from peti

@Profpatsch Profpatsch Awaiting requested review from Profpatsch

@RaghavSood RaghavSood Awaiting requested review from RaghavSood

@roberth roberth Awaiting requested review from roberth

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lovek323 @SuperSandro2000 @lukegb @jonringer @FRidh