commit f75c11cfdfff3448623250e151cb47df70d4f224 · pyrox.dev/nixpkgs

+2 -2

lib/attrsets.nix

···

       4
        
       let

     

       5
        
         inherit (builtins) head tail length;

     

       6
        
         inherit (lib.trivial) and;

     

       7
       -
         inherit (lib.strings) concatStringsSep;

     

       8
        
         inherit (lib.lists) fold concatMap concatLists;

     

       9
        
       in

     

       10
        
       

     
···

       310
        
             path' = builtins.storePath path;

     

       311
        
             res =

     

       312
        
               { type = "derivation";

     

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

     

       314
        
                 outPath = path';

     

       315
        
                 outputs = [ "out" ];

     

       316
        
                 out = res;

···

       4
        
       let

     

       5
        
         inherit (builtins) head tail length;

     

       6
        
         inherit (lib.trivial) and;

     

       7
       +
         inherit (lib.strings) concatStringsSep sanitizeDerivationName;

     

       8
        
         inherit (lib.lists) fold concatMap concatLists;

     

       9
        
       in

     

       10
        
       

     
···

       310
        
             path' = builtins.storePath path;

     

       311
        
             res =

     

       312
        
               { type = "derivation";

     

       313
       +
                 name = sanitizeDerivationName (builtins.substring 33 (-1) (baseNameOf path'));

     

       314
        
                 outPath = path';

     

       315
        
                 outputs = [ "out" ];

     

       316
        
                 out = res;

+32

lib/strings.nix

···

       678
        
              => "1.0"

     

       679
        
         */

     

       680
        
         fileContents = file: removeSuffix "\n" (builtins.readFile file);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       681
        
       }

···

       678
        
              => "1.0"

     

       679
        
         */

     

       680
        
         fileContents = file: removeSuffix "\n" (builtins.readFile file);

     

       681
       +
       

     

       682
       +
       

     

       683
       +
         /* Creates a valid derivation name from a potentially invalid one.

     

       684
       +
       

     

       685
       +
            Type: sanitizeDerivationName :: String -> String

     

       686
       +
       

     

       687
       +
            Example:

     

       688
       +
              sanitizeDerivationName "../hello.bar # foo"

     

       689
       +
              => "-hello.bar-foo"

     

       690
       +
              sanitizeDerivationName ""

     

       691
       +
              => "unknown"

     

       692
       +
              sanitizeDerivationName pkgs.hello

     

       693
       +
              => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10"

     

       694
       +
         */

     

       695
       +
         sanitizeDerivationName = string: lib.pipe string [

     

       696
       +
           # Get rid of string context. This is safe under the assumption that the

     

       697
       +
           # resulting string is only used as a derivation name

     

       698
       +
           builtins.unsafeDiscardStringContext

     

       699
       +
           # Strip all leading "."

     

       700
       +
           (x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0)

     

       701
       +
           # Split out all invalid characters

     

       702
       +
           # https://github.com/NixOS/nix/blob/2.3.2/src/libstore/store-api.cc#L85-L112

     

       703
       +
           # https://github.com/NixOS/nix/blob/2242be83c61788b9c0736a92bb0b5c7bbfc40803/nix-rust/src/store/path.rs#L100-L125

     

       704
       +
           (builtins.split "[^[:alnum:]+._?=-]+")

     

       705
       +
           # Replace invalid character ranges with a "-"

     

       706
       +
           (concatMapStrings (s: if lib.isList s then "-" else s))

     

       707
       +
           # Limit to 211 characters (minus 4 chars for ".drv")

     

       708
       +
           (x: substring (lib.max (stringLength x - 207) 0) (-1) x)

     

       709
       +
           # If the result is empty, replace it with "unknown"

     

       710
       +
           (x: if stringLength x == 0 then "unknown" else x)

     

       711
       +
         ];

     

       712
       +
       

     

       713
        
       }

+42

lib/tests/misc.nix

···

       3
        
       # if the resulting list is empty, all tests passed

     

       4
        
       with import ../default.nix;

     

       5
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6
        
       runTests {

     

       7
        
       

     

       8
        
       

     
···

       489
        
           };

     

       490
        
       

     

       491
        
           expected = "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       492
        
         };

     

       493
        
       }

···

       3
        
       # if the resulting list is empty, all tests passed

     

       4
        
       with import ../default.nix;

     

       5
        
       

     

       6
       +
       let

     

       7
       +
       

     

       8
       +
         testSanitizeDerivationName = { name, expected }:

     

       9
       +
         let

     

       10
       +
           drv = derivation {

     

       11
       +
             name = strings.sanitizeDerivationName name;

     

       12
       +
             builder = "x";

     

       13
       +
             system = "x";

     

       14
       +
           };

     

       15
       +
         in {

     

       16
       +
           # Evaluate the derivation so an invalid name would be caught

     

       17
       +
           expr = builtins.seq drv.drvPath drv.name;

     

       18
       +
           inherit expected;

     

       19
       +
         };

     

       20
       +
       

     

       21
       +
       in

     

       22
       +
       

     

       23
        
       runTests {

     

       24
        
       

     

       25
        
       

     
···

       506
        
           };

     

       507
        
       

     

       508
        
           expected = "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'";

     

       509
       +
         };

     

       510
       +
       

     

       511
       +
         testSanitizeDerivationNameLeadingDots = testSanitizeDerivationName {

     

       512
       +
           name = "..foo";

     

       513
       +
           expected = "foo";

     

       514
       +
         };

     

       515
       +
       

     

       516
       +
         testSanitizeDerivationNameAscii = testSanitizeDerivationName {

     

       517
       +
           name = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";

     

       518
       +
           expected = "-+--.-0123456789-=-?-ABCDEFGHIJKLMNOPQRSTUVWXYZ-_-abcdefghijklmnopqrstuvwxyz-";

     

       519
       +
         };

     

       520
       +
       

     

       521
       +
         testSanitizeDerivationNameTooLong = testSanitizeDerivationName {

     

       522
       +
           name = "This string is loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong";

     

       523
       +
           expected = "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong";

     

       524
       +
         };

     

       525
       +
       

     

       526
       +
         testSanitizeDerivationNameTooLongWithInvalid = testSanitizeDerivationName {

     

       527
       +
           name = "Hello there aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&&&&&&&";

     

       528
       +
           expected = "there-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-";

     

       529
       +
         };

     

       530
       +
       

     

       531
       +
         testSanitizeDerivationNameEmpty = testSanitizeDerivationName {

     

       532
       +
           name = "";

     

       533
       +
           expected = "unknown";

     

       534
        
         };

     

       535
        
       }