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: 67c70aa581cf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4871946c63c8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 13, 2017

  1. s-tui: init at 0.6.0

    @infinisil
    infinisil committed Sep 13, 2017
    Copy the full SHA
    753d114 View commit details

  2. Merge pull request #29310 from Infinisil/s-tui 

    s-tui: init at 0.6.0
    @FRidh
    FRidh authored Sep 13, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    yurrriq Eric Bailey
    GPG key ID: 29E1B8D32C1635C4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4871946 View commit details
Showing with 26 additions and 0 deletions.
  1. +24 −0 pkgs/tools/system/s-tui/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
24 changes: 24 additions & 0 deletions pkgs/tools/system/s-tui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, pythonPackages }:

pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "s-tui";
version = "0.6.2";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0fijk26sm51bnxf7plzd1fn2k4f8mdqd7j9zqc3d8zri7228vik2";
};

propagatedBuildInputs = with pythonPackages; [
urwid
psutil
];

meta = with stdenv.lib; {
homepage = https://amanusk.github.io/s-tui/;
descrption = "Stress-Terminal UI monitoring tool";
license = licenses.gpl2;
maintainers = with maintainers; [ infinisil ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4195,6 +4195,8 @@ with pkgs;

rzip = callPackage ../tools/compression/rzip { };

s-tui = callPackage ../tools/system/s-tui { };

s3backer = callPackage ../tools/filesystems/s3backer { };

s3fs = callPackage ../tools/filesystems/s3fs { };