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: 56a9ab5b8fb1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c30bd1c1316d
Choose a head ref
  • 7 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 1, 2018

  1. nixos/slurm: Extend configuration options 

    * Updated SrunX11 option
* Added extraPlugstackConfig parameter
* Added option enableStools
* Add cgroup.conf to module
* Fix some typos
    @markuskowa
    markuskowa committed Jun 1, 2018
    Copy the full SHA
    995d2ec View commit details
    Browse the repository at this point in the history

  2. nixos/slurm: Add man pages to wrapedSlurm 

    The nixos module adds a new derivation to
systemPackages to make sure that the binaries
get the generated config file. This derivation
did not contain the man pages so far.
Activating the module now makes the man pages
available in the system environment.
    @markuskowa
    markuskowa committed Jun 1, 2018
    Copy the full SHA
    b7e91f0 View commit details
    Browse the repository at this point in the history

  3. slurm: add freeipmi, readline, libssh2, fix hwloc 

    * add freeipmi to get power meter readings
* readline support for scontrol
* libssh2 support for X11 supporta
* Add note to enableSrunX11 in module
* fix hwloc support (was detected by configure)
    @markuskowa
    markuskowa committed Jun 1, 2018
    Copy the full SHA
    8026127 View commit details
    Browse the repository at this point in the history

  4. nixos/slurm: update test, add test for enableStools 

    * Add pure submit host to test 'enableStools'
* Disable client.enable on control machine
    @markuskowa
    markuskowa committed Jun 1, 2018
    Copy the full SHA
    c8faa48 View commit details
    Browse the repository at this point in the history

  5. slurm: add maintainer

    @markuskowa
    markuskowa committed Jun 1, 2018
    Copy the full SHA
    f07ddea View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2018

  1. nixos/slurm: remove propagatedBuidInputs from slurmWrapped 

    propagatedBuildInputs = [ cfg.package etcSlurm ]; had no effect
    @markuskowa
    markuskowa committed Jun 2, 2018
    Copy the full SHA
    d7412d0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #41377 from markuskowa/slurm-ext-pr 

    nixos/slurm: Improve slurm configuration options and features.
    @joachifm
    joachifm committed Jun 2, 2018
    Copy the full SHA
    c30bd1c View commit details
    Browse the repository at this point in the history