diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/by-name/rm/rmlint/package.nix similarity index 93% rename from pkgs/tools/misc/rmlint/default.nix rename to pkgs/by-name/rm/rmlint/package.nix index 3646164672bb..069ff9e2dab7 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/by-name/rm/rmlint/package.nix @@ -15,7 +15,6 @@ polkit, python3, scons, - sphinx, util-linux, wrapGAppsHook3, withGui ? false, @@ -23,15 +22,15 @@ assert withGui -> !stdenv.hostPlatform.isDarwin; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rmlint"; version = "2.10.2"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; - rev = "v${version}"; - sha256 = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo="; }; patches = [ @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - sphinx + python3.pkgs.sphinx scons ] ++ lib.optionals withGui [ @@ -103,4 +102,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "rmlint"; }; -} +}) diff --git a/pkgs/tools/misc/rmlint/scons-nix-env.patch b/pkgs/by-name/rm/rmlint/scons-nix-env.patch similarity index 100% rename from pkgs/tools/misc/rmlint/scons-nix-env.patch rename to pkgs/by-name/rm/rmlint/scons-nix-env.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c0c1ace4016..e5dbf81836bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2963,10 +2963,6 @@ with pkgs; rmate = rubyPackages.rmate; - rmlint = callPackage ../tools/misc/rmlint { - inherit (python3Packages) sphinx; - }; - rpatool = with python3Packages; toPythonApplication rpatool; rpm = callPackage ../tools/package-management/rpm {