diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-07-13 09:32:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-13 09:32:51 +0100 |
| commit | c29b5b5a4077b1fa93d28b94ee2d89f9410e139a (patch) | |
| tree | d014b177a9baf89bf2e7d0e2e67c0a135280097d /pkgs/top-level | |
| parent | 9e12be50b48898328f78d3ee9f7d5d164e2bd395 (diff) | |
| parent | 00d73c42407d22cb94bac67ca889318e1c373787 (diff) | |
| download | nixlib-c29b5b5a4077b1fa93d28b94ee2d89f9410e139a.tar nixlib-c29b5b5a4077b1fa93d28b94ee2d89f9410e139a.tar.gz nixlib-c29b5b5a4077b1fa93d28b94ee2d89f9410e139a.tar.bz2 nixlib-c29b5b5a4077b1fa93d28b94ee2d89f9410e139a.tar.lz nixlib-c29b5b5a4077b1fa93d28b94ee2d89f9410e139a.tar.xz nixlib-c29b5b5a4077b1fa93d28b94ee2d89f9410e139a.tar.zst nixlib-c29b5b5a4077b1fa93d28b94ee2d89f9410e139a.zip | |
Merge pull request #27350 from veprbl/slurm
Bump slurm, add pyslurm
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91ac16960cca..926d045948c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11485,9 +11485,9 @@ with pkgs; storm = callPackage ../servers/computing/storm { }; - slurm-llnl = callPackage ../servers/computing/slurm { gtk2 = null; }; + slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; - slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); + slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { }); systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43debbdfbb13..429c16d2cdb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -324,6 +324,10 @@ in { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pyslurm = callPackage ../development/python-modules/pyslurm { + slurm = pkgs.slurm; + }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; |