commit 09ab016c6c68a890a155789aa0b9108be2f845cf · pyrox.dev/nixpkgs

+2 -2

doc/introduction.xml

···

       7
       7
        
       <para>This manual tells you how to write packages for the Nix Packages

     

       8
       8
        
       collection (Nixpkgs).  Thus it’s for packagers and developers who want

     

       9
       9
        
       to add packages to Nixpkgs.  End users are kindly referred to the

     

       10
       10
       -
       <link xlink:href="http://nixos.org/releases/nix/unstable/manual/">Nix

     

       10
       10
       +
       <link xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual">Nix

     

       11
       11
        
       manual</link>.</para>

     

       12
       12
        
       

     

       13
       13
        
       <para>This manual does not describe the syntax and semantics of the

     

       14
       14
        
       Nix expression language, which are given in the Nix manual in the

     

       15
       15
        
       <link

     

       16
       16
       -
       xlink:href="http://nixos.org/releases/nix/unstable/manual/#chap-writing-nix-expressions">chapter

     

       16
       16
       +
       xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter

     

       17
       17
        
       on writing Nix expressions</link>.  It only describes the facilities

     

       18
       18
        
       provided by Nixpkgs to make writing packages easier, such as the

     

       19
       19
        
       standard build environment (<literal>stdenv</literal>).</para>

doc/language-support.xml

···

       196
       196
        
       </section>

     

       197
       197
        
       

     

       198
       198
        
       

     

       199
       199
       +
       <!--

     

       199
       200
        
       <section><title>Haskell</title>

     

       200
       201
        
       

     

       201
       202
        
       <para>TODO</para>

     
···

       215
       216
        
       <para>* Special support for building TeX documents</para>

     

       216
       217
        
       

     

       217
       218
        
       </section>

     

       219
       219
       +
       -->

     

       218
       220
        
       

     

       219
       221
        
       

     

       220
       222
        
       </chapter>

+2 -4

doc/manual.xml

···

       14
       14
        
               <surname>Dolstra</surname>

     

       15
       15
        
             </personname>

     

       16
       16
        
             <affiliation>

     

       17
       17
       -
               <orgname>Delft University of Technology</orgname>

     

       18
       18
       -
               <orgdiv>Department of Software Technology</orgdiv>

     

       17
       17
       +
               <orgname>LogicBlox</orgname>

     

       19
       18
        
             </affiliation>

     

       20
       19
        
           </author>

     

       21
       20
        
       

     

       22
       21
        
           <copyright>

     

       23
       23
       -
             <year>2008</year>

     

       24
       24
       -
             <year>2009</year>

     

       22
       22
       +
             <year>2008-2012</year>

     

       25
       23
        
             <holder>Eelco Dolstra</holder>

     

       26
       24
        
           </copyright>

     

       27
       25

doc/package-notes.xml

···

       224
       224
        
       

     

       225
       225
        
       <!--============================================================-->

     

       226
       226
        
       

     

       227
       227
       +
       <!--

     

       227
       228
        
       <section>

     

       228
       229
        
         <title>Gnome</title>

     

       229
       230
        
         <para>* Expression is auto-generated</para>

     

       230
       231
        
         <para>* How to update</para>

     

       231
       232
        
       </section>

     

       233
       233
       +
       -->

     

       232
       234
        
       

     

       233
       235
        
       

     

       234
       236
        
       <!--============================================================-->

     

       235
       237
        
       

     

       238
       238
       +
       <!--

     

       236
       239
        
       <section>

     

       237
       240
        
         <title>GCC</title>

     

       238
       241
        
         <para>…</para>

     

       239
       242
        
       </section>

     

       243
       243
       +
       -->

     

       240
       244
        
       

     

       241
       245
        
       

     

       242
       246
        
       </chapter>

+39 -67

doc/style.css

···

       8
       8
        
       

     

       9
       9
        
       body

     

       10
       10
        
       {

     

       11
       11
       -
           font-family: sans-serif;

     

       11
       11
       +
           font-family: "Nimbus Sans L", sans-serif;

     

       12
       12
        
           background: white;

     

       13
       13
        
           margin: 2em 1em 2em 1em;

     

       14
       14
        
       }

     

       15
       15
        
       

     

       16
       16
       -
       h1,h2,h3

     

       16
       16
       +
       h1, h2, h3, h4

     

       17
       17
        
       {

     

       18
       18
        
           color: #005aa0;

     

       19
       19
       -
           text-align: left;

     

       20
       19
        
       }

     

       21
       20
        
       

     

       22
       21
        
       h1 /* title */

     
···

       46
       45
        
           font-size: 125%;

     

       47
       46
        
       }

     

       48
       47
        
       

     

       48
       48
       +
       div.simplesect h2

     

       49
       49
       +
       {

     

       50
       50
       +
           font-size: 110%;

     

       51
       51
       +
       }

     

       52
       52
       +
       

     

       49
       53
        
       div.appendix h3

     

       50
       54
        
       {

     

       51
       55
        
           font-size: 150%;

     
···

       70
       74
        
       

     

       71
       75
        
       div.example

     

       72
       76
        
       {

     

       73
       73
       -
           border: 1px solid #6185a0;

     

       77
       77
       +
           border: 1px solid #b0b0b0;

     

       74
       78
        
           padding: 6px 6px;

     

       75
       79
        
           margin-left: 1.5em;

     

       76
       80
        
           margin-right: 1.5em;

     

       77
       81
        
           background: #f4f4f8;

     

       82
       82
       +
           border-radius: 0.4em;

     

       83
       83
       +
           box-shadow: 0.4em 0.4em 0.5em #e0e0e0;

     

       78
       84
        
       }

     

       79
       85
        
       

     

       80
       86
        
       div.example p.title

     
···

       82
       88
        
           margin-top: 0em;

     

       83
       89
        
       }

     

       84
       90
        
       

     

       91
       91
       +
       div.example pre

     

       92
       92
       +
       {

     

       93
       93
       +
           box-shadow: none;

     

       94
       94
       +
       }

     

       95
       95
       +
       

     

       85
       96
        
       

     

       86
       97
        
       /***************************************************************************

     

       87
       98
        
                                   Screen dumps:

     
···

       89
       100
        
       

     

       90
       101
        
       pre.screen, pre.programlisting

     

       91
       102
        
       {

     

       92
       92
       -
           border: 1px solid #6185a0;

     

       103
       103
       +
           border: 1px solid #b0b0b0;

     

       93
       104
        
           padding: 3px 3px;

     

       94
       105
        
           margin-left: 1.5em;

     

       95
       106
        
           margin-right: 1.5em;

     

       96
       107
        
           color: #600000;

     

       97
       108
        
           background: #f4f4f8;

     

       98
       109
        
           font-family: monospace;

     

       99
       99
       -
           /* font-size: 90%; */

     

       110
       110
       +
           border-radius: 0.4em;

     

       111
       111
       +
           box-shadow: 0.4em 0.4em 0.5em #e0e0e0;

     

       100
       112
        
       }

     

       101
       113
        
       

     

       102
       114
        
       div.example pre.programlisting

     
···

       113
       125
        
       

     

       114
       126
        
       .note, .warning

     

       115
       127
        
       {

     

       116
       116
       -
           border: 1px solid #6185a0;

     

       128
       128
       +
           border: 1px solid #b0b0b0;

     

       117
       129
        
           padding: 3px 3px;

     

       118
       130
        
           margin-left: 1.5em;

     

       119
       131
        
           margin-right: 1.5em;

     

       120
       132
        
           margin-bottom: 1em;

     

       121
       133
        
           padding: 0.3em 0.3em 0.3em 0.3em;

     

       122
       134
        
           background: #fffff5;

     

       135
       135
       +
           border-radius: 0.4em;

     

       136
       136
       +
           box-shadow: 0.4em 0.4em 0.5em #e0e0e0;

     

       123
       137
        
       }

     

       124
       138
        
       

     

       125
       139
        
       div.note, div.warning

     
···

       131
       145
        
       {

     

       132
       146
        
           color: red;

     

       133
       147
        
           font-size: 100%;

     

       134
       134
       -
       //    margin: 0 0 0 0;

     

       135
       148
        
           padding-right: 0.5em;

     

       136
       149
        
           display: inline;

     

       137
       150
        
       }

     
···

       162
       175
        
                               Links colors and highlighting: 

     

       163
       176
        
        ***************************************************************************/

     

       164
       177
        
       

     

       178
       178
       +
       a { text-decoration: none; }

     

       179
       179
       +
       a:hover { text-decoration: underline; }

     

       165
       180
        
       a:link { color: #0048b3; }

     

       166
       181
        
       a:visited { color: #002a6a; }

     

       167
       167
       -
       a:hover { background: #ffffcd; }

     

       168
       182
        
       

     

       169
       183
        
       

     

       170
       184
        
       /***************************************************************************

     

       171
       185
        
                                     Table of contents:

     

       172
       186
        
        ***************************************************************************/

     

       173
       187
        
       

     

       174
       174
       -
       .toc

     

       188
       188
       +
       div.toc

     

       175
       189
        
       {

     

       176
       190
        
           font-size: 90%;

     

       177
       191
        
       }

     

       178
       192
        
       

     

       193
       193
       +
       div.toc dl

     

       194
       194
       +
       {

     

       195
       195
       +
           margin-top: 0em;

     

       196
       196
       +
           margin-bottom: 0em;

     

       197
       197
       +
       }

     

       179
       198
        
       

     

       180
       199
        
       

     

       181
       200
        
       /***************************************************************************

     
···

       208
       227
        
           font-style: italic;

     

       209
       228
        
       }

     

       210
       229
        
       

     

       211
       211
       -
       .default

     

       212
       212
       -
       {

     

       213
       213
       -
           font-style: italic;

     

       214
       214
       -
       }

     

       215
       215
       -
       

     

       216
       216
       -
       .availability

     

       217
       217
       -
       {

     

       218
       218
       -
           font-style: italic;

     

       219
       219
       -
       }

     

       220
       220
       -
       

     

       221
       230
        
       .varname

     

       222
       231
        
       {

     

       223
       232
        
           color: #400000;

     

       224
       233
        
       }

     

       225
       234
        
       

     

       226
       226
       -
       

     

       227
       227
       -
       div.informaltable table

     

       228
       228
       -
       {

     

       229
       229
       -
         border: 1px solid #6185a0;

     

       230
       230
       -
         width: 100%;

     

       231
       231
       -
       }

     

       232
       232
       -
       

     

       233
       233
       -
       div.informaltable td

     

       235
       235
       +
       span.command strong

     

       234
       236
        
       {

     

       235
       235
       -
         border: 0;

     

       236
       236
       -
         padding: 5px;

     

       237
       237
       +
           font-weight: normal;

     

       238
       238
       +
           color: #400000;

     

       237
       239
        
       }

     

       238
       240
        
       

     

       239
       239
       -
       div.informaltable td.default

     

       241
       241
       +
       div.calloutlist table

     

       240
       242
        
       {

     

       241
       241
       -
         text-align: right;

     

       243
       243
       +
           box-shadow: none;

     

       242
       244
        
       }

     

       243
       245
        
       

     

       244
       244
       -
       div.informaltable th

     

       246
       246
       +
       table

     

       245
       247
        
       {

     

       246
       246
       -
         text-align: left;

     

       247
       247
       -
         color: #005aa0;

     

       248
       248
       -
         border: 0;

     

       249
       249
       -
         padding: 5px;

     

       250
       250
       -
         background: #fffff5;

     

       251
       251
       -
         font-weight: normal;

     

       252
       252
       -
         font-style: italic;

     

       248
       248
       +
           border-collapse: collapse;

     

       249
       249
       +
           box-shadow: 0.4em 0.4em 0.5em #e0e0e0;

     

       253
       250
        
       }

     

       254
       251
        
       

     

       255
       255
       -
       td.varname, td.tagname, td.paramname

     

       256
       256
       -
       {

     

       257
       257
       -
         font-weight: bold;

     

       258
       258
       -
         vertical-align: top;

     

       259
       259
       -
       }

     

       260
       260
       -
       

     

       261
       261
       -
       div.epigraph

     

       252
       252
       +
       div.affiliation

     

       262
       253
        
       {

     

       263
       254
        
           font-style: italic;

     

       264
       264
       -
           text-align: right;

     

       265
       265
       -
       }

     

       266
       266
       -
       

     

       267
       267
       -
       table.productionset table.productionset

     

       268
       268
       -
       {

     

       269
       269
       -
           font-family: monospace;

     

       270
       270
       -
       }

     

       271
       271
       -
       

     

       272
       272
       -
       strong.command

     

       273
       273
       -
       {

     

       274
       274
       -
       //    font-family: monospace;

     

       275
       275
       -
       //    font-style: italic;

     

       276
       276
       -
       //    font-weight: normal;

     

       277
       277
       -
           color: #400000;

     

       278
       278
       -
       }

     

       279
       279
       -
       

     

       280
       280
       -
       div.calloutlist td

     

       281
       281
       -
       {

     

       282
       282
       -
           padding-bottom: 1em;

     

       283
       283
       -
       }

     

       255
       255
       +
       }