commit 931f464581651b32b02eac6b28847b8d1b93ffcd · pyrox.dev/nixpkgs

lib/tests/modules/pathWith.nix

···

       58
       58
        
         pathInStore.ok1 = "${storeDir}/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv";

     

       59
       59
        
         pathInStore.ok2 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15";

     

       60
       60
        
         pathInStore.ok3 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash";

     

       61
       61
       +
         pathInStore.ok4 = "/1121rp0gvr1qya7hvy925g5kjwg66acz6sn1ra1hca09f1z5dsab"; # CA derivation

     

       62
       62
       +
         pathInStore.ok5 = "/1121rp0gvr1qya7hvy925g5kjwg66acz6sn1ra1hca09f1z5dsab/bin/bash"; # CA derivation

     

       63
       63
       +
         pathInStore.ok6 = /1121rp0gvr1qya7hvy925g5kjwg66acz6sn1ra1hca09f1z5dsab; # CA derivation, path type

     

       61
       64
        
         pathInStore.bad1 = "";

     

       62
       65
        
         pathInStore.bad2 = "${storeDir}";

     

       63
       66
        
         pathInStore.bad3 = "${storeDir}/";

+8 -1

lib/types.nix

···

       669
       669
        
                   check =

     

       670
       670
        
                     x:

     

       671
       671
        
                     let

     

       672
       672
       -
                       isInStore = builtins.match "${builtins.storeDir}/[^.].*" (toString x) != null;

     

       672
       672
       +
                       isInStore = lib.path.hasStorePathPrefix (

     

       673
       673
       +
                         if builtins.isPath x then

     

       674
       674
       +
                           x

     

       675
       675
       +
                         # Discarding string context is necessary to convert the value to

     

       676
       676
       +
                         # a path and safe as the result is never used in any derivation.

     

       677
       677
       +
                         else

     

       678
       678
       +
                           /. + builtins.unsafeDiscardStringContext x

     

       679
       679
       +
                       );

     

       673
       680
        
                       isAbsolute = builtins.substring 0 1 (toString x) == "/";

     

       674
       681
        
                       isExpectedType = (

     

       675
       682
        
                         if inStore == null || inStore then isStringLike x else isString x # Do not allow a true path, which could be copied to the store later on.