diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-30 15:03:10 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-30 15:03:10 -0700 |
| commit | 7ebe164ae027972cf2a7c05fa9021fb489d063cb (patch) | |
| tree | 60b3e3ce7a01a6bbd608d3afdf05461fbadaa029 /pkgs/tools/misc | |
| parent | 428f9ad382d2f0911ff3c70e55f427d305002b3e (diff) | |
| parent | 942e74bec8ba8d3de286f16a68dd73f22b78ce00 (diff) | |
| download | nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.gz nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.bz2 nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.lz nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.xz nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.zst nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/bmon/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 308232ac2fe8..1bbabcf5523f 100644 --- 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.7"; + version = "3.8"; src = fetchFromGitHub { owner = "tgraf"; repo = "bmon"; rev = "v${version}"; - sha256 = "0rh0r8gabcsqq3d659yqk8nz6y4smsi7p1vwa2v584m2l2d0rqd6"; + sha256 = "19jv14r9j9n54bqhidw3z11z3wys1v2cagqpsxn0kjga1gkg87xs"; }; buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index cfbe32e579c5..1f616d8d9af1 100644 --- 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-20150622"; + name = "parallel-20150722"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0j7gg88zk2r4jv3mvmrl4bhwcv9k8rxanygp6lssbx685ab9qfln"; + sha256 = "0jpklc4awr5z6slgn7xjhrcpk6i8jp9mwhkkaczikvbaqzbyabkx"; }; patchPhase = |