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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 96e305b96811
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 94864bbd3749
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 9, 2019

  1. slurm: 18.08.5.2 -> 18.08.6.2

    @markuskowa
    markuskowa committed Mar 9, 2019
    Copy the full SHA
    a2331a2 View commit details

  2. nixos/tests: make slurm test more reliable

    @markuskowa
    markuskowa committed Mar 9, 2019
    Copy the full SHA
    62ea707 View commit details

Commits on Mar 23, 2019

  1. Merge pull request #57133 from markuskowa/upd-slurm 

    slurm: 18.08.5.2 -> 18.08.6.2
    @joachifm
    joachifm authored Mar 23, 2019
    Copy the full SHA
    94864bb View commit details
Showing with 5 additions and 2 deletions.
  1. +3 −0 nixos/tests/slurm.nix
  2. +2 −2 pkgs/servers/computing/slurm/default.nix
3 changes: 3 additions & 0 deletions nixos/tests/slurm.nix
View file
Original file line number Diff line number Diff line change
@@ -108,6 +108,8 @@ in {
# cluster in the database before slurmctld is restarted
subtest "add_account", sub {
$control->succeed("sacctmgr -i add cluster default");
# check for cluster entry
$control->succeed("sacctmgr list cluster | awk '{ print \$1 }' | grep default");
};
subtest "can_start_slurmctld", sub {
@@ -133,6 +135,7 @@ in {
subtest "check_slurm_dbd", sub {
# find the srun job from above in the database
sleep 2;
$submit->succeed("sacct | grep hostname");
};
'';
4 changes: 2 additions & 2 deletions pkgs/servers/computing/slurm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

stdenv.mkDerivation rec {
name = "slurm-${version}";
version = "18.08.5.2";
version = "18.08.6.2";

# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${builtins.replaceStrings ["."] ["-"] name}";
sha256 = "0x1pdq58sdf0m28cai0lcyzvhhjl7l85gq324pwh8fi3zy2h0n4k";
sha256 = "0py1795jrgip00k46gr9f9y49gpv5478kc3v68d90nl158fngixc";
};

outputs = [ "out" "dev" ];