diff options
author | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
commit | f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3 (patch) | |
tree | 0f17999d3a5444f16f09e0c1d7f3075e0224e731 /pkgs/tools/system | |
parent | 3f45f0948d6fe158bed063adb66850ded0ba4861 (diff) | |
parent | c61445357e2a92470bee43a71a10baef1a3196e4 (diff) | |
download | nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.gz nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.bz2 nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.lz nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.xz nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.zst nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/collectd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/foreman/Gemfile | 3 | ||||
-rw-r--r-- | pkgs/tools/system/foreman/Gemfile.lock | 15 | ||||
-rw-r--r-- | pkgs/tools/system/foreman/default.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/system/foreman/gemset.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/system/htop/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/system/ts/default.nix | 4 |
7 files changed, 94 insertions, 4 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index a1d676d708df..5f42e39871a4 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -30,9 +30,9 @@ , varnish ? null , yajl ? null }: - stdenv.mkDerivation rec { - name = "collectd-5.5.0"; + version = "5.5.0"; + name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; diff --git a/pkgs/tools/system/foreman/Gemfile b/pkgs/tools/system/foreman/Gemfile new file mode 100644 index 000000000000..e25e6d790fc0 --- /dev/null +++ b/pkgs/tools/system/foreman/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "foreman" diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/tools/system/foreman/Gemfile.lock new file mode 100644 index 000000000000..8fa9a213ab28 --- /dev/null +++ b/pkgs/tools/system/foreman/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + foreman (0.78.0) + thor (~> 0.19.1) + thor (0.19.1) + +PLATFORMS + ruby + +DEPENDENCIES + foreman + +BUNDLED WITH + 1.11.2 diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/tools/system/foreman/default.nix new file mode 100644 index 000000000000..594947c265a3 --- /dev/null +++ b/pkgs/tools/system/foreman/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, ruby, bundlerEnv, makeWrapper }: + +stdenv.mkDerivation rec { + name = "foreman-${env.gems.foreman.version}"; + + env = bundlerEnv { + inherit ruby; + name = "${name}-gems"; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + + phases = ["installPhase"]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/foreman $out/bin/foreman + ''; + + meta = with lib; { + description = "Process manager for applications with multiple components"; + homepage = https://github.com/ddollar/foreman; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + platforms = ruby.meta.platforms; + }; +} diff --git a/pkgs/tools/system/foreman/gemset.nix b/pkgs/tools/system/foreman/gemset.nix new file mode 100644 index 000000000000..b35bd15c9749 --- /dev/null +++ b/pkgs/tools/system/foreman/gemset.nix @@ -0,0 +1,18 @@ +{ + thor = { + version = "0.19.1"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + }; + foreman = { + version = "0.78.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix new file mode 100644 index 000000000000..9301107d2db9 --- /dev/null +++ b/pkgs/tools/system/htop/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, stdenv, ncurses, +IOKit }: + +stdenv.mkDerivation rec { + name = "htop-${version}"; + version = "2.0.1"; + + src = fetchurl { + sha256 = "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l"; + url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; + }; + + buildInputs = + [ ncurses ] ++ + lib.optionals stdenv.isDarwin [ IOKit ]; + + meta = with stdenv.lib; { + description = "An interactive process viewer for Linux"; + homepage = https://hisham.hm/htop/; + license = licenses.gpl2Plus; + platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; + maintainers = with maintainers; [ rob simons relrod nckx ]; + }; +} diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index ff2fdfefb059..8e65eda8f540 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -3,7 +3,7 @@ sendmailPath ? "/var/setuid-wrappers/sendmail" }: stdenv.mkDerivation rec { - name = "ts-0.7.4"; + name = "ts-0.7.6"; installPhase=''make install "PREFIX=$out"''; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://viric.name/~viric/soft/ts/${name}.tar.gz"; - sha256 = "042r9a09300v4fdrw4r60g5xi25v5m6g12kvvr6pcsm9qnfqyqqs"; + sha256 = "07b61sx3hqpdxlg5a1xrz9sxww9yqdix3bmr0sm917r3rzk87lwk"; }; meta = with stdenv.lib; { |