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

thc-hydra: 8.5 -> 9.0 #69210

Merged
merged 2 commits into from Sep 24, 2019
Merged

thc-hydra: 8.5 -> 9.0 #69210

merged 2 commits into from Sep 24, 2019

Conversation

peterhoeg
Copy link
Member

Motivation for this change

Update.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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 @offlinehacker

@ofborg ofborg bot requested a review from offlinehacker September 21, 2019 13:23
@peterhoeg peterhoeg merged commit 8445556 into NixOS:master Sep 24, 2019
@peterhoeg peterhoeg deleted the u/hydra branch September 24, 2019 21:33
veprbl added a commit to veprbl/nixpkgs that referenced this pull request Sep 25, 2019
@veprbl
Merge remote-tracking branch 'upstream/master' into eval/staging-next
ed4867c 
Fixes eval after NixOS#69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10 which
adapts NixOS#69210 to master that doesn't yet have
329a88e
@veprbl veprbl mentioned this pull request Sep 25, 2019
Closed
veprbl added a commit that referenced this pull request Sep 25, 2019
@veprbl
Merge branch 'master' into staging-next
c455adc 
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10 which
adapts #69210 to master that doesn't yet have
329a88e

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@peterhoeg