spacefm: drop (#483227)
This commit is contained in:
Sandro
@@ -162,6 +162,8 @@
|
||||
|
||||
- All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11.
|
||||
|
||||
- `spacefm` was removed because it appeared to be unmaintained upstream.
|
||||
|
||||
- `vimPlugins.nvim-treesitter` has been updated to `main` branch, which is a full and incompatible rewrite. If you can't or don't want to update, you should use `vimPlugins.nvim-treesitter-legacy`.
|
||||
|
||||
## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
|
||||
|
||||
@@ -317,7 +317,6 @@
|
||||
./programs/slock.nix
|
||||
./programs/sniffnet.nix
|
||||
./programs/soundmodem.nix
|
||||
./programs/spacefm.nix
|
||||
./programs/ssh.nix
|
||||
./programs/starship.nix
|
||||
./programs/steam.nix
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
# Global configuration for spacefm.
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.programs.spacefm;
|
||||
|
||||
in
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
programs.spacefm = {
|
||||
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to install SpaceFM and create {file}`/etc/spacefm/spacefm.conf`.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.attrs;
|
||||
default = {
|
||||
tmp_dir = "/tmp";
|
||||
terminal_su = "${pkgs.sudo}/bin/sudo";
|
||||
};
|
||||
defaultText = lib.literalExpression ''
|
||||
{
|
||||
tmp_dir = "/tmp";
|
||||
terminal_su = "''${pkgs.sudo}/bin/sudo";
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
The system-wide spacefm configuration.
|
||||
Parameters to be written to {file}`/etc/spacefm/spacefm.conf`.
|
||||
Refer to the [relevant entry](https://ignorantguru.github.io/spacefm/spacefm-manual-en.html#programfiles-etc) in the SpaceFM manual.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.spaceFM ];
|
||||
|
||||
environment.etc."spacefm/spacefm.conf".text = lib.concatStrings (
|
||||
lib.mapAttrsToList (n: v: "${n}=${toString v}\n") cfg.settings
|
||||
);
|
||||
};
|
||||
}
|
||||
@@ -469,6 +469,9 @@ in
|
||||
(mkRemovedOptionModule [ "virtualisation" "multipass" ] ''
|
||||
virtualisation.multipass has been removed since it was unmaintained in nixpkgs
|
||||
'')
|
||||
(mkRemovedOptionModule [ "programs" "spacefm" ] ''
|
||||
spacefm has been removed since it was unmaintained upstream.
|
||||
'')
|
||||
# Do NOT add any option renames here, see top of the file
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 27f5614..2b45708 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
@@ -1,103 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
lib,
|
||||
stdenv,
|
||||
gtk3,
|
||||
udev,
|
||||
desktop-file-utils,
|
||||
shared-mime-info,
|
||||
intltool,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
ffmpegthumbnailer,
|
||||
jmtpfs,
|
||||
ifuseSupport ? false,
|
||||
ifuse ? null,
|
||||
lsof,
|
||||
udisks,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "spacefm";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IgnorantGuru";
|
||||
repo = "spacefm";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix compilation error due to missing include
|
||||
./glibc-fix.patch
|
||||
|
||||
# restrict GDK backends to only X11
|
||||
./x11-only.patch
|
||||
|
||||
# gcc-14 build fix from:
|
||||
# https://github.com/IgnorantGuru/spacefm/pull/816
|
||||
(fetchpatch {
|
||||
name = "gcc-14.patch";
|
||||
url = "https://github.com/IgnorantGuru/spacefm/commit/98efb1f43e6339b3ceddb9f65ee85e26790fefdf.patch";
|
||||
hash = "sha256-dau1AMnSBsp8iDrjoo0WTnFQ13vNZW2kM4qz0B/beDI=";
|
||||
})
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: spacefm-item-prop.o:src/settings.h:123: multiple definition of
|
||||
# `xsets'; vfs/spacefm-vfs-file-info.o:src/settings.h:123: first defined here
|
||||
# TODO: can be removed once https://github.com/IgnorantGuru/spacefm/pull/772
|
||||
# or equivalent is merged upstream.
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
configureFlags = [
|
||||
"--with-bash-path=${pkgs.bash}/bin/bash"
|
||||
"--sysconfdir=${placeholder "out"}/etc"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -f $out/etc/spacefm/spacefm.conf
|
||||
ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3
|
||||
udev
|
||||
desktop-file-utils
|
||||
shared-mime-info
|
||||
wrapGAppsHook3
|
||||
ffmpegthumbnailer
|
||||
jmtpfs
|
||||
lsof
|
||||
udisks
|
||||
]
|
||||
++ (lib.optionals ifuseSupport [ ifuse ]);
|
||||
# Introduced because ifuse doesn't build due to CVEs in libplist
|
||||
# Revert when libplist builds again…
|
||||
|
||||
meta = {
|
||||
description = "Multi-panel tabbed file manager";
|
||||
longDescription = ''
|
||||
Multi-panel tabbed file and desktop manager for Linux
|
||||
with built-in VFS, udev- or HAL-based device manager,
|
||||
customizable menu system, and bash integration
|
||||
'';
|
||||
homepage = "http://ignorantguru.github.io/spacefm/";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
obadz
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/src/main.c 2021-02-09 13:54:32.847364236 +0100
|
||||
+++ b/src/main.c 2021-02-09 10:41:51.541203271 +0100
|
||||
@@ -1350,6 +1351,7 @@
|
||||
vfs_file_monitor_clean();
|
||||
return 1;
|
||||
}
|
||||
+ gdk_set_allowed_backends("x11");
|
||||
gtk_init (&argc, &argv);
|
||||
int ret = custom_dialog_init( argc, argv );
|
||||
if ( ret != 0 )
|
||||
@@ -1799,6 +1799,7 @@ mapAliases {
|
||||
sourcehut = throw "'sourcehut.*' has been removed due to being broken and unmaintained"; # Added 2025-06-15
|
||||
SP800-90B_EntropyAssessment = throw "'SP800-90B_EntropyAssessment' has been renamed to/replaced by 'sp800-90b-entropyassessment'"; # Converted to throw 2025-10-27
|
||||
space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
|
||||
spacefm = throw "spacefm was dropped since it was unmaintained upstream."; # Added 2026-01-24
|
||||
spacevim = throw "'spacevim' has been removed due to being archived upstream."; # Added 2026-02-10
|
||||
SPAdes = throw "'SPAdes' has been renamed to/replaced by 'spades'"; # Converted to throw 2025-10-27
|
||||
spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
|
||||
|
||||
Reference in New Issue
Block a user