diff options
Diffstat (limited to 'pkgs/applications/file-managers')
8 files changed, 30 insertions, 116 deletions
diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix index b26d20c6509..ad35ae555d1 100644 --- a/pkgs/applications/file-managers/browsr/default.nix +++ b/pkgs/applications/file-managers/browsr/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "browsr"; - version = "1.16.0"; + version = "1.17.1"; format = "pyproject"; src = fetchFromGitHub { owner = "juftin"; repo = "browsr"; rev = "v${version}"; - hash = "sha256-Tb/7ek5aKFxv8g4jAmj9nQ909LiHqrAXJoeC9o6fwFM="; + hash = "sha256-FExDKugFP94C3zMnR1V4QDPWeM2OtRH2ei0LNs3h06c="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 37369ccdb20..577bad9e694 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline }: +{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline, python3 }: stdenv.mkDerivation rec { pname = "clifm"; - version = "1.14.6"; + version = "1.15"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0EOG7BAZL3OPP2/qePNkljAa0/Qb3zwuJWz2P4l8GZc="; + sha256 = "sha256-4Z2u1APNfJ9Ai95MMWb5FCUgCA2Hrbp+5eBJZD3tN+U="; }; - buildInputs = [ libcap acl file readline ]; + buildInputs = [ libcap acl file readline python3]; makeFlags = [ "DESTDIR=${placeholder "out"}" diff --git a/pkgs/applications/file-managers/dfilemanager/default.nix b/pkgs/applications/file-managers/dfilemanager/default.nix index 2c374511af5..6c5544aded3 100644 --- a/pkgs/applications/file-managers/dfilemanager/default.nix +++ b/pkgs/applications/file-managers/dfilemanager/default.nix @@ -17,7 +17,7 @@ mkDerivation { cmakeFlags = [ "-DQT5BUILD=true" ]; meta = { - homepage = "http://dfilemanager.sourceforge.net/"; + homepage = "https://github.com/probonopd/dfilemanager"; description = "File manager written in Qt/C++"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; diff --git a/pkgs/applications/file-managers/doublecmd/default.nix b/pkgs/applications/file-managers/doublecmd/default.nix deleted file mode 100644 index 6ab82404968..00000000000 --- a/pkgs/applications/file-managers/doublecmd/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, dbus -, fpc -, getopt -, glib -, lazarus -, libX11 -, libqt5pas -, wrapQtAppsHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "doublecmd"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "doublecmd"; - repo = "doublecmd"; - rev = "v${finalAttrs.version}"; - hash = "sha256-IccM7AwPiOtGHjAzvjQ99mrLFh8iZu8G7Rf71LJHB/g="; - }; - - nativeBuildInputs = [ - fpc - getopt - lazarus - wrapQtAppsHook - ]; - - buildInputs = [ - dbus - glib - libX11 - libqt5pas - ]; - - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.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/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index b0b7c34127b..04491de0fd9 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -3,32 +3,40 @@ , fetchFromGitHub , pkg-config , bzip2 +, libgit2 +, zlib , zstd , zoxide }: rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.8.1"; + version = "2.10.1"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; rev = "v${version}"; - hash = "sha256-RDCX5+Viq/VRb0SXUYxCtWF+aVahI5WGhp9/Vn+uHqI="; + hash = "sha256-pDJW/QhkJtEAq7xusYn/t/pPizT77OYmlbVlF/RTXic="; }; - cargoHash = "sha256-kgI+afly+/Ag0witToM95L9b3yQXP5Gskwl4Lf4SusY="; + cargoHash = "sha256-AGQt06fMXuyOEmQIEiUCzuK1Atx3gQMUCB+hPWlrldk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 + libgit2 + zlib zstd ]; nativeCheckInputs = [ zoxide ]; + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + buildFeatures = [ "zstd/pkg-config" ]; checkFlags = [ @@ -37,11 +45,6 @@ rustPlatform.buildRustPackage rec { "--skip=state::tests::test_has_write_permission" ]; - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "A tui file manager with vim-like key mapping"; homepage = "https://github.com/kyoheiu/felix"; diff --git a/pkgs/applications/file-managers/walk/default.nix b/pkgs/applications/file-managers/walk/default.nix index 2a15b12a9f3..d6273cf07ed 100644 --- a/pkgs/applications/file-managers/walk/default.nix +++ b/pkgs/applications/file-managers/walk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "walk"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "walk"; rev = "v${version}"; - hash = "sha256-Wo8i0nPAuzADLXlsEho9TSSbNh3d13iNsXXx5onPnIs="; + hash = "sha256-hif62WAyJyFHpJoP3ph7gJk1QkEL7qkcv/BJuoXkwFU="; }; - vendorHash = "sha256-AmgCyq+N+EMdpIUCe6Lzd8bDXHsbOzclsHPp+H5ROMc="; + vendorHash = "sha256-e292ke0JiFEopLSozb+FkpwzSuhpIs/PdWOYuNI2M2o="; meta = with lib; { description = "Terminal file manager"; diff --git a/pkgs/applications/file-managers/worker/default.nix b/pkgs/applications/file-managers/worker/default.nix deleted file mode 100644 index 3848487cbdc..00000000000 --- a/pkgs/applications/file-managers/worker/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, libX11, fetchurl }: - -stdenv.mkDerivation rec { - pname = "worker"; - version = "4.12.1"; - - src = fetchurl { - url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-11tSOVuGuCU0IvqpEKiKvUZj9DtjWJErLpM8IsTtvcs="; - }; - - buildInputs = [ libX11 ]; - - meta = with lib; { - description = "A two-pane file manager with advanced file manipulation features"; - homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; - license = licenses.gpl2; - maintainers = []; - }; -} diff --git a/pkgs/applications/file-managers/yazi/default.nix b/pkgs/applications/file-managers/yazi/default.nix index 7757a1322b1..cd0476c1e00 100644 --- a/pkgs/applications/file-managers/yazi/default.nix +++ b/pkgs/applications/file-managers/yazi/default.nix @@ -3,6 +3,7 @@ , lib , makeWrapper +, installShellFiles , stdenv , Foundation @@ -30,18 +31,18 @@ rustPlatform.buildRustPackage rec { pname = "yazi"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "sxyazi"; repo = pname; rev = "v${version}"; - hash = "sha256-ARpludMVQlZtCRAfW0cNYVmT3m9t9lunMIW24peYX6Y="; + hash = "sha256-FhKrq4N32uJRHGc0qRl+CIVNRW597jACcTFEgj8hiSE="; }; - cargoHash = "sha256-dhdk5aGKv6tY8x7MmA0hWcmJBiXOXC92DlQTd/1AKtQ="; + cargoHash = "sha256-YUymZhDp1Pjm+W6m8Vmh2AgMCdaNt6TQQpiJwSg/gPw="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; postInstall = with lib; @@ -60,6 +61,10 @@ rustPlatform.buildRustPackage rec { '' wrapProgram $out/bin/yazi \ --prefix PATH : "${makeBinPath runtimePaths}" + installShellCompletion --cmd yazi \ + --bash ./config/completions/yazi.bash \ + --fish ./config/completions/yazi.fish \ + --zsh ./config/completions/_yazi ''; passthru.updateScript = nix-update-script { }; |