diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/liboping | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/liboping')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/liboping/default.nix | 16 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/liboping/ncurses-6.3.patch | 21 |
2 files changed, 36 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/liboping/default.nix b/nixpkgs/pkgs/development/libraries/liboping/default.nix index 932133e01921..9a44e84b136f 100644 --- a/nixpkgs/pkgs/development/libraries/liboping/default.nix +++ b/nixpkgs/pkgs/development/libraries/liboping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses ? null, perl ? null, lib }: +{ stdenv, fetchurl, fetchpatch, ncurses ? null, perl ? null, lib }: stdenv.mkDerivation rec { pname = "liboping"; @@ -9,6 +9,20 @@ stdenv.mkDerivation rec { sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; + patches = [ + # Add support for ncurses-6.3. A backport of patch pending upstream + # inclusion: https://github.com/octo/liboping/pull/61 + ./ncurses-6.3.patch + + # Pull pending fix for format arguments mismatch: + # https://github.com/octo/liboping/pull/60 + (fetchpatch { + name = "format-args.patch"; + url = "https://github.com/octo/liboping/commit/7a50e33f2a686564aa43e4920141e6f64e042df1.patch"; + sha256 = "118fl3k84m3iqwfp49g5qil4lw1gcznzmyxnfna0h7za2nm50cxw"; + }) + ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; diff --git a/nixpkgs/pkgs/development/libraries/liboping/ncurses-6.3.patch b/nixpkgs/pkgs/development/libraries/liboping/ncurses-6.3.patch new file mode 100644 index 000000000000..14d2be07fe38 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/liboping/ncurses-6.3.patch @@ -0,0 +1,21 @@ +A backport of https://github.com/octo/liboping/pull/61 +--- a/src/oping.c ++++ b/src/oping.c +@@ -1125,7 +1125,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ + wattron (ctx->window, COLOR_PAIR(color)); + + if (has_utf8()) +- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol); ++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc); + +@@ -1222,7 +1222,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */ + if (counters[x] == 0) + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' '); + else if (has_utf8 ()) +- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, ++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", + hist_symbols_utf8[index]); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, |