From 3cefeee6a40c6b430d9abbf00759d82a631128d7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 28 Jun 2022 00:12:37 -0300 Subject: [PATCH 1/2] all-packages: reorder file-managers There are many file manager expressions scattered. Let's reunite them! --- pkgs/top-level/all-packages.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ace5a916435..77a9dbcb6ac5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1590,12 +1590,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 { }; @@ -1611,6 +1617,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 @@ -26087,8 +26099,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 { @@ -28647,8 +28657,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 { }; @@ -28776,8 +28784,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 { }; @@ -29379,8 +29385,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 {}; @@ -30943,8 +30947,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; @@ -31102,10 +31104,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 {}; From e3b17ac5c33726c79d98de308e48a11742471201 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 28 Jun 2022 00:18:01 -0300 Subject: [PATCH 2/2] krusader: move to file-managers --- .../file-managers/krusader/default.nix | 47 +++++++++++++++++++ pkgs/applications/misc/krusader/default.nix | 26 ---------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/file-managers/krusader/default.nix delete mode 100644 pkgs/applications/misc/krusader/default.nix diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix new file mode 100644 index 000000000000..9895cc108ef6 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix deleted file mode 100644 index 585dfe3e04f1..000000000000 --- a/pkgs/applications/misc/krusader/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77a9dbcb6ac5..2b74ecfea2f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1582,6 +1582,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 { }; @@ -27928,8 +27930,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 { };