Merge pull request #179400 from AndersonTorres/file-managers

Reorder file managers

pkgs/applications/file-managers/krusader/default.nix

@@ -0,0 +1,47 @@
+{ mkDerivation
+, lib
+, fetchurl
+, extra-cmake-modules
+, kdoctools
+, wrapGAppsHook
+, karchive
+, kconfig
+, kcrash
+, kguiaddons
+, kinit
+, kparts
+, kwindowsystem
+}:
+
+mkDerivation rec {
+  pname = "krusader";
+  version = "2.7.2";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+    hash = "sha256-QaOaQ7PELdHR7K6obfMMr/agYf7MHWb2CFmyo8qXYQk=";
+  };
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    wrapGAppsHook
+  ];
+
+  propagatedBuildInputs = [
+    karchive
+    kconfig
+    kcrash
+    kguiaddons
+    kinit
+    kparts
+    kwindowsystem
+  ];
+
+  meta = with lib; {
+    homepage = "http://www.krusader.org";
+    description = "Norton/Total Commander clone for KDE";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ sander turion ];
+  };
+}

pkgs/applications/misc/krusader/default.nix

@@ -1,26 +0,0 @@
-{
-  mkDerivation, fetchurl, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
-  karchive, kconfig, kcrash, kguiaddons, kinit, kparts, kwindowsystem
-}:
-
-mkDerivation rec {
-  pname = "krusader";
-  version = "2.7.2";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
-    sha256 = "02b1jz5a7cjr13v6c7fczrhs1xmg1krnva5fxk8x2bf4nd1rm8s1";
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-
-  propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ];
-
-  meta = with lib; {
-    description = "Norton/Total Commander clone for KDE";
-    homepage = "http://www.krusader.org";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ sander turion ];
-  };
-}

pkgs/top-level/all-packages.nix

@@ -1586,6 +1586,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation;
   };
 
+  krusader = libsForQt5.callPackage ../applications/file-managers/krusader { };
+
   lf = callPackage ../applications/file-managers/lf { };
 
   llama = callPackage ../applications/file-managers/llama { };
@@ -1594,12 +1596,18 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
+  mucommander = callPackage ../applications/file-managers/mucommander { };
+
   nimmm = callPackage ../applications/file-managers/nimmm { };
 
   nnn = callPackage ../applications/file-managers/nnn { };
 
   noice = callPackage ../applications/file-managers/noice { };
 
+  pcmanfm = callPackage ../applications/file-managers/pcmanfm { };
+
+  portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { };
+
   ranger = callPackage ../applications/file-managers/ranger { };
 
   sfm = callPackage ../applications/file-managers/sfm { };
@@ -1615,6 +1623,12 @@ with pkgs;
     inherit lib udisks2 python3;
   };
 
+  worker = callPackage ../applications/file-managers/worker { };
+
+  xfe = callPackage ../applications/file-managers/xfe {
+    fox = fox_1_6;
+  };
+
   ytree = callPackage ../applications/file-managers/ytree { };
 
   ### APPLICATIONS/TERMINAL-EMULATORS
@@ -26096,8 +26110,6 @@ with pkgs;
 
   dfasma = libsForQt5.callPackage ../applications/audio/dfasma { };
 
-  dfilemanager = libsForQt5.callPackage ../applications/file-managers/dfilemanager { };
-
   dht = callPackage ../applications/networking/p2p/dht { };
 
   dia = callPackage ../applications/graphics/dia {
@@ -27927,8 +27939,6 @@ with pkgs;
 
   krita = libsForQt5.callPackage ../applications/graphics/krita { };
 
-  krusader = libsForQt5.callPackage ../applications/misc/krusader { };
-
   ksuperkey = callPackage ../tools/X11/ksuperkey { };
 
   ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { };
@@ -28656,8 +28666,6 @@ with pkgs;
 
   mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { };
 
-  mucommander = callPackage ../applications/file-managers/mucommander { };
-
   multimarkdown = callPackage ../tools/typesetting/multimarkdown { };
 
   multimon-ng = callPackage ../applications/radio/multimon-ng { };
@@ -28785,8 +28793,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  pcmanfm = callPackage ../applications/file-managers/pcmanfm { };
-
   pcmanfm-qt = lxqt.pcmanfm-qt;
 
   pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { };
@@ -29388,8 +29394,6 @@ with pkgs;
 
   ponymix = callPackage ../applications/audio/ponymix { };
 
-  portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { };
-
   pothos = libsForQt5.callPackage ../applications/radio/pothos { };
 
   potrace = callPackage ../applications/graphics/potrace {};
@@ -30952,8 +30956,6 @@ with pkgs;
 
   wordgrinder = callPackage ../applications/office/wordgrinder { };
 
-  worker = callPackage ../applications/file-managers/worker { };
-
   workrave = callPackage ../applications/misc/workrave {
     inherit (python27Packages) cheetah;
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
@@ -31111,10 +31113,6 @@ with pkgs;
   win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { };
   win-signed-gplpv-drivers = callPackage ../applications/virtualization/driver/win-signed-gplpv-drivers { };
 
-  xfe = callPackage ../applications/file-managers/xfe {
-    fox = fox_1_6;
-  };
-
   xfig = callPackage ../applications/graphics/xfig { };
 
   xfractint = callPackage ../applications/graphics/xfractint {};