diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-30 23:58:07 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-30 23:58:07 -0700 |
| commit | 612f0bdd679e16bd05397c85de9ea4b147cb45dc (patch) | |
| tree | 68f50e65ea610c52a60ab9bb3b6fe27006db368d /pkgs/tools/misc | |
| parent | 857efa12fb54a05674406fafcdc43b0576d17eb2 (diff) | |
| parent | ddf15bc78a869ec61487aa20edd4e8d9ba044519 (diff) | |
| download | nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.gz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.bz2 nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.lz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.xz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.zst nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/bmon/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/misc/memtest86+/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/screen/default.nix | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 4416c3e1625d..308232ac2fe8 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -3,18 +3,15 @@ stdenv.mkDerivation rec { name = "bmon-${version}"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "tgraf"; repo = "bmon"; rev = "v${version}"; - sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q"; + sha256 = "0rh0r8gabcsqq3d659yqk8nz6y4smsi7p1vwa2v584m2l2d0rqd6"; }; - # https://github.com/tgraf/bmon/pull/24#issuecomment-98068887 - postPatch = "sed '1i#include <net/if.h>' -i src/in_netlink.c"; - buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ]; preConfigure = "sh ./autogen.sh"; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index dbd5a46e10ab..7e3824263365 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { fi ''; - NIX_CFLAGS_COMPILE = "-I."; + NIX_CFLAGS_COMPILE = "-I. -std=gnu90"; buildFlags = "memtest.bin"; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index d329106b979e..1fe71ae96160 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pam ? null }: stdenv.mkDerivation rec { - name = "screen-4.3.0"; + name = "screen-4.3.1"; src = fetchurl { url = "mirror://gnu/screen/${name}.tar.gz"; - sha256 = "0ilccnwszaxr9wbrx0swh4fisha2rj2jiq76fwqikmv0rjdyhr2i"; + sha256 = "0qwxd4axkgvxjigz9xs0kcv6qpfkrzr2gm43w9idx0z2mvw4jh7s"; }; preConfigure = '' |