JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #154829 from peterhoeg/u/mtr

Browse Source 
mtr: 0.94 -> 0.95
This commit is contained in:
7c6f434c 2022-01-13 09:43:17 +00:00 committed by GitHub
commit bece1fa267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/tools/networking/mtr/default.nix
View File

@ -1,28 +1,27 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config { stdenv
, libcap, ncurses, jansson , lib
, withGtk ? false, gtk3 }: , fetchFromGitHub
, fetchpatch
, autoreconfHook
, pkg-config
, libcap
, ncurses
, jansson
, withGtk ? false
, gtk3
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mtr${lib.optionalString withGtk "-gui"}"; pname = "mtr${lib.optionalString withGtk "-gui"}";
version = "0.94"; version = "0.95";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "traviscross"; owner = "traviscross";
repo = "mtr"; repo = "mtr";
rev = "v${version}"; rev = "v${version}";
sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; sha256 = "sha256-f5bL3IdXibIc1xXCuZHwcEV5vhypRE2mLsS3A8HW2QM=";
}; };
patches = [
# pull patch to fix build failure against ncurses-6.3:
# https://github.com/traviscross/mtr/pull/411
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/traviscross/mtr/commit/aeb493e08eabcb4e6178bda0bb84e9cd01c9f213.patch";
sha256 = "1qk8lf4sha18g36mr84vbdvll2s8khgbzyyq0as3ifx44lv0qlf2";
})
];
# we need this before autoreconfHook does its thing # we need this before autoreconfHook does its thing
postPatch = '' postPatch = ''
echo ${version} > .tarball-version echo ${version} > .tarball-version