b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #163630 from wentasah/trace-cmd-3.0

Browse source 
trace-cmd: 2.9.7 -> 3.1.1
This commit is contained in:
Sandro 2022-07-06 10:56:30 +02:00 committed by GitHub
parent 1fe9c408a2 c30f978f23
commit 45e12964fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/os-specific/linux/libtraceevent/default.nix
View file

@ -1,18 +1,19 @@
{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, coreutils }:
stdenv.mkDerivation rec {
pname = "libtraceevent";
version = "1.5.1";
version = "1.6.1";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
rev = "libtraceevent-${version}";
sha256 = "sha256-g4dB8QhCG6SgZVAU3TCtb70vYYh1KN7FrcldzTGAUnI=";
sha256 = "sha256-Yt7W+ouEZ/pJEKyY2Cgh+mYG0qz0lOIou5JufAD9Zd0=";
};
# Don't build and install html documentation
postPatch = ''
sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile
substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd
'';
outputs = [ "out" "dev" "devman" ];

4
pkgs/os-specific/linux/libtracefs/default.nix
View file

@ -15,12 +15,12 @@
stdenv.mkDerivation rec {
pname = "libtracefs";
version = "1.3.0";
version = "1.4.1";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";
rev = "libtracefs-${version}";
sha256 = "sha256-Kg1mPjTZ2UCeco18Fa8GqmLo2R35XvUE/q2J1HAmtEc=";
sha256 = "sha256-htif1Hty/AQkx6jALHUVMBF1wIpVwLmdINP8QUZmv/s=";
};
postPatch = ''

31
pkgs/os-specific/linux/trace-cmd/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, libxslt, libtraceevent, libtracefs }:
{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }:
stdenv.mkDerivation rec {
pname = "trace-cmd";
version = "2.9.7";
version = "3.1.1";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
rev = "trace-cmd-v${version}";
sha256 = "sha256-04qsTlOVYh/jHVWxaGuqYj4DkUpcEYcpfUqnqhphIMg=";
sha256 = "sha256-zYw6DObwmroAU3ikUNo9XrwQeDlyLppe7E63WFjn44Q=";
};
# Don't build and install html documentation
@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
Documentation{,/trace-cmd,/libtracecmd}/Makefile
'';
nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto ];
nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto docbook_xsl docbook_xml_dtd_45 sourceHighlight ];
buildInputs = [ libtraceevent libtracefs ];
buildInputs = [ libtraceevent libtracefs zstd ];
outputs = [ "out" "lib" "dev" "man" ];
@ -27,19 +27,28 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = [
"all" "libs" "doc"
# The following values appear in the generated .pc file
"prefix=${placeholder "lib"}"
"libdir=${placeholder "lib"}/lib"
"includedir=${placeholder "dev"}/include"
];
installTargets = [ "install_cmd" "install_libs" "install_doc" ];
# We do not mention targets (like "doc") explicitly in makeFlags
# because the Makefile would not print warnings about too old
# libraries (see "warning:" in the Makefile)
postBuild = ''
make libs doc -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
'';
installTargets = [
"install_cmd"
"install_libs"
"install_doc"
];
installFlags = [
"LDCONFIG=false"
"bindir=${placeholder "out"}/bin"
"man_dir=${placeholder "man"}/share/man"
"mandir=${placeholder "man"}/share/man"
"libdir=${placeholder "lib"}/lib"
"pkgconfig_dir=${placeholder "lib"}/lib/pkgconfig"
"pkgconfig_dir=${placeholder "dev"}/lib/pkgconfig"
"includedir=${placeholder "dev"}/include"
"BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions"
];