From 8d34d0e6a7b0a3fb7485828e9d01d14c65d48c2a Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 25 Jul 2024 15:57:25 +0200 Subject: [PATCH 1/4] libtracefs: add updateScript --- pkgs/os-specific/linux/libtracefs/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 3d99466c8f34..19ab804e3242 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,6 +15,7 @@ , bison , ninja , cunit +, gitUpdater }: stdenv.mkDerivation rec { @@ -52,6 +53,12 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ cunit ]; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; + rev-prefix = "libtracefs-"; + }; + meta = with lib; { description = "Linux kernel trace file system library"; mainProgram = "sqlhist"; From 619b92b24cc4c6efd5a2673637d2d3ce1d0f3c94 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 25 Jul 2024 15:58:56 +0200 Subject: [PATCH 2/4] libtracefs: 1.7.0 -> 1.8.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 19ab804e3242..288a2b0629ba 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.7.0"; + version = "1.8.1"; src = fetchzip { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-libtracefs-${version}.tar.gz"; - hash = "sha256-64eXFFdnZHHf4C3vbADtPuIMsfJ85VZ6t8A1gIc1CW0="; + hash = "sha256-2UiEgY4mQRLpWah+2rVfPiiUYBSSzRAy5gOv4YELQFQ="; }; postPatch = '' From bf0bf51934fe869f6a3d5693de81d04fcdba00f0 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 25 Jul 2024 16:35:01 +0200 Subject: [PATCH 3/4] libtracefs: remove unused argument --- pkgs/os-specific/linux/libtracefs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 288a2b0629ba..d96f028e39aa 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -7,7 +7,6 @@ , xmlto , docbook_xml_dtd_45 , docbook_xsl -, coreutils , valgrind , sourceHighlight , meson From 7de6d04e7ac629a118101667acae2b5e9fe20c9d Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 4 Aug 2024 09:33:50 +0200 Subject: [PATCH 4/4] libtracefs: Add patch to compile all documentation --- pkgs/os-specific/linux/libtracefs/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index d96f028e39aa..d35b9e709626 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,6 +15,7 @@ , ninja , cunit , gitUpdater +, fetchpatch }: stdenv.mkDerivation rec { @@ -26,6 +27,14 @@ stdenv.mkDerivation rec { hash = "sha256-2UiEgY4mQRLpWah+2rVfPiiUYBSSzRAy5gOv4YELQFQ="; }; + patches = [ + (fetchpatch { + name = "add-missing-documentation-to-meson-build.patch"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/patch/?id=4cbebed79b1fe933367e298ea7ddef694b9f98d0"; + hash = "sha256-tSaR0wpxrm50IyMgMoUCcHBB9r8lQQZZYGru6Znre50="; + }) + ]; + postPatch = '' chmod +x samples/extract-example.sh patchShebangs --build check-manpages.sh samples/extract-example.sh Documentation/install-docs.sh.in