From c9c895062fc3fa81ec1625f0b011603398f174e4 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 27 Jul 2019 20:19:08 +0200 Subject: [PATCH] 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"; }