From dd21919e9f6507b84a8a5e6d44f70c41bd5396a2 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 1 Sep 2024 12:49:45 +0200 Subject: [PATCH 1/2] trace-cmd: Add updateScript --- pkgs/os-specific/linux/trace-cmd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 80b20c555b4e..48da6b31b240 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }: +{ lib, stdenv, fetchpatch, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight, gitUpdater }: stdenv.mkDerivation rec { pname = "trace-cmd"; version = "3.2"; @@ -61,6 +61,12 @@ stdenv.mkDerivation rec { "BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions" ]; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"; + rev-prefix = "trace-cmd-v"; + }; + meta = with lib; { description = "User-space tools for the Linux kernel ftrace subsystem"; mainProgram = "trace-cmd"; From 28603d0f8d15b3056f54e63610bfda38cef9798e Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 1 Sep 2024 12:50:56 +0200 Subject: [PATCH 2/2] trace-cmd: 3.2 -> 3.3.1 --- pkgs/os-specific/linux/trace-cmd/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 48da6b31b240..5c339c093dd5 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,21 +1,13 @@ -{ lib, stdenv, fetchpatch, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight, gitUpdater }: +{ lib, stdenv, fetchzip, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight, gitUpdater }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.2"; + version = "3.3.1"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz"; - hash = "sha256-rTcaaEQ3Y4cneNnZSGiMZNp+Z7dyAa3oNTNMAEXr28g="; + hash = "sha256-kEji3qDqQsSK0tL8Fx2ycSd2lTXBXOHHTvsb6XDNSa8="; }; - patches = [ - # Upstream patches to be released in the next version - (fetchpatch { - sha256 = "sha256-eGuHODm29M7rbGYsyXUPoNe1xsIG3eJYhwXQDakRJHA="; - url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/patch/?id=6b07a7df871342068604b204711ab741d421d051"; - }) - ]; - # Don't build and install html documentation postPatch = '' sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' \