commit b1ce3cc1729fad3cc41066547d7fd502770623b2 · pyrox.dev/nixpkgs

+3 -3

lib/sources.nix

···

       21
       21
        
       

     

       22
       22
        
       

     

       23
       23
        
         # Get all files ending with the specified suffices from the given

     

       24
       24
       -
         # directory.  E.g. `sourceFilesBySuffices ./dir [".xml" ".c"]'.

     

       24
       24
       +
         # directory or its descendants.  E.g. `sourceFilesBySuffices ./dir

     

       25
       25
       +
         # [".xml" ".c"]'.

     

       25
       26
        
         sourceFilesBySuffices = path: exts:

     

       26
       27
        
           let filter = name: type:

     

       27
       28
        
             let base = baseNameOf (toString name);

     

       28
       28
       -
             in type != "directory" && lib.any (ext: lib.hasSuffix ext base) exts;

     

       29
       29
       +
             in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;

     

       29
       30
        
           in builtins.filterSource filter path;

     

       30
       30
       -
       

     

       31
       31
        
       

     

       32
       32
        
       }

+15 -11

nixos/doc/manual/default.nix

···

       36
       36
        
             -o $out ${./options-to-docbook.xsl} ${optionsXML}

     

       37
       37
        
         '';

     

       38
       38
        
       

     

       39
       39
       +
         sources = sourceFilesBySuffices ./. [".xml"];

     

       40
       40
       +
       

     

       41
       41
       +
         copySources =

     

       42
       42
       +
           ''

     

       43
       43
       +
             cp -prd $sources/* . # */

     

       44
       44
       +
             ln -s ${optionsDocBook} options-db.xml

     

       45
       45
       +
             echo "${version}" > version

     

       46
       46
       +
           '';

     

       47
       47
       +
       

     

       39
       48
        
       in rec {

     

       40
       49
        
       

     

       41
       50
        
         # Generate the NixOS manual.

     

       42
       51
        
         manual = stdenv.mkDerivation {

     

       43
       52
        
           name = "nixos-manual";

     

       44
       53
        
       

     

       45
       45
       -
           sources = sourceFilesBySuffices ./. [".xml"];

     

       54
       54
       +
           inherit sources;

     

       46
       55
        
       

     

       47
       56
        
           buildInputs = [ libxml2 libxslt ];

     

       48
       57
        
       

     
···

       57
       66
        
           '';

     

       58
       67
        
       

     

       59
       68
        
           buildCommand = ''

     

       60
       60
       -
             ln -s $sources/*.xml . # */

     

       61
       61
       -
             ln -s ${optionsDocBook} options-db.xml

     

       62
       62
       -
             echo "${version}" > version

     

       69
       69
       +
             ${copySources}

     

       63
       70
        
       

     

       64
       71
        
             # Check the validity of the manual sources.

     

       65
       72
        
             xmllint --noout --nonet --xinclude --noxincludenode \

     
···

       90
       97
        
         manualPDF = stdenv.mkDerivation {

     

       91
       98
        
           name = "nixos-manual-pdf";

     

       92
       99
        
       

     

       93
       93
       -
           sources = sourceFilesBySuffices ./. [".xml"];

     

       100
       100
       +
           inherit sources;

     

       94
       101
        
       

     

       95
       102
        
           buildInputs = [ libxml2 libxslt dblatex tetex ];

     

       96
       103
        
       

     
···

       98
       105
        
             # TeX needs a writable font cache.

     

       99
       106
        
             export VARTEXFONTS=$TMPDIR/texfonts

     

       100
       107
        
       

     

       101
       101
       -
             ln -s $sources/*.xml . # */

     

       102
       102
       -
             ln -s ${optionsDocBook} options-db.xml

     

       103
       103
       -
             echo "${version}" > version

     

       108
       108
       +
             ${copySources}

     

       104
       109
        
       

     

       105
       110
        
             dst=$out/share/doc/nixos

     

       106
       111
        
             mkdir -p $dst

     
···

       117
       122
        
         manpages = stdenv.mkDerivation {

     

       118
       123
        
           name = "nixos-manpages";

     

       119
       124
        
       

     

       120
       120
       -
           sources = sourceFilesBySuffices ./. [".xml"];

     

       125
       125
       +
           inherit sources;

     

       121
       126
        
       

     

       122
       127
        
           buildInputs = [ libxml2 libxslt ];

     

       123
       128
        
       

     

       124
       129
        
           buildCommand = ''

     

       125
       125
       -
             ln -s $sources/*.xml . # */

     

       126
       126
       -
             ln -s ${optionsDocBook} options-db.xml

     

       130
       130
       +
             ${copySources}

     

       127
       131
        
       

     

       128
       132
        
             # Check the validity of the manual sources.

     

       129
       133
        
             xmllint --noout --nonet --xinclude --noxincludenode \