From 57af7751e818a835168c5efd82b9e4b59a655156 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 14 Mar 2025 18:57:10 -0400
Subject: [PATCH] ecryptfs-helper: remove package

---
 pkgs/tools/security/ecryptfs/helper.nix | 36 -------------------------
 pkgs/top-level/aliases.nix              |  1 +
 pkgs/top-level/all-packages.nix         |  2 --
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/tools/security/ecryptfs/helper.nix

diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
deleted file mode 100644
index 4f2070f8bd28..000000000000
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  makeWrapper,
-  python2,
-}:
-
-stdenv.mkDerivation {
-  pname = "ecryptfs-helper";
-  version = "20160722";
-
-  src = fetchurl {
-    url = "https://gist.githubusercontent.com/obadz/ec053fdb00dcb48441d8313169874e30/raw/4b657a4b7c3dc684e4d5e3ffaf46ced1b7675163/ecryptfs-helper.py";
-    sha256 = "0gp4m22zc80814ng80s38hp930aa8r4zqihr7jr23m0m2iq4pdpg";
-  };
-
-  dontUnpack = true;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin
-  installPhase = ''
-    mkdir -p $out/bin $out/libexec
-    cp $src $out/libexec/ecryptfs-helper.py
-    makeWrapper "${python2.interpreter}" "$out/bin/ecryptfs-helper" --add-flags "$out/libexec/ecryptfs-helper.py"
-  '';
-
-  meta = with lib; {
-    description = "Helper script to create/mount/unemount encrypted directories using eCryptfs without needing root permissions";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ obadz ];
-    platforms = platforms.linux;
-    hydraPlatforms = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f218415ab6b6..7257b0705ac9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -533,6 +533,7 @@ mapAliases {
   ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
 
+  ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08
   edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
   edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24
   elasticsearch7Plugins = elasticsearchPlugins;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 736be54a296b..7d59ca8260fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3265,8 +3265,6 @@ with pkgs;
 
   ecryptfs = callPackage ../tools/security/ecryptfs { };
 
-  ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { };
-
   eid-mw = callPackage ../tools/security/eid-mw {
     autoreconfHook = buildPackages.autoreconfHook269;
   };