diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index f3f29cc1acd6..4c632667c229 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -4,7 +4,7 @@ let dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { pname = "lsof"; - version = "4.94.0"; + version = "4.95.0"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; @@ -13,19 +13,11 @@ stdenv.mkDerivation rec { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp"; + sha256 = "sha256-HgU7/HxLdUOfLU2E/dpusko6gBOoEKeWPJIFbBQGzFU="; }; patches = [ ./no-build-info.patch - - # Pull upstream fix for -fno-common toolchains: - # https://github.com/lsof-org/lsof/pull/221 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/lsof-org/lsof/commit/80e7c890585deec02c527dbcf42bc0e5d8d7c534.patch"; - sha256 = "17xshi7j7af9nli1zjk1m5f4il2ajvvhw7lii8g8d27rkkgyb8g6"; - }) ]; postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/tools/misc/lsof/no-build-info.patch b/pkgs/development/tools/misc/lsof/no-build-info.patch index cf785e248f2a..c433fd6e08f8 100644 --- a/pkgs/development/tools/misc/lsof/no-build-info.patch +++ b/pkgs/development/tools/misc/lsof/no-build-info.patch @@ -1,12 +1,9 @@ -diff -ru -x '*~' lsof_4.91_src-orig/usage.c lsof_4.91_src/usage.c ---- lsof_4.91_src-orig/usage.c 2018-02-14 15:20:32.000000000 +0100 -+++ lsof_4.91_src/usage.c 2018-10-08 21:57:45.718560869 +0200 -@@ -930,26 +930,6 @@ +--- a/usage.c 2018-02-14 15:20:32.000000000 +0100 ++++ b/usage.c 2018-10-08 21:57:45.718560869 +0200 +@@ -930,24 +930,6 @@ (void) fprintf(stderr, " configuration info: %s\n", cp); #endif /* defined(LSOF_CINFO) */ -- if ((cp = isnullstr(LSOF_CCDATE))) -- (void) fprintf(stderr, " constructed: %s\n", cp); - cp = isnullstr(LSOF_HOST); - if (!(cp1 = isnullstr(LSOF_LOGNAME))) - cp1 = isnullstr(LSOF_USER);