diff options
| author | Shea Levy <shea@shealevy.com> | 2014-01-02 00:03:49 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-01-02 00:03:49 -0500 |
| commit | 6b7ede300f0cc64f8e7e1ca279b56bd8a4524d10 (patch) | |
| tree | 81800fb212a3d7bdb33198c6d76d8a59f09cdf76 /pkgs | |
| parent | 2c38df1c5bd2f79b9c6f28118ae0520fdd95974b (diff) | |
| download | nixpkgs-6b7ede300f0cc64f8e7e1ca279b56bd8a4524d10.tar nixpkgs-6b7ede300f0cc64f8e7e1ca279b56bd8a4524d10.tar.gz nixpkgs-6b7ede300f0cc64f8e7e1ca279b56bd8a4524d10.tar.bz2 nixpkgs-6b7ede300f0cc64f8e7e1ca279b56bd8a4524d10.tar.lz nixpkgs-6b7ede300f0cc64f8e7e1ca279b56bd8a4524d10.tar.xz nixpkgs-6b7ede300f0cc64f8e7e1ca279b56bd8a4524d10.tar.zst nixpkgs-6b7ede300f0cc64f8e7e1ca279b56bd8a4524d10.zip | |
systemtap: Remove from linuxPackagesFor
It doesn't seem to depend on the kernel in any way. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/profiling/systemtap/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index bdd11b88da5..884091c1636 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,9 +1,9 @@ -{ fetchurl, stdenv, linux, elfutils, latex2html, xmlto, docbook_xml_dtd_412 +{ fetchurl, stdenv, elfutils, latex2html, xmlto, docbook_xml_dtd_412 , libxml2, docbook_xsl, libxslt, texLive, texLiveExtra, ghostscript, pkgconfig , gtkmm, libglademm, boost, perl, sqlite }: stdenv.mkDerivation rec { - name = "systemtap-1.2-${linux.version}"; + name = "systemtap-1.2"; src = fetchurl { url = "http://sources.redhat.com/systemtap/ftp/releases/${name}.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94cbd83f93a..c595cba8f06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6910,11 +6910,6 @@ let inherit (gnome) libglade; }; - systemtap = callPackage ../development/tools/profiling/systemtap { - linux = self.kernelDev; - inherit (gnome) libglademm; - }; - tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; v86d = callPackage ../os-specific/linux/v86d { }; @@ -7115,6 +7110,11 @@ let systemd = callPackage ../os-specific/linux/systemd { }; + systemtap = callPackage ../development/tools/profiling/systemtap { + inherit (gnome) libglademm; + }; + + # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get # LVM2 working in systemd. systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: { |