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

pythonPackages.django-simple-captcha: init at 0.5.12 #76515

Merged
merged 3 commits into from Jan 6, 2020

Conversation

@schmittlauch
Copy link
Contributor

@schmittlauch schmittlauch commented Dec 25, 2019

Motivation for this change

This PR succeeds #64523 which has somehow stalled and is based on @MrMebelMan's work.
After approval it probably needs to be squashed into 1 commit, but I wanted to keep the history intact so far.

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.
Notify maintainers

cc @

Copy link
Contributor

@jonringer jonringer left a comment

each package addition should include the additional entry to python-packages. I would also squash the other "enhance" commit into the first simple-captcha bump. Your commit history should be:

pythonPackages.django-simple-captcha: init at 0.5.6
pythonPackages.django-ranged-response: init at 0.2.0
@schmittlauch schmittlauch force-pushed the schmittlauch:init/django-simple-captcha branch from a8fb31a to a026522 Dec 26, 2019
@schmittlauch
Copy link
Contributor Author

@schmittlauch schmittlauch commented Dec 26, 2019

@jonringer Done, commit history adjusted to your requests.

Copy link
Contributor

@jonringer jonringer left a comment

otherwise LGTM

NIT: the ordering of the packages should probably go in a separate commit, as that's much more likely to cause merge conflicts if these packages needed to be cherry-picked

@schmittlauch schmittlauch force-pushed the schmittlauch:init/django-simple-captcha branch from a026522 to 9fedb1d Dec 27, 2019
@schmittlauch
Copy link
Contributor Author

@schmittlauch schmittlauch commented Dec 27, 2019

@jonringer all done.
I also formatted both expressions with nixpkgs-nixfmt.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 3, 2020

do you mind resolving conflicts and rebasing?

co-author: Vladyslav Burzakovskyy <vladislav.burzakovskij@satoshilabs.com>
co-author: Vladyslav Burzakovskyy <vladislav.burzakovskij@satoshilabs.com>
@schmittlauch schmittlauch force-pushed the schmittlauch:init/django-simple-captcha branch from 9fedb1d to 7178664 Jan 3, 2020
@schmittlauch schmittlauch requested a review from jonringer Jan 3, 2020
@schmittlauch
Copy link
Contributor Author

@schmittlauch schmittlauch commented Jan 3, 2020

@jonringer done

Copy link
Contributor

@jonringer jonringer left a comment

diff LGTM
commits LGTM

failure unrelated to PR (python38Packages.aiohttp is broken)

[9 built, 9 copied (134.2 MiB), 24.3 MiB DL]
https://github.com/NixOS/nixpkgs/pull/76515
6 package built:
python27Packages.django-ranged-response python27Packages.django-simple-captcha python37Packages.django-ranged-response python37Packages.django-simple-captcha python38Packages.django-ranged-response python38Packages.django-simple-captcha
@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 3, 2020

@GrahamcOfBorg build python27Packages.django-ranged-response python27Packages.django-simple-captcha python37Packages.django-ranged-response python37Packages.django-simple-captcha python38Packages.django-ranged-response python38Packages.django-simple-captcha

@schmittlauch
Copy link
Contributor Author

@schmittlauch schmittlauch commented Jan 5, 2020

@jonringer FYI: All builds went through

@jonringer jonringer merged commit fe1f77a into NixOS:master Jan 6, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
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="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
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
python27Packages.django-ranged-response, python27Packages.django-simple-captcha, python37Packages.django-ranged-response, python37Packages.django-simple-captcha, python38Packages.django-ranged-response, python38Packages.django-simple-captcha on aarch64-linux Success
Details
python27Packages.django-ranged-response, python27Packages.django-simple-captcha, python37Packages.django-ranged-response, python37Packages.django-simple-captcha, python38Packages.django-ranged-response, python38Packages.django-simple-captcha on x86_64-darwin Success
Details
python27Packages.django-ranged-response, python27Packages.django-simple-captcha, python37Packages.django-ranged-response, python37Packages.django-simple-captcha, python38Packages.django-ranged-response, python38Packages.django-simple-captcha on x86_64-linux Success
Details
@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 6, 2020

sorry about that, don't have as much free time as i used to

@schmittlauch
Copy link
Contributor Author

@schmittlauch schmittlauch commented Jan 6, 2020

@jonringer Don't worry, that's why I pinged you. Glad that was okay.

@schmittlauch schmittlauch deleted the schmittlauch:init/django-simple-captcha branch Jan 6, 2020
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.