about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/lib
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-09-10 00:47:22 +0200
committersternenseemann <sternenseemann@systemli.org>2022-10-07 00:37:53 +0200
commit9e9b7f4d99086901f95d856fb8cdd63e7818fc6e (patch)
treebf6fc95c11985125a461fe8f2f8dd53ac6ca553c /pkgs/development/haskell-modules/lib
parentac1f1ad0e0a8cfd35db476529c82354e033a48cc (diff)
haskell.lib.compose.addOptparseApplicativeCompletionScripts: remove
This function was deprecated when it was first added to
haskell.lib.compose, so we can probably safely drop it.
Diffstat (limited to 'pkgs/development/haskell-modules/lib')
-rw-r--r--pkgs/development/haskell-modules/lib/compose.nix4
-rw-r--r--pkgs/development/haskell-modules/lib/default.nix4
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix
index 43ad7313e6ee8..5f7e127c0b4df 100644
--- a/pkgs/development/haskell-modules/lib/compose.nix
+++ b/pkgs/development/haskell-modules/lib/compose.nix
@@ -417,10 +417,6 @@ rec {
       in
         builtins.listToAttrs (map toKeyVal haskellPaths);
 
-  addOptparseApplicativeCompletionScripts = exeName: pkg:
-    lib.warn "addOptparseApplicativeCompletionScripts is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!"
-    (__generateOptparseApplicativeCompletion exeName pkg);
-
   /*
     INTERNAL function retained for backwards compatibility, use
     haskell.packages.*.generateOptparseApplicativeCompletions instead!
diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix
index a4f4104e97684..581e9aa1016f2 100644
--- a/pkgs/development/haskell-modules/lib/default.nix
+++ b/pkgs/development/haskell-modules/lib/default.nix
@@ -316,7 +316,9 @@ rec {
   # packagesFromDirectory : { directory : Directory, ... } -> HaskellPackageOverrideSet
   packagesFromDirectory = compose.packagesFromDirectory;
 
-  addOptparseApplicativeCompletionScripts = compose.addOptparseApplicativeCompletionScripts;
+  addOptparseApplicativeCompletionScripts = exeName: pkg:
+    lib.warn "addOptparseApplicativeCompletionScripts is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!"
+    (compose.__generateOptparseApplicativeCompletion exeName pkg);
 
   /*
     Modify a Haskell package to add shell completion scripts for the