stdenv: remove deprecated adapters

1 files changed, 0 insertions, 44 deletions

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 3e11f7c6c41..85bd8d2087f 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -149,21 +149,6 @@ rec {
   });
 
 
-  # remove after 22.05 and before 22.11
-  addCoverageInstrumentation = stdenv:
-    builtins.trace "'addCoverageInstrumentation' adapter is deprecated and will be removed before 22.11"
-    overrideInStdenv stdenv [ pkgs.enableGCOVInstrumentation pkgs.keepBuildTree ];
-
-
-  # remove after 22.05 and before 22.11
-  replaceMaintainersField = stdenv: pkgs: maintainers:
-    builtins.trace "'replaceMaintainersField' adapter is deprecated and will be removed before 22.11"
-    stdenv.override (old: {
-      mkDerivationFromStdenv = overrideMkDerivationResult (pkg:
-        lib.recursiveUpdate pkg { meta.maintainers = maintainers; });
-    });
-
-
   /* Use the trace output to report all processed derivations with their
      license name.
   */
@@ -183,35 +168,6 @@ rec {
     });
 
 
-  # remove after 22.05 and before 22.11
-  validateLicenses = licensePred: stdenv:
-    builtins.trace "'validateLicenses' adapter is deprecated and will be removed before 22.11"
-    stdenv.override (old: {
-      mkDerivationFromStdenv = overrideMkDerivationResult (pkg:
-        let
-          drv = builtins.unsafeDiscardStringContext pkg.drvPath;
-          license =
-            pkg.meta.license or
-              # Fixed-output derivations such as source tarballs usually
-              # don't have licensing information, but that's OK.
-              (pkg.outputHash or
-                (builtins.trace
-                  "warning: ${drv} lacks licensing information" null));
-
-          validate = arg:
-            if licensePred license then arg
-            else abort ''
-              while building ${drv}:
-              license `${builtins.toString license}' does not pass the predicate.
-            '';
-
-        in pkg // {
-          outPath = validate pkg.outPath;
-          drvPath = validate pkg.drvPath;
-        });
-    });
-
-
   /* Modify a stdenv so that it produces debug builds; that is,
      binaries have debug info, and compiler optimisations are
      disabled. */