From a9b4881f9439c2115aa74c59533faf37e8f0c289 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 27 Apr 2019 13:34:05 +0200
Subject: [PATCH 1/8] trace-cmd: 2.6 -> 2.8-c8d9e1a

---
 pkgs/os-specific/linux/trace-cmd/default.nix  | 44 ++++++++++------
 .../linux/trace-cmd/fix-Makefiles.patch       | 51 +++++++++++++++++++
 pkgs/os-specific/linux/trace-cmd/src.nix      |  5 ++
 3 files changed, 85 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
 create mode 100644 pkgs/os-specific/linux/trace-cmd/src.nix

diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 33dbfe5bf0a..67f6f9af93e 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -1,25 +1,39 @@
 { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
-
-stdenv.mkDerivation rec {
+let
+  srcSpec = import ./src.nix;
+  shortRev = builtins.substring 0 7 srcSpec.rev;
+in stdenv.mkDerivation rec {
   name    = "trace-cmd-${version}";
-  version = "2.6";
+  version = "2.8-${shortRev}";
 
-  src = fetchgit {
-    url    = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git";
-    rev    = "refs/tags/trace-cmd-v${version}";
-    sha256 = "15d6b7l766h2mamqgphx6l6a33b1zn0yar2h7i6b24ph6kz3idxn";
-  };
+  src = fetchgit srcSpec;
 
-  buildInputs = [ asciidoc libxslt ];
+  patches = [ ./fix-Makefiles.patch ];
+
+  nativeBuildInputs = [ asciidoc libxslt ];
+
+  outputs = [ "out" "lib" "dev" "man" ];
+
+  MANPAGE_DOCBOOK_XSL="${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl";
 
   dontConfigure = true;
-  buildPhase     = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl all doc";
-  installPhase   = "make prefix=$out install install_doc";
 
-  meta = {
+  buildPhase = "make trace-cmd libs doc";
+
+  installTargets = [ "install_cmd" "install_libs" "install_man" ];
+  installFlags = [
+    "bindir=${placeholder "out"}/bin"
+    "man_dir=${placeholder "man"}/share/man"
+    "libdir=${placeholder "lib"}/lib"
+    "includedir=${placeholder "dev"}/include/trace-cmd"
+    "BASH_COMPLETE_DIR=${placeholder "out"}/etc/bash_completion.d"
+  ];
+
+  meta = with stdenv.lib; {
     description = "User-space tools for the Linux kernel ftrace subsystem";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    homepage    = http://kernelshark.org/;
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice basvandijk ];
   };
 }
diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
new file mode 100644
index 00000000000..9d0be8b4200
--- /dev/null
+++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
@@ -0,0 +1,51 @@
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+index 21e42fd..b74c912 100644
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -108,7 +108,9 @@ $(IMGS_INSTALL): %.png.install : %.png force
+ 
+ GUI_INSTALL = $(HTML_INSTALL) $(IMGS_INSTALL)
+ 
+-install: $(MAN1_INSTALL) $(MAN5_INSTALL) $(GUI_INSTALL)
++install_man: $(MAN1_INSTALL) $(MAN5_INSTALL)
++
++install: install_man $(GUI_INSTALL)
+ 
+ clean:
+ 	(cd $(obj); \
+diff --git a/Makefile b/Makefile
+index cde45f8..d218ecc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -281,7 +281,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
+ libtracecmd.a: $(LIBTRACECMD_STATIC)
+ libtracecmd.so: $(LIBTRACECMD_SHARED)
+ 
+-libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED)
++libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC)
+ 
+ plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir
+ 	$(Q)$(MAKE) -C $(src)/plugins
+@@ -337,8 +337,12 @@ install_gui: install_cmd gui
+ install_libs: libs
+ 	$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
+ 	$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
++	$(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ))
++	$(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ))
+ 	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ))
++	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ))
+ 	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
++	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-filter-hash.h,$(includedir_SQ))
+ 
+ doc:
+ 	$(MAKE) -C $(src)/Documentation all
+@@ -346,6 +350,9 @@ doc:
+ doc_clean:
+ 	$(MAKE) -C $(src)/Documentation clean
+ 
++install_man:
++	$(MAKE) -C $(src)/Documentation install_man
++
+ install_doc:
+ 	$(MAKE) -C $(src)/Documentation install
+ 
diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/pkgs/os-specific/linux/trace-cmd/src.nix
new file mode 100644
index 00000000000..d75063b9765
--- /dev/null
+++ b/pkgs/os-specific/linux/trace-cmd/src.nix
@@ -0,0 +1,5 @@
+{
+  url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
+  rev    = "c8d9e1a82e75ae0d35d8ca2800ef6c65be3ac4e5";
+  sha256 = "0ask7sdmlpffcfbzg3g68bqx8gy7qbk2h0faw8ksbw7p8cf5mnhd";
+}

From fa5a34624404b30eedf8dd195f2e87c3cf727d2c Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 28 Apr 2019 12:56:20 +0200
Subject: [PATCH 2/8] kernelshark: init at 0.9.8-c8d9e1a

---
 .../fix-kernel-shark-CMakeLists.txt.patch     | 32 +++++++++++++++++
 .../linux/trace-cmd/kernelshark.nix           | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 70 insertions(+)
 create mode 100644 pkgs/os-specific/linux/trace-cmd/fix-kernel-shark-CMakeLists.txt.patch
 create mode 100644 pkgs/os-specific/linux/trace-cmd/kernelshark.nix

diff --git a/pkgs/os-specific/linux/trace-cmd/fix-kernel-shark-CMakeLists.txt.patch b/pkgs/os-specific/linux/trace-cmd/fix-kernel-shark-CMakeLists.txt.patch
new file mode 100644
index 00000000000..249df035204
--- /dev/null
+++ b/pkgs/os-specific/linux/trace-cmd/fix-kernel-shark-CMakeLists.txt.patch
@@ -0,0 +1,32 @@
+diff --git a/kernel-shark/build/ks.desktop.cmake b/kernel-shark/build/ks.desktop.cmake
+index 10e3610..ba29ced 100644
+--- a/kernel-shark/build/ks.desktop.cmake
++++ b/kernel-shark/build/ks.desktop.cmake
+@@ -5,6 +5,6 @@ Name=Kernel Shark
+ GenericName=Kernel Shark
+ Comment=
+ Exec=@_INSTALL_PREFIX@/bin/kernelshark
+-Icon=@KS_DIR@/icons/ksharkicon.png
++Icon=@_INSTALL_PREFIX@/share/icons/kernelshark/ksharkicon.png
+ Categories=System;
+ Terminal=false
+diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
+index b7dbd7e..be633ce 100644
+--- a/kernel-shark/src/CMakeLists.txt
++++ b/kernel-shark/src/CMakeLists.txt
+@@ -82,10 +82,13 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
+             LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/kshark/)
+ 
+     install(FILES "${KS_DIR}/kernelshark.desktop"
+-            DESTINATION /usr/share/applications/)
++            DESTINATION ${_INSTALL_PREFIX}/share/applications/)
++
++    install(FILES "${KS_DIR}/icons/ksharkicon.png"
++            DESTINATION ${_INSTALL_PREFIX}/share/icons/kernelshark)
+ 
+     install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"
+-            DESTINATION /usr/share/polkit-1/actions/)
++            DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/)
+ 
+     install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
+             DESTINATION ${_INSTALL_PREFIX}/bin/)
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
new file mode 100644
index 00000000000..e583f636387
--- /dev/null
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -0,0 +1,36 @@
+{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd }:
+let
+  srcSpec = import ./src.nix;
+  shortRev = builtins.substring 0 7 srcSpec.rev;
+in mkDerivation rec {
+  pname = "kernelshark";
+  version = "0.9.8-${shortRev}";
+
+  src = fetchgit srcSpec;
+
+  sourceRoot = "trace-cmd-${shortRev}/kernel-shark";
+
+  patches = [ ./fix-kernel-shark-CMakeLists.txt.patch ];
+  patchFlags = [ "-p2" ];
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ qtbase json_c mesa_glu freeglut ];
+
+  cmakeFlags = [
+    "-D_INSTALL_PREFIX=${placeholder "out"}"
+    "-DTRACECMD_BIN_DIR=${trace-cmd}/bin"
+    "-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include/trace-cmd"
+    "-DTRACECMD_LIBRARY_DIR=${trace-cmd.lib}/lib"
+    "-DTRACEEVENT_INCLUDE_DIR=${trace-cmd.dev}/include/trace-cmd"
+    "-DTRACEEVENT_LIBRARY_DIR=${trace-cmd.lib}/lib"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem";
+    homepage    = http://kernelshark.org/;
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ basvandijk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e40497eee0b..9190b2862cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6389,6 +6389,8 @@ in
 
   trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
 
+  kernelshark = libsForQt5.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { };
+
   traceroute = callPackage ../tools/networking/traceroute { };
 
   tracebox = callPackage ../tools/networking/tracebox { };

From d1466e7006fa5eedbdbf04040714c8663c8dafd9 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 3 Jun 2019 23:59:34 +0200
Subject: [PATCH 3/8] trace-cmd: 2.8-c8d9e1a -> 2.8-0c957d2

---
 .../fix-kernel-shark-CMakeLists.txt.patch     | 32 -------------------
 .../linux/trace-cmd/kernelshark.nix           |  3 --
 pkgs/os-specific/linux/trace-cmd/src.nix      |  4 +--
 3 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/trace-cmd/fix-kernel-shark-CMakeLists.txt.patch

diff --git a/pkgs/os-specific/linux/trace-cmd/fix-kernel-shark-CMakeLists.txt.patch b/pkgs/os-specific/linux/trace-cmd/fix-kernel-shark-CMakeLists.txt.patch
deleted file mode 100644
index 249df035204..00000000000
--- a/pkgs/os-specific/linux/trace-cmd/fix-kernel-shark-CMakeLists.txt.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/kernel-shark/build/ks.desktop.cmake b/kernel-shark/build/ks.desktop.cmake
-index 10e3610..ba29ced 100644
---- a/kernel-shark/build/ks.desktop.cmake
-+++ b/kernel-shark/build/ks.desktop.cmake
-@@ -5,6 +5,6 @@ Name=Kernel Shark
- GenericName=Kernel Shark
- Comment=
- Exec=@_INSTALL_PREFIX@/bin/kernelshark
--Icon=@KS_DIR@/icons/ksharkicon.png
-+Icon=@_INSTALL_PREFIX@/share/icons/kernelshark/ksharkicon.png
- Categories=System;
- Terminal=false
-diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
-index b7dbd7e..be633ce 100644
---- a/kernel-shark/src/CMakeLists.txt
-+++ b/kernel-shark/src/CMakeLists.txt
-@@ -82,10 +82,13 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
-             LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/kshark/)
- 
-     install(FILES "${KS_DIR}/kernelshark.desktop"
--            DESTINATION /usr/share/applications/)
-+            DESTINATION ${_INSTALL_PREFIX}/share/applications/)
-+
-+    install(FILES "${KS_DIR}/icons/ksharkicon.png"
-+            DESTINATION ${_INSTALL_PREFIX}/share/icons/kernelshark)
- 
-     install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"
--            DESTINATION /usr/share/polkit-1/actions/)
-+            DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/)
- 
-     install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
-             DESTINATION ${_INSTALL_PREFIX}/bin/)
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index e583f636387..f634746662d 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -10,9 +10,6 @@ in mkDerivation rec {
 
   sourceRoot = "trace-cmd-${shortRev}/kernel-shark";
 
-  patches = [ ./fix-kernel-shark-CMakeLists.txt.patch ];
-  patchFlags = [ "-p2" ];
-
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ qtbase json_c mesa_glu freeglut ];
diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/pkgs/os-specific/linux/trace-cmd/src.nix
index d75063b9765..ea239219360 100644
--- a/pkgs/os-specific/linux/trace-cmd/src.nix
+++ b/pkgs/os-specific/linux/trace-cmd/src.nix
@@ -1,5 +1,5 @@
 {
   url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
-  rev    = "c8d9e1a82e75ae0d35d8ca2800ef6c65be3ac4e5";
-  sha256 = "0ask7sdmlpffcfbzg3g68bqx8gy7qbk2h0faw8ksbw7p8cf5mnhd";
+  rev    = "0c957d2d85787350083ac990b35428e665f392a5";
+  sha256 = "1b1d8k5qazm7x6vcprvl9hwsw3kk44pv8wcbgny53rniv7vv22ia";
 }

From 4542cca0b21d019ff428093c308a10426ed91228 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 25 Jul 2019 21:30:46 +0200
Subject: [PATCH 4/8] trace-cmd: 2.8-0c957d2 -> 2.9-dev-1517dc3

---
 pkgs/os-specific/linux/trace-cmd/default.nix     |  6 +++++-
 .../linux/trace-cmd/fix-Makefiles.patch          | 16 ++++++----------
 pkgs/os-specific/linux/trace-cmd/kernelshark.nix | 15 +++++++--------
 pkgs/os-specific/linux/trace-cmd/src.nix         |  4 ++--
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 67f6f9af93e..0759839a9c0 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -4,7 +4,7 @@ let
   shortRev = builtins.substring 0 7 srcSpec.rev;
 in stdenv.mkDerivation rec {
   name    = "trace-cmd-${version}";
-  version = "2.8-${shortRev}";
+  version = "2.9-dev-${shortRev}";
 
   src = fetchgit srcSpec;
 
@@ -29,6 +29,10 @@ in stdenv.mkDerivation rec {
     "BASH_COMPLETE_DIR=${placeholder "out"}/etc/bash_completion.d"
   ];
 
+  postInstall = ''
+    mv $dev/include/trace-cmd/traceevent $dev/include/traceevent
+  '';
+
   meta = with stdenv.lib; {
     description = "User-space tools for the Linux kernel ftrace subsystem";
     homepage    = http://kernelshark.org/;
diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
index 9d0be8b4200..218460eddb3 100644
--- a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
+++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
@@ -14,10 +14,10 @@ index 21e42fd..b74c912 100644
  clean:
  	(cd $(obj); \
 diff --git a/Makefile b/Makefile
-index cde45f8..d218ecc 100644
+index 3e63e9e..65743c6 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -281,7 +281,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
+@@ -292,7 +292,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
  libtracecmd.a: $(LIBTRACECMD_STATIC)
  libtracecmd.so: $(LIBTRACECMD_SHARED)
  
@@ -26,20 +26,16 @@ index cde45f8..d218ecc 100644
  
  plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir
  	$(Q)$(MAKE) -C $(src)/plugins
-@@ -337,8 +337,12 @@ install_gui: install_cmd gui
+@@ -348,6 +348,8 @@ install_gui: install_cmd gui
  install_libs: libs
  	$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
  	$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
 +	$(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ))
 +	$(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ))
- 	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ))
-+	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ))
+ 	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
+ 	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
  	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
-+	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-filter-hash.h,$(includedir_SQ))
- 
- doc:
- 	$(MAKE) -C $(src)/Documentation all
-@@ -346,6 +350,9 @@ doc:
+@@ -359,6 +361,9 @@ doc:
  doc_clean:
  	$(MAKE) -C $(src)/Documentation clean
  
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index f634746662d..96e237fc459 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd }:
+{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config, doxygen, graphviz }:
 let
   srcSpec = import ./src.nix;
   shortRev = builtins.substring 0 7 srcSpec.rev;
@@ -10,17 +10,16 @@ in mkDerivation rec {
 
   sourceRoot = "trace-cmd-${shortRev}/kernel-shark";
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake doxygen graphviz ];
 
-  buildInputs = [ qtbase json_c mesa_glu freeglut ];
+  buildInputs = [ qtbase json_c mesa_glu freeglut pkg-config ];
 
   cmakeFlags = [
     "-D_INSTALL_PREFIX=${placeholder "out"}"
-    "-DTRACECMD_BIN_DIR=${trace-cmd}/bin"
-    "-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include/trace-cmd"
-    "-DTRACECMD_LIBRARY_DIR=${trace-cmd.lib}/lib"
-    "-DTRACEEVENT_INCLUDE_DIR=${trace-cmd.dev}/include/trace-cmd"
-    "-DTRACEEVENT_LIBRARY_DIR=${trace-cmd.lib}/lib"
+    "-DTRACECMD_EXECUTABLE=${trace-cmd}/bin/trace-cmd"
+    "-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include"
+    "-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/libtracecmd.a"
+    "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/libtraceevent.a"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/pkgs/os-specific/linux/trace-cmd/src.nix
index ea239219360..5d5ae0a8c91 100644
--- a/pkgs/os-specific/linux/trace-cmd/src.nix
+++ b/pkgs/os-specific/linux/trace-cmd/src.nix
@@ -1,5 +1,5 @@
 {
   url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
-  rev    = "0c957d2d85787350083ac990b35428e665f392a5";
-  sha256 = "1b1d8k5qazm7x6vcprvl9hwsw3kk44pv8wcbgny53rniv7vv22ia";
+  rev    = "1517dc3a15606850b1b52b789cbdeb554e2c68c6";
+  sha256 = "112ccsnza3r3ha8ql733sn256bz0xjhzyw3avbr214r36aag4zrj";
 }

From 585de35cd6db1123b547c792a1c7d509d6657edb Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 25 Jul 2019 22:13:17 +0200
Subject: [PATCH 5/8] kernelshark: install documentation

---
 .../linux/trace-cmd/fix-Makefiles.patch           | 15 ++++++++++-----
 pkgs/os-specific/linux/trace-cmd/kernelshark.nix  | 12 +++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
index 218460eddb3..0bf9f501ca3 100644
--- a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
+++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
@@ -1,20 +1,22 @@
 diff --git a/Documentation/Makefile b/Documentation/Makefile
-index 21e42fd..b74c912 100644
+index 21e42fd..826361d 100644
 --- a/Documentation/Makefile
 +++ b/Documentation/Makefile
-@@ -108,7 +108,9 @@ $(IMGS_INSTALL): %.png.install : %.png force
+@@ -108,7 +108,11 @@ $(IMGS_INSTALL): %.png.install : %.png force
  
  GUI_INSTALL = $(HTML_INSTALL) $(IMGS_INSTALL)
  
 -install: $(MAN1_INSTALL) $(MAN5_INSTALL) $(GUI_INSTALL)
 +install_man: $(MAN1_INSTALL) $(MAN5_INSTALL)
 +
-+install: install_man $(GUI_INSTALL)
++install_gui: $(GUI_INSTALL)
++
++install: install_man install_gui
  
  clean:
  	(cd $(obj); \
 diff --git a/Makefile b/Makefile
-index 3e63e9e..65743c6 100644
+index 3e63e9e..146fe88 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -292,7 +292,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
@@ -35,12 +37,15 @@ index 3e63e9e..65743c6 100644
  	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
  	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
  	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
-@@ -359,6 +361,9 @@ doc:
+@@ -359,6 +361,12 @@ doc:
  doc_clean:
  	$(MAKE) -C $(src)/Documentation clean
  
 +install_man:
 +	$(MAKE) -C $(src)/Documentation install_man
++
++install_gui_docs:
++	$(MAKE) -C $(src)/Documentation install_gui
 +
  install_doc:
  	$(MAKE) -C $(src)/Documentation install
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index 96e237fc459..2ca6eff2608 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -8,7 +8,11 @@ in mkDerivation rec {
 
   src = fetchgit srcSpec;
 
-  sourceRoot = "trace-cmd-${shortRev}/kernel-shark";
+  patches = [ ./fix-Makefiles.patch ];
+
+  outputs = [ "out" "doc" ];
+
+  preConfigure = "pushd kernel-shark";
 
   nativeBuildInputs = [ cmake doxygen graphviz ];
 
@@ -22,6 +26,12 @@ in mkDerivation rec {
     "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/libtraceevent.a"
   ];
 
+  preInstall = ''
+    popd
+    make install_gui_docs prefix=$doc
+    pushd kernel-shark/build
+  '';
+
   meta = with stdenv.lib; {
     description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem";
     homepage    = http://kernelshark.org/;

From d9e3118ab00c2d60159902acbd3514e35fdbd8bf Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 25 Jul 2019 22:17:43 +0200
Subject: [PATCH 6/8] kernelshark: remove doxygen and graphviz because they
 aren't used

---
 pkgs/os-specific/linux/trace-cmd/kernelshark.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index 2ca6eff2608..7cf8c98335f 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config, doxygen, graphviz }:
+{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
 let
   srcSpec = import ./src.nix;
   shortRev = builtins.substring 0 7 srcSpec.rev;
@@ -14,7 +14,7 @@ in mkDerivation rec {
 
   preConfigure = "pushd kernel-shark";
 
-  nativeBuildInputs = [ cmake doxygen graphviz ];
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [ qtbase json_c mesa_glu freeglut pkg-config ];
 

From 7803c04c7c5b1dd9d387501727ed12573218e54d Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 27 Jul 2019 20:02:58 +0200
Subject: [PATCH 7/8] kernelshark: 0.9.8-f97e28a -> 1.0.0

---
 .../linux/trace-cmd/fix-Makefiles.patch       | 21 +++++++++++++++----
 .../linux/trace-cmd/kernelshark.nix           |  9 +++-----
 pkgs/os-specific/linux/trace-cmd/src.nix      |  4 ++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
index 0bf9f501ca3..547e6385bb6 100644
--- a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
+++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
@@ -16,10 +16,10 @@ index 21e42fd..826361d 100644
  clean:
  	(cd $(obj); \
 diff --git a/Makefile b/Makefile
-index 3e63e9e..146fe88 100644
+index 3afd982..8dd55ba 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -292,7 +292,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
+@@ -293,7 +293,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
  libtracecmd.a: $(LIBTRACECMD_STATIC)
  libtracecmd.so: $(LIBTRACECMD_SHARED)
  
@@ -28,7 +28,7 @@ index 3e63e9e..146fe88 100644
  
  plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir
  	$(Q)$(MAKE) -C $(src)/plugins
-@@ -348,6 +348,8 @@ install_gui: install_cmd gui
+@@ -349,6 +349,8 @@ install_gui: install_cmd gui
  install_libs: libs
  	$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
  	$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
@@ -37,7 +37,7 @@ index 3e63e9e..146fe88 100644
  	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
  	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
  	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
-@@ -359,6 +361,12 @@ doc:
+@@ -360,6 +362,12 @@ doc:
  doc_clean:
  	$(MAKE) -C $(src)/Documentation clean
  
@@ -50,3 +50,16 @@ index 3e63e9e..146fe88 100644
  install_doc:
  	$(MAKE) -C $(src)/Documentation install
  
+diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
+index 21494cc..d91c365 100644
+--- a/kernel-shark/src/CMakeLists.txt
++++ b/kernel-shark/src/CMakeLists.txt
+@@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
+             DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
+ 
+     install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"
+-            DESTINATION /usr/share/polkit-1/actions/)
++            DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/)
+ 
+     install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
+             DESTINATION ${_INSTALL_PREFIX}/bin/)
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index 7cf8c98335f..d220fe55672 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -1,12 +1,9 @@
 { stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
-let
-  srcSpec = import ./src.nix;
-  shortRev = builtins.substring 0 7 srcSpec.rev;
-in mkDerivation rec {
+mkDerivation rec {
   pname = "kernelshark";
-  version = "0.9.8-${shortRev}";
+  version = "1.0.0";
 
-  src = fetchgit srcSpec;
+  src = fetchgit (import ./src.nix);
 
   patches = [ ./fix-Makefiles.patch ];
 
diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/pkgs/os-specific/linux/trace-cmd/src.nix
index 5d5ae0a8c91..8c3ef7220a8 100644
--- a/pkgs/os-specific/linux/trace-cmd/src.nix
+++ b/pkgs/os-specific/linux/trace-cmd/src.nix
@@ -1,5 +1,5 @@
 {
   url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
-  rev    = "1517dc3a15606850b1b52b789cbdeb554e2c68c6";
-  sha256 = "112ccsnza3r3ha8ql733sn256bz0xjhzyw3avbr214r36aag4zrj";
+  rev    = "f97e28a331aba716cd431ce4b7f7fc1583875ae7";
+  sha256 = "002axw1v53jk343l101hvk0ip6agl9idrc8k7d7r18mmybw637iv";
 }

From c9c895062fc3fa81ec1625f0b011603398f174e4 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 27 Jul 2019 20:19:08 +0200
Subject: [PATCH 8/8] trace-cmd/kernelshark: downgrade to the
 trace-cmd-stable-v2.8 branch

---
 pkgs/os-specific/linux/trace-cmd/default.nix  |  9 +++-----
 .../linux/trace-cmd/fix-Makefiles.patch       | 21 ++++---------------
 .../linux/trace-cmd/kernelshark.nix           |  4 ++--
 pkgs/os-specific/linux/trace-cmd/src.nix      |  4 ++--
 4 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 0759839a9c0..3133602b44e 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -1,12 +1,9 @@
 { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
-let
-  srcSpec = import ./src.nix;
-  shortRev = builtins.substring 0 7 srcSpec.rev;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name    = "trace-cmd-${version}";
-  version = "2.9-dev-${shortRev}";
+  version = "2.8.3";
 
-  src = fetchgit srcSpec;
+  src = fetchgit (import ./src.nix);
 
   patches = [ ./fix-Makefiles.patch ];
 
diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
index 547e6385bb6..0d6f5c5d8bf 100644
--- a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
+++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
@@ -16,10 +16,10 @@ index 21e42fd..826361d 100644
  clean:
  	(cd $(obj); \
 diff --git a/Makefile b/Makefile
-index 3afd982..8dd55ba 100644
+index 2bcc383..107ead0 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -293,7 +293,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
+@@ -289,7 +289,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
  libtracecmd.a: $(LIBTRACECMD_STATIC)
  libtracecmd.so: $(LIBTRACECMD_SHARED)
  
@@ -28,7 +28,7 @@ index 3afd982..8dd55ba 100644
  
  plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir
  	$(Q)$(MAKE) -C $(src)/plugins
-@@ -349,6 +349,8 @@ install_gui: install_cmd gui
+@@ -345,6 +345,8 @@ install_gui: install_cmd gui
  install_libs: libs
  	$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
  	$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
@@ -37,7 +37,7 @@ index 3afd982..8dd55ba 100644
  	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
  	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
  	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
-@@ -360,6 +362,12 @@ doc:
+@@ -356,6 +358,12 @@ doc:
  doc_clean:
  	$(MAKE) -C $(src)/Documentation clean
  
@@ -50,16 +50,3 @@ index 3afd982..8dd55ba 100644
  install_doc:
  	$(MAKE) -C $(src)/Documentation install
  
-diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
-index 21494cc..d91c365 100644
---- a/kernel-shark/src/CMakeLists.txt
-+++ b/kernel-shark/src/CMakeLists.txt
-@@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
-             DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
- 
-     install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"
--            DESTINATION /usr/share/polkit-1/actions/)
-+            DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/)
- 
-     install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
-             DESTINATION ${_INSTALL_PREFIX}/bin/)
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index d220fe55672..8e49af77139 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -1,7 +1,7 @@
 { stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
 mkDerivation rec {
   pname = "kernelshark";
-  version = "1.0.0";
+  version = "0.9.8";
 
   src = fetchgit (import ./src.nix);
 
@@ -17,7 +17,7 @@ mkDerivation rec {
 
   cmakeFlags = [
     "-D_INSTALL_PREFIX=${placeholder "out"}"
-    "-DTRACECMD_EXECUTABLE=${trace-cmd}/bin/trace-cmd"
+    "-DTRACECMD_BIN_DIR=${trace-cmd}/bin"
     "-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include"
     "-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/libtracecmd.a"
     "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/libtraceevent.a"
diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/pkgs/os-specific/linux/trace-cmd/src.nix
index 8c3ef7220a8..836e71b1851 100644
--- a/pkgs/os-specific/linux/trace-cmd/src.nix
+++ b/pkgs/os-specific/linux/trace-cmd/src.nix
@@ -1,5 +1,5 @@
 {
   url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
-  rev    = "f97e28a331aba716cd431ce4b7f7fc1583875ae7";
-  sha256 = "002axw1v53jk343l101hvk0ip6agl9idrc8k7d7r18mmybw637iv";
+  rev    = "138c70106835ee0f05879e7f2f46bca8dae7ca99"; # branch: trace-cmd-stable-v2.8
+  sha256 = "1grpip7lywf98nsm7ql1d6bgc0ky0672savr8jz3a8hf9ny265nx";
 }