commit 16a224b35584e4c63b0ae401e791657fe20f3e9c · pyrox.dev/nixpkgs

+37 -20

pkgs/build-support/src-only/default.nix

···

       37
       37
        
       

     

       38
       38
        
       attrs:

     

       39
       39
        
       let

     

       40
       40
       -
         args = attrs.drvAttrs or attrs;

     

       41
       41
       -
         name = args.name or "${args.pname}-${args.version}";

     

       42
       42
       -
         stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC);

     

       43
       43
       -
         drv = stdenv.mkDerivation (

     

       44
       44
       -
           args

     

       45
       45
       -
           // {

     

       46
       46
       -
             name = "${name}-source";

     

       40
       40
       +
         argsToOverride = args: {

     

       41
       41
       +
           name = "${args.name or "${args.pname}-${args.version}"}-source";

     

       47
       42
        
       

     

       48
       48
       -
             outputs = [ "out" ];

     

       43
       43
       +
           outputs = [ "out" ];

     

       49
       44
        
       

     

       50
       50
       -
             phases = [

     

       51
       51
       -
               "unpackPhase"

     

       52
       52
       -
               "patchPhase"

     

       53
       53
       -
               "installPhase"

     

       54
       54
       -
             ];

     

       55
       55
       -
             separateDebugInfo = false;

     

       45
       45
       +
           phases = [

     

       46
       46
       +
             "unpackPhase"

     

       47
       47
       +
             "patchPhase"

     

       48
       48
       +
             "installPhase"

     

       49
       49
       +
           ];

     

       50
       50
       +
           separateDebugInfo = false;

     

       56
       51
        
       

     

       57
       57
       -
             dontUnpack = false;

     

       52
       52
       +
           dontUnpack = lib.warnIf (args.dontUnpack or false

     

       53
       53
       +
           ) "srcOnly: derivation has dontUnpack set, overriding" false;

     

       58
       54
        
       

     

       59
       59
       -
             dontInstall = false;

     

       60
       60
       -
             installPhase = "cp -pr --reflink=auto -- . $out";

     

       61
       61
       -
           }

     

       62
       62
       -
         );

     

       55
       55
       +
           dontInstall = false;

     

       56
       56
       +
           installPhase = "cp -pr --reflink=auto -- . $out";

     

       57
       57
       +
         };

     

       63
       58
        
       in

     

       64
       64
       -
       lib.warnIf (args.dontUnpack or false) "srcOnly: derivation has dontUnpack set, overriding" drv

     

       59
       59
       +
       

     

       60
       60
       +
       # If we are passed a derivation (based on stdenv*), we can use overrideAttrs to

     

       61
       61
       +
       # update the arguments to mkDerivation. This gives us the proper awareness of

     

       62
       62
       +
       # what arguments were effectively passed *to* mkDerivation as opposed to

     

       63
       63
       +
       # builtins.derivation (by mkDerivation). For example, stdenv.mkDerivation

     

       64
       64
       +
       # accepts an `env` attribute set which is postprocessed before being passed to

     

       65
       65
       +
       # builtins.derivation. This can lead to evaluation failures, if we assume

     

       66
       66
       +
       # that drvAttrs is equivalent to the arguments passed to mkDerivation.

     

       67
       67
       +
       # See https://github.com/NixOS/nixpkgs/issues/269539.

     

       68
       68
       +
       if lib.isDerivation attrs && attrs ? overrideAttrs then

     

       69
       69
       +
         attrs.overrideAttrs (_finalAttrs: prevAttrs: argsToOverride prevAttrs)

     

       70
       70
       +
       else

     

       71
       71
       +
         let

     

       72
       72
       +
           # TODO(@sternenseemann): remove drvAttrs special casing

     

       73
       73
       +
           # If we don't have overrideAttrs, it is extremely unlikely that we are seeing

     

       74
       74
       +
           # a derivation constructed by stdenv.mkDerivation. Since srcOnly assumes

     

       75
       75
       +
           # that we are using stdenv's setup.sh, it therefore doesn't make sense to

     

       76
       76
       +
           # have derivation specific logic in this branch.

     

       77
       77
       +
           args = attrs.drvAttrs or attrs;

     

       78
       78
       +
           stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC);

     

       79
       79
       +
           drv = stdenv.mkDerivation (args // argsToOverride args);

     

       80
       80
       +
         in

     

       81
       81
       +
         drv

+85 -22

pkgs/build-support/src-only/tests.nix

···

       5
       5
        
         hello,

     

       6
       6
        
         emptyDirectory,

     

       7
       7
        
         zlib,

     

       8
       8
       +
         git,

     

       9
       9
       +
         withCFlags,

     

       8
       10
        
         stdenv,

     

       9
       11
        
         testers,

     

       10
       12
        
       }:

     

       11
       13
        
       

     

       12
       14
        
       let

     

       15
       15
       +
         # Extract (effective) arguments passed to stdenv.mkDerivation and compute the

     

       16
       16
       +
         # arguments we would need to pass to srcOnly manually in order to get the same

     

       17
       17
       +
         # as `srcOnly drv`, i.e. the arguments passed to stdenv.mkDerivation plus the

     

       18
       18
       +
         # used stdenv itself.

     

       19
       19
       +
         getEquivAttrs =

     

       20
       20
       +
           drv:

     

       21
       21
       +
           let

     

       22
       22
       +
             drv' = drv.overrideAttrs (

     

       23
       23
       +
               _finalAttrs: prevAttrs: {

     

       24
       24
       +
                 passthru = prevAttrs.passthru or { } // {

     

       25
       25
       +
                   passedAttrs = prevAttrs;

     

       26
       26
       +
                 };

     

       27
       27
       +
               }

     

       28
       28
       +
             );

     

       29
       29
       +
           in

     

       30
       30
       +
           drv'.passedAttrs // { inherit (drv') stdenv; };

     

       31
       31
       +
       

     

       32
       32
       +
         canEvalDrv = drv: (builtins.tryEval drv.drvPath).success;

     

       33
       33
       +
       

     

       13
       34
        
         emptySrc = srcOnly emptyDirectory;

     

       14
       35
        
         zlibSrc = srcOnly zlib;

     

       15
       36
        
       

     

       16
       37
        
         # It can be invoked in a number of ways. Let's make sure they're equivalent.

     

       17
       17
       -
         zlibSrcDrvAttrs = srcOnly zlib.drvAttrs;

     

       38
       38
       +
         zlibSrcEquiv = srcOnly (getEquivAttrs zlib);

     

       18
       39
        
         # zlibSrcFreeform = # ???;

     

       19
       40
        
         helloSrc = srcOnly hello;

     

       20
       20
       -
         helloSrcDrvAttrs = srcOnly hello.drvAttrs;

     

       41
       41
       +
         helloSrcEquiv = srcOnly (getEquivAttrs hello);

     

       42
       42
       +
       

     

       43
       43
       +
         gitSrc = srcOnly git;

     

       44
       44
       +
         gitSrcEquiv = srcOnly (getEquivAttrs git);

     

       21
       45
        
       

     

       22
       46
        
         # The srcOnly <drv> invocation leaks a lot of attrs into the srcOnly derivation,

     

       23
       47
        
         # so for comparing with the freeform invocation, we need to make a selection.

     
···

       33
       57
        
             ;

     

       34
       58
        
         };

     

       35
       59
        
         helloDrvSimpleSrc = srcOnly helloDrvSimple;

     

       36
       36
       -
         helloDrvSimpleSrcFreeform = srcOnly (

     

       37
       37
       -
           {

     

       38
       38
       -
             inherit (helloDrvSimple)

     

       39
       39
       -
               name

     

       40
       40
       -
               pname

     

       41
       41
       -
               version

     

       42
       42
       -
               src

     

       43
       43
       -
               patches

     

       44
       44
       -
               stdenv

     

       45
       45
       -
               ;

     

       46
       46
       -
           }

     

       47
       47
       -
           # __impureHostDeps get duplicated in helloDrvSimpleSrc (on darwin)

     

       48
       48
       -
           # This is harmless, but fails the test for what is arguably an

     

       49
       49
       -
           # unrelated non-problem, so we just work around it here.

     

       50
       50
       -
           # The inclusion of __impureHostDeps really shouldn't be required,

     

       51
       51
       -
           # and should be removed from this test.

     

       52
       52
       -
           // lib.optionalAttrs (helloDrvSimple ? __impureHostDeps) {

     

       53
       53
       -
             inherit (helloDrvSimple) __impureHostDeps;

     

       60
       60
       +
         helloDrvSimpleSrcFreeform = srcOnly ({

     

       61
       61
       +
           inherit (helloDrvSimple)

     

       62
       62
       +
             name

     

       63
       63
       +
             pname

     

       64
       64
       +
             version

     

       65
       65
       +
             src

     

       66
       66
       +
             patches

     

       67
       67
       +
             stdenv

     

       68
       68
       +
             ;

     

       69
       69
       +
         });

     

       70
       70
       +
       

     

       71
       71
       +
         # Test the issue reported in https://github.com/NixOS/nixpkgs/issues/269539

     

       72
       72
       +
         stdenvAdapterDrv =

     

       73
       73
       +
           let

     

       74
       74
       +
             drv = (withCFlags [ "-Werror" "-Wall" ] stdenv).mkDerivation {

     

       75
       75
       +
               name = "drv-using-stdenv-adapter";

     

       76
       76
       +
             };

     

       77
       77
       +
           in

     

       78
       78
       +
           # Confirm the issue we are trying to avoid exists

     

       79
       79
       +
           assert !(canEvalDrv (srcOnly drv.drvAttrs));

     

       80
       80
       +
           drv;

     

       81
       81
       +
         stdenvAdapterDrvSrc = srcOnly stdenvAdapterDrv;

     

       82
       82
       +
         stdenvAdapterDrvSrcEquiv = srcOnly (

     

       83
       83
       +
           getEquivAttrs stdenvAdapterDrv

     

       84
       84
       +
           // {

     

       85
       85
       +
             # The upside of using overrideAttrs is that any stdenv adapter related

     

       86
       86
       +
             # modifications are only applied once. Using the adapter here again would

     

       87
       87
       +
             # mean applying it twice in total (since withCFlags functions more or less

     

       88
       88
       +
             # like an automatic overrideAttrs).

     

       89
       89
       +
             inherit stdenv;

     

       54
       90
        
           }

     

       55
       91
        
         );

     

       56
       92
        
       

     

       93
       93
       +
         # Issue similar to https://github.com/NixOS/nixpkgs/issues/269539

     

       94
       94
       +
         structuredAttrsDrv =

     

       95
       95
       +
           let

     

       96
       96
       +
             drv = stdenv.mkDerivation {

     

       97
       97
       +
               name = "drv-using-structured-attrs";

     

       98
       98
       +
               src = emptyDirectory;

     

       99
       99
       +
       

     

       100
       100
       +
               env.NIX_DEBUG = true;

     

       101
       101
       +
               __structuredAttrs = true;

     

       102
       102
       +
             };

     

       103
       103
       +
           in

     

       104
       104
       +
           # Confirm the issue we are trying to avoid exists

     

       105
       105
       +
           assert !(canEvalDrv (srcOnly drv.drvAttrs));

     

       106
       106
       +
           drv;

     

       107
       107
       +
         structuredAttrsDrvSrc = srcOnly structuredAttrsDrv;

     

       108
       108
       +
         structuredAttrsDrvSrcEquiv = srcOnly (getEquivAttrs structuredAttrsDrv);

     

       109
       109
       +
       

     

       57
       110
        
       in

     

       58
       111
        
       

     

       59
       112
        
       runCommand "srcOnly-tests"

     

       60
       113
        
         {

     

       61
       114
        
           moreTests = [

     

       62
       62
       -
             (testers.testEqualDerivation "zlibSrcDrvAttrs == zlibSrc" zlibSrcDrvAttrs zlibSrc)

     

       115
       115
       +
             (testers.testEqualDerivation "zlibSrcEquiv == zlibSrc" zlibSrcEquiv zlibSrc)

     

       63
       116
        
             # (testers.testEqualDerivation

     

       64
       117
        
             #   "zlibSrcFreeform == zlibSrc"

     

       65
       118
        
             #   zlibSrcFreeform

     

       66
       119
        
             #   zlibSrc)

     

       67
       67
       -
             (testers.testEqualDerivation "helloSrcDrvAttrs == helloSrc" helloSrcDrvAttrs helloSrc)

     

       120
       120
       +
             (testers.testEqualDerivation "helloSrcEquiv == helloSrc" helloSrcEquiv helloSrc)

     

       121
       121
       +
             (testers.testEqualDerivation "helloSrcEquiv == helloSrc" helloSrcEquiv helloSrc)

     

       122
       122
       +
             (testers.testEqualDerivation "gitSrcEquiv == gitSrc" gitSrcEquiv gitSrc)

     

       68
       123
        
             (testers.testEqualDerivation "helloDrvSimpleSrcFreeform == helloDrvSimpleSrc"

     

       69
       124
        
               helloDrvSimpleSrcFreeform

     

       70
       125
        
               helloDrvSimpleSrc

     

       126
       126
       +
             )

     

       127
       127
       +
             (testers.testEqualDerivation "stdenvAdapterDrvSrcEquiv == stdenvAdapterDrvSrc"

     

       128
       128
       +
               stdenvAdapterDrvSrcEquiv

     

       129
       129
       +
               stdenvAdapterDrvSrc

     

       130
       130
       +
             )

     

       131
       131
       +
             (testers.testEqualDerivation "structuredAttrsDrvSrcEquiv == structuredAttrsDrvSrc"

     

       132
       132
       +
               structuredAttrsDrvSrcEquiv

     

       133
       133
       +
               structuredAttrsDrvSrc

     

       71
       134
        
             )

     

       72
       135
        
           ];

     

       73
       136
        
         }