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

[20.09] pythonPackages.bcrypt: use 3.1.x for python older than 3.6 #98222

Merged
merged 2 commits into from Sep 23, 2020

Conversation

@mvnetbiz
Copy link
Contributor

@mvnetbiz mvnetbiz commented Sep 18, 2020

Motivation for this change

Backport of #97996
ZHF: #97479
cc @NixOS/nixos-release-managers

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.
@mvnetbiz mvnetbiz requested review from FRidh and jonringer as code owners Sep 18, 2020
@ofborg ofborg bot added the 6.topic: python label Sep 18, 2020
@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 18, 2020

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

@ofborg ofborg bot requested a review from domenkozar Sep 18, 2020
@mvnetbiz mvnetbiz force-pushed the mvnetbiz:backport-bcrypt branch 2 times, most recently from 0eff3e1 to 9f2ca35 Sep 18, 2020
@mvnetbiz
Copy link
Contributor Author

@mvnetbiz mvnetbiz commented Sep 18, 2020

I think I must have copy pasted wrong. I did get it right this time correct?

mvnetbiz added 2 commits Sep 14, 2020
(cherry picked from commit 5f4b880)
@mvnetbiz mvnetbiz force-pushed the mvnetbiz:backport-bcrypt branch from 9f2ca35 to 497582d Sep 18, 2020
@mvnetbiz
Copy link
Contributor Author

@mvnetbiz mvnetbiz commented Sep 18, 2020

I think I had forgotten -x in cherry-pick @jonringer

Copy link
Contributor

@jonringer jonringer left a comment

LGTM

failures are broken on target branch

https://github.com/NixOS/nixpkgs/pull/98222
1 package marked as broken and skipped:
python27Packages.junos-eznc

1 package failed to build:
python27Packages.trackpy

34 packages built:
mysql-workbench poretools python27Packages.Fabric python27Packages.ansible python27Packages.awkward python27Packages.bcrypt python27Packages.bkcharts python27Packages.docker python27Packages.drms python27Packages.duckdb python27Packages.flammkuchen python27Packages.flask-bcrypt python27Packages.imbalanced-learn python27Packages.ldaptor python27Packages.mapsplotlib python27Packages.moto python27Packages.ncclient python27Packages.pandas python27Packages.paramiko python27Packages.passlib python27Packages.privacyidea-ldap-proxy python27Packages.pwntools python27Packages.pysftp python27Packages.pytest-ansible python27Packages.robotframework-sshlibrary python27Packages.scp python27Packages.seaborn python27Packages.sshtunnel python27Packages.uproot python27Packages.uproot-methods python27Packages.vega_datasets python27Packages.vidstab python27Packages.yfinance syncthing-gtk
@jonringer jonringer merged commit 5b94572 into NixOS:release-20.09 Sep 23, 2020
16 checks passed
16 checks passed
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="497582d"; rev="497582d57b459637ab8b5e8dd5c6d1c025823acc"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="497582d"; rev="497582d57b459637ab8b5e8dd5c6d1c025823acc"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="497582d"; rev="497582d57b459637ab8b5e8dd5c6d1c025823acc"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="497582d"; rev="497582d57b459637ab8b5e8dd5c6d1c025823acc"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="497582d"; rev="497582d57b459637ab8b5e8dd5c6d1c025823acc"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="497582d"; rev="497582d57b459637ab8b5e8dd5c6d1c025823acc"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="497582d"; rev="497582d57b459637ab8b5e8dd5c6d1c025823acc"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.