From 948e656d818f55bae45b818f2d7d19b6a70b26ad Mon Sep 17 00:00:00 2001 From: Jack Rosenberg Date: Fri, 5 Jun 2026 17:03:18 +0200 Subject: [PATCH] {encfs, gencfsm}: drop --- pkgs/by-name/ba/backintime-common/package.nix | 2 - pkgs/by-name/en/encfs/package.nix | 73 ----------------- pkgs/by-name/ge/gencfsm/makefile-mkdir.patch | 14 ---- pkgs/by-name/ge/gencfsm/package.nix | 80 ------------------- pkgs/by-name/si/sirikali/package.nix | 4 +- pkgs/kde/plasma/plasma-vault/default.nix | 4 - .../plasma/plasma-vault/hardcode-paths.patch | 19 ----- pkgs/top-level/aliases.nix | 2 + 8 files changed, 3 insertions(+), 195 deletions(-) delete mode 100644 pkgs/by-name/en/encfs/package.nix delete mode 100644 pkgs/by-name/ge/gencfsm/makefile-mkdir.patch delete mode 100644 pkgs/by-name/ge/gencfsm/package.nix diff --git a/pkgs/by-name/ba/backintime-common/package.nix b/pkgs/by-name/ba/backintime-common/package.nix index 32fd94112ac7..e9fb6e0d9025 100644 --- a/pkgs/by-name/ba/backintime-common/package.nix +++ b/pkgs/by-name/ba/backintime-common/package.nix @@ -9,7 +9,6 @@ cron, openssh, sshfs-fuse, - encfs, gocryptfs, which, ps, @@ -33,7 +32,6 @@ let cron rsync sshfs-fuse - encfs gocryptfs ]; in diff --git a/pkgs/by-name/en/encfs/package.nix b/pkgs/by-name/en/encfs/package.nix deleted file mode 100644 index ba1f655747fe..000000000000 --- a/pkgs/by-name/en/encfs/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - perl, - gettext, - fuse, - openssl, - tinyxml-2, - gtest, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "encfs"; - version = "1.9.5"; - - src = fetchFromGitHub { - sha256 = "099rjb02knr6yz7przlnyj62ic0ag5ncs7vvcc36ikyqrmpqsdch"; - rev = "v${finalAttrs.version}"; - repo = "encfs"; - owner = "vgough"; - }; - - patches = lib.optionals stdenv.cc.isClang [ - # Fixes a build failure when building with newer versions of clang. - # https://github.com/vgough/encfs/pull/650 - (fetchpatch { - url = "https://github.com/vgough/encfs/commit/406b63bfe234864710d1d23329bf41d48001fbfa.patch"; - hash = "sha256-VunC5ICRJBgCXqkr7ad7DPzweRJr1bdOpo1LKNCs4zY="; - }) - ]; - - buildInputs = [ - fuse - openssl - tinyxml-2 - gtest - ]; - nativeBuildInputs = [ - cmake - pkg-config - perl - gettext - ]; - strictDeps = true; - - cmakeFlags = [ - "-DUSE_INTERNAL_TINYXML=OFF" - "-DBUILD_SHARED_LIBS=ON" - "-DINSTALL_LIBENCFS=ON" - - # Fix the build with CMake 4. - # - # Upstream is deprecated, so it won’t be fixed there. We should - # probably phase this package out. - "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" - ]; - - meta = { - description = "Encrypted filesystem in user-space via FUSE"; - homepage = "https://vgough.github.io/encfs"; - license = with lib.licenses; [ - gpl3Plus - lgpl3Plus - ]; - platforms = lib.platforms.unix; - # The last successful Darwin Hydra build was in 2024 - broken = stdenv.hostPlatform.isDarwin; - }; -}) diff --git a/pkgs/by-name/ge/gencfsm/makefile-mkdir.patch b/pkgs/by-name/ge/gencfsm/makefile-mkdir.patch deleted file mode 100644 index 49c7b0b4d9d1..000000000000 --- a/pkgs/by-name/ge/gencfsm/makefile-mkdir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/dist/Makefile.am -+++ b/dist/Makefile.am -@@ -10,9 +10,9 @@ install-data-hook: - chmod 0755 $(shell find $(dist) -type d) - chmod 0644 $(shell find $(dist) -type f) - chmod 0755 $(shell find "scripts" -type f) -- test -z "$(DESTDIR)$(datadir)/dbus-1/services/" || /bin/mkdir -p "$(DESTDIR)$(datadir)/dbus-1/services/" -+ test -z "$(DESTDIR)$(datadir)/dbus-1/services/" || $(MKDIR_P) "$(DESTDIR)$(datadir)/dbus-1/services/" - cp "extra/com.libertyzero.gnome-encfs-manager.service" "$(DESTDIR)$(datadir)/dbus-1/services/" -- test -z "$(gencfsmdir)" || /bin/mkdir -p "$(gencfsmdir)" -+ test -z "$(gencfsmdir)" || $(MKDIR_P) "$(gencfsmdir)" - cp --parent -rf $(dist) "$(gencfsmdir)" - cp --parent -rf $(icons) $(DESTDIR)$(datadir) - diff --git a/pkgs/by-name/ge/gencfsm/package.nix b/pkgs/by-name/ge/gencfsm/package.nix deleted file mode 100644 index 710f0b7751be..000000000000 --- a/pkgs/by-name/ge/gencfsm/package.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - autoconf, - automake, - intltool, - libtool, - pkg-config, - encfs, - libsecret, - glib, - libgee, - gtk3, - vala, - wrapGAppsHook3, - libsm, - libice, - gobject-introspection, -}: - -stdenv.mkDerivation (finalAttrs: { - version = "1.9"; - pname = "gnome-encfs-manager"; - - src = fetchurl { - url = - with lib.versions; - "https://launchpad.net/gencfsm/trunk/${major finalAttrs.version}.${minor finalAttrs.version}/+download/gnome-encfs-manager_${finalAttrs.version}.tar.xz"; - sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8="; - }; - - env.NIX_CFLAGS_COMPILE = toString [ - # tools.c:38:5: error: implicit declaration of function 'gnome_encfs_manager_on_logout' [] - "-Wno-implicit-function-declaration" - ]; - - nativeBuildInputs = [ - autoconf - automake - intltool - libtool - pkg-config - vala - wrapGAppsHook3 - gobject-introspection - ]; - buildInputs = [ - glib - encfs - gtk3 - libgee - libsm - libice - libsecret - ]; - - # Fix hardcoded paths to /bin/mkdir - patches = [ ./makefile-mkdir.patch ]; - - preConfigure = '' - ./autogen.sh - ''; - - configureFlags = [ "--disable-appindicator" ]; - - preFixup = "gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)"; - - enableParallelBuilding = true; - - meta = { - homepage = "http://www.libertyzero.com/GEncfsM/"; - downloadPage = "https://launchpad.net/gencfsm/"; - description = "EncFS manager and mounter with GNOME3 integration"; - mainProgram = "gnome-encfs-manager"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.spacefrogg ]; - }; -}) diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix index 6e9421881eb4..e5515c04c595 100644 --- a/pkgs/by-name/si/sirikali/package.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -9,7 +9,6 @@ qt6, kdePackages, cryfs, - encfs, fscrypt-experimental, gocryptfs, sshfs, @@ -49,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { "--prefix PATH : ${ lib.makeBinPath [ cryfs - encfs fscrypt-experimental gocryptfs sshfs @@ -67,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "Qt/C++ GUI front end to sshfs, ecryptfs-simple, cryfs, gocryptfs, fscrypt and encfs"; + description = "Qt/C++ GUI front end to sshfs, ecryptfs-simple, cryfs, gocryptfs and fscrypt"; homepage = "https://github.com/mhogomchungu/sirikali"; changelog = "https://github.com/mhogomchungu/sirikali/blob/${finalAttrs.src.rev}/changelog"; license = lib.licenses.gpl3Only; diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix index 9ae129288028..9af74adc3a89 100644 --- a/pkgs/kde/plasma/plasma-vault/default.nix +++ b/pkgs/kde/plasma/plasma-vault/default.nix @@ -4,8 +4,6 @@ replaceVars, pkg-config, cryfs, - encfs, - fuse, gocryptfs, lsof, }: @@ -15,8 +13,6 @@ mkKdeDerivation { patches = [ (replaceVars ./hardcode-paths.patch { cryfs = lib.getExe' cryfs "cryfs"; - encfs = lib.getExe' encfs "encfs"; - encfsctl = lib.getExe' encfs "encfsctl"; gocryptfs = lib.getExe' gocryptfs "gocryptfs"; lsof = lib.getExe lsof; }) diff --git a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch index 10382774eb87..a39328027d6d 100644 --- a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch +++ b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch @@ -10,25 +10,6 @@ index f425eb3..5b8cd43 100644 + return process("@cryfs@", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}}); } - } // namespace PlasmaVault -diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp -index 2d15fa2..870b711 100644 ---- a/kded/engine/backends/encfs/encfsbackend.cpp -+++ b/kded/engine/backends/encfs/encfsbackend.cpp -@@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const - auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); - KConfigGroup backendConfig(config, "EncfsBackend"); - -- return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); -+ return process("@encfs@", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); - } - - QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const - { -- return process("encfsctl", arguments, {}); -+ return process("@encfsctl@", arguments, {}); - } - } // namespace PlasmaVault diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp index b992f6f..eb828dd 100644 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 95e5f5ba46ad..f0ee5b75ed9d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -693,6 +693,7 @@ mapAliases { EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27 emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 + encfs = throw "'encfs' has been removed as it depends on fuse2, which is deprecated"; # Added 2026-05-05 enchant2 = warnAlias "'enchant2' has been renamed to 'enchant_2'" enchant_2; # Added 2026-01-14 encodings = font-encodings; # Added 2026-01-19 enyo-doom = throw "'enyo-doom' has been renamed to/replaced by 'enyo-launcher'"; # Converted to throw 2025-10-27 @@ -847,6 +848,7 @@ mapAliases { gdc11 = throw "gdc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08 gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08 + gencfsm = throw "'gnecfsm' has been removed as it depends on encfs, which depends on the deprecated fuse2"; # Added 2026-05-05 gensgs = throw "gensgs has been removed as it was unmaintained, abandoned upstream since 2009 and relied on gtk2"; # Added 2025-10-29 geos_3_9 = throw "geos_3_9 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2025-09-21 gfie = throw "'gfie' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-17