diff options
author | pennae <github@quasiparticle.net> | 2022-08-26 16:25:44 +0200 |
---|---|---|
committer | pennae <github@quasiparticle.net> | 2022-08-26 16:25:44 +0200 |
commit | abd2e87da1a2e8e13ddc43377014a558b016fb98 (patch) | |
tree | 8f688bb862af2c12e54e8e0aeaa5dacda9e22da3 /pkgs/stdenv/adapters.nix | |
parent | b76df7321ecfaca5b6f5a264704dfe70aa1e3a9d (diff) | |
download | nixlib-abd2e87da1a2e8e13ddc43377014a558b016fb98.tar nixlib-abd2e87da1a2e8e13ddc43377014a558b016fb98.tar.gz nixlib-abd2e87da1a2e8e13ddc43377014a558b016fb98.tar.bz2 nixlib-abd2e87da1a2e8e13ddc43377014a558b016fb98.tar.lz nixlib-abd2e87da1a2e8e13ddc43377014a558b016fb98.tar.xz nixlib-abd2e87da1a2e8e13ddc43377014a558b016fb98.tar.zst nixlib-abd2e87da1a2e8e13ddc43377014a558b016fb98.zip |
stdenv: remove deprecated adapters
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
-rw-r--r-- | pkgs/stdenv/adapters.nix | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 3e11f7c6c418..85bd8d2087f6 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. */ |