Merge branch 'master' into staging

2014-11-26 21:48:26 +01:00
parent 1e5242931b b1803465d9
commit b5ff06eda4
48 changed files with 517 additions and 168 deletions
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -3,13 +3,13 @@

 stdenv.mkDerivation rec {
  name = "bmon-${version}";
-  version = "3.5";
+  version = "3.6";

  src = fetchFromGitHub {
    owner = "tgraf";
    repo = "bmon";
    rev = "v${version}";
-    sha256 = "0k6cwprwnrnilbs2fgkx7z9mg6rr11wf6djq6pjfc7fjn2fjvybi";
+    sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q";
  };

  buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:

 stdenv.mkDerivation rec {
-  name = "parallel-20141022";
+  name = "parallel-20141122";

  src = fetchurl {
    url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1dpssybids6k6na4rh2gwv1m581h28rcmsvq0hs56hrrh7qpjmvp";
+    sha256 = "1kpd4ayd4lb867nfnpkam4b3mh86jl6cdy386x1rich938gbrg38";
  };

  patchPhase =