commit 214d4fb73cd5c2aab6718a38b35c8b5217f0f200 · pyrox.dev/nixpkgs

+10

lib/attrsets.nix

···

       221
       221
        
         isDerivation = x: isAttrs x && x ? type && x.type == "derivation";

     

       222
       222
        
       

     

       223
       223
        
       

     

       224
       224
       +
         /* Convert a store path to a fake derivation. */

     

       225
       225
       +
         toDerivation = path:

     

       226
       226
       +
           let path' = builtins.storePath path; in

     

       227
       227
       +
           { type = "derivation";

     

       228
       228
       +
             name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path'));

     

       229
       229
       +
             outPath = path';

     

       230
       230
       +
             outputs = [ "out" ];

     

       231
       231
       +
           };

     

       232
       232
       +
       

     

       233
       233
       +
       

     

       224
       234
        
         /* If the Boolean `cond' is true, return the attribute set `as',

     

       225
       235
        
            otherwise an empty attribute set. */

     

       226
       236
        
         optionalAttrs = cond: as: if cond then as else {};

+5

lib/strings.nix

···

       218
       218
        
       

     

       219
       219
        
         # Format a number adding leading zeroes up to fixed width.

     

       220
       220
        
         fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);

     

       221
       221
       +
       

     

       222
       222
       +
       

     

       223
       223
       +
         # Check whether a value is a store path.

     

       224
       224
       +
         isStorePath = x: builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == builtins.storeDir;

     

       225
       225
       +
       

     

       221
       226
        
       }

+5 -3

lib/types.nix

···

       94
       94
        
           # derivation is a reserved keyword.

     

       95
       95
        
           package = mkOptionType {

     

       96
       96
        
             name = "derivation";

     

       97
       97
       -
             check = isDerivation;

     

       98
       98
       -
             merge = mergeOneOption;

     

       97
       97
       +
             check = x: isDerivation x || isStorePath x;

     

       98
       98
       +
             merge = loc: defs:

     

       99
       99
       +
               let res = mergeOneOption loc defs;

     

       100
       100
       +
               in if isDerivation res then res else toDerivation res;

     

       99
       101
        
           };

     

       100
       102
        
       

     

       101
       103
        
           path = mkOptionType {

     

       102
       104
        
             name = "path";

     

       103
       105
        
             # Hacky: there is no ‘isPath’ primop.

     

       104
       104
       -
             check = x: builtins.unsafeDiscardStringContext (builtins.substring 0 1 (toString x)) == "/";

     

       106
       106
       +
             check = x: builtins.substring 0 1 (toString x) == "/";

     

       105
       107
        
             merge = mergeOneOption;

     

       106
       108
        
           };

     

       107
       109

+10 -1

nixos/doc/manual/development/option-declarations.xml

···

       107
       107
        
         </varlistentry>

     

       108
       108
        
       

     

       109
       109
        
         <varlistentry>

     

       110
       110
       +
           <term><varname>types.package</varname></term>

     

       111
       111
       +
           <listitem>

     

       112
       112
       +
             <para>A derivation (such as <literal>pkgs.hello</literal>) or a

     

       113
       113
       +
             store path (such as

     

       114
       114
       +
             <filename>/nix/store/1ifi1cfbfs5iajmvwgrbmrnrw3a147h9-hello-2.10</filename>).</para>

     

       115
       115
       +
           </listitem>

     

       116
       116
       +
         </varlistentry>

     

       117
       117
       +
       

     

       118
       118
       +
         <varlistentry>

     

       110
       119
        
           <term><varname>types.listOf</varname> <replaceable>t</replaceable></term>

     

       111
       120
        
           <listitem>

     

       112
       121
        
             <para>A list of elements of type <replaceable>t</replaceable>

     
···

       138
       147
        
       <varname>mkOptionType</varname>.  See

     

       139
       148
        
       <filename>lib/types.nix</filename> in Nixpkgs for details.</para>

     

       140
       149
        
       

     

       141
       141
       -
       </section>
     

       150
       150
       +
       </section>