Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 331f45f7bb5a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6928cb22e943
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 10, 2019

  1. nixos/slurm: fix X11 with spank module

    * 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 committed Nov 10, 2019
    Copy the full SHA
    8219a3b View commit details
    Browse the repository at this point in the history
  2. nixos/slurm: add option for external slurmdbd.conf

    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.
    markuskowa committed Nov 10, 2019
    Copy the full SHA
    472e165 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    9b28dbd View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2019

  1. Merge pull request #73179 from markuskowa/fix-slurm

    nixos/slurm: fix test and X11 options
    markuskowa committed Nov 12, 2019
    Copy the full SHA
    6928cb2 View commit details
    Browse the repository at this point in the history