From f63020259750bb2433ce9333009516ff20fb67fa Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 10 Mar 2022 23:28:46 +0100 Subject: [PATCH 1/6] libtracefs: 1.3.0 -> 1.3.1 trace-cmd 3.0 requires libtracefs 1.3.1. --- pkgs/os-specific/linux/libtracefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 972a71d50390..c836fa4433ad 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.3.0"; + version = "1.3.1"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "sha256-Kg1mPjTZ2UCeco18Fa8GqmLo2R35XvUE/q2J1HAmtEc="; + sha256 = "sha256-jwgDveDSXekHMvvxtK8LYVgeppeZLccSheevVusWYws="; }; postPatch = '' From 8d9773fec413cb7641306fa30a48f0988c45a734 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 10 Mar 2022 23:49:46 +0100 Subject: [PATCH 2/6] libtraceevent: 1.5.1 -> 1.5.3 substituteInPlace was probably needed even in the older versions. Without this, make prints: make[1]: /bin/pwd: No such file or directory --- pkgs/os-specific/linux/libtraceevent/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 7ec8ac35e62a..4e3fd1b2e07c 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -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.5.3"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - sha256 = "sha256-g4dB8QhCG6SgZVAU3TCtb70vYYh1KN7FrcldzTGAUnI="; + sha256 = "sha256-TaJOwunejEdJz84p3CkGvtR++jN+hXedyxxN+RoeXko="; }; # 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" ]; From 3a9bdc3f3e474627fa9e898887d0d543679431fe Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 10 Mar 2022 23:52:44 +0100 Subject: [PATCH 3/6] trace-cmd: 2.9.7 -> 3.0.3 --- pkgs/os-specific/linux/trace-cmd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index a339c60e8dfa..f92ed2749027 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -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.0.3"; 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-28/XEtVlqgD/by0FmvYHAJHKdNi+JHhiM1xPMymuaIY="; }; # 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" ]; From 60c8c66d00b1b0b588b7ad79d12d13cb0949eb19 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 19 Jun 2022 14:42:11 +0200 Subject: [PATCH 4/6] libtracefs: 1.3.1->1.4.1 --- pkgs/os-specific/linux/libtracefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index c836fa4433ad..c4bec6629874 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.3.1"; + version = "1.4.1"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "sha256-jwgDveDSXekHMvvxtK8LYVgeppeZLccSheevVusWYws="; + sha256 = "sha256-htif1Hty/AQkx6jALHUVMBF1wIpVwLmdINP8QUZmv/s="; }; postPatch = '' From 9786d883ac44fe0877c934e88e9f491fa49f9cc3 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 19 Jun 2022 14:42:34 +0200 Subject: [PATCH 5/6] libtraceevent: 1.5.3->1.6.1 --- pkgs/os-specific/linux/libtraceevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 4e3fd1b2e07c..7fc577d0ab0e 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.5.3"; + version = "1.6.1"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - sha256 = "sha256-TaJOwunejEdJz84p3CkGvtR++jN+hXedyxxN+RoeXko="; + sha256 = "sha256-Yt7W+ouEZ/pJEKyY2Cgh+mYG0qz0lOIou5JufAD9Zd0="; }; # Don't build and install html documentation From c30f978f233f7adace4e8fffff12745486008751 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 19 Jun 2022 14:44:40 +0200 Subject: [PATCH 6/6] trace-cmd: 3.0.3->3.1.1 --- pkgs/os-specific/linux/trace-cmd/default.nix | 25 +++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index f92ed2749027..0bf5a8e2adb0 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,12 +1,12 @@ { 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 = "3.0.3"; + 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-28/XEtVlqgD/by0FmvYHAJHKdNi+JHhiM1xPMymuaIY="; + sha256 = "sha256-zYw6DObwmroAU3ikUNo9XrwQeDlyLppe7E63WFjn44Q="; }; # Don't build and install html documentation @@ -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" ];