diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
commit | 7d648ac22d941d0c7efdd987315ae0ddf9932ba0 (patch) | |
tree | 51a3e8126722c5a52a9a1e7e40b4eeaf4610db0b /nixpkgs/pkgs/applications/file-managers | |
parent | aa4353b499e6950b7333578f936455a628145c31 (diff) | |
parent | db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b (diff) | |
download | nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.gz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.bz2 nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.lz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.xz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.zst nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/file-managers')
5 files changed, 24 insertions, 26 deletions
diff --git a/nixpkgs/pkgs/applications/file-managers/browsr/default.nix b/nixpkgs/pkgs/applications/file-managers/browsr/default.nix index 1065940c916f..409f1d1c5dfa 100644 --- a/nixpkgs/pkgs/applications/file-managers/browsr/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/browsr/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "browsr"; - version = "1.13.0"; + version = "1.15.0"; format = "pyproject"; src = fetchFromGitHub { owner = "juftin"; repo = "browsr"; rev = "v${version}"; - hash = "sha256-vYb4XWBdQ4HJzICXNiBXit4aVgjYA9SCX15MppVtTS8="; + hash = "sha256-v3DNk0wNG/TISP609YsVfgOFcr+ZOtdOXrm4j81dtLE="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/applications/file-managers/nnn/default.nix b/nixpkgs/pkgs/applications/file-managers/nnn/default.nix index eb3e943676e4..6b7e8f9c6421 100644 --- a/nixpkgs/pkgs/applications/file-managers/nnn/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/nnn/default.nix @@ -24,13 +24,13 @@ assert withEmojis -> (withIcons == false && withNerdIcons == false); stdenv.mkDerivation (finalAttrs: { pname = "nnn"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${finalAttrs.version}"; - hash = "sha256-QbKW2wjhUNej3zoX18LdeUHqjNLYhEKyvPH2MXzp/iQ="; + hash = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU="; }; patches = [ @@ -38,11 +38,6 @@ stdenv.mkDerivation (finalAttrs: { # By default, nnn expects the macOS default file command, not the one provided by Nix. # However, both commands use different arguments to obtain the MIME type. ./darwin-fix-file-mime-opts.patch - # FIXME: remove for next release - (fetchpatch { - url = "https://github.com/jarun/nnn/commit/20e944f5e597239ed491c213a634eef3d5be735e.patch"; - hash = "sha256-RxG3AU8i3lRPCjRVZPnej4m1No/SKtsHwbghj9JQ7RQ="; - }) ]; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); diff --git a/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix index ef28d8cea340..3ee1f0c03ebf 100644 --- a/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -7,18 +7,18 @@ , glib , gobject-introspection , gtk3 -, libhandy -, librsvg +, gtk4 +, libadwaita , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "portfolio"; - version = "0.9.15"; + version = "1.0.0"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tchx84"; repo = "Portfolio"; rev = "v${version}"; - hash = "sha256-/OwHeeUjpjm35O7mySoAfKt7Rsp1EK2WE+tfiV3oiQg="; + hash = "sha256-ahVrOyyF/7X19ZJcHQ4YbC+4b96CPEnns7TUAFCvKao="; }; postPatch = '' @@ -37,20 +37,17 @@ python3.pkgs.buildPythonApplication rec { appstream-glib desktop-file-utils gettext - glib gobject-introspection - gtk3 + gtk3 # For gtk-update-icon-cache meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - glib - gtk3 - libhandy - librsvg + gtk4 + libadwaita ]; propagatedBuildInputs = with python3.pkgs; [ @@ -65,6 +62,12 @@ python3.pkgs.buildPythonApplication rec { ln -s dev.tchx84.Portfolio "$out/bin/portfolio" ''; + # Prevent double wrapping + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru = { updateScript = nix-update-script { }; }; diff --git a/nixpkgs/pkgs/applications/file-managers/tuifimanager/default.nix b/nixpkgs/pkgs/applications/file-managers/tuifimanager/default.nix index 8bb7024793b1..252c77deb8d1 100644 --- a/nixpkgs/pkgs/applications/file-managers/tuifimanager/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/tuifimanager/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "tuifi-manager"; - version = "3.0.0"; + version = "3.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "GiorgosXou"; repo = "TUIFIManager"; rev = "v.${version}"; - hash = "sha256-ahZUm+FkAaM4I6FfSa/Oej+lMux8avw8LxzzGqTpuH8="; + hash = "sha256-yBMme0LJSlEXPxE9NMr0Z5VJWcWOzzdvbTnavkLHsvo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/file-managers/yazi/default.nix b/nixpkgs/pkgs/applications/file-managers/yazi/default.nix index ef9c47490c0b..7757a1322b15 100644 --- a/nixpkgs/pkgs/applications/file-managers/yazi/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/yazi/default.nix @@ -30,16 +30,16 @@ rustPlatform.buildRustPackage rec { pname = "yazi"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "sxyazi"; repo = pname; rev = "v${version}"; - hash = "sha256-IUE2846AltYyEefkavCJOEak9mW0wygojWsucwUEgh4="; + hash = "sha256-ARpludMVQlZtCRAfW0cNYVmT3m9t9lunMIW24peYX6Y="; }; - cargoHash = "sha256-wwtdaReb+teXf+VDwqAqCbSy2qWI11IRlcygmWdaqF4="; + cargoHash = "sha256-dhdk5aGKv6tY8x7MmA0hWcmJBiXOXC92DlQTd/1AKtQ="; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; |