Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 66fa4057ff02
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9e5caa8c19f6
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 30, 2018

  1. slurm: 17.11.3 -> 17.11.5 

    Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/slurm/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/sattach -h` got 0 exit code
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/sattach --help` got 0 exit code
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/sattach -V` and found version 17.11.5
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/sattach --version` and found version 17.11.5
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/slurmd -h` got 0 exit code
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/slurmd -V` and found version 17.11.5
- found 17.11.5 with grep in /nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5
- directory tree listing: https://gist.github.com/a4fb120a8f87f92e70daccf30910015b

(cherry picked from commit 0e0b80d)
    @ryantm @veprbl
    ryantm authored and veprbl committed Apr 30, 2018
    Copy the full SHA
    e50476d View commit details

Commits on May 2, 2018

  1. pythonPackages.pyslurm: 20170302 -> 20180427 

    Fixes build against slurm 17.11.5

Fixes: 0e0b80d ('slurm: 17.11.3 -> 17.11.5')
(cherry picked from commit bb12277)
    @veprbl
    veprbl committed May 2, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    markuskowa Markus Kowalewski
    GPG key ID: D865C8A91D7025EB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    be099f0 View commit details

  2. Merge pull request #39688 from veprbl/pr/release-18.03/CVE-2018-7033_v2 

    [release-18.03] slurm: 17.11.3 -> 17.11.5 (Fix CVE-2018-7033)
    @xeji
    xeji authored May 2, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    markuskowa Markus Kowalewski
    GPG key ID: D865C8A91D7025EB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9e5caa8 View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 pkgs/development/python-modules/pyslurm/default.nix
  2. +2 −2 pkgs/servers/computing/slurm/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/pyslurm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildPythonPackage rec {
pname = "pyslurm";
version = "20170302";
version = "20180427";

src = fetchFromGitHub {
repo = "pyslurm";
owner = "PySlurm";
rev = "f5a756f199da404ec73cb7fcd7f04ec4d21ea3ff";
sha256 = "1xn321nc8i8zmngh537j6lnng1rhdp460qx4skvh9daz5h9nxznx";
rev = "3900e1afac9ffd13c80c57d8c39933d42eb7bad7";
sha256 = "1a183ig4sdbc70rx2yyaslyq61wkbsf8cbim1jj0kzrp65nf0vls";
};

buildInputs = [ cython slurm ];
4 changes: 2 additions & 2 deletions pkgs/servers/computing/slurm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
name = "slurm-${version}";
version = "17.11.3";
version = "17.11.5";

src = fetchurl {
url = "https://download.schedmd.com/slurm/${name}.tar.bz2";
sha256 = "1x3i6z03d9m46fvj1cslrapm1drvgyqch9pn4xf23kvbz4gkhaps";
sha256 = "07ghyyz12k4rksm06xf7dshwp1ndm13zphdbqja99401q4xwbx9r";
};

outputs = [ "out" "dev" ];