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`) 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 = '' 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; 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c74d1cc4ff..9f936dccbec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -332,8 +332,6 @@ with pkgs; chrysalis = callPackage ../applications/misc/chrysalis { }; - clifm = callPackage ../applications/misc/clifm { }; - clj-kondo = callPackage ../development/tools/clj-kondo { }; cloak = callPackage ../applications/misc/cloak { @@ -1572,6 +1570,53 @@ 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 { }; + + doublecmd = callPackage ../applications/file-managers/doublecmd { + inherit (qt5) wrapQtAppsHook; + }; + + 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 { @@ -1624,8 +1669,6 @@ with pkgs; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - nimmm = callPackage ../applications/terminal-emulators/nimmm { }; - roxterm = callPackage ../applications/terminal-emulators/roxterm { }; rxvt = callPackage ../applications/terminal-emulators/rxvt { }; @@ -3045,8 +3088,6 @@ with pkgs; cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; - cfm = callPackage ../applications/misc/cfm { }; - charliecloud = callPackage ../applications/virtualization/charliecloud { }; chelf = callPackage ../tools/misc/chelf { }; @@ -5022,8 +5063,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - clex = callPackage ../tools/misc/clex { }; - client-ip-echo = callPackage ../servers/misc/client-ip-echo { }; cloc = callPackage ../tools/misc/cloc { }; @@ -7497,10 +7536,6 @@ with pkgs; jo = callPackage ../development/tools/jo { }; - joshuto = callPackage ../applications/misc/joshuto { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; - }; - jrnl = callPackage ../applications/misc/jrnl { }; jsawk = callPackage ../tools/text/jsawk { }; @@ -7696,8 +7731,6 @@ with pkgs; less = callPackage ../tools/misc/less { }; - lf = callPackage ../tools/misc/lf {}; - lha = callPackage ../tools/archivers/lha { }; lhasa = callPackage ../tools/compression/lhasa {}; @@ -8425,10 +8458,6 @@ with pkgs; mbutil = python3Packages.callPackage ../applications/misc/mbutil { }; - mc = callPackage ../tools/misc/mc { - inherit (darwin) autoSignDarwinBinariesHook; - }; - mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; mcron = callPackage ../tools/system/mcron { @@ -8800,8 +8829,6 @@ with pkgs; nitter = callPackage ../servers/nitter { }; - noice = callPackage ../applications/misc/noice { }; - noip = callPackage ../tools/networking/noip { }; nomad = nomad_1_2; @@ -8926,12 +8953,6 @@ with pkgs; nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; - nnn = callPackage ../applications/misc/nnn { }; - - sfm = callPackage ../applications/misc/sfm { }; - - shfm = callPackage ../applications/misc/shfm { }; - noise-repellent = callPackage ../applications/audio/noise-repellent { }; noisetorch = callPackage ../applications/audio/noisetorch { }; @@ -9918,8 +9939,6 @@ with pkgs; rambox-pro = callPackage ../applications/networking/instant-messengers/rambox/pro.nix { }; - ranger = callPackage ../applications/misc/ranger { }; - rar = callPackage ../tools/archivers/rar { }; rarcrack = callPackage ../tools/security/rarcrack { }; @@ -10666,8 +10685,6 @@ with pkgs; Carbon Cocoa ScriptingBridge SkyLight; }; - spaceFM = callPackage ../applications/misc/spacefm { }; - speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot; @@ -11444,13 +11461,6 @@ with pkgs; pythonPackages = python3Packages; }; - vifm = callPackage ../applications/misc/vifm { }; - - vifm-full = callPackage ../applications/misc/vifm { - mediaSupport = true; - inherit lib udisks2 python3; - }; - via = callPackage ../tools/misc/via {}; vial = callPackage ../tools/misc/vial {}; @@ -12076,10 +12086,6 @@ with pkgs; ytfzf = callPackage ../tools/misc/ytfzf { }; - ytree = callPackage ../tools/misc/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; @@ -19156,8 +19162,6 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; - llama = callPackage ../applications/misc/llama { }; - malcontent = callPackage ../development/libraries/malcontent { }; malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { }; @@ -25415,6 +25419,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 { }; @@ -26092,7 +26098,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 { }; @@ -28652,7 +28658,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 { }; @@ -28781,7 +28787,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; @@ -29384,7 +29390,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 { }; @@ -30948,7 +30954,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; @@ -31107,7 +31113,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; };