MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #67658 from averelld/lsof-update

Browse source 
lsof: 4.91 -> 4.93.2
This commit is contained in:
Marek Mahut 2019-08-30 10:17:48 +02:00 committed by GitHub
commit d9e7601926
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/tools/misc/lsof/darwin-dfile.patch
View file

@ -1,12 +0,0 @@
diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c
--- a/dialects/darwin/libproc/dfile.c 2018-02-14 09:28:06.000000000 -0500
+++ b/dialects/darwin/libproc/dfile.c 2018-04-16 18:52:40.828715293 -0400
@@ -43,7 +43,7 @@
#include "lsof.h"
#if defined(PROC_FP_GUARDED)
-#extern struct pff_tab Pgf_tab[];
+extern struct pff_tab Pgf_tab[];
#endif /* defined(PROC_FP_GUARDED) */

34
pkgs/development/tools/misc/lsof/default.nix
View file

@ -1,34 +1,22 @@
{ stdenv, fetchurl, buildPackages, ncurses }: { stdenv, fetchFromGitHub, buildPackages, ncurses }:
let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lsof-${version}"; pname = "lsof";
version = "4.91"; version = "4.93.2";
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
src = fetchurl { src = fetchFromGitHub {
urls = ["https://fossies.org/linux/misc/lsof_${version}.tar.bz2"] ++ # Mirrors seem to be down... owner = "lsof-org";
["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] repo = "lsof";
++ map ( rev = "${version}";
# the tarball is moved after new version is released sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv";
isOld: "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/"
+ "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2"
) [ false true ]
++ map (
# the tarball is moved after new version is released
isOld: "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/"
+ "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2"
) [ false true ]
;
sha256 = "18sh4hbl9jw2szkf0gvgan8g13f3g4c6s2q9h3zq5gsza9m99nn9";
}; };
unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; patches = [ ./no-build-info.patch ];
patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch;
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1
@ -47,12 +35,12 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/man/man8 mkdir -p $out/bin $out/man/man8
cp lsof.8 $out/man/man8/ cp Lsof.8 $out/man/man8/lsof.8
cp lsof $out/bin cp lsof $out/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://people.freebsd.org/~abe/; homepage = "https://github.com/lsof-org/lsof";
description = "A tool to list open files"; description = "A tool to list open files";
longDescription = '' longDescription = ''
List open files. Can show what process has opened some file, List open files. Can show what process has opened some file,