From ba92e37183b29db012768b4d151add7e7cfb01b3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 21:44:25 -0300 Subject: [PATCH 01/28] doc/contributing/coding-conventions: add a section about file managers --- doc/contributing/coding-conventions.chapter.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 9a01b5a0828..bc49fdc4723 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -338,6 +338,10 @@ A (typically large) program with a distinct user interface, primarily used inter - `applications/terminal-emulators` (e.g. `alacritty` or `rxvt` or `termite`) +- **If it’s a _file manager_:** + + - `applications/file-managers` (e.g. `mc` or `ranger` or `pcmanfm`) + - **If it’s for _video playback / editing_:** - `applications/video` (e.g. `vlc`) From fb89bc5fca012787bfc9396ea5a5b6d61b3b8e1f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 21:38:41 -0300 Subject: [PATCH 02/28] cfm: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/cfm/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) rename pkgs/applications/{misc => file-managers}/cfm/default.nix (94%) diff --git a/pkgs/applications/misc/cfm/default.nix b/pkgs/applications/file-managers/cfm/default.nix similarity index 94% rename from pkgs/applications/misc/cfm/default.nix rename to pkgs/applications/file-managers/cfm/default.nix index 4e56f376c80..0955403e7eb 100644 --- a/pkgs/applications/misc/cfm/default.nix +++ b/pkgs/applications/file-managers/cfm/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "cfm"; @@ -17,10 +20,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + homepage = "https://github.com/willeccles/cfm"; description = "Simple and fast TUI file manager with no dependencies"; license = licenses.mpl20; maintainers = with maintainers; [ lom ]; - homepage = "https://github.com/willeccles/cfm"; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 233ae5c9a2b..963a2a02f5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3041,7 +3041,7 @@ with pkgs; cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; - cfm = callPackage ../applications/misc/cfm { }; + cfm = callPackage ../applications/file-managers/cfm { }; charliecloud = callPackage ../applications/virtualization/charliecloud { }; From f47027dfd0cf76bae4b4c59511f0a2153b6a5e86 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 21:46:29 -0300 Subject: [PATCH 03/28] clex: move to applications/file-managers --- .../{tools/misc => applications/file-managers}/clex/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/misc => applications/file-managers}/clex/default.nix (100%) diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/applications/file-managers/clex/default.nix similarity index 100% rename from pkgs/tools/misc/clex/default.nix rename to pkgs/applications/file-managers/clex/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 963a2a02f5e..98242d8cd70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4996,7 +4996,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - clex = callPackage ../tools/misc/clex { }; + clex = callPackage ../applications/file-managers/clex { }; client-ip-echo = callPackage ../servers/misc/client-ip-echo { }; From 98b11298c2929728ddfbbb352f738e3bb76c1a87 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 21:54:10 -0300 Subject: [PATCH 04/28] clifm: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/clifm/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/clifm/default.nix (100%) diff --git a/pkgs/applications/misc/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix similarity index 100% rename from pkgs/applications/misc/clifm/default.nix rename to pkgs/applications/file-managers/clifm/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98242d8cd70..f6a4188bf13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -328,7 +328,7 @@ with pkgs; chrysalis = callPackage ../applications/misc/chrysalis { }; - clifm = callPackage ../applications/misc/clifm { }; + clifm = callPackage ../applications/file-managers/clifm { }; clj-kondo = callPackage ../development/tools/clj-kondo { }; From e5d16d10911b70d39ac6268f2b86477b6d35c4d1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 21:55:34 -0300 Subject: [PATCH 05/28] dfilemanager: move to applications/file-managers --- .../{misc => file-managers}/dfilemanager/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/dfilemanager/default.nix (100%) diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/file-managers/dfilemanager/default.nix similarity index 100% rename from pkgs/applications/misc/dfilemanager/default.nix rename to pkgs/applications/file-managers/dfilemanager/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6a4188bf13..c06effdc497 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26021,7 +26021,7 @@ with pkgs; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; + dfilemanager = libsForQt5.callPackage ../applications/file-managers/dfilemanager { }; dht = callPackage ../applications/networking/p2p/dht { }; From a0b1b66a067d0a7709a8bf683d1fba722d991be6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 22:26:46 -0300 Subject: [PATCH 06/28] joshuto: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/joshuto/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/joshuto/default.nix (100%) diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/file-managers/joshuto/default.nix similarity index 100% rename from pkgs/applications/misc/joshuto/default.nix rename to pkgs/applications/file-managers/joshuto/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c06effdc497..3f37bd8f38e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7471,7 +7471,7 @@ with pkgs; jo = callPackage ../development/tools/jo { }; - joshuto = callPackage ../applications/misc/joshuto { + joshuto = callPackage ../applications/file-managers/joshuto { inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; }; From 6c8b81b0f1d593fba35ee40b30aaa9d3e9d54e38 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 22:21:41 -0300 Subject: [PATCH 07/28] llama: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/llama/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/llama/default.nix (100%) diff --git a/pkgs/applications/misc/llama/default.nix b/pkgs/applications/file-managers/llama/default.nix similarity index 100% rename from pkgs/applications/misc/llama/default.nix rename to pkgs/applications/file-managers/llama/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f37bd8f38e..14a7e65fc1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19108,7 +19108,7 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; - llama = callPackage ../applications/misc/llama { }; + llama = callPackage ../applications/file-managers/llama { }; malcontent = callPackage ../development/libraries/malcontent { }; From aa1742748425e3988717ce0e562232139881d506 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 22:49:42 -0300 Subject: [PATCH 08/28] lf: move to applications/file-managers --- pkgs/{tools/misc => applications/file-managers}/lf/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/misc => applications/file-managers}/lf/default.nix (100%) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix similarity index 100% rename from pkgs/tools/misc/lf/default.nix rename to pkgs/applications/file-managers/lf/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14a7e65fc1f..24ff767786b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7670,7 +7670,7 @@ with pkgs; less = callPackage ../tools/misc/less { }; - lf = callPackage ../tools/misc/lf {}; + lf = callPackage ../applications/file-managers/lf { }; lha = callPackage ../tools/archivers/lha { }; From 13d788ff956628ecb481787470d8bf10a95221b4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 22:51:59 -0300 Subject: [PATCH 09/28] mc: move to applications/file-managers --- pkgs/{tools/misc => applications/file-managers}/mc/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/misc => applications/file-managers}/mc/default.nix (100%) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix similarity index 100% rename from pkgs/tools/misc/mc/default.nix rename to pkgs/applications/file-managers/mc/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24ff767786b..da41d52b4d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8399,7 +8399,7 @@ with pkgs; mbutil = python3Packages.callPackage ../applications/misc/mbutil { }; - mc = callPackage ../tools/misc/mc { + mc = callPackage ../applications/file-managers/mc { inherit (darwin) autoSignDarwinBinariesHook; }; From fbe60ee310367e279c97d568eb958a3ca4544fc1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:11:39 -0300 Subject: [PATCH 10/28] mucommander: move to applications/file-managers --- .../{misc => file-managers}/mucommander/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/mucommander/default.nix (100%) diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix similarity index 100% rename from pkgs/applications/misc/mucommander/default.nix rename to pkgs/applications/file-managers/mucommander/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da41d52b4d3..05e70228c74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28577,7 +28577,7 @@ with pkgs; mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { }; - mucommander = callPackage ../applications/misc/mucommander { }; + mucommander = callPackage ../applications/file-managers/mucommander { }; multimarkdown = callPackage ../tools/typesetting/multimarkdown { }; From 2e6338d62e8bdeeb7cf0001b1ecd704505a3fc8a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:12:31 -0300 Subject: [PATCH 11/28] nimmm: move to applications/file-managers --- .../{terminal-emulators => file-managers}/nimmm/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{terminal-emulators => file-managers}/nimmm/default.nix (100%) diff --git a/pkgs/applications/terminal-emulators/nimmm/default.nix b/pkgs/applications/file-managers/nimmm/default.nix similarity index 100% rename from pkgs/applications/terminal-emulators/nimmm/default.nix rename to pkgs/applications/file-managers/nimmm/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05e70228c74..8b0d208977d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1620,7 +1620,7 @@ with pkgs; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - nimmm = callPackage ../applications/terminal-emulators/nimmm { }; + nimmm = callPackage ../applications/file-managers/nimmm { }; roxterm = callPackage ../applications/terminal-emulators/roxterm { }; From e284d732bb834c598dc039981504e163b4e11dfb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:20:53 -0300 Subject: [PATCH 12/28] pcmanfm: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/pcmanfm/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/pcmanfm/default.nix (100%) diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/file-managers/pcmanfm/default.nix similarity index 100% rename from pkgs/applications/misc/pcmanfm/default.nix rename to pkgs/applications/file-managers/pcmanfm/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b0d208977d..ac42af6f571 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28706,7 +28706,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; - pcmanfm = callPackage ../applications/misc/pcmanfm { }; + pcmanfm = callPackage ../applications/file-managers/pcmanfm { }; pcmanfm-qt = lxqt.pcmanfm-qt; From 032bbe845dd73c8031ae50241b9a171526755651 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:22:26 -0300 Subject: [PATCH 13/28] portfolio-filemanager: move to applications/file-managers --- .../{misc => file-managers}/portfolio-filemanager/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/portfolio-filemanager/default.nix (100%) diff --git a/pkgs/applications/misc/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix similarity index 100% rename from pkgs/applications/misc/portfolio-filemanager/default.nix rename to pkgs/applications/file-managers/portfolio-filemanager/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac42af6f571..47e37155301 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29309,7 +29309,7 @@ with pkgs; ponymix = callPackage ../applications/audio/ponymix { }; - portfolio-filemanager = callPackage ../applications/misc/portfolio-filemanager { }; + portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { }; pothos = libsForQt5.callPackage ../applications/radio/pothos { }; From b9432b63ab3696a2db194eed84975d4335ed897e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:24:35 -0300 Subject: [PATCH 14/28] ranger: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/ranger/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/ranger/default.nix (100%) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix similarity index 100% rename from pkgs/applications/misc/ranger/default.nix rename to pkgs/applications/file-managers/ranger/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e37155301..150c5a698b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9892,7 +9892,7 @@ with pkgs; rambox-pro = callPackage ../applications/networking/instant-messengers/rambox/pro.nix { }; - ranger = callPackage ../applications/misc/ranger { }; + ranger = callPackage ../applications/file-managers/ranger { }; rar = callPackage ../tools/archivers/rar { }; From c5ab4a57cbe080aa5efac1f882cc9b1a22fdd804 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:28:50 -0300 Subject: [PATCH 15/28] sfm: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/sfm/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/sfm/default.nix (100%) diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/file-managers/sfm/default.nix similarity index 100% rename from pkgs/applications/misc/sfm/default.nix rename to pkgs/applications/file-managers/sfm/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 150c5a698b5..e19f2073c8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8902,7 +8902,7 @@ with pkgs; nnn = callPackage ../applications/misc/nnn { }; - sfm = callPackage ../applications/misc/sfm { }; + sfm = callPackage ../applications/file-managers/sfm { }; shfm = callPackage ../applications/misc/shfm { }; From 39a9ea7f5e9a914a2e83f5805b87671c27fb5694 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:30:43 -0300 Subject: [PATCH 16/28] nnn: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/nnn/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/nnn/default.nix (100%) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix similarity index 100% rename from pkgs/applications/misc/nnn/default.nix rename to pkgs/applications/file-managers/nnn/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e19f2073c8e..d05f62a1de6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8900,7 +8900,7 @@ with pkgs; nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; - nnn = callPackage ../applications/misc/nnn { }; + nnn = callPackage ../applications/file-managers/nnn { }; sfm = callPackage ../applications/file-managers/sfm { }; From 77f472a4cf6edee31175f6afe110a10b69a5b9d6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:31:47 -0300 Subject: [PATCH 17/28] noice: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/noice/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/noice/default.nix (100%) diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/file-managers/noice/default.nix similarity index 100% rename from pkgs/applications/misc/noice/default.nix rename to pkgs/applications/file-managers/noice/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d05f62a1de6..9c2053ec1cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8774,7 +8774,7 @@ with pkgs; nitter = callPackage ../servers/nitter { }; - noice = callPackage ../applications/misc/noice { }; + noice = callPackage ../applications/file-managers/noice { }; noip = callPackage ../tools/networking/noip { }; From d2c526c2e6a866f62245f54e9522893d62ed9966 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:32:26 -0300 Subject: [PATCH 18/28] shfm: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/shfm/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/shfm/default.nix (100%) diff --git a/pkgs/applications/misc/shfm/default.nix b/pkgs/applications/file-managers/shfm/default.nix similarity index 100% rename from pkgs/applications/misc/shfm/default.nix rename to pkgs/applications/file-managers/shfm/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c2053ec1cc..8e0e78c446a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8904,7 +8904,7 @@ with pkgs; sfm = callPackage ../applications/file-managers/sfm { }; - shfm = callPackage ../applications/misc/shfm { }; + shfm = callPackage ../applications/file-managers/shfm { }; noise-repellent = callPackage ../applications/audio/noise-repellent { }; From 25bc8d2b18f960921ea3b5eabb6eb89510c1742e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:34:33 -0300 Subject: [PATCH 19/28] vifm: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/vifm/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/{misc => file-managers}/vifm/default.nix (100%) diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/file-managers/vifm/default.nix similarity index 100% rename from pkgs/applications/misc/vifm/default.nix rename to pkgs/applications/file-managers/vifm/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e0e78c446a..df1c692bcc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11418,9 +11418,9 @@ with pkgs; pythonPackages = python3Packages; }; - vifm = callPackage ../applications/misc/vifm { }; + vifm = callPackage ../applications/file-managers/vifm { }; - vifm-full = callPackage ../applications/misc/vifm { + vifm-full = vifm.override { mediaSupport = true; inherit lib udisks2 python3; }; From 81f5320646b8f5a1d16649a835886281e29165e7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:35:12 -0300 Subject: [PATCH 20/28] worker: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/worker/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/worker/default.nix (100%) diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/file-managers/worker/default.nix similarity index 100% rename from pkgs/applications/misc/worker/default.nix rename to pkgs/applications/file-managers/worker/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df1c692bcc0..3ed76e7185b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30871,7 +30871,7 @@ with pkgs; wordgrinder = callPackage ../applications/office/wordgrinder { }; - worker = callPackage ../applications/misc/worker { }; + worker = callPackage ../applications/file-managers/worker { }; workrave = callPackage ../applications/misc/workrave { inherit (python27Packages) cheetah; From 20acab1b9b83bd534b5a311fbb1136b7f737fc47 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:36:01 -0300 Subject: [PATCH 21/28] xfe: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/xfe/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/xfe/default.nix (100%) diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix similarity index 100% rename from pkgs/applications/misc/xfe/default.nix rename to pkgs/applications/file-managers/xfe/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ed76e7185b..0c708c0a9ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31030,7 +31030,7 @@ 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/misc/xfe { + xfe = callPackage ../applications/file-managers/xfe { fox = fox_1_6; }; From 99a4c03e774afb7beadca9e399e49afa48233afb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:46:01 -0300 Subject: [PATCH 22/28] ytree: move to applications/file-managers --- .../misc => applications/file-managers}/ytree/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/misc => applications/file-managers}/ytree/default.nix (100%) diff --git a/pkgs/tools/misc/ytree/default.nix b/pkgs/applications/file-managers/ytree/default.nix similarity index 100% rename from pkgs/tools/misc/ytree/default.nix rename to pkgs/applications/file-managers/ytree/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c708c0a9ba..90625fadaaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12050,7 +12050,7 @@ with pkgs; ytfzf = callPackage ../tools/misc/ytfzf { }; - ytree = callPackage ../tools/misc/ytree { }; + ytree = callPackage ../applications/file-managers/ytree { }; yggdrasil = callPackage ../tools/networking/yggdrasil { }; From 6910e46427c7719f0f47cdae2b0ed414f1b57e2a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:47:16 -0300 Subject: [PATCH 23/28] spaceFM: move to applications/file-managers --- pkgs/applications/{misc => file-managers}/spacefm/default.nix | 0 .../{misc => file-managers}/spacefm/glibc-fix.patch | 0 .../applications/{misc => file-managers}/spacefm/x11-only.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/{misc => file-managers}/spacefm/default.nix (100%) rename pkgs/applications/{misc => file-managers}/spacefm/glibc-fix.patch (100%) rename pkgs/applications/{misc => file-managers}/spacefm/x11-only.patch (100%) diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix similarity index 100% rename from pkgs/applications/misc/spacefm/default.nix rename to pkgs/applications/file-managers/spacefm/default.nix diff --git a/pkgs/applications/misc/spacefm/glibc-fix.patch b/pkgs/applications/file-managers/spacefm/glibc-fix.patch similarity index 100% rename from pkgs/applications/misc/spacefm/glibc-fix.patch rename to pkgs/applications/file-managers/spacefm/glibc-fix.patch diff --git a/pkgs/applications/misc/spacefm/x11-only.patch b/pkgs/applications/file-managers/spacefm/x11-only.patch similarity index 100% rename from pkgs/applications/misc/spacefm/x11-only.patch rename to pkgs/applications/file-managers/spacefm/x11-only.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90625fadaaf..e1223834292 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10640,7 +10640,7 @@ with pkgs; Carbon Cocoa ScriptingBridge SkyLight; }; - spaceFM = callPackage ../applications/misc/spacefm { }; + spaceFM = callPackage ../applications/file-managers/spacefm { }; speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; From 3e4672efd52eb211649f498c59b928ddc7d204c7 Mon Sep 17 00:00:00 2001 From: Sven Over Date: Mon, 27 Jun 2022 13:10:17 +0100 Subject: [PATCH 24/28] spr: 1.3.2 -> 1.3.3 --- pkgs/development/tools/spr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix index c19bf5b174b..4d2c005b719 100644 --- a/pkgs/development/tools/spr/default.nix +++ b/pkgs/development/tools/spr/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "spr"; - version = "1.3.2"; + version = "1.3.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-6IPNA1Ivj3o+X733a8Kxh1STODS5lLZaK4lh0lxU4bo="; + sha256 = "sha256-ozirfRyJWgs5+CWZrXkIHzlNQcUOEAuX/XV+VrUnJC8="; }; - cargoSha256 = "sha256-m/mHOiuaFJtiuyFr2Z3ovk/Q06vxwvUBAiz0rF4R3kU="; + cargoSha256 = "sha256-Khua8g/vk0KTBmca37VhiBSHvfi8tKVhqxDYeJ594Qg="; buildInputs = lib.optional stdenv.isDarwin Security; From 667eea766a43c9402223146a42e4532f7db56017 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jun 2022 16:09:43 +0000 Subject: [PATCH 25/28] python310Packages.fastavro: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/fastavro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 805914b670b..3ea51b2e03f 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.5.1"; + version = "1.5.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-kI1KRJ4iQP19hYTSRQ6VHZz+Pg5Ar7CaOB7yUJbHm2Q="; + sha256 = "sha256-DNBTuONWlyn+ls4VfWv54tXXbsjxLVfwEjWp3PpruYk="; }; preBuild = '' From a2e509c1db221e8d93a2e811cc864bee97d95826 Mon Sep 17 00:00:00 2001 From: Sergei Shilovsky Date: Tue, 28 Jun 2022 01:13:26 +0300 Subject: [PATCH 26/28] bindfs: 1.16.0 -> 1.16.1 https://github.com/mpartel/bindfs/blob/cbd163fb0eb328be66831e073ef9fb760482da0a/ChangeLog --- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 333157d829f..cc4bfc917ef 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.16.0"; + version = "1.16.1"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-AuvvqqZOGwRPxcdDxYKarSHtb3FF9NsHI7zEXwhXgfY="; + sha256 = "sha256-Veo9KqjkjQvqI7fAsDlQz+tJI1W/2Nu4oXOh44PyKLw="; }; nativeBuildInputs = [ pkg-config ]; From 2f5e9730c0d4838208a609469f17f0481dd47500 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 23:57:20 -0300 Subject: [PATCH 27/28] all-packages: reorder file-managers --- pkgs/top-level/all-packages.nix | 88 +++++++++++++++++---------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1223834292..fadb2ba5c6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -328,8 +328,6 @@ with pkgs; chrysalis = callPackage ../applications/misc/chrysalis { }; - clifm = callPackage ../applications/file-managers/clifm { }; - clj-kondo = callPackage ../development/tools/clj-kondo { }; cloak = callPackage ../applications/misc/cloak { @@ -1568,6 +1566,49 @@ with pkgs; openal = null; }; + ### APPLICATIONS/FILE-MANAGERS + + cfm = callPackage ../applications/file-managers/cfm { }; + + clex = callPackage ../applications/file-managers/clex { }; + + clifm = callPackage ../applications/file-managers/clifm { }; + + joshuto = callPackage ../applications/file-managers/joshuto { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; + }; + + lf = callPackage ../applications/file-managers/lf { }; + + llama = callPackage ../applications/file-managers/llama { }; + + mc = callPackage ../applications/file-managers/mc { + inherit (darwin) autoSignDarwinBinariesHook; + }; + + nimmm = callPackage ../applications/file-managers/nimmm { }; + + nnn = callPackage ../applications/file-managers/nnn { }; + + noice = callPackage ../applications/file-managers/noice { }; + + ranger = callPackage ../applications/file-managers/ranger { }; + + sfm = callPackage ../applications/file-managers/sfm { }; + + shfm = callPackage ../applications/file-managers/shfm { }; + + spaceFM = callPackage ../applications/file-managers/spacefm { }; + + vifm = callPackage ../applications/file-managers/vifm { }; + + vifm-full = vifm.override { + mediaSupport = true; + inherit lib udisks2 python3; + }; + + ytree = callPackage ../applications/file-managers/ytree { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -1620,8 +1661,6 @@ with pkgs; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - nimmm = callPackage ../applications/file-managers/nimmm { }; - roxterm = callPackage ../applications/terminal-emulators/roxterm { }; rxvt = callPackage ../applications/terminal-emulators/rxvt { }; @@ -3041,8 +3080,6 @@ with pkgs; cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; - cfm = callPackage ../applications/file-managers/cfm { }; - charliecloud = callPackage ../applications/virtualization/charliecloud { }; chelf = callPackage ../tools/misc/chelf { }; @@ -4996,8 +5033,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - clex = callPackage ../applications/file-managers/clex { }; - client-ip-echo = callPackage ../servers/misc/client-ip-echo { }; cloc = callPackage ../tools/misc/cloc { }; @@ -7471,10 +7506,6 @@ with pkgs; jo = callPackage ../development/tools/jo { }; - joshuto = callPackage ../applications/file-managers/joshuto { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; - }; - jrnl = callPackage ../applications/misc/jrnl { }; jsawk = callPackage ../tools/text/jsawk { }; @@ -7670,8 +7701,6 @@ with pkgs; less = callPackage ../tools/misc/less { }; - lf = callPackage ../applications/file-managers/lf { }; - lha = callPackage ../tools/archivers/lha { }; lhasa = callPackage ../tools/compression/lhasa {}; @@ -8399,10 +8428,6 @@ with pkgs; mbutil = python3Packages.callPackage ../applications/misc/mbutil { }; - mc = callPackage ../applications/file-managers/mc { - inherit (darwin) autoSignDarwinBinariesHook; - }; - mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; mcron = callPackage ../tools/system/mcron { @@ -8774,8 +8799,6 @@ with pkgs; nitter = callPackage ../servers/nitter { }; - noice = callPackage ../applications/file-managers/noice { }; - noip = callPackage ../tools/networking/noip { }; nomad = nomad_1_2; @@ -8900,12 +8923,6 @@ with pkgs; nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; - nnn = callPackage ../applications/file-managers/nnn { }; - - sfm = callPackage ../applications/file-managers/sfm { }; - - shfm = callPackage ../applications/file-managers/shfm { }; - noise-repellent = callPackage ../applications/audio/noise-repellent { }; noisetorch = callPackage ../applications/audio/noisetorch { }; @@ -9892,8 +9909,6 @@ with pkgs; rambox-pro = callPackage ../applications/networking/instant-messengers/rambox/pro.nix { }; - ranger = callPackage ../applications/file-managers/ranger { }; - rar = callPackage ../tools/archivers/rar { }; rarcrack = callPackage ../tools/security/rarcrack { }; @@ -10640,8 +10655,6 @@ with pkgs; Carbon Cocoa ScriptingBridge SkyLight; }; - spaceFM = callPackage ../applications/file-managers/spacefm { }; - speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot; @@ -11418,13 +11431,6 @@ with pkgs; pythonPackages = python3Packages; }; - vifm = callPackage ../applications/file-managers/vifm { }; - - vifm-full = vifm.override { - mediaSupport = true; - inherit lib udisks2 python3; - }; - via = callPackage ../tools/misc/via {}; vial = callPackage ../tools/misc/vial {}; @@ -12050,10 +12056,6 @@ with pkgs; ytfzf = callPackage ../tools/misc/ytfzf { }; - ytree = callPackage ../applications/file-managers/ytree { }; - - yggdrasil = callPackage ../tools/networking/yggdrasil { }; - # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { haskellPackages = haskell.packages.ghc8107; @@ -19108,8 +19110,6 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; - llama = callPackage ../applications/file-managers/llama { }; - malcontent = callPackage ../development/libraries/malcontent { }; malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { }; @@ -25344,6 +25344,8 @@ with pkgs; appvm = callPackage ../applications/virtualization/appvm { }; + yggdrasil = callPackage ../tools/networking/yggdrasil { }; + masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; From 34a6690deddead6bfb4b57758a481876ab8f0ad6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 26 Jun 2022 19:30:23 -0300 Subject: [PATCH 28/28] doublecmd: init at 1.0.6 --- .../file-managers/doublecmd/default.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/applications/file-managers/doublecmd/default.nix diff --git a/pkgs/applications/file-managers/doublecmd/default.nix b/pkgs/applications/file-managers/doublecmd/default.nix new file mode 100644 index 00000000000..0222f5be483 --- /dev/null +++ b/pkgs/applications/file-managers/doublecmd/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, dbus +, fpc +, getopt +, glib +, lazarus +, libX11 +, libqt5pas +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "doublecmd"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "doublecmd"; + repo = "doublecmd"; + rev = "v${version}"; + hash = "sha256-aEWu/bRVOwjK6QTWsMntRYwAfjuwo9SNuH4qkQn0mOY="; + }; + + nativeBuildInputs = [ + fpc + getopt + lazarus + wrapQtAppsHook + ]; + + buildInputs = [ + dbus + glib + libX11 + libqt5pas + ]; + + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + + postPatch = '' + patchShebangs build.sh install/linux/install.sh + substituteInPlace build.sh \ + --replace '$(which lazbuild)' '"${lazarus}/bin/lazbuild --lazarusdir=${lazarus}/share/lazarus"' + substituteInPlace install/linux/install.sh \ + --replace '$DC_INSTALL_PREFIX/usr' '$DC_INSTALL_PREFIX' + ''; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + ./build.sh release qt5 + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install/linux/install.sh -I $out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://doublecmd.sourceforge.io/"; + description = "Two-panel graphical file manager written in Pascal"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} +# TODO: deal with other platforms too diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ace5a91643..ec10fb1b9ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1578,6 +1578,10 @@ with pkgs; clifm = callPackage ../applications/file-managers/clifm { }; + doublecmd = callPackage ../applications/file-managers/doublecmd { + inherit (qt5) wrapQtAppsHook; + }; + joshuto = callPackage ../applications/file-managers/joshuto { inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; };