push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -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,

View File

@@ -0,0 +1,70 @@
{
stdenv,
fetchurl,
fetchpatch,
ncurses ? null,
perl ? null,
pkg-config,
lib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "liboping";
version = "1.10.0";
src = fetchurl {
url = "https://noping.cc/files/liboping-${finalAttrs.version}.tar.bz2";
hash = "sha256-6ziqk/k+irKC2X4lgvuuqIs/iJoIy8nb8gBZw3edXNg=";
};
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";
})
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";
nativeBuildInputs = [
perl
pkg-config
];
buildInputs = [
ncurses
perl
];
configureFlags = [
"ac_cv_func_malloc_0_nonnull=yes"
]
++ lib.optional (perl == null) "--with-perl-bindings=no";
buildFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"LD=${stdenv.cc.targetPrefix}cc"
];
meta = {
description = "C library to generate ICMP echo requests (a.k.a. ping packets)";
longDescription = ''
liboping is a C library to generate ICMP echo requests, better known as
"ping packets". It is intended for use in network monitoring applications
or applications that would otherwise need to fork ping(1) frequently.
Included is a sample application, called oping, which demonstrates the
library's abilities.
'';
homepage = "https://noping.cc/";
license = lib.licenses.lgpl21;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.bjornfor ];
};
})