From 410f2a9dabe52c490858618cf827b82828cf5938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 31 Jul 2014 15:48:06 +0200
Subject: [PATCH] lttng: align attribute name with package name
lttngModules => lttng-modules
lttngTools => lttng-tools
lttngUst => lttng-ust
But keep the old attributes around for backward compatibility.
---
pkgs/development/tools/misc/lttng-tools/default.nix | 4 ++--
pkgs/top-level/all-packages.nix | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 541385d8bec..5758500d86f 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst, kmod }:
+{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }:
stdenv.mkDerivation rec {
name = "lttng-tools-2.4.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr";
};
- buildInputs = [ popt libuuid liburcu lttngUst ];
+ buildInputs = [ popt libuuid liburcu lttng-ust ];
prePatch = ''
sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98f4d27669e..2a9a219da17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4006,9 +4006,9 @@ let
ltrace = callPackage ../development/tools/misc/ltrace { };
- lttngTools = callPackage ../development/tools/misc/lttng-tools { };
+ lttng-tools = callPackage ../development/tools/misc/lttng-tools { };
- lttngUst = callPackage ../development/tools/misc/lttng-ust { };
+ lttng-ust = callPackage ../development/tools/misc/lttng-ust { };
lttv = callPackage ../development/tools/misc/lttv { };
@@ -7439,7 +7439,7 @@ let
ktap = callPackage ../os-specific/linux/ktap { };
- lttngModules = callPackage ../os-specific/linux/lttng-modules { };
+ lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
@@ -11418,6 +11418,9 @@ let
# Attributes for backward compatibility.
adobeReader = adobe-reader;
asciidocFull = asciidoc-full; # added 2014-06-22
+ lttngModules = lttng-modules; # added 2014-07-31
+ lttngTools = lttng-tools; # added 2014-07-31
+ lttngUst = lttng-ust; # added 2014-07-31
}; in self; in pkgs