commit 9670af42427c31f6a0c56ba7b5b0cb84c32a3d9b · pyrox.dev/nixpkgs

+8 -2

pkgs/pkgs-lib/formats/hocon/src/src/main.rs

···

       210
       210
        
                       let content = (if includes.is_empty() {

     

       211
       211
        
                           items

     

       212
       212
        
                       } else {

     

       213
       213
       -
                           format!("{}{}", includes, items)

     

       213
       213
       +
                           format!("{}\n{}", includes, items)

     

       214
       214
        
                       })

     

       215
       215
        
                       .split('\n')

     

       216
       216
       -
                       .map(|s| format!("  {}", s))

     

       216
       216
       +
                       .map(|s| {

     

       217
       217
       +
                           if s.is_empty() {

     

       218
       218
       +
                               "".to_string()

     

       219
       219
       +
                           } else {

     

       220
       220
       +
                               format!("  {}", s)

     

       221
       221
       +
                           }

     

       222
       222
       +
                       })

     

       217
       223
        
                       .collect::<Vec<String>>()

     

       218
       224
        
                       .join("\n");

     

       219
       225

pkgs/pkgs-lib/formats/hocon/test/comprehensive/expected.txt

···

       42
       42
        
           include required(file("/nix/store/ccnzr53dpipdacxgci3ii3bqacvb5hxm-hocon-test-include.conf"))

     

       43
       43
        
           include "/nix/store/ccnzr53dpipdacxgci3ii3bqacvb5hxm-hocon-test-include.conf"

     

       44
       44
        
           include url("https://example.com")

     

       45
       45
       +
       

     

       45
       46
        
         }

     

       46
       47
        
       }

     

       47
       48