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

aws-adfs: 1.21.2 -> 1.24.3 #84058

Merged
merged 1 commit into from Apr 2, 2020
Merged

aws-adfs: 1.21.2 -> 1.24.3 #84058

merged 1 commit into from Apr 2, 2020

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Apr 2, 2020

Carried over from #83931, as the PR needs
some edits and I can't quite figure out how to push to r-ryantm's fork (though I
successfully did so the other day).

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.

@bhipple bhipple mentioned this pull request Apr 2, 2020
Closed
@bhipple
Copy link
Contributor Author

bhipple commented Apr 2, 2020

Passes nixpkgs-review on Linux, but I saw the bot was failing on Darwin, so I'll give it time to run.

@jonringer
Copy link
Contributor

I can't quite figure out how to push to r-ryantm's fork

hub pr checkout N
# do additional commits
local branch=$(git rev-parse --abbrev-ref HEAD)
git push git@github.com:r-ryantm/nixpkgs.git ''${branch}:''${branch} $@

jonringer
jonringer approved these changes Apr 2, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

darwin failure unrelated to PR, but dependency https://github.com/NixOS/nixpkgs/pull/83931/checks?check_run_id=552538718

https://github.com/NixOS/nixpkgs/pull/84058
2 package built:
aws-adfs python38Packages.aws-adfs

@bhipple
Copy link
Contributor Author

bhipple commented Apr 2, 2020 •
edited

Ohhh . . . I was pushing with HTTPS, and providing my username:password, but because I have 2FA on my github account that doesn't work; it would've worked if I had used git@github.com:r-ryantm!

Makes sense now.

@jonringer jonringer merged commit 8234f4a into NixOS:master Apr 2, 2020
@jonringer
Copy link
Contributor

I used it for #84053

@grahamc
Copy link
Member

grahamc commented Apr 2, 2020

just a note that ofborg is currently down but will be back up shortly

@jonringer
Copy link
Contributor

just a note that ofborg is currently down but will be back up shortly

nixpkgs-review will do a full evaluation, and another with --meta enabled

$ nix-env -f /home/jon/.cache/nixpkgs-review/pr-84061-1/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit 7d328725a9abcc9c0ea263549d0f3b01ee6a129c
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/jon/.cache/nixpkgs-review/pr-84061-1/nixpkgs -qaP --xml --out-path --show-trace --meta

I don't think it's quite the same as to what ofborg does, but major breakages should be caught

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bhipple @jonringer @grahamc @r-ryantm