Skip to content

nixos/slurm: fix test and X11 options#73179

Merged
markuskowa merged 3 commits intoNixOS:masterfrom
markuskowa:fix-slurm
Nov 12, 2019
Merged

nixos/slurm: fix test and X11 options#73179
markuskowa merged 3 commits intoNixOS:masterfrom
markuskowa:fix-slurm

Conversation

@markuskowa
Copy link
Copy Markdown
Member

@markuskowa markuskowa commented Nov 10, 2019 •
edited
Loading

Motivation for this change

This PR fixes two bugs:

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 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

@markuskowa
nixos/slurm: fix X11 with spank module
8219a3b 
* Fix path in module for slurm to find plugstack.conf
* Fix configure flags so that slurm can be compiled
  without internal X11 support (required for spank-x11).
@markuskowa
nixos/slurm: add option for external slurmdbd.conf
472e165 
Slurmdbd requires a password database which is stored in slurmdbd.conf.
A seperate config file avoids that the password ends up in the nix store.

Slurmdbd does 19.5 does not support MySQL socket conections.
Adapated the slurm test to provide username and password.
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 10, 2019
@markuskowa
Copy link
Copy Markdown
Member Author

markuskowa commented Nov 10, 2019 •
edited
Loading

@GrahamcOfBorg test slurm

@tfc tfc mentioned this pull request Nov 11, 2019
Closed
@markuskowa markuskowa requested a review from veprbl November 12, 2019 12:13
veprbl
veprbl approved these changes Nov 12, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

I'm not a slurm or NixOS user, but LGTM.

@markuskowa markuskowa merged commit 6928cb2 into NixOS:master Nov 12, 2019
@markuskowa markuskowa deleted the fix-slurm branch November 12, 2019 20:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@veprbl veprbl veprbl approved these changes

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@markuskowa @veprbl