diff --git a/pkgs/os-specific/linux/kernel/lockdep.nix b/pkgs/os-specific/linux/lockdep/default.nix similarity index 58% rename from pkgs/os-specific/linux/kernel/lockdep.nix rename to pkgs/os-specific/linux/lockdep/default.nix index 4b1805fc39e8..77cb43a7b53c 100644 --- a/pkgs/os-specific/linux/kernel/lockdep.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -1,9 +1,13 @@ -{ stdenv, kernel }: +{ stdenv, fetchurl }: -assert stdenv.lib.versionAtLeast kernel.version "3.14"; -stdenv.mkDerivation { - name = "lockdep-linux-${kernel.version}"; - inherit (kernel) src patches; +stdenv.mkDerivation rec { + name = "lockdep-${version}"; + version = "3.14"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa"; + }; preConfigure = "cd tools/lib/lockdep"; installPhase = '' @@ -16,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - description = "User-space locking validation via the kernel"; + description = "userspace locking validation tool built on the Linux kernel"; homepage = "https://kernel.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4862a0cdcf68..016f95820661 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7065,8 +7065,6 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; - lockdep = callPackage ../os-specific/linux/kernel/lockdep.nix { }; - psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; spl = callPackage ../os-specific/linux/spl/default.nix { }; @@ -7131,6 +7129,8 @@ let lm_sensors = callPackage ../os-specific/linux/lm-sensors { }; + lockdep = callPackage ../os-specific/linux/lockdep { }; + lsiutil = callPackage ../os-specific/linux/lsiutil { }; kmod = callPackage ../os-specific/linux/kmod { };