diff options
author | 7c6f434c <7c6f434c@mail.ru> | 2022-01-13 09:43:17 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-13 09:43:17 +0000 |
commit | bece1fa267d43150871e8c6234b231f986f84ea4 (patch) | |
tree | 608ed91262c2ca9e2c54d6095f4d767f26445f52 /pkgs/tools/networking | |
parent | a5a6e31c017630588f957f297928b42a085bc250 (diff) | |
parent | 5d07e1cc64db016b36e97a7418f91f7c700c9c61 (diff) |
Merge pull request #154829 from peterhoeg/u/mtr
mtr: 0.94 -> 0.95
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/mtr/default.nix | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 177fdee99b377..9ce71df109e0d 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,28 +1,27 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config -, libcap, ncurses, jansson -, withGtk ? false, gtk3 }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkg-config +, libcap +, ncurses +, jansson +, withGtk ? false +, gtk3 +}: stdenv.mkDerivation rec { pname = "mtr${lib.optionalString withGtk "-gui"}"; - version = "0.94"; + version = "0.95"; src = fetchFromGitHub { owner = "traviscross"; repo = "mtr"; 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 postPatch = '' echo ${version} > .tarball-version |