From 6be4eb7a43fdea484f05ac16a34f3bfb9e72894a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 15 Jan 2015 16:39:19 +0100 Subject: [PATCH 1/3] Add package: stag --- pkgs/applications/misc/stag/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/stag/default.nix diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix new file mode 100644 index 00000000000..aad857b2573 --- /dev/null +++ b/pkgs/applications/misc/stag/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, curses }: + +stdenv.mkDerivation { + name = "stag-1.0"; + + src = fetchgit { + url = https://github.com/seenaburns/stag.git; + rev = "90e2964959ea8242349250640d24cee3d1966ad6"; + sha256 = "88628dfa07a0772c7eca0cc66ef2d8f3e20297deec021c776a82fe1323bafb0f"; + }; + + buildInputs = [ stdenv curses ]; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = { + homepage = "https://github.com/seenaburns/stag"; + description = "Terminal streaming bar graph passed through stdin.; + license = stdenv.lib.licenses.bsdOriginal; + + # FIXME: waiting on PR #5773 for maintainer entry + #maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 895977fc4fa..91ad934eac0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10957,6 +10957,10 @@ let conf = config.st.conf or null; }; + stag = callPackage ../applications/misc/stag { + curses = ncurses; + }; + stella = callPackage ../misc/emulators/stella { }; linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; From ee06c5994425472fdd7c6560cad505684b35510b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 15 Jan 2015 17:14:31 +0100 Subject: [PATCH 2/3] Fixup: Missing terminating quote --- pkgs/applications/misc/stag/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index aad857b2573..a89b0ce96a0 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/seenaburns/stag"; - description = "Terminal streaming bar graph passed through stdin.; + description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; # FIXME: waiting on PR #5773 for maintainer entry From 261f596335f371fbdc35e168578fff93f4f2d031 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 15 Jan 2015 18:38:51 +0100 Subject: [PATCH 3/3] Fixup: set maintainer --- pkgs/applications/misc/stag/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index a89b0ce96a0..8856e5be52f 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation { homepage = "https://github.com/seenaburns/stag"; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; - - # FIXME: waiting on PR #5773 for maintainer entry - #maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; }; }