commit 9a0739cbe2b3b56dbc923a36f4e204afba917641 · pyrox.dev/nixpkgs

+9 -4

pkgs/pkgs-lib/formats/java-properties/default.nix

···

       1
       1
        
       { lib, pkgs }:

     

       2
       2
        
       {

     

       3
       3
       -
         javaProperties = {}: {

     

       3
       3
       +
         javaProperties = { comment ? "Generated with Nix" }: {

     

       4
       4
        
           type = lib.types.attrsOf lib.types.str;

     

       5
       5
        
       

     

       6
       6
        
           generate = name: value:

     
···

       76
       76
        
       

     

       77
       77
        
                 inputEncoding = "UTF-8";

     

       78
       78
        
       

     

       79
       79
       +
                 inherit comment;

     

       80
       80
       +
       

     

       79
       81
        
               } ''

     

       80
       80
       -
               jq -r --arg hash '#' "$jqCode" "$valuePath" \

     

       81
       81
       -
                 | iconv --from-code "$inputEncoding" --to-code JAVA \

     

       82
       82
       -
                 > "$out"

     

       82
       82
       +
               (

     

       83
       83
       +
                 echo "$comment" | while read -r ln; do echo "# $ln"; done

     

       84
       84
       +
                 echo

     

       85
       85
       +
                 jq -r --arg hash '#' "$jqCode" "$valuePath" \

     

       86
       86
       +
                   | iconv --from-code "$inputEncoding" --to-code JAVA \

     

       87
       87
       +
               ) > "$out"

     

       83
       88
        
             '';

     

       84
       89
        
         };

     

       85
       90
        
       }

pkgs/pkgs-lib/tests/formats.nix

···

       179
       179
        
             "الجبر" = "أكثر من مجرد أرقام";

     

       180
       180
        
           };

     

       181
       181
        
           expected = ''

     

       182
       182
       +
             # Generated with Nix

     

       183
       183
       +
       

     

       182
       184
        
             1 = 2

     

       183
       185
        
             foo = bar

     

       184
       186
        
             \u00fctf\ 8 = d\u00fbh