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

spark: provided-hadoop -> nixpkgs hadoop #31861

Merged
merged 1 commit into from Apr 23, 2018
Merged

spark: provided-hadoop -> nixpkgs hadoop #31861

merged 1 commit into from Apr 23, 2018

Conversation

kamilchm
Copy link
Member

@kamilchm kamilchm commented Nov 20, 2017 •
edited

Motivation for this change

spark should use nixpkgs provided hadoop to make it consistent
for bigger Nix hadoop + spark setup

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

matthewbauer
matthewbauer requested changes Apr 21, 2018
View reviewed changes
Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

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

merge conflicts

@kamilchm kamilchm force-pushed the spark branch 2 times, most recently from 10ae8bb to a0a31a9 Compare April 23, 2018 18:43
@kamilchm
spark: provided-hadoop -> nixpkgs hadoop
3cdb8f5 
spark should use nixpkgs provided hadoop to make it consistent
for bigger Nix hadoop + spark setup
@kamilchm
Copy link
Member Author

conflict resolved

@matthewbauer matthewbauer merged commit 7ab91da into NixOS:master Apr 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer requested changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@kamilchm @matthewbauer @7c6f434c @GrahamcOfBorg