From 54cd1f7264f9414c3c3cfa67ef4ad8fa206536bb Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 May 2025 16:51:05 +0200 Subject: [PATCH] mkDerivation: Un-inline makeDerivationExtensible from makeDerivationExtensibleConst Considering the code was out of sync, this adds the `version`/`src` warning to non-"finalAttrs" calls to `mkDerivation`. That didn't work. (I un-DRY-ed this as a micro-optimization at some point, and I apologize... while simultaneously blaming contributors who change the file without understanding it, therefore implicating myself *yet again* and making myself a hypocrite) --- pkgs/stdenv/generic/make-derivation.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 0b775da748f9..fda9158ff179 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -136,24 +136,7 @@ let in finalPackage; - #makeDerivationExtensibleConst = attrs: makeDerivationExtensible (_: attrs); - # but pre-evaluated for a slight improvement in performance. - makeDerivationExtensibleConst = - attrs: - mkDerivationSimple ( - f0: - let - f = - self: super: - let - x = f0 super; - in - if builtins.isFunction x then f0 self super else x; - in - makeDerivationExtensible ( - self: attrs // (if builtins.isFunction f0 || f0 ? __functor then f self attrs else f0) - ) - ) attrs; + makeDerivationExtensibleConst = attrs: makeDerivationExtensible (_: attrs); knownHardeningFlags = [ "bindnow"