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

Commits on Oct 27, 2018

  1. slurm: 18.08.1.1 -> 18.08.3.1

    @markuskowa
    markuskowa committed Oct 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bba31d1 View commit details

  2. pyslurm: 20180908 -> 18.08.3

    @markuskowa
    markuskowa committed Oct 27, 2018
    Copy the full SHA
    220aa36 View commit details

  3. Merge pull request #49309 from markuskowa/up-slurm 

    slurm: 18.08.1.1 -> 18.08.3.1, pyslurm: 20180908 -> 18.08.3
    @markuskowa
    markuskowa authored Oct 27, 2018
    Copy the full SHA
    a3e367f 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 = "20180908";
version = "18-08-3";

src = fetchFromGitHub {
repo = "pyslurm";
owner = "PySlurm";
rev = "50dc113e99d82e70e84fc2e812333733708be4ed";
sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k";
rev = version;
sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg";
};

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
@@ -8,7 +8,7 @@

stdenv.mkDerivation rec {
name = "slurm-${version}";
version = "18.08.1.1";
version = "18.08.3.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 = "1yndxi11vj0di3yf6ky78zcnffk6d3676gf5y7jn7vwxxmzm4h5k";
sha256 = "1dz5hgnlsld8b8vrbckk3mj7cqrv662wsp0s9z4x8wafygz3zx07";
};

outputs = [ "out" "dev" ];