diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-31 19:19:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 19:19:54 -0500 |
| commit | 2e705b0ffcb21d9dd284489eb4aa1cd76a339f58 (patch) | |
| tree | eee891f0c363cbe23b94db94ea77c92a52c79b34 /pkgs/top-level | |
| parent | 3f47ee271bc10c2ea68e3d2119816d06d4b1feb5 (diff) | |
| parent | f51e6696eb63c02c0709ce221ec006aeaa23072a (diff) | |
| download | nixlib-2e705b0ffcb21d9dd284489eb4aa1cd76a339f58.tar nixlib-2e705b0ffcb21d9dd284489eb4aa1cd76a339f58.tar.gz nixlib-2e705b0ffcb21d9dd284489eb4aa1cd76a339f58.tar.bz2 nixlib-2e705b0ffcb21d9dd284489eb4aa1cd76a339f58.tar.lz nixlib-2e705b0ffcb21d9dd284489eb4aa1cd76a339f58.tar.xz nixlib-2e705b0ffcb21d9dd284489eb4aa1cd76a339f58.tar.zst nixlib-2e705b0ffcb21d9dd284489eb4aa1cd76a339f58.zip | |
Merge pull request #37706 from geistesk/slstatus-unstable-2018-03-21
slstatus: init at unstable-2018-03-28
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0244e877dfc2..16f5198d1f92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4809,6 +4809,10 @@ with pkgs; slsnif = callPackage ../tools/misc/slsnif { }; + slstatus = callPackage ../applications/misc/slstatus { + conf = config.slstatus.conf or null; + }; + smartmontools = callPackage ../tools/system/smartmontools { inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; }; |