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: 2545e3f370ce
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 715cd2273e06
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 13, 2020

  1. pdsh: enable optional slurm support

    @dylex
    dylex committed Nov 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b3eb813 View commit details

Commits on Nov 24, 2020

  1. Merge pull request #103652 from dylex/pdsh 

    pdsh: enable optional slurm support
    @SuperSandro2000
    SuperSandro2000 authored Nov 24, 2020
    Copy the full SHA
    715cd22 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/tools/networking/pdsh/default.nix
6 changes: 4 additions & 2 deletions pkgs/tools/networking/pdsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, readline, rsh, ssh }:
{ stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }:

stdenv.mkDerivation rec {
name = "pdsh-2.34";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl";
};

buildInputs = [ perl readline ssh ];
buildInputs = [ perl readline ssh ]
++ (stdenv.lib.optional slurmSupport slurm);

preConfigure = ''
configureFlagsArray=(
@@ -18,6 +19,7 @@ stdenv.mkDerivation rec {
${if readline == null then "--without-readline" else "--with-readline"}
${if ssh == null then "--without-ssh" else "--with-ssh"}
${if rsh == false then "--without-rsh" else "--with-rsh"}
${if slurmSupport then "--with-slurm" else "--without-slurm"}
"--with-dshgroups"
"--with-xcpu"
"--disable-debug"