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: a3a6dd712753
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: 68fe8c9862cc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 29, 2018

  1. slurm: Fix CVE-2018-7033

    @veprbl
    veprbl committed Apr 29, 2018
    Copy the full SHA
    1daa405 View commit details

Commits on Apr 30, 2018

  1. Merge pull request #39667 from veprbl/pr/release-17.09/CVE-2018-7033 

    [release-17.09] slurm: Fix CVE-2018-7033
    @xeji
    xeji authored Apr 30, 2018
    Copy the full SHA
    68fe8c9 View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/servers/computing/slurm/default.nix
11 changes: 10 additions & 1 deletion pkgs/servers/computing/slurm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libtool, curl, python, munge, perl, pam, openssl
{ stdenv, fetchurl, fetchpatch, pkgconfig, libtool, curl, python, munge, perl, pam, openssl
, ncurses, mysql, gtk2, lua, hwloc, numactl
}:

@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "0w8v7fzbn7b3f9kg6lcj2jpkzln3vcv9s2cz37xbdifz0m2p1x7s";
};

patches = [
(fetchpatch {
url = "https://github.com/SchedMD/slurm/commit/db468895240ad6817628d07054fe54e71273b2fe.patch";
sha256 = "06l3qcqs9isjz3kyv2x3nfjpvfnw720aw4qspbx0fs4jr3if6waa";
name = "CVE-2018-7033.patch";
excludes = [ "NEWS" ];
})
];

outputs = [ "out" "dev" ];

# nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'