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

Commits on Jun 3, 2019

  1. slurm: 18.08.7.1 -> 19.05.0.1 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/slurm/versions
    @r-ryantm
    r-ryantm committed Jun 3, 2019
    Copy the full SHA
    917a1f5 View commit details

Commits on Jun 5, 2019

  1. nixos/slurm: fix test 

    The entry slurmdbd seems to be delayed.
Increasing the waiting time make the test more reliable.
    @markuskowa
    markuskowa committed Jun 5, 2019
    Copy the full SHA
    fcde305 View commit details

  2. Merge pull request #62570 from r-ryantm/auto-update/slurm 

    slurm: 18.08.7.1 -> 19.05.0.1
    @markuskowa
    markuskowa authored Jun 5, 2019
    Copy the full SHA
    0bf6841 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 nixos/tests/slurm.nix
  2. +2 −2 pkgs/servers/computing/slurm/default.nix
4 changes: 2 additions & 2 deletions nixos/tests/slurm.nix
View file
Original file line number Diff line number Diff line change
@@ -135,8 +135,8 @@ in {
subtest "check_slurm_dbd", sub {
# find the srun job from above in the database
sleep 2;
$submit->succeed("sacct | grep hostname");
sleep 5;
$control->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.7.1";
version = "19.05.0.1";

# 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 = "13asdirygkp0mmi2da0094c9h180nl7nb7nkj4j9d842xzw21454";
sha256 = "0cc1lac7x00s1zz8p9sbaj6zg4yf4ngr0ldszhpxpvykhx9wzfay";
};

outputs = [ "out" "dev" ];